From 601a79bd2450b3be2e7384ee1f78def39e002194 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 18 Mar 2021 11:27:44 +0300 Subject: [PATCH 01/19] override config --- app/Lang/Loader.php | 11 +++++++++++ resources/streams/config/translate.php | 7 +++++++ 2 files changed, 18 insertions(+) create mode 100644 resources/streams/config/translate.php diff --git a/app/Lang/Loader.php b/app/Lang/Loader.php index e0e333626..84407a3a5 100644 --- a/app/Lang/Loader.php +++ b/app/Lang/Loader.php @@ -180,6 +180,17 @@ class Loader extends FileLoader $lines = array_replace_recursive($lines, $this->files->getRequire($file)); } } + + //Override System + $override_list = config('streams::translate.override'); + + foreach ($override_list as $override) { + $override = explode(':', $override); + if (count($override) > 1) { + $lines = $this->findArrayValue($override[0], $override[1], $lines); + } + } + if (config()->has('override_text')) { foreach (config()->get('override_text') as $override) { $override = explode(':', $override); diff --git a/resources/streams/config/translate.php b/resources/streams/config/translate.php new file mode 100644 index 000000000..41135f165 --- /dev/null +++ b/resources/streams/config/translate.php @@ -0,0 +1,7 @@ + [ + 'Sümüklüböcek:Benzersiz İsim', + ], +]; \ No newline at end of file From 33aec0f5d4ff9ec6a00f98045d276e1ed8d99bb1 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 18 Mar 2021 16:31:13 +0300 Subject: [PATCH 02/19] #3512 Enabled Currencies make it tag --- .../visiosoft/advs-module/resources/config/settings/settings.php | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php index af1b774f1..563d68e07 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -173,6 +173,7 @@ return [ 'type' => 'anomaly.field_type.checkboxes', 'required' => true, 'config' => [ + 'mode' => 'tags', 'default_value' => function () { return [config('streams::currencies.default')]; }, From 745ceb28a5ca5b4f955224a523aebb6078039f60 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 18 Mar 2021 17:17:37 +0300 Subject: [PATCH 03/19] #3460 Make "show all" 1000 record --- .../views/table/partials/footer.twig | 62 +++++++++++++++++++ .../src/DefaultadminThemeServiceProvider.php | 4 ++ 2 files changed, 66 insertions(+) create mode 100644 addons/default/visiosoft/defaultadmin-theme/resources/views/table/partials/footer.twig diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/table/partials/footer.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/table/partials/footer.twig new file mode 100644 index 000000000..293ce23d2 --- /dev/null +++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/table/partials/footer.twig @@ -0,0 +1,62 @@ + +{% if table.actions|length or table.data.pagination.links|length %} + + + +
+ {{ buttons(table.actions)|raw }} +
+ + {% if table.data.pagination.links|length %} +
+ + + + {{ table.data.pagination.links|raw }} +
+ {% endif %} + +
+ + + +{% endif %} +{% if table.options.total_results %} + + + + {{ table.options.total_results }} {{ trans('streams::message.results') }} + + + +{% endif %} + diff --git a/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php b/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php index 17d9560e7..70fc9b229 100644 --- a/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php +++ b/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php @@ -27,6 +27,10 @@ class DefaultadminThemeServiceProvider extends AddonServiceProvider ], ]; + protected $overrides = [ + 'streams::table/partials/footer' => 'visiosoft.theme.defaultadmin::table/partials/footer' + ]; + public function register() { AbstractPaginator::$defaultView = 'visiosoft.theme.defaultadmin::pagination/bootstrap-4'; From 7cfdf064f166faa22174e875f7bfe71128898979 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 19 Mar 2021 15:27:22 +0300 Subject: [PATCH 04/19] trans to lang text --- addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php index 6c62c79ae..6518e653d 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php @@ -96,7 +96,7 @@ class AdvCriteria extends EntryCriteria public function getCurrentLocale() { - return locale_get_display_name(config('app.locale')); + return trans('streams::locale.' . config('app.locale') . '.name'); } public function isEnabled($slug) From 9deee510ea9d4424426db4baea67559367db8bab Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 19 Mar 2021 17:42:49 +0300 Subject: [PATCH 05/19] fixed addBlock orher fields --- .../resources/views/new-ad/new-create.twig | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) 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 9faa16334..17e8aadd8 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 @@ -103,11 +103,13 @@ {% set PriceValue = form.fields.price.value|split('.') %}
- +
{% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
-
{% endif %} @@ -135,11 +137,13 @@ {{ trans('visiosoft.module.advs::field.options') }}
- @@ -177,25 +181,28 @@
{{ form.fields.files.input |raw }} - +
{% for docs in form.fields.doc_files.value %} - - {{ docs.name }} - -
+ + {{ docs.name }} + +
{% endfor %}
- - {% if custom_fields and count(custom_fields) %} + {% set other_fields = addBlock('new-ad/other-fields',{'custom_fields':custom_fields}) %} + {% if other_fields or (custom_fields and count(custom_fields)) %}
{{ trans('visiosoft.module.advs::field.additional_fields') }}
- {{ addBlock('new-ad/other-fields',{'custom_fields':custom_fields})|raw }} + {{ other_fields|raw }}
{% endif %} From f837e70e14904f292c1fb83800d467f07731a260 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Mon, 22 Mar 2021 16:39:38 +0300 Subject: [PATCH 06/19] remote sales contract --- .../visiosoft/advs-module/src/Support/_helpers.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/addons/default/visiosoft/advs-module/src/Support/_helpers.php b/addons/default/visiosoft/advs-module/src/Support/_helpers.php index 45c94b635..f5f0bc714 100644 --- a/addons/default/visiosoft/advs-module/src/Support/_helpers.php +++ b/addons/default/visiosoft/advs-module/src/Support/_helpers.php @@ -31,4 +31,16 @@ if (!function_exists('auth_id_if_null')) function auth_id_if_null($userId) { return $userId ?: auth()->id(); } +} + +if (!function_exists('replace_to_text')) +{ + function replace_to_text($content, $array) + { + foreach ($array as $key => $value) { + $content = str_replace('${' . $key . '}', $value, $content); + } + + return $content; + } } \ No newline at end of file From 7055bb85c12fa9d22ebd9f804a3bd0dd58c605a3 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 22 Mar 2021 16:58:42 +0300 Subject: [PATCH 07/19] fixed cover photo error --- .../visiosoft/advs-module/src/Adv/AdvRepository.php | 9 ++++----- 1 file changed, 4 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 779e01c47..c27314a55 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -330,10 +330,8 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface 'extension' => $image->extension, ]); - $coverPhoto = 'files/images/' . $fileName; - } else { - $coverPhoto = $thumbnail->url(); } + $coverPhoto = $thumbnail->url(); } else { $coverPhoto = null; } @@ -502,8 +500,9 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface ->paginate(setting_value('visiosoft.module.advs::popular_ads_limit', setting_value('streams::per_page'))); } - public function getName($id){ - return $this->find($id)->name; + public function getName($id) + { + return $this->find($id)->name; } public function approveAds($adsIDs) From d5fb8f578e440bc3e9762e389c29892c5db8650c Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 22 Mar 2021 17:02:33 +0300 Subject: [PATCH 08/19] fixed cover photo error --- addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index c27314a55..bdc1c0b89 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -331,7 +331,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface ]); } - $coverPhoto = $thumbnail->url(); + $coverPhoto = 'files/images/' . $fileName; } else { $coverPhoto = null; } From 9e839fb64bd228f3235608b2d752b6e716389d23 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 23 Mar 2021 14:55:12 +0300 Subject: [PATCH 09/19] igamkoop bugs and request edited --- .../advs-module/src/Adv/Table/AdvTableColumns.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php index 64f303c65..1780c08fc 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php @@ -21,12 +21,16 @@ class AdvTableColumns 'wrapper' => ' #{value.id}{value.name}
- {value.finish_at} + {value.date}
{value.category}', 'value' => [ 'id' => 'entry.id', - 'finish_at' => 'entry.finish_at', + 'date' => function(EntryInterface $entry){ + $created_at = date_format($entry['created_at'], 'd.m.Y H:i'); + $finish_at = date_format($entry['finish_at'], 'd.m.Y H:i'); + return $created_at . ' ' . $finish_at; + }, 'name' => function (EntryInterface $entry) { if ($entry->getTitle()) { $value = " {entry.name} "; From a3f277d919ed8716d41cceedf3ed62aa631d4142 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 24 Mar 2021 10:22:13 +0300 Subject: [PATCH 10/19] hide price filter by category --- .../views/list/partials/price-filter.twig | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig index 180820296..06734c9a3 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig @@ -1,4 +1,14 @@ -{% if setting_value('visiosoft.module.advs::hide_price_filter') == false %} +{% set hidePriceCats = setting_value('visiosoft.module.advs::hide_price_categories') %} +{% set cats = entries('cats','category').whereIn('id', hidePriceCats).get() %} +{% set isHidden = false %} + +{% for cat in cats %} + {% if request().segment(2) == cat.slug %} + {% set isHidden = true %} + {% endif %} +{% endfor %} + +{% if setting_value('visiosoft.module.advs::hide_price_filter') == false and not isHidden%}
-{% endif %} \ No newline at end of file +{% endif %} From a81c5d5abcace37548fc8964b7ee6ba266634ad6 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 24 Mar 2021 17:42:14 +0300 Subject: [PATCH 11/19] fixed dateformat --- .../visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php index 1780c08fc..b8364f0fe 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php @@ -27,8 +27,8 @@ class AdvTableColumns 'value' => [ 'id' => 'entry.id', 'date' => function(EntryInterface $entry){ - $created_at = date_format($entry['created_at'], 'd.m.Y H:i'); - $finish_at = date_format($entry['finish_at'], 'd.m.Y H:i'); + $created_at = ($entry['created_at']) ?date_format($entry['created_at'], 'd.m.Y H:i'): ''; + $finish_at = ($entry['finish_at']) ? date_format($entry['finish_at'], 'd.m.Y H:i'): ''; return $created_at . ' ' . $finish_at; }, 'name' => function (EntryInterface $entry) { From 1877b08f3643672d550e23efe7c976b157d079d0 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 25 Mar 2021 10:53:56 +0300 Subject: [PATCH 12/19] #3607 igamkoop bugs and requests --- .../default/visiosoft/advs-module/resources/js/filter_modal.js | 2 +- .../resources/views/list/partials/filter-modal.twig | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/js/filter_modal.js b/addons/default/visiosoft/advs-module/resources/js/filter_modal.js index 0f371ad38..8fd2d27c1 100644 --- a/addons/default/visiosoft/advs-module/resources/js/filter_modal.js +++ b/addons/default/visiosoft/advs-module/resources/js/filter_modal.js @@ -70,7 +70,7 @@ promiseForCategory.then(function (categories_list) { function CategoryField(name, level) { return '
\n' + '\n\n
'; } diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig index 8ba54e038..a43ffc88f 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig @@ -1,5 +1,6 @@ {{ asset_add('scripts.js','visiosoft.module.advs::js/filter_modal.js') }} -
+
+ {% include 'visiosoft.module.advs::list/partials/list-filter' with {"filter_id": 'listFilterFormMobile'} %} +
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 24015510f..d977a7892 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 }} From ea947ce1b1408b3ae71b5773db98f590788c7a32 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 26 Mar 2021 17:46:40 +0300 Subject: [PATCH 17/19] fixed configured ads --- .../src/Http/Controller/advsController.php | 14 ++++++++++---- .../OptionConfigurationModel.php | 17 +++++++++++++++++ 2 files changed, 27 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 d1311c2a1..76b6d07d8 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -21,6 +21,7 @@ use Visiosoft\AdvsModule\Adv\Event\viewAd; use Visiosoft\AdvsModule\Adv\Form\AdvFormBuilder; use Visiosoft\AdvsModule\Option\Contract\OptionRepositoryInterface; use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationRepositoryInterface; +use Visiosoft\AdvsModule\OptionConfiguration\OptionConfigurationModel; use Visiosoft\AdvsModule\Productoption\Contract\ProductoptionRepositoryInterface; use Visiosoft\AdvsModule\ProductoptionsValue\Contract\ProductoptionsValueRepositoryInterface; use Visiosoft\AlgoliaModule\Search\SearchModel; @@ -1241,10 +1242,15 @@ class AdvsController extends PublicController $quantity = $request->quantity; $id = $request->id; $type = $request->type; - $advmodel = new AdvModel(); - $adv = $advmodel->getAdv($id); - - $status = $advmodel->stockControl($id, $quantity); + if ($request->dataType === 'ad-configuration') { + $optionConf = new OptionConfigurationModel(); + $adv = $optionConf->newQuery()->find($id); + $status = $adv->stockControl($id, $quantity); + } else { + $advmodel = new AdvModel(); + $adv = $advmodel->getAdv($id); + $status = $advmodel->stockControl($id, $quantity); + } $response = array(); if ($status == 1) { diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php index c7153d80d..1341a6b4f 100644 --- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php @@ -1,5 +1,6 @@ name . ' | ' . trim($option_group_value, ' '); } } + + public function stockControl($id, $quantity) + { + $conf = $this->newQuery()->find($id); + $stock = $conf->stock; + + if ($stock === NULL || $stock === 0) { + return 0; + } + + if ($stock < $quantity) { + return 0; + } + + return 1; + } } From 1176ca5c5f42c403fe145f8ba7ec91e036c44a60 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 26 Mar 2021 17:47:39 +0300 Subject: [PATCH 18/19] fixed configured ads --- .../src/OptionConfiguration/OptionConfigurationModel.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php index 1341a6b4f..9e54d6752 100644 --- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php @@ -1,11 +1,8 @@ Date: Sat, 27 Mar 2021 22:35:19 +0300 Subject: [PATCH 19/19] getMains is used by store --- .../src/Category/CategoryModel.php | 22 +++++++++++++++++++ .../Category/Contract/CategoryInterface.php | 2 ++ 2 files changed, 24 insertions(+) diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php index 4eef167cc..560eb498c 100644 --- a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php +++ b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php @@ -20,4 +20,26 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface { return $this->parent_category; } + public function getMains($id) + { + $categories = array(); + $z = 1; + for ($i = 1; $i <= $z; $i++) { + if ($main = $this->newQuery()->where('id', $id)->first()) { + $new = array(); + $new['id'] = $main->id; + $new['val'] = $main->name; + $new['slug'] = $main->slug; + $categories[] = $new; + if ($main->parent_category_id != null) { + $id = $main->parent_category_id; + $z++; + } + } + } + $categories = array_reverse($categories); + unset($categories[count($categories) - 1]); + return $categories; + } + } diff --git a/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php b/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php index 8cd765413..f607252d3 100644 --- a/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php +++ b/addons/default/visiosoft/cats-module/src/Category/Contract/CategoryInterface.php @@ -9,4 +9,6 @@ interface CategoryInterface extends EntryInterface public function getMetaDescription(); public function getParent(); + + public function getMains($id); }