From e647124f0f43fb4c1b59c538ea540a572e4e4180 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Tue, 24 Dec 2019 18:17:02 +0300 Subject: [PATCH 01/11] #557 Installment calculation widget --- .../resources/views/ad-detail/detail.twig | 2 ++ .../advs-module/src/AdvsModuleServiceProvider.php | 5 +++++ .../src/Http/Controller/AjaxController.php | 12 +++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig index b0ec93e9a..b3e8195a8 100644 --- a/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig +++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig @@ -47,6 +47,8 @@ {{ blocks('ad-item-content-block-area') }} {% endif %} + {{ addBlock('ad-detail/widget', {'price': adv.price, 'id': adv.id})|raw }} + diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index 997e73ee5..439b3ceb5 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -207,6 +207,11 @@ class AdvsModuleServiceProvider extends AddonServiceProvider 'as' => 'ajax::getAds', 'uses' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@getMyAds' ], + + 'ajax/loanApplication' => [ + 'as' => 'ajax::loanApplication', + 'uses' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@sendLoanApplication' + ], ]; /** 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 9ddb7ad32..960f45490 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 @@ adv_model = $advModel; + $this->userModel = $userModel; parent::__construct(); } @@ -88,4 +92,10 @@ class AjaxController extends PublicController return response()->json(['success' => true, 'content' => $my_advs, 'title' => $page_title]); } + public function sendLoanApplication(Request $request) + { + $this->userModel->find(1)->notify(new SendLoanApplicationMail($request)); + return response()->json(['success' => true, 'content' => $request['firstName']]); + } + } \ No newline at end of file From 7827806f71ba694c5effd8d66a1988ed3c14901b Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 25 Dec 2019 14:19:12 +0300 Subject: [PATCH 02/11] #587 [sahibinden-module] Getting custom fields dynamically --- .../visiosoft/advs-module/src/AdvsModuleServiceProvider.php | 4 ---- .../advs-module/src/Http/Controller/AjaxController.php | 6 ------ 2 files changed, 10 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index 439b3ceb5..b90a22ade 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -208,10 +208,6 @@ class AdvsModuleServiceProvider extends AddonServiceProvider 'uses' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@getMyAds' ], - 'ajax/loanApplication' => [ - 'as' => 'ajax::loanApplication', - 'uses' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@sendLoanApplication' - ], ]; /** 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 960f45490..ea82429bd 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/AjaxController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AjaxController.php @@ -92,10 +92,4 @@ class AjaxController extends PublicController return response()->json(['success' => true, 'content' => $my_advs, 'title' => $page_title]); } - public function sendLoanApplication(Request $request) - { - $this->userModel->find(1)->notify(new SendLoanApplicationMail($request)); - return response()->json(['success' => true, 'content' => $request['firstName']]); - } - } \ No newline at end of file From 4bf516f700c8ee862d159a657a26a845e1e912a4 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 26 Dec 2019 17:44:02 +0300 Subject: [PATCH 03/11] #611 [Store-module] Bugs needs to fix --- .../views/list/partials/user-section.twig | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig index 86d13a10b..4035dca7a 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig @@ -1,22 +1,22 @@ {% if app.request.get('user') != null or app.request.get('user') != "" %} - - {% if userProfile.adv_listing_banner.url == '' %} - {% set background_user = img('visiosoft.module.advs::images/user_section_back.png').url %} - {% else %} - {% set background_user = userProfile.adv_listing_banner.url %} - {% endif %} -
-
-
-
- - {# #} -
-
{{ user.first_name }} {{ user.last_name }}
+ {% set store = entries('store','store').where('user_id', user.id).first() %} + {% if store is not null %} + {% if userProfile.adv_listing_banner.url == '' %} + {% set background_user = img('visiosoft.module.advs::images/user_section_back.png').url %} + {% else %} + {% set background_user = userProfile.adv_listing_banner.url %} + {% endif %} +
+
+
+
+ +
+
{{ store.name }}
+
-
+ {% endif %} {% endif %} \ No newline at end of file From b8da5221ce01bf46320e3dd73015ff0db4f3c68a Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 30 Dec 2019 12:11:05 +0300 Subject: [PATCH 04/11] !5 update message module --- .../resources/assets/js/messages.js | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 addons/default/visiosoft/profile-module/resources/assets/js/messages.js diff --git a/addons/default/visiosoft/profile-module/resources/assets/js/messages.js b/addons/default/visiosoft/profile-module/resources/assets/js/messages.js new file mode 100644 index 000000000..dba45a9ab --- /dev/null +++ b/addons/default/visiosoft/profile-module/resources/assets/js/messages.js @@ -0,0 +1,45 @@ +function crud(params, url, type, callback) { + $.ajax({ + type: type, + data: params, + url: url, + success: function (response) { + console.log(response) + callback(response); + }, + }); +} + +function getMyMessages(type) { + crud({'type': type}, '/api/messages', 'GET', function (response) { + $('#nav-' + type).html(""); + $.each(response, function (index, message) { + $('#nav-' + type).append( + addMessagesRow( + message.id, + message.sender_name, + message.receiver_name, + message.sent_at + ) + ); + }); + }) +} + +$('.profile-ads-tab a').on('click', function () { + getMyMessages($(this).attr('data-type')) +}); + +getMyMessages('inbox'); + +function addMessagesRow(id, senderName, receiverName, sentAt) { + return ` + +
+
${from}:${senderName}
+
${to}:${receiverName}
+ ${sentAt} +
+ + ` +} From 60be8e32dbb29581d0c0ca6446c2065fc4b05523 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 30 Dec 2019 13:19:19 +0300 Subject: [PATCH 05/11] #77 Filtering options disappear when you use pagination --- .../visiosoft/advs-module/resources/lang/en/setting.php | 3 +++ .../visiosoft/advs-module/resources/views/list/list.twig | 4 +++- .../visiosoft/advs-module/src/Adv/AdvRepository.php | 3 --- .../advs-module/src/Http/Controller/advsController.php | 8 -------- .../location-module/resources/lang/en/setting.php | 3 +++ 5 files changed, 9 insertions(+), 12 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php index 6b89c2c6d..d252b2e13 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -42,6 +42,9 @@ return [ 'currencies' => [ 'name' => 'Active Currencies', ], + 'latest-limit' => [ + 'name' => 'Latest Limit', + ], 'site_address' => [ 'name' => 'Site address', 'warning' => 'Auto added www. www.sitename.com ', diff --git a/addons/default/visiosoft/advs-module/resources/views/list/list.twig b/addons/default/visiosoft/advs-module/resources/views/list/list.twig index 6d934047c..f6cc74d44 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -33,7 +33,9 @@ {% block listContent %} {% include "visiosoft.module.advs::list/partials/ads" %} {% endblock %} - +
+
+ {{ advs.links()|raw }}
{#
#}
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index 84fdc2a26..6d3e570c5 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -48,8 +48,6 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface public function searchAdvs($type, $param = null, $customParameters = null, $limit = null) { - //dd($param); - $isActiveDopings = new AdvModel(); $isActiveDopings = $isActiveDopings->is_enabled('dopings'); @@ -246,7 +244,6 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface $query = $query->select('advs_advs.*', 'advs_advs_translations.name as name', 'advs_advs_translations.advs_desc as advs_desc'); } - if ($type == "list") { return $query->paginate($this->settings->value('streams::per_page')); } else { diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index 9075eb65d..2470f4b85 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -465,14 +465,6 @@ class AdvsController extends PublicController return redirect('/'); } - if ($advModel->is_enabled('store')) { - $StoreAdModel = new AdModel(); - if ($request->store != "0" and $request->store != null) { - $StoreAdModel->createStoreAdLoggedInUser($request->store, $request->update_id); - } else { - $StoreAdModel->removeAdStore($request->update_id); - } - } $adv->is_get_adv = $request->is_get_adv; $adv->save(); diff --git a/addons/default/visiosoft/location-module/resources/lang/en/setting.php b/addons/default/visiosoft/location-module/resources/lang/en/setting.php index d0f6d8039..40603ccda 100644 --- a/addons/default/visiosoft/location-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/location-module/resources/lang/en/setting.php @@ -10,4 +10,7 @@ return [ 'detail_page_location' => [ 'name' => 'Detail Page Location Field', ], + 'show_search_location_btn' => [ + 'name' => 'Show Search Location Button', + ], ]; From a0d1ca2c3f934e2b4b009ce1a70347ec19026a71 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 30 Dec 2019 13:54:19 +0300 Subject: [PATCH 06/11] #77 Filtering options disappear when you use pagination FIXED! --- .../visiosoft/advs-module/resources/views/list/list.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/list.twig b/addons/default/visiosoft/advs-module/resources/views/list/list.twig index f6cc74d44..d2ed6b68c 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -35,7 +35,7 @@ {% endblock %}
- {{ advs.links()|raw }} + {{ advs.appends(request_query()).links()|raw }}
{#
#}
From c9827cfb3b19dcdc14b8c1994be545708e515f75 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 30 Dec 2019 15:53:44 +0300 Subject: [PATCH 07/11] #604 Video filtering --- .../visiosoft/advs-module/src/Adv/AdvRepository.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index 6d3e570c5..67ac7a901 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -123,11 +123,9 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface if (!empty($param['photo'])) { $query = $query->whereNotNull('cover_photo'); } -// if (!empty($param['video'])) { -// $int = (int)$num; -// $column = "JSON_EXTRACT(foreign_currencies, '$." . $param['currency'] . "') <=" . $int; -// $query = $query->whereRaw($column); -// } + if (!empty($param['video'])) { + $query = $query->where('cover_photo', 'like', '%video/upload/w_400,e_loop%'); + } if (!empty($param['map']) && $param['map'] == true) { $query = $query->whereNotNull('map_Val'); } From adb9c53c2d564612b1e54abd265738b8d839d25d Mon Sep 17 00:00:00 2001 From: Diatrex Date: Tue, 31 Dec 2019 10:36:56 +0300 Subject: [PATCH 08/11] make loancalc module work with sahibinden theme --- .../resources/views/list/partials/user-section.twig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig index 4035dca7a..030e431df 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig @@ -1,18 +1,18 @@ {% if app.request.get('user') != null or app.request.get('user') != "" %} {% set store = entries('store','store').where('user_id', user.id).first() %} {% if store is not null %} - {% if userProfile.adv_listing_banner.url == '' %} - {% set background_user = img('visiosoft.module.advs::images/user_section_back.png').url %} + {% if store.store_banner is null %} + {% set background_image = img('visiosoft.module.advs::images/user_section_back.png').url %} {% else %} - {% set background_user = userProfile.adv_listing_banner.url %} + {% set background_image = store.store_banner.url %} {% endif %} -
+
-
{{ store.name }}
+
{{ store.name }}
From bbd8a718e339925bce0225e494eed87f135330b2 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Tue, 31 Dec 2019 10:48:28 +0300 Subject: [PATCH 09/11] show store section for all users in the store --- .../resources/views/list/partials/user-section.twig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig index 030e431df..01f105bf1 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig @@ -1,5 +1,9 @@ {% if app.request.get('user') != null or app.request.get('user') != "" %} {% set store = entries('store','store').where('user_id', user.id).first() %} + {% if store is null %} + {% set user = entries('store','user').where('user_id', user.id).first() %} + {% set store = user.store %} + {% endif %} {% if store is not null %} {% if store.store_banner is null %} {% set background_image = img('visiosoft.module.advs::images/user_section_back.png').url %} From c7b214c6cd3bf46d777c8e4c2c2de63a8de851f1 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Tue, 31 Dec 2019 16:44:55 +0300 Subject: [PATCH 10/11] better way to get language from the request --- .../Controller/Admin/CategoryController.php | 27 +------------------ 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php b/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php index b591cf89b..8e6ee1829 100644 --- a/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php +++ b/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php @@ -71,7 +71,7 @@ class CategoryController extends AdminController return $this->redirect->back(); } - $locale = $this->getRequestLang($all); + $locale = config('streams::locales.enabled'); $translatable = array(); foreach ($all as $key => $value) { @@ -171,31 +171,6 @@ class CategoryController extends AdminController return substr_compare($string, $test, $strlen - $testlen, $testlen) === 0; } - public function getRequestLang($request) { - $locale = array(); - foreach ($request as $key => $field) { - $locale[] = substr($key, 0, -2); - } - $notTrans = array(); - $trans = array(); - foreach ($locale as $translatable) { - if (!in_array($translatable, $notTrans)) { - $notTrans[] = $translatable; - } else { - $trans[] = $translatable; - } - } - $locale = array(); - foreach ($request as $key => $field) { - foreach (array_unique($trans) as $entry) { - if (strpos($key, $entry) === 0) { - $locale[] = substr($key, -2); - } - } - } - return $locale; - } - public function edit(CategoryFormBuilder $form, Request $request, $id) { if ($request->action == "update") { From db38cc2d15104e652d89332363da3bdcf802ede9 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Tue, 31 Dec 2019 17:05:29 +0300 Subject: [PATCH 11/11] better way to get language from the request --- .../resources/views/list/partials/user-section.twig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig index 01f105bf1..7ee42f61d 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig @@ -14,7 +14,11 @@
- + {% if store.file is null %} + + {% else %} + + {% endif %}
{{ store.name }}