diff --git a/addons/default/visiosoft/advs-module/resources/css/post-category.css b/addons/default/visiosoft/advs-module/resources/css/post-category.css index 46b168d06..45e145bd1 100644 --- a/addons/default/visiosoft/advs-module/resources/css/post-category.css +++ b/addons/default/visiosoft/advs-module/resources/css/post-category.css @@ -1,4 +1,22 @@ +#ad-cat-section .step-icon { + height: 1rem; + vertical-align: baseline; +} + +.category-tab { + overflow-x: auto; +} + +.cat-item:not(.focus-select) div, .cat-item:not(.focus-select) select { + background-color: #f8f9fa; +} + +.focus-select .cat-option { + box-shadow: 0 .125rem .25rem rgba(0,0,0,.075); +} + .cat-select { + height: 0; width: 100%; border: none; overflow-y: auto @@ -8,12 +26,16 @@ outline: none; } +.cat-item { + flex: none; + width: 13rem; +} + .cat-select option { - border-top: 1px solid #f2f2f2; - padding: 15px 0 20px; + cursor: pointer; + border-radius: 2px; position: relative; - padding-left: 10px; - font-size: 16px; + font-size: 13px; color: #505050; } @@ -21,14 +43,32 @@ display: none; } -.cat-item-3 { +.cat-item:last-child { display: none; } +.next-stap img { + width: 60px; +} + +.next-stap p { + font-size: 13px; + font-weight: 500; +} + .btn-1 { background-color: #00a651; - padding: 5px 50px 7px; + padding: 5px 30px 7px; color: #fff; border: 1px solid #dadada; margin-right: 5px; +} + +.cat-select::-webkit-scrollbar { + width: 4px; +} + +.cat-select::-webkit-scrollbar-thumb { + border-radius: 4px; + background-color: rgba(0,0,0,0.5); } \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/resources/images/ascend.svg b/addons/default/visiosoft/advs-module/resources/images/ascend.svg new file mode 100644 index 000000000..40404a167 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/ascend.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/check.svg b/addons/default/visiosoft/advs-module/resources/images/check.svg new file mode 100644 index 000000000..14ca17bff --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/check.svg @@ -0,0 +1,2 @@ + + diff --git a/addons/default/visiosoft/advs-module/resources/images/cross.svg b/addons/default/visiosoft/advs-module/resources/images/cross.svg new file mode 100644 index 000000000..5c708d2f6 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/cross.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/js/cats.js b/addons/default/visiosoft/advs-module/resources/js/cats.js index c489f8cf7..91ab7fdd7 100644 --- a/addons/default/visiosoft/advs-module/resources/js/cats.js +++ b/addons/default/visiosoft/advs-module/resources/js/cats.js @@ -22,26 +22,40 @@ $(document).ready(function () { success: function (response) { hideLoader(); if(response['title'] != undefined){ - var btn = '' - if(response['link'] != "") { - btn = ""+response['nextBtn']+""; + response['success'] ? $('.cross-icon').hide() : $('.check-icon').hide(); + + let btn = ''; + if (response['link']) { + btn = ""+response['continueBtn']+""; } - $('.cat-item-3').html( - '
' + - '
'+response['title']+'
' + - '

'+response['msg']+'

' + - '
' + - btn + - ''+response['cancelBtn']+'
' - ); - $('.cat-item-3').show(); + let content; + if (response['msg']) { + content = ` +

${response['title']}

+ ${response['msg']} +
${btn}
+ ` + } else { + content = ` +

${response['title']}

