From 25278a50acdbdd3ef5cc17426b6dfa69ee32273e Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 21 May 2020 18:24:38 +0300 Subject: [PATCH 1/7] #1522 Register fixes --- .../base-theme/resources/js/register.js | 2 +- .../base-theme/resources/lang/en/field.php | 6 + .../addons/anomaly/users-module/register.twig | 21 +-- .../base-theme/src/BaseThemeSeeder.php | 17 ++ .../src/Seed/RegisterInstructionSeeder.php | 156 ++++++++++++++++++ 5 files changed, 181 insertions(+), 21 deletions(-) create mode 100644 addons/default/visiosoft/base-theme/src/BaseThemeSeeder.php create mode 100644 addons/default/visiosoft/base-theme/src/Seed/RegisterInstructionSeeder.php diff --git a/addons/default/visiosoft/base-theme/resources/js/register.js b/addons/default/visiosoft/base-theme/resources/js/register.js index 5930e77f5..30a737a04 100644 --- a/addons/default/visiosoft/base-theme/resources/js/register.js +++ b/addons/default/visiosoft/base-theme/resources/js/register.js @@ -1,4 +1,4 @@ -phoneMask("input[name='phone'],input[name='land_phone']"); +// phoneMask("input[name='phone'],input[name='land_phone']"); // Phone register validation //setup before functions diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/field.php b/addons/default/visiosoft/base-theme/resources/lang/en/field.php index 524892cad..4c0d09949 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/en/field.php +++ b/addons/default/visiosoft/base-theme/resources/lang/en/field.php @@ -50,4 +50,10 @@ return [ 'secure_e-commerce_ads' => 'Secure e-Commerce Ads', 'sms' => 'Send Text Message (SMS)', 'mail' => 'Send Mail', + + // Register instruction seed + 'register_instructions' => 'Register Instructions', + 'list' => 'List', + 'instruction_description' => 'Instruction Description', + 'instruction_list' => 'Instruction List', ]; \ 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 2954be1fc..ae48c529b 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 @@ -34,29 +34,10 @@ {{ addBlock('register/corporate-register')|raw }} -
-
-
- {% if setting_value('visiosoft.theme.base::register_page_instruction_logo') %} - - {% endif %} -

- {{ trans('visiosoft.theme.base::field.personal_registration_header') }} -

-
-
- {{ trans('visiosoft.theme.base::field.personal_registration_body') }} -
-
    -
  • {{ trans('visiosoft.theme.base::field.personal_registration_list_1') }}
    • -
  • {{ trans('visiosoft.theme.base::field.personal_registration_list_2') }}
    • -
  • {{ trans('visiosoft.theme.base::field.personal_registration_list_3') }}
    • -
