From a248853a8a7a16cb3ad29cd08dd97396a581c2b9 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 12 Nov 2020 11:22:02 +0300 Subject: [PATCH 1/3] fixed null --- addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index eb1b70eb9..34e91fa0e 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -35,7 +35,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface } public function searchAdvs( - $type, $param = null, $customParameters = null, + $type, $param = null, $customParameters = [], $limit = null, $category = null, $city = null, $paginate = true ) { From 0dd3934aeb92d68935b8896c8273e3009d5ab7ba Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 12 Nov 2020 13:09:51 +0300 Subject: [PATCH 2/3] myAds price currency format edited --- .../advs-module/src/Http/Controller/AjaxController.php | 2 ++ .../visiosoft/profile-module/resources/assets/js/ads.js | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/AjaxController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/AjaxController.php index 7f88318b2..97c6447ff 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/AjaxController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AjaxController.php @@ -1,6 +1,7 @@ $ad) { $my_advs[$index]->detail_url = $this->adv_model->getAdvDetailLinkByModel($ad, 'list'); $my_advs[$index] = $this->adv_model->AddAdsDefaultCoverImage($ad); + $my_advs[$index]->formatted_price = app(Currency::class)->format($ad->price, $ad->currency); } return response()->json(['success' => true, 'content' => $my_advs, 'title' => $page_title]); diff --git a/addons/default/visiosoft/profile-module/resources/assets/js/ads.js b/addons/default/visiosoft/profile-module/resources/assets/js/ads.js index c6b8b7454..98689ab42 100644 --- a/addons/default/visiosoft/profile-module/resources/assets/js/ads.js +++ b/addons/default/visiosoft/profile-module/resources/assets/js/ads.js @@ -37,8 +37,8 @@ function changePage(page) { } for (var i = (page - 1) * records_per_page; i < (page * records_per_page) && i < objJson.length; i++) { listing_table.append(addAdsRow(objJson[i].id, objJson[i].detail_url, objJson[i].cover_photo, objJson[i].name, - objJson[i].price + " " + objJson[i].currency, - objJson[i].city_name, objJson[i].country_name, objJson[i].cat1_name, objJson[i].cat2_name, objJson[i].status)); + objJson[i].formatted_price, objJson[i].city_name, objJson[i].country_name, objJson[i].cat1_name, + objJson[i].cat2_name, objJson[i].status)); } page_span.html(page + "/" + numPages()); @@ -97,7 +97,7 @@ type = type ? type : 'approved'; getMyAdvs(type); -function addAdsRow(id, href, image, name, price, city, country, cat1, cat2, status) { +function addAdsRow(id, href, image, name, formatted_price, city, country, cat1, cat2, status) { return "
\n" + "
\n" + "
\n" + @@ -120,7 +120,7 @@ function addAdsRow(id, href, image, name, price, city, country, cat1, cat2, stat "
\n" + "
\n" + "
\n" + - "" + price + "\n" + + "" + formatted_price + "\n" + "
\n" + "
\n" + "" + city + " " + country + "\n" + From 381d01063894af74e1f51cd15e3245c313476134 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 12 Nov 2020 13:21:39 +0300 Subject: [PATCH 3/3] latestAds currency format edited --- .../visiosoft/base-theme/resources/views/index/default.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/base-theme/resources/views/index/default.twig b/addons/default/visiosoft/base-theme/resources/views/index/default.twig index 682d8f74f..1dc1a2507 100644 --- a/addons/default/visiosoft/base-theme/resources/views/index/default.twig +++ b/addons/default/visiosoft/base-theme/resources/views/index/default.twig @@ -36,7 +36,7 @@
{% if setting_value('visiosoft.theme.base::price_fields') %}
- {{ latestAd.price }} {{ latestAd.currency }} + {{ currency_format(latestAd.price, latestAd.currency) }}
{% endif %}