+
${btn}
+ ` + } + $('.cat-item-3 .next-content').html(content); + $('.cat-item-3').parent().css('display', 'flex'); stop(); - } - else { + } else { response.forEach(function(options){ - $(catId).append("").closest('.cat-item-2').show(); + $(catId).append(""); }); + $('.focus-select').removeClass('focus-select'); + $(catId).animate({height: '14rem'}, 200); + $(catId).closest('.cat-item-2').show().addClass('focus-select') } + // Auto scroll right + let categoryTab = $('.category-tab'); + let pos = categoryTab.scrollLeft() + categoryTab.width(); + categoryTab.animate( {scrollLeft: pos}, 1000); }, beforeSend: function () { showLoader() @@ -54,8 +68,10 @@ $(document).ready(function () { var endNo = 9; while (startNo <= endNo) { - $('#cat'+ startNo).html("").closest('.cat-item-2').hide(); - $('.cat-item-3').hide(); + $('#cat'+ startNo).animate({height: 0}, 200, 'linear', function () { + $(this).html("").closest('.cat-item-2').hide(); + }); + $('.cat-item-3').parent().hide(); startNo++; } }; @@ -63,13 +79,14 @@ $(document).ready(function () { for (var i = 1; i <= 10; i++) { (function(){ var ii = i; - $('#cat'+i).on('change', function (i,e) { - divId = $(this).find('option:selected').val(); + $('#cat' + i).on('change', function (i, e) { + let selectedOption = $(this).find('option:selected'); + let divId = selectedOption.val(); if (divId == 0) { - filter.hideCats(ii+1); + filter.hideCats(ii + 1); } - filter.hideCats(ii+1); - filter.getCats("#cat"+(ii+1), divId); + filter.hideCats(ii + 1); + filter.getCats("#cat" + (ii + 1), divId); }); })(); } diff --git a/addons/default/visiosoft/advs-module/resources/js/editContactInformation.js b/addons/default/visiosoft/advs-module/resources/js/editContactInformation.js index 8c4e95740..7b852843d 100644 --- a/addons/default/visiosoft/advs-module/resources/js/editContactInformation.js +++ b/addons/default/visiosoft/advs-module/resources/js/editContactInformation.js @@ -1,30 +1,48 @@ phoneMask("input[name='gsm_phone'],input[name='office_phone'],input[name='land_phone']") $('.formEditInfo').on('submit', function (e) { e.preventDefault(); + + const oldBtnHtml = $(this).find('.btn-success').html(); + $(this).find('.btn-success').attr('disabled', true).html(` + + `); + var form = $(this); - crud(form.serialize() + "&action=update", '/ajax/update-user-info', 'POST', function (callback) { - if (callback.status == "success") { - var profile = callback.data; - $('.infoName').html(profile.first_name + " " + profile.last_name); - $('.infoGsmPhone').html(profile.gsm_phone); - $('.infoOfficePhone').html(profile.office_phone); - $('.infoLandPhone').html(profile.land_phone); - $('#editMyInfo').modal('hide'); + $.ajax({ + type: 'POST', + data: form.serialize() + "&action=update", + url: '/ajax/update-user-info', + success: function (response) { + if (response.status == "success") { + var profile = response.data; + $('.infoName').html(profile.first_name + " " + profile.last_name); + $('.infoGsmPhone').html(profile.gsm_phone); + $('.infoOfficePhone').html(profile.office_phone); + $('.infoLandPhone').html(profile.land_phone); + $('#editMyInfo').modal('hide'); + + $('.formEditInfo .btn-success').attr('disabled', false).html(oldBtnHtml); + } } - }) -}) + }); +}); $('.editInformationUser').on('click', function () { $('#editMyInfo').modal('show'); - crud({}, '/ajax/update-user-info', 'POST', function (callback) { - if (callback.status == "success") { - var profile = callback.data; - $('input[name="first_name"]').val(profile.first_name) - $('input[name="last_name"]').val(profile.last_name) - intlTelInput(document.querySelector("input[name='gsm_phone']")).setNumber(profile.gsm_phone) - intlTelInput(document.querySelector("input[name='office_phone']")).setNumber(profile.office_phone) - intlTelInput(document.querySelector("input[name='land_phone']")).setNumber(profile.land_phone) + + $.ajax({ + type: 'POST', + url: '/ajax/update-user-info', + success: function (response) { + if (response.status == "success") { + var profile = response.data; + $('input[name="first_name"]').val(profile.first_name) + $('input[name="last_name"]').val(profile.last_name) + intlTelInput(document.querySelector("input[name='gsm_phone']")).setNumber(profile.gsm_phone) + intlTelInput(document.querySelector("input[name='office_phone']")).setNumber(profile.office_phone) + intlTelInput(document.querySelector("input[name='land_phone']")).setNumber(profile.land_phone) + } } - }) + }); }) \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/field.php b/addons/default/visiosoft/advs-module/resources/lang/en/field.php index d7c747df0..112ea9eac 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -285,4 +285,7 @@ return [ 'update_my_contact_info' => 'update my contact info', 'contact_info' => 'Contact information', 'ad_info' => 'Ad Information', + + // Select cat + 'select_category_step_by_step' => 'Select Category Step by Step', ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/message.php b/addons/default/visiosoft/advs-module/resources/lang/en/message.php index 8b0759ce3..128c6171a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/message.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/message.php @@ -10,16 +10,13 @@ return [ 'updated_category_msg' => 'Category successfully edited.', 'max_ad_limit' => [ 'title' => "Your Free Ad Limit is Out.", - 'msg' => "You have reached your free ad limit.", - 'nextBtn' => "Show Ads", - 'cancelBtn' => "or Cancel", + 'continueBtn' => "Show Ads", + 'link' => "/profile", ], 'create_ad_with_post_cat' => [ - 'title' => "Post an Ad in just 30 seconds", - 'msg' => "Please DO NOT post multiple ads for the same items or service. All duplicate, spam and wrongly categorized ads will be deleted.", - 'nextBtn' => "Next", - 'cancelBtn' => "or Cancel", - 'link' => "", + 'title' => "Category selection has been completed.", + 'success' => true, + 'continueBtn' => "Continue", ], 'update_category_info' => 'Please update category.', 'filter_by_search_msg' => 'Filter By Search.', diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig index 3a58ebaaf..435a6582b 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig @@ -1,8 +1,8 @@ {% extends layout('new-create') %} {% block content %} -
-
+
+
\ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/contact-info.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/contact-info.twig new file mode 100644 index 000000000..7975a456f --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/contact-info.twig @@ -0,0 +1,47 @@ +
{{ trans('visiosoft.module.advs::field.contact_info') }}
+
+
+
+
+ +
+
+ {{ getProfileDetail(auth_user().id).first_name }} + {{ getProfileDetail(auth_user().id).last_name }} +
+
+
+
+ +
+
+ {{ getProfileDetail(auth_user().id).gsm_phone }} +
+
+
+
+ +
+
+ {{ getProfileDetail(auth_user().id).office_phone }} +
+
+
+
+ +
+
+ {{ getProfileDetail(auth_user().id).land_phone }} +
+
+

+ + + {{ trans('visiosoft.module.advs::field.update_my_contact_info') }} + +

+
+
\ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/modals.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/modals.twig index d4fb395f0..82fba63d0 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/modals.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/modals.twig @@ -58,5 +58,3 @@
{{ asset_add("scripts.js", "visiosoft.module.advs::js/editContactInformation.js") }} - - diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/post-cat.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/post-cat.twig index 2dd1f60ec..7776c2240 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/post-cat.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/post-cat.twig @@ -1,121 +1,96 @@ {% extends layout('post-cat') %} +{% block styles %} + {{ asset_style("visiosoft.module.advs::css/post-category.css") }} +{% endblock %} + {% block content %} -
-
- {% include "visiosoft.module.advs::new-ad/partials/breadcrumb" %} -
-
-
- -
-
-
{{ trans('visiosoft.module.advs::field.select_a_category') }}
- -
+
+ {% include "visiosoft.module.advs::new-ad/partials/breadcrumb" %} +
+
+ + {{ trans('visiosoft.module.advs::field.select_category_step_by_step') }} +
+ +
+
+
+
+
-
-
-
{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}
- -
+
+
+
-
-
-
{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}
- -
+
+
+
+
-
-
-
{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}
- -
+
+
+
+
-
-
-
{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}
- -
+
+
+
+
-
-
-
{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}
- - -
+
-
-
-
{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}
- -
+
+
+
+
-
-
-
{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}
- -
+
+
+
+
-
-
-
{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}
- -
+
+
+
+
-
-
-
{{ trans('visiosoft.module.advs::field.select_a_sub_category') }}
- -
+
+
+
+
+
-
-
- +
+
+
+ + +
-
-
- {{ blocks('center-add-ad-banner-area') }} -
+
+
+
+ {{ blocks('center-add-ad-banner-area') }}
- -
+
+
- {{ asset_add("scripts.js", "visiosoft.module.advs::js/cats.js") }} - {{ asset_add("styles.css", "visiosoft.module.advs::css/post-category.css") }} - - {% endblock %} diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig index cbeb11a10..ee8c60afc 100644 --- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig +++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig @@ -1,5 +1,9 @@ {% extends "theme::layouts/default" %} +{% block styles %} + {{ asset_style('visiosoft.theme.base::css/login.css') }} +{% endblock %} + {% block content %} {% set phoneLogin = not setting_value('visiosoft.module.advs::register_email_field') or app.request.get('type') == 'phone' %}
@@ -97,5 +101,4 @@
{{ asset_add('scripts.js','visiosoft.theme.base::js/login.js') }} - {{ asset_add('styles.css','visiosoft.theme.base::css/login.css') }} {% endblock %} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig index fca671f2d..2954be1fc 100644 --- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig +++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig @@ -1,5 +1,9 @@ {% extends "theme::layouts/default" %} +{% block styles %} + {{ asset_style('visiosoft.theme.base::css/register.css') }} +{% endblock %} + {% block content %}
@@ -24,12 +28,8 @@ {{ trans('visiosoft.theme.base::button.register') }} -
- {{ form_close() }}
@@ -72,9 +72,6 @@
- {{ asset_add("styles.css", "visiosoft.theme.base::css/register.css") }} {{ asset_add("scripts.js", "visiosoft.theme.base::js/register.js") }} - - {% endblock %} diff --git a/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig b/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig index b38c512b8..667e38454 100644 --- a/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig +++ b/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig @@ -13,6 +13,7 @@ {% include "theme::partials/metadata" %} + {% block styles %}{% endblock %} diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php index b5b4ee545..028a7d051 100644 --- a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php +++ b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php @@ -58,6 +58,21 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface return count($this->getParentCats($id)) + 1; } + public function getParentsCount($id) + { + $parentCats = array(); + $currentId = $id; + do { + $cat = $this->getCat($currentId); + $catParent = $cat->parent_category_id; + if ($catParent) { + $currentId = $catParent; + $parentCats[] = $catParent; + } + } while ($catParent); + return count($parentCats); + } + public function getSubCategories($id, $get = null) { $sub_categories = $this->where('parent_category_id', $id)->get(); diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php b/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php index be73e968b..8f60bd3a1 100644 --- a/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php +++ b/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php @@ -50,7 +50,15 @@ class CategoryRepository extends EntryRepository implements CategoryRepositoryIn public function getSubCatById($id) { - return $this->model->where('parent_category_id', $id)->where('deleted_at', null)->orderBy('sort_order')->get(); + $orderBy = $this->model->getParentsCount($id) >= 1 ? 'name' : 'sort_order'; + return $this->model->newQuery() + ->join('cats_category_translations', 'cats_category.id', '=', 'cats_category_translations.entry_id') + ->where('cats_category_translations.locale', config('app.locale')) + ->where('parent_category_id', $id) + ->where('deleted_at', null) + ->select('cats_category.*') + ->orderBy($orderBy) + ->get(); } public function getSingleCat($id) diff --git a/webpack.mix.js b/webpack.mix.js index e409afcf7..38af9c2b7 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -14,4 +14,5 @@ let mix = require('laravel-mix'); mix .js('resources/assets/js/app.js', 'public/js') .js('addons/default/visiosoft/*/resources/js/vue/app.js', 'public/js') + .js('core/visiosoft/*/resources/js/vue/app.js', 'public/js') .sass('resources/assets/sass/app.scss', 'public/css');