From 5544ad5c85842b6cce22a4d0fa09aa45bf109d15 Mon Sep 17 00:00:00 2001 From: diashalabi Date: Thu, 5 Aug 2021 13:54:53 +0300 Subject: [PATCH 1/7] #4348 Heavy Machinery Project- Photograph Module --- .../visiosoft/advs-module/src/Adv/AdvModel.php | 13 +++++++++++++ .../advs-module/src/Adv/Contract/AdvInterface.php | 2 ++ .../multiple-field_type/resources/css/lookup.scss | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index 1ebe01dd3..5819e9ef0 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -6,6 +6,7 @@ use Anomaly\Streams\Platform\Model\Advs\AdvsCustomFieldsEntryModel; use Carbon\Carbon; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Str; use Visiosoft\AdvsModule\Adv\Contract\AdvInterface; use Anomaly\Streams\Platform\Model\Advs\AdvsAdvsEntryModel; use Visiosoft\AdvsModule\OptionConfiguration\OptionConfigurationModel; @@ -510,4 +511,16 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface { return $this->created_by_id == \auth()->id() || \auth()->user()->isAdmin(); } + + public function getCatsIDs() + { + $attr = $this->getAttributes(); + return array_filter( + $attr, + function ($key) use ($attr) { + return Str::startsWith($key, 'cat') && $attr[$key]; + }, + ARRAY_FILTER_USE_KEY + ); + } } diff --git a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php index de1339d4e..23304f5e2 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php @@ -93,4 +93,6 @@ interface AdvInterface extends EntryInterface public function changeStatus($status); public function canEdit(); + + public function getCatsIDs(); } diff --git a/addons/default/visiosoft/multiple-field_type/resources/css/lookup.scss b/addons/default/visiosoft/multiple-field_type/resources/css/lookup.scss index ab65d6794..0c6542bac 100644 --- a/addons/default/visiosoft/multiple-field_type/resources/css/lookup.scss +++ b/addons/default/visiosoft/multiple-field_type/resources/css/lookup.scss @@ -240,7 +240,7 @@ a { background-color: unset; border: 0; - color: #DC3545; + color: #DC3545 !important; font-family: 'Poppins', sans-serif; font-weight: 500; display: inline-flex; From a397352c73d3d33e4740aac8a30aa06e2432fe31 Mon Sep 17 00:00:00 2001 From: diashalabi Date: Fri, 6 Aug 2021 12:14:21 +0300 Subject: [PATCH 2/7] #4284 advs import --- addons/default/visiosoft/advs-module/src/Adv/AdvsImport.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvsImport.php b/addons/default/visiosoft/advs-module/src/Adv/AdvsImport.php index 6e16350e0..0c0a200cb 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvsImport.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvsImport.php @@ -11,12 +11,13 @@ class AdvsImport implements ToModel, WithHeadingRow { public function model(array $row) { + $row['name'] = $row['name'] ?? $row['title']; if ($row['name'] !== null && $row['price'] !== null && $row['currency'] !== null) { return new AdvModel([ 'name' => $row['name'], 'slug' => Str::slug($row['name']), 'advs_desc' => $row['description'] ?? null, - 'standard_price' => $row['standard_price'] ?? null, + 'standard_price' => $row['standard_price'] ?? 0, 'price' => $row['price'], 'currency' => $row['currency'], 'country' => $row['country'] ?? null, From e2e8fbfb61b51340d83ef49dc753407d98eeac78 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 6 Aug 2021 17:26:41 +0300 Subject: [PATCH 3/7] shipping information --- .../resources/views/new-ad/preview/preview.twig | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig index f35434419..822ac03fd 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig @@ -32,6 +32,13 @@ {% endif %} {% endif %} + {% if isActive('shipping') %} + + + {{ trans('visiosoft.module.shipping::button.create_shipping_information') }} + + {% endif %} {{ trans('visiosoft.module.advs::field.edit') }} @@ -51,6 +58,14 @@ {{ trans('visiosoft.module.advs::button.create_configurations') }} {% endif %} + + {% if isActive('shipping') %} + + Create Shipping Information + + {% endif %} + {{ trans('visiosoft.module.advs::field.edit') }} From 37b2997745a73cca469315376ba7f078fa43b541 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 6 Aug 2021 18:05:48 +0300 Subject: [PATCH 4/7] translate --- .../advs-module/resources/views/new-ad/preview/preview.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig index 822ac03fd..ef6a06f63 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig @@ -62,7 +62,7 @@ {% if isActive('shipping') %} - Create Shipping Information + {{ trans('visiosoft.module.shipping::button.create_shipping_information') }} {% endif %} From 1f018e8acdcfa2e9f31ffa1a41540cfea15105a7 Mon Sep 17 00:00:00 2001 From: diashalabi Date: Mon, 9 Aug 2021 12:46:11 +0300 Subject: [PATCH 5/7] #4239 [SEO] Duplicate pages without canonical --- .../resources/views/addons/anomaly/users-module/login.twig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 8d05f6bd1..ca3751215 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,6 +1,8 @@ {% extends "theme::layouts/default" %} {% block styles %} + + {{ asset_style('visiosoft.theme.base::css/login.css') }} {% endblock %} @@ -103,4 +105,4 @@ {{ asset_add('scripts.js','visiosoft.theme.base::js/login.js') }} -{% endblock %} \ No newline at end of file +{% endblock %} From 5be3d9ed0c98982d767785fc233eda20c04fc729 Mon Sep 17 00:00:00 2001 From: diashalabi Date: Tue, 10 Aug 2021 13:04:29 +0300 Subject: [PATCH 6/7] #4413 asfaltdunyasi bug --- .../advs-module/src/Listener/AddTotalSales.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Listener/AddTotalSales.php b/addons/default/visiosoft/advs-module/src/Listener/AddTotalSales.php index 14332d921..f85eb02df 100644 --- a/addons/default/visiosoft/advs-module/src/Listener/AddTotalSales.php +++ b/addons/default/visiosoft/advs-module/src/Listener/AddTotalSales.php @@ -16,9 +16,11 @@ class AddTotalSales public function handle(CreatedOrderDetail $event) { $item = $event->getOrderItem(); - $adv = $this->advModel->find($event->getOrderItem()->item_id); - $total = $adv->total_sales + $item->piece; - $adv->total_sales = $total; - $adv->save(); + if ($item->item_type === 'adv') { + $adv = $this->advModel->find($event->getOrderItem()->item_id); + $total = $adv->total_sales + $item->piece; + $adv->total_sales = $total; + $adv->save(); + } } -} \ No newline at end of file +} From b8c96371c341d4a18161abfefc4018a899f44980 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 11 Aug 2021 15:36:13 +0300 Subject: [PATCH 7/7] fixed --- .../advs-module/resources/views/new-ad/preview/preview.twig | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig index 3b3b7ad80..b227bf2a3 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/preview/preview.twig @@ -16,6 +16,7 @@

{% endif %} +
{% if isActive('packages') and setting_value('visiosoft.module.packages::move_the_buy_package_to_the_end') and (auth_user().isAdmin or not auth_user().hasPermission('visiosoft.module.packages::packages.no_read')) %} {% set continueLink = url_route('visiosoft.module.packages::add_package', [adv.id]) %}