-
+ {{ blocks('register-instructions') }} {{ addBlock('register/instructions')|raw }} diff --git a/addons/default/visiosoft/base-theme/src/BaseThemeSeeder.php b/addons/default/visiosoft/base-theme/src/BaseThemeSeeder.php new file mode 100644 index 000000000..68458ac53 --- /dev/null +++ b/addons/default/visiosoft/base-theme/src/BaseThemeSeeder.php @@ -0,0 +1,17 @@ +call(RegisterInstructionSeeder::class); + } +} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/src/Seed/RegisterInstructionSeeder.php b/addons/default/visiosoft/base-theme/src/Seed/RegisterInstructionSeeder.php new file mode 100644 index 000000000..bf3095689 --- /dev/null +++ b/addons/default/visiosoft/base-theme/src/Seed/RegisterInstructionSeeder.php @@ -0,0 +1,156 @@ +areaRepository = $areaRepository; + $this->blocksTypeRepository = $blocksTypeRepository; + $this->fieldRepository = $fieldRepository; + $this->assignmentRepository = $assignmentRepository; + $this->streamRepository = $streamRepository; + $this->blockRepository = $blockRepository; + } + + /** + * Run the database seeds. + */ + public function run() + { + // Create block area + if ($registerInstructionsArea = $this->areaRepository->findBySlug('register-instructions')) { + $registerInstructionsArea->delete(); + } + $registerInstructionsArea = $this->areaRepository->create([ + 'name' => trans('visiosoft.theme.base::field.register_instructions'), + 'slug' => 'register-instructions', + ]); + + // Create block type + if ($blockType = $this->blocksTypeRepository->getModel()->withTrashed()->where('slug', 'list')->first()) { + $blockType->forceDelete(); + } + $blockType = $this->blocksTypeRepository->create([ + 'name' => trans('visiosoft.theme.base::field.list'), + 'slug' => 'list', + 'category' => 'other', + 'content_layout' => '
+
+ {% if setting_value(\'visiosoft.theme.base::register_page_instruction_logo\') %} + + {% endif %} +

+ {{ block.title }} +

+
+
+ {{ block.instruction_description }} +
+
    + {% for listItem in block.instruction_list.values %} +
  • {{ listItem }}
    • + {% endfor %} +
+
', + 'wrapper_layout' => '{% extends "anomaly.module.blocks::types.wrapper" %}' + ]); + + // Create block stream + if ($listBlock = $this->streamRepository->findBySlugAndNamespace('list_blocks', 'blocks')) { + $listBlock->delete(); + } + $listBlock = $this->streamRepository->create([ + 'name' => trans('visiosoft.theme.base::field.list'), + 'namespace' => 'blocks', + 'slug' => 'list_blocks', + 'prefix' => 'blocks_', + 'translatable' => 1, + ]); + + // Create block fields + $blocksFields = [ + 'instruction_description' => [ + 'name' => trans('visiosoft.theme.base::field.instruction_description'), + 'namespace' => 'blocks', + 'slug' => 'instruction_description', + 'type' => 'anomaly.field_type.text', + "config" => [ + "type" => "text", + ] + ], + 'instruction_list' => [ + 'name' => trans('visiosoft.theme.base::field.instruction_list'), + 'namespace' => 'blocks', + 'slug' => 'instruction_list', + 'type' => 'visiosoft.field_type.list', + "config" => [ + "type" => "text", + ] + ] + ]; + foreach ($blocksFields as $blocksField) { + if ($field = $this->fieldRepository->findBySlugAndNamespace($blocksField['slug'], $blocksField['namespace'])) { + $field->delete(); + } + $field = $this->fieldRepository->create([ + 'name' => $blocksField['name'], + 'namespace' => $blocksField['namespace'], + 'slug' => $blocksField['slug'], + 'type' => $blocksField['type'], + 'locked' => 0, + "config" => $blocksField['config'] + ]); + $this->assignmentRepository->create([ + 'stream_id' => $listBlock->getId(), + 'field_id' => $field->id, + 'label' => $blocksField['name'], + 'translatable' => 1, + ]); + } + + // Add default instructions + $blockFieldId = $this->fieldRepository->findBySlugAndNamespace('blocks', 'blocks')->getId(); + $block = $this->blockRepository->create([ + 'title' => trans('visiosoft.theme.base::field.personal_registration_header'), + 'field' => $blockFieldId, + 'extension' => 'anomaly.extension.list_block', + 'display_title' => false, + ]); + $blockInfo = app('Anomaly\Streams\Platform\Model\Blocks\BlocksListBlocksEntryModel')->newQuery()->create([ + 'instruction_description' => trans('visiosoft.theme.base::field.personal_registration_body'), + 'instruction_list' => [ + trans('visiosoft.theme.base::field.personal_registration_list_1'), + trans('visiosoft.theme.base::field.personal_registration_list_2'), + trans('visiosoft.theme.base::field.personal_registration_list_3'), + ] + ]); + $block->update([ + 'area_id' => $registerInstructionsArea->getId(), + 'area_type' => get_class($registerInstructionsArea), + 'entry_id' => $blockInfo->id, + 'entry_type' => get_class($blockInfo), + ]); + } +} \ No newline at end of file From 32bf8408ccac80d4e0b0e2e3f8bdeca42219df2e Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 21 May 2020 18:26:09 +0300 Subject: [PATCH 2/7] #1522 Register fixes --- .../visiosoft/base-theme/src/Seed/RegisterInstructionSeeder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/base-theme/src/Seed/RegisterInstructionSeeder.php b/addons/default/visiosoft/base-theme/src/Seed/RegisterInstructionSeeder.php index bf3095689..b112da205 100644 --- a/addons/default/visiosoft/base-theme/src/Seed/RegisterInstructionSeeder.php +++ b/addons/default/visiosoft/base-theme/src/Seed/RegisterInstructionSeeder.php @@ -129,7 +129,7 @@ class RegisterInstructionSeeder extends Seeder 'translatable' => 1, ]); } - + // Add default instructions $blockFieldId = $this->fieldRepository->findBySlugAndNamespace('blocks', 'blocks')->getId(); $block = $this->blockRepository->create([ From 13c7b2453abebab282331099a4161350f90734a0 Mon Sep 17 00:00:00 2001 From: Fatih Alp Date: Thu, 21 May 2020 18:44:30 +0300 Subject: [PATCH 3/7] Update composer.json --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 97affb5a5..d4e64448a 100644 --- a/composer.json +++ b/composer.json @@ -78,6 +78,7 @@ "ammadeuss/laravel-html-dom-parser": "^1.1", "visiosoft/decimal-field_type": "~2.1.0", "visiosoft/integer-field_type": "~2.1.0", + "visiosoft/list-field_type": "*", "guzzlehttp/guzzle": "~6.3.3" }, "replace": { From 9da48e7be70cb825486207baaac5612e1bc65396 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 21 May 2020 19:41:13 +0300 Subject: [PATCH 4/7] #1522 Register fixes (remove mask) --- .../base-theme/resources/js/phonefield.js | 36 +++++++++---------- .../base-theme/resources/js/register.js | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/js/phonefield.js b/addons/default/visiosoft/base-theme/resources/js/phonefield.js index df0027f0a..66535c2a8 100644 --- a/addons/default/visiosoft/base-theme/resources/js/phonefield.js +++ b/addons/default/visiosoft/base-theme/resources/js/phonefield.js @@ -15,27 +15,27 @@ function phoneMask(fields) { }) }); - var fields_arr = fields.split(','); - $.each(fields_arr, function (index, value) { - maskPhone($(value).attr('name')) - }); + // var fields_arr = fields.split(','); + // $.each(fields_arr, function (index, value) { + // maskPhone($(value).attr('name')) + // }); - $(fields).on('countrychange', function (e) { - maskPhone($(this).attr('name')) - }); + // $(fields).on('countrychange', function (e) { + // maskPhone($(this).attr('name')) + // }); - function maskPhone(name) { - if ( $("input[name='" + name + "']").length ) { - var currentMask = $("input[name='" + name + "']").attr('placeholder'); - if(currentMask) { - $("input[name='" + name + "']").mask(currentMask.replace(/[0-9+]/ig, '9'), { - autoclear: true, - clearIncomplete: true - }); - } - } - } + // function maskPhone(name) { + // if ( $("input[name='" + name + "']").length ) { + // var currentMask = $("input[name='" + name + "']").attr('placeholder'); + // if(currentMask) { + // $("input[name='" + name + "']").mask(currentMask.replace(/[0-9+]/ig, '9'), { + // autoclear: true, + // clearIncomplete: true + // }); + // } + // } + // } } diff --git a/addons/default/visiosoft/base-theme/resources/js/register.js b/addons/default/visiosoft/base-theme/resources/js/register.js index 30a737a04..5930e77f5 100644 --- a/addons/default/visiosoft/base-theme/resources/js/register.js +++ b/addons/default/visiosoft/base-theme/resources/js/register.js @@ -1,4 +1,4 @@ -// phoneMask("input[name='phone'],input[name='land_phone']"); +phoneMask("input[name='phone'],input[name='land_phone']"); // Phone register validation //setup before functions From c2fb5d85a0ab024433ec9892c771229c50e0072d Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 27 May 2020 17:09:15 +0300 Subject: [PATCH 5/7] #1490 Cat link improvments --- .../advs-module/resources/css/list.css | 14 ++++++++++++++ .../advs-module/resources/js/list.js | 12 ++++++++++-- .../advs-module/resources/lang/en/field.php | 2 ++ .../resources/views/list/list.twig | 15 +++++++++++++-- .../views/list/partials/list-filter.twig | 4 ++-- .../src/Http/Controller/advsController.php | 19 ++++++++++++++++++- .../resources/views/partials/metatags.twig | 6 ++++-- 7 files changed, 63 insertions(+), 9 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/css/list.css b/addons/default/visiosoft/advs-module/resources/css/list.css index a62c171b2..9b738db06 100644 --- a/addons/default/visiosoft/advs-module/resources/css/list.css +++ b/addons/default/visiosoft/advs-module/resources/css/list.css @@ -105,4 +105,18 @@ #filterModal { overflow-y: auto; +} + +.result-text { + font-size: 13px; + margin: 0 -15px; +} + +.result-text span:first-child { + font-weight: 500; +} + +.result-text span:last-child { + color: #8f0100; + font-weight: 500; } \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/resources/js/list.js b/addons/default/visiosoft/advs-module/resources/js/list.js index 19a4b670d..ef12cd5d7 100644 --- a/addons/default/visiosoft/advs-module/resources/js/list.js +++ b/addons/default/visiosoft/advs-module/resources/js/list.js @@ -173,5 +173,13 @@ $('.ad-info-right-bar-video').tooltip({ html: true }); - - +$("#listFilterForm").submit(function(e) { + const inputs = $('#listFilterForm :input'); + [...inputs].forEach((input) => { + if ($(input).val() == "" + || $(input).prop("checked") == false + || $(input).find(':selected').val() == "") { + $(input).prop('disabled', true); + } + }); +}); \ 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 112ea9eac..cdb991641 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -263,6 +263,8 @@ return [ "no_location" => "No location is selected.", "continue" => 'Continue', "gallery" => 'Gallery', + "ads" => 'Ads', + "were_found" => 'were found.', // Pending screen 'pending_message_1' => 'The Ad is in the Approval Process', 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 434637fdf..21792d979 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -1,5 +1,9 @@ {% extends layout('list') %} +{% block styles %} + {{ asset_style("visiosoft.module.advs::css/list.css") }} +{% endblock %} + {% block content %}
@@ -15,7 +19,15 @@
- + {% if catText %} +
+

+ "{{ catText }}" + {{ advs.total }} {{ trans('visiosoft.module.advs::field.ads')|lower }} + {{ trans('visiosoft.module.advs::field.were_found') }} +

+
+ {% endif %}
@@ -61,7 +73,6 @@ {{ asset_add("scripts.js", "visiosoft.module.advs::js/list.js") }} - {{ asset_add("styles.css", "visiosoft.module.advs::css/list.css") }} {% endblock %} {% block customjs %} diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig index 7e1b0e988..214fc5575 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig @@ -1,5 +1,5 @@ {% set formHtml %} -
+ {% endset %} {% set catSlug = null %} {% set citySlug = null %} @@ -12,7 +12,7 @@ {% endif %} {% if catSlug %} {% set formHtml %} - + {% endset %} {% endif %} {{ formHtml }} 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 53f117929..a0becfb78 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -279,9 +279,26 @@ class AdvsController extends PublicController $viewType = $this->requestHttp->cookie('viewType'); + if (!isset($allCats)) { + if (count($mainCats) == 1 || count($mainCats) == 2) { + $catText = end($mainCats)['val']; + } elseif (count($mainCats) > 2) { + $catArray = array_slice($mainCats, 2); + $catText = ''; + $loop = 0; + foreach ($catArray as $cat) { + $catText = !$loop ? $catText . $cat['val'] : $catText . ' ' . $cat['val']; + $loop++; + } + } + $this->template->set('notShowTitle', true); + $this->template->set('meta_title', $catText); + $this->template->set('meta_description', $catText); + } + $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'checkboxes', 'request', 'param', 'user', 'featured_advs', 'viewType', 'topfields', 'selectDropdown', 'selectRange', 'selectImage', 'ranges', 'seenList', - 'searchedCountry', 'radio', 'categoryId', 'cityId', 'allCats'); + 'searchedCountry', 'radio', 'categoryId', 'cityId', 'allCats', 'catText'); return $this->viewTypeBasedRedirect($viewType, $compact); } diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig index 311344e88..2422744c0 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig @@ -8,8 +8,10 @@ - {{ setting_value('streams::name', config_get('streams::distribution.name')) }} - › + {% if not template.notShowTitle %} + {{ setting_value('streams::name', config_get('streams::distribution.name')) }} + › + {% endif %} {{ trans(template.meta_title) }} From aca3e51d5ae6d7112aa4727aaeba45000f2264e2 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Thu, 28 May 2020 10:01:29 +0300 Subject: [PATCH 6/7] #1490 Cat link improvments #580 --- .../advs-module/src/Http/Controller/advsController.php | 6 +++--- .../base-theme/resources/views/partials/metatags.twig | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) 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 a0becfb78..88e6db12c 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -291,14 +291,14 @@ class AdvsController extends PublicController $loop++; } } - $this->template->set('notShowTitle', true); + $this->template->set('showTitle', false); $this->template->set('meta_title', $catText); $this->template->set('meta_description', $catText); } $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'checkboxes', 'request', 'param', - 'user', 'featured_advs', 'viewType', 'topfields', 'selectDropdown', 'selectRange', 'selectImage', 'ranges', 'seenList', - 'searchedCountry', 'radio', 'categoryId', 'cityId', 'allCats', 'catText'); + 'user', 'featured_advs', 'viewType', 'topfields', 'selectDropdown', 'selectRange', 'selectImage', 'ranges', + 'seenList', 'searchedCountry', 'radio', 'categoryId', 'cityId', 'allCats', 'catText'); return $this->viewTypeBasedRedirect($viewType, $compact); } diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig index 2422744c0..387e7c4c5 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig @@ -8,7 +8,8 @@ - {% if not template.notShowTitle %} + {% set showTitle = template.showTitle is same as(false) ? false : true %} + {% if showTitle %} {{ setting_value('streams::name', config_get('streams::distribution.name')) }} › {% endif %} From 695fed2e39a4d33c1b4089490a869194574263a2 Mon Sep 17 00:00:00 2001 From: Diatrex <diahshalabi@hotmail.com> Date: Thu, 28 May 2020 13:38:43 +0300 Subject: [PATCH 7/7] #1568 alabilirim.com trash and pending error --- .../src/Listener/AddViewAdsButton.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddViewAdsButton.php b/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddViewAdsButton.php index c9bf758f8..2ec46d7eb 100644 --- a/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddViewAdsButton.php +++ b/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddViewAdsButton.php @@ -41,13 +41,15 @@ class AddViewAdsButton protected function addViewAdsButton(UserTableBuilder $builder) { $buttons = $builder->getButtons(); - $dropdown = array_merge($buttons['settings']['dropdown'], [ - "ads" => [ - "text" => trans('visiosoft.theme.defaultadmin::button.view_ads'), - "href" => "admin/advs?filter_User={entry.id}" - ] - ]); - $buttons['settings']['dropdown'] = $dropdown; - $builder->setButtons($buttons); + if (isset($buttons['settings'])) { + $dropdown = array_merge($buttons['settings']['dropdown'], [ + "ads" => [ + "text" => trans('visiosoft.theme.defaultadmin::button.view_ads'), + "href" => "admin/advs?filter_User={entry.id}" + ] + ]); + $buttons['settings']['dropdown'] = $dropdown; + $builder->setButtons($buttons); + } } } \ No newline at end of file