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/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/resources/views/list/list.twig b/addons/default/visiosoft/advs-module/resources/views/list/list.twig index 6d934047c..d2ed6b68c 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.appends(request_query()).links()|raw }}
{#
#} 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 9f3ebabee..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 @@ -1,25 +1,30 @@ {% 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 %} + {% 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 user.file is null %} - - {% else %} - - {% endif %} -
-
{{ user.first_name }} {{ user.last_name }}
+ {% if store is not null %} + {% if store.store_banner is null %} + {% set background_image = img('visiosoft.module.advs::images/user_section_back.png').url %} + {% else %} + {% set background_image = store.store_banner.url %} + {% endif %} +
+
+
+
+ {% if store.file is null %} + + {% else %} + + {% endif %} +
+
{{ store.name }}
+
-
+ {% endif %} {% endif %} \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index 84fdc2a26..67ac7a901 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'); @@ -125,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'); } @@ -246,7 +242,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/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index 997e73ee5..b90a22ade 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -207,6 +207,7 @@ class AdvsModuleServiceProvider extends AddonServiceProvider 'as' => 'ajax::getAds', 'uses' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@getMyAds' ], + ]; /** 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..ea82429bd 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(); } 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 663518125..d515ed4d6 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/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") { 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', + ], ]; 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} +
+ + ` +}