From 0b410bf31f3aafaa5c70b3e9d43ca199a282fd32 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 5 Feb 2021 12:16:51 +0300 Subject: [PATCH 1/8] alibaba-theme is_buying area review --- .../resources/js/alibaba/buyingSelling.js | 23 +++++++++++++++++++ .../admin/settings/form/partials/default.twig | 18 +++++++++++++++ .../src/DefaultadminThemeServiceProvider.php | 6 +++++ 3 files changed, 47 insertions(+) create mode 100644 addons/default/visiosoft/defaultadmin-theme/resources/js/alibaba/buyingSelling.js create mode 100644 addons/default/visiosoft/defaultadmin-theme/resources/views/admin/settings/form/partials/default.twig diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/js/alibaba/buyingSelling.js b/addons/default/visiosoft/defaultadmin-theme/resources/js/alibaba/buyingSelling.js new file mode 100644 index 000000000..f654b2d29 --- /dev/null +++ b/addons/default/visiosoft/defaultadmin-theme/resources/js/alibaba/buyingSelling.js @@ -0,0 +1,23 @@ +$(() => { + if (buying_selling_title) { + console.log(is_buying) + getCfValue(buying_selling_title) + } + var is_buying_selling_title = $('#is_buying_selling_title'); + is_buying_selling_title.on('change', () => { + if (is_buying_selling_title.val()) { + getCfValue(is_buying_selling_title.val()) + } + }) +}); + +function getCfValue(cf) { + crudAjax(null, `/ajax/get-cf-value/${cf}`, 'GET', function (callback) { + $('select[name="is_buying_value"]').html(""); + $('select[name="is_selling_value"]').html(""); + $.each(callback, function (index, value) { + $('select[name="is_buying_value"]').append(``) + $('select[name="is_selling_value"]').append(``) + }); + }); +} \ No newline at end of file diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/admin/settings/form/partials/default.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/admin/settings/form/partials/default.twig new file mode 100644 index 000000000..d287b8dee --- /dev/null +++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/admin/settings/form/partials/default.twig @@ -0,0 +1,18 @@ +
+ + {% include "streams::form/partials/header" with {"section": section} %} + +
+ + {% include "streams::form/partials/fields" with {"fields": form.fields.base().pluck('field_name').all()} %} + +
+
+ + +{{ asset_add("scripts.js", "visiosoft.theme.defaultadmin::js/alibaba/buyingSelling.js") }} diff --git a/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php b/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php index 11f231931..2a71a16df 100644 --- a/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php +++ b/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php @@ -51,6 +51,12 @@ class DefaultadminThemeServiceProvider extends AddonServiceProvider ]; } + if ($request->segment(2) === "settings") { + return [ + 'streams::form/partials/default' => 'visiosoft.theme.defaultadmin::admin/settings/form/partials/default', + ]; + } + return parent::getOverrides(); } } From bb3fd15a762d70daf12e3fdef7247489f83a9308 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 5 Feb 2021 19:13:39 +0300 Subject: [PATCH 2/8] marhab request --- .../src/Category/CategoryRepository.php | 35 +++++++++++++++++++ .../Contract/CategoryRepositoryInterface.php | 2 ++ 2 files changed, 37 insertions(+) diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php b/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php index d92229ef1..53d5a2cc0 100644 --- a/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php +++ b/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php @@ -1,6 +1,7 @@ model->deleteSubCategories($id); } } + + public function getMainAndSubCats() + { + $dBName = 'default_cats_category'; + $dBNamet = $dBName . '_translations'; + + $catsDB = DB::table((DB::raw($dBName . ' c1'))) + ->select( + DB::raw('c1.id'), + DB::raw('c1.slug'), + DB::raw('c1.parent_category_id'), + DB::raw('t1.name'), + + DB::raw('c2.id as c2_id'), + DB::raw('c2.slug as c2_slug'), + DB::raw('c2.parent_category_id as c2_parent_category_id'), + DB::raw('t2.name as c2_name') + ) + ->leftJoin((DB::raw($dBName . ' c2')), DB::raw('c2.parent_category_id'), '=', DB::raw('c1.id')) + ->leftJoin((DB::raw($dBNamet . ' t1')), DB::raw('c1.id'), '=', DB::raw('t1.entry_id')) + ->leftJoin((DB::raw($dBNamet . ' t2')), DB::raw('c2.id'), '=', DB::raw('t2.entry_id')) + ->where(DB::raw('t1.locale'), Request()->session()->get('_locale', setting_value('streams::default_locale'))) + ->where(DB::raw('t2.locale'), Request()->session()->get('_locale', setting_value('streams::default_locale'))) + ->where(DB::raw("c1.deleted_at"), NULL) + ->where(DB::raw("c2.deleted_at"), NULL) + ->whereNull(DB::raw("c1.parent_category_id")) + ->orderBy(DB::raw("c1.sort_order")) + ->orderBy(DB::raw("c2.sort_order")) + ->get(); + $cats = collect([]); + $cats->subcats = $catsDB; + $cats->maincats = $catsDB->unique('id'); + return $cats; + } } diff --git a/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryRepositoryInterface.php b/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryRepositoryInterface.php index 38d128225..2448359f3 100644 --- a/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryRepositoryInterface.php +++ b/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryRepositoryInterface.php @@ -21,4 +21,6 @@ interface CategoryRepositoryInterface extends EntryRepositoryInterface public function getCategories(); public function DeleteCategories($id); + + public function getMainAndSubCats(); } From 6423a74b3ee6fdb3e4557a8f9ae33aa79d821326 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Mon, 8 Feb 2021 12:59:02 +0300 Subject: [PATCH 3/8] js removed log --- .../defaultadmin-theme/resources/js/alibaba/buyingSelling.js | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/js/alibaba/buyingSelling.js b/addons/default/visiosoft/defaultadmin-theme/resources/js/alibaba/buyingSelling.js index f654b2d29..90229b170 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/js/alibaba/buyingSelling.js +++ b/addons/default/visiosoft/defaultadmin-theme/resources/js/alibaba/buyingSelling.js @@ -1,6 +1,5 @@ $(() => { if (buying_selling_title) { - console.log(is_buying) getCfValue(buying_selling_title) } var is_buying_selling_title = $('#is_buying_selling_title'); From 5723d469db66a667a2046db2f19df20fd54b9238 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Mon, 8 Feb 2021 17:37:23 +0300 Subject: [PATCH 4/8] corporate register agreement edited --- .../profile-module/resources/config/settings/sections.php | 1 + .../profile-module/resources/config/settings/settings.php | 6 ++++++ .../visiosoft/profile-module/resources/lang/en/setting.php | 3 +++ 3 files changed, 10 insertions(+) diff --git a/addons/default/visiosoft/profile-module/resources/config/settings/sections.php b/addons/default/visiosoft/profile-module/resources/config/settings/sections.php index 6a042d197..a7604a1f7 100644 --- a/addons/default/visiosoft/profile-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/profile-module/resources/config/settings/sections.php @@ -12,6 +12,7 @@ return [ 'show_tax_office', 'show_checkbox_terms_on_register', 'register_protection_url', + 'register_corporate_protection_url', 'register_privacy_url', 'hide_register_type_profile', 'show_education_profession', diff --git a/addons/default/visiosoft/profile-module/resources/config/settings/settings.php b/addons/default/visiosoft/profile-module/resources/config/settings/settings.php index 35e8ba2f3..cfde4119d 100644 --- a/addons/default/visiosoft/profile-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/profile-module/resources/config/settings/settings.php @@ -47,6 +47,12 @@ return [ 'default_value' => '#', ] ], + 'register_corporate_protection_url' => [ + 'type' => 'anomaly.field_type.url', + 'config' => [ + 'default_value' => '#' + ] + ], 'register_privacy_url' => [ 'type' => 'anomaly.field_type.url', 'config' => [ diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/setting.php b/addons/default/visiosoft/profile-module/resources/lang/en/setting.php index ff66a5ce9..fc16cd442 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/profile-module/resources/lang/en/setting.php @@ -17,6 +17,9 @@ return [ 'register_protection_url' => [ 'name' => 'Register Protection URL', ], + 'register_corporate_protection_url' => [ + 'name' => 'Register Corporate Protection Url', + ], 'register_privacy_url' => [ 'name' => 'Register Privacy URL', ], From 9334379952ee12fd2170e926ffde81890df4cc91 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 9 Feb 2021 09:45:34 +0300 Subject: [PATCH 5/8] merge request comment fixed --- .../profile-module/resources/config/settings/sections.php | 1 - .../profile-module/resources/config/settings/settings.php | 6 ------ .../visiosoft/profile-module/resources/lang/en/setting.php | 3 --- 3 files changed, 10 deletions(-) diff --git a/addons/default/visiosoft/profile-module/resources/config/settings/sections.php b/addons/default/visiosoft/profile-module/resources/config/settings/sections.php index a7604a1f7..6a042d197 100644 --- a/addons/default/visiosoft/profile-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/profile-module/resources/config/settings/sections.php @@ -12,7 +12,6 @@ return [ 'show_tax_office', 'show_checkbox_terms_on_register', 'register_protection_url', - 'register_corporate_protection_url', 'register_privacy_url', 'hide_register_type_profile', 'show_education_profession', diff --git a/addons/default/visiosoft/profile-module/resources/config/settings/settings.php b/addons/default/visiosoft/profile-module/resources/config/settings/settings.php index cfde4119d..35e8ba2f3 100644 --- a/addons/default/visiosoft/profile-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/profile-module/resources/config/settings/settings.php @@ -47,12 +47,6 @@ return [ 'default_value' => '#', ] ], - 'register_corporate_protection_url' => [ - 'type' => 'anomaly.field_type.url', - 'config' => [ - 'default_value' => '#' - ] - ], 'register_privacy_url' => [ 'type' => 'anomaly.field_type.url', 'config' => [ diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/setting.php b/addons/default/visiosoft/profile-module/resources/lang/en/setting.php index fc16cd442..ff66a5ce9 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/profile-module/resources/lang/en/setting.php @@ -17,9 +17,6 @@ return [ 'register_protection_url' => [ 'name' => 'Register Protection URL', ], - 'register_corporate_protection_url' => [ - 'name' => 'Register Corporate Protection Url', - ], 'register_privacy_url' => [ 'name' => 'Register Privacy URL', ], From f41e696e040175f6832093570acff75cb355b964 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 9 Feb 2021 13:07:54 +0300 Subject: [PATCH 6/8] bug fixed --- .../visiosoft/base-theme/resources/views/partials/assets.twig | 2 +- .../visiosoft/base-theme/resources/views/partials/metadata.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig index 5c8339fe0..efae4833f 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig @@ -21,7 +21,7 @@ {{ asset_add("theme.js", "visiosoft.theme.base::js/theme/search.js") }} {{ asset_add("theme.js", "visiosoft.theme.base::js/theme/modal.js") }} -{{ asset_script("theme.js",['min']) }} +{{ asset_script("theme.js") }} {{ addBlock('theme/partials/assets/additional-assets')|raw }} diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig index edb6c35eb..a811222ed 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig @@ -20,7 +20,7 @@ {{ asset_script('visiosoft.theme.base::js/visiosoft.js') }} -{{ asset_style("theme.css",["min"]) }} +{{ asset_style("theme.css") }} {% include "visiosoft.theme.base::partials/styles" %} From ca06b82a5daf4b217f51d41be11bd8445f60fb9b Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 9 Feb 2021 13:08:23 +0300 Subject: [PATCH 7/8] alibaba-theme cat-icon edited --- .../cats-module/src/Category/CategoryRepository.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php b/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php index 53d5a2cc0..7ff342133 100644 --- a/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php +++ b/addons/default/visiosoft/cats-module/src/Category/CategoryRepository.php @@ -120,16 +120,20 @@ class CategoryRepository extends EntryRepository implements CategoryRepositoryIn DB::raw('c1.id'), DB::raw('c1.slug'), DB::raw('c1.parent_category_id'), + DB::raw('c1.icon_id'), DB::raw('t1.name'), DB::raw('c2.id as c2_id'), DB::raw('c2.slug as c2_slug'), DB::raw('c2.parent_category_id as c2_parent_category_id'), - DB::raw('t2.name as c2_name') + DB::raw('t2.name as c2_name'), + + DB::raw('file.id as file_id') ) ->leftJoin((DB::raw($dBName . ' c2')), DB::raw('c2.parent_category_id'), '=', DB::raw('c1.id')) ->leftJoin((DB::raw($dBNamet . ' t1')), DB::raw('c1.id'), '=', DB::raw('t1.entry_id')) ->leftJoin((DB::raw($dBNamet . ' t2')), DB::raw('c2.id'), '=', DB::raw('t2.entry_id')) + ->leftJoin(DB::raw('default_files_files file'), DB::raw('c1.icon_id'), DB::raw('file.id')) ->where(DB::raw('t1.locale'), Request()->session()->get('_locale', setting_value('streams::default_locale'))) ->where(DB::raw('t2.locale'), Request()->session()->get('_locale', setting_value('streams::default_locale'))) ->where(DB::raw("c1.deleted_at"), NULL) From 67abf4b94189b83505ca2e153e3acf0cbc96941a Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 9 Feb 2021 16:02:57 +0300 Subject: [PATCH 8/8] alibaba is_buying settings changed --- .../resources/js/alibaba/buyingSelling.js | 22 ------------------- .../admin/settings/form/partials/default.twig | 18 --------------- .../src/DefaultadminThemeServiceProvider.php | 6 ----- 3 files changed, 46 deletions(-) delete mode 100644 addons/default/visiosoft/defaultadmin-theme/resources/js/alibaba/buyingSelling.js delete mode 100644 addons/default/visiosoft/defaultadmin-theme/resources/views/admin/settings/form/partials/default.twig diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/js/alibaba/buyingSelling.js b/addons/default/visiosoft/defaultadmin-theme/resources/js/alibaba/buyingSelling.js deleted file mode 100644 index 90229b170..000000000 --- a/addons/default/visiosoft/defaultadmin-theme/resources/js/alibaba/buyingSelling.js +++ /dev/null @@ -1,22 +0,0 @@ -$(() => { - if (buying_selling_title) { - getCfValue(buying_selling_title) - } - var is_buying_selling_title = $('#is_buying_selling_title'); - is_buying_selling_title.on('change', () => { - if (is_buying_selling_title.val()) { - getCfValue(is_buying_selling_title.val()) - } - }) -}); - -function getCfValue(cf) { - crudAjax(null, `/ajax/get-cf-value/${cf}`, 'GET', function (callback) { - $('select[name="is_buying_value"]').html(""); - $('select[name="is_selling_value"]').html(""); - $.each(callback, function (index, value) { - $('select[name="is_buying_value"]').append(``) - $('select[name="is_selling_value"]').append(``) - }); - }); -} \ No newline at end of file diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/admin/settings/form/partials/default.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/admin/settings/form/partials/default.twig deleted file mode 100644 index d287b8dee..000000000 --- a/addons/default/visiosoft/defaultadmin-theme/resources/views/admin/settings/form/partials/default.twig +++ /dev/null @@ -1,18 +0,0 @@ -
- - {% include "streams::form/partials/header" with {"section": section} %} - -
- - {% include "streams::form/partials/fields" with {"fields": form.fields.base().pluck('field_name').all()} %} - -
-
- - -{{ asset_add("scripts.js", "visiosoft.theme.defaultadmin::js/alibaba/buyingSelling.js") }} diff --git a/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php b/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php index 2a71a16df..11f231931 100644 --- a/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php +++ b/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php @@ -51,12 +51,6 @@ class DefaultadminThemeServiceProvider extends AddonServiceProvider ]; } - if ($request->segment(2) === "settings") { - return [ - 'streams::form/partials/default' => 'visiosoft.theme.defaultadmin::admin/settings/form/partials/default', - ]; - } - return parent::getOverrides(); } }