From 4ede41825b62b603677a8fc9ebfcade8f578b985 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Tue, 1 Jun 2021 11:35:20 +0300 Subject: [PATCH] added is options --- .../resources/views/new-ad/new-create.twig | 22 +++++++++------- .../src/Adv/Command/IsOptionsByCategory.php | 25 +++++++++++++++++++ .../src/Http/Controller/AdvsController.php | 10 +++++++- 3 files changed, 47 insertions(+), 10 deletions(-) create mode 100644 addons/default/visiosoft/advs-module/src/Adv/Command/IsOptionsByCategory.php 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 a82a57656..1c891aed5 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 @@ -126,10 +126,12 @@ {% set standardPriceValue = form.fields.standard_price.value|split('.') %} + placeholder="0" value="{{ standardPriceValue|first }}" + type="text"> {% if setting_value('visiosoft.field_type.decimal::showDecimal') %} {% endif %} @@ -194,14 +196,16 @@ {% endif %} {% else %} -
- -
- {{ form.fields.product_options_value.configSet('cat1', adv.cat1).input|raw }} + {% if is_options %} +
+ +
+ {{ form.fields.product_options_value.configSet('cat1', adv.cat1).input|raw }} +
-
+ {% endif %} {% endif %} {% endif %}
diff --git a/addons/default/visiosoft/advs-module/src/Adv/Command/IsOptionsByCategory.php b/addons/default/visiosoft/advs-module/src/Adv/Command/IsOptionsByCategory.php new file mode 100644 index 000000000..27de8eab1 --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Adv/Command/IsOptionsByCategory.php @@ -0,0 +1,25 @@ +cat_id = $cat_id; + } + + public function handle() + { + $option_repository = app(ProductoptionRepositoryInterface::class); + $value_repository = app(ProductoptionsValueRepositoryInterface::class); + + $options_id = $option_repository->getWithCategoryId($this->cat_id)->pluck('id')->all(); + + return count($value_repository->getWithOptionsId($options_id)); + } +} 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 6a786d521..5cbe78018 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php @@ -10,6 +10,7 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Cookie; use Visiosoft\AdvsModule\Adv\AdvModel; +use Visiosoft\AdvsModule\Adv\Command\IsOptionsByCategory; use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface; use Visiosoft\AdvsModule\Adv\Event\ChangedStatusAd; use Visiosoft\AdvsModule\Adv\Event\CreatedAd; @@ -21,6 +22,8 @@ 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\CatsModule\Category\Contract\CategoryRepositoryInterface; use Visiosoft\LocationModule\City\CityModel; use Visiosoft\LocationModule\City\CityRepository; @@ -992,9 +995,14 @@ class AdvsController extends PublicController $hidePrice = in_array($adv['cat1'], $hidePriceCats); } + /* Check Options + * Added to query if there are product options. + */ + $is_options = dispatch_now(new IsOptionsByCategory($adv['cat1'])); + return $this->view->make( 'visiosoft.module.advs::new-ad/new-create', - compact('id', 'cats_d', 'cats', 'adv', 'custom_fields', 'options', 'hidePrice') + compact('id', 'cats_d', 'cats', 'adv', 'custom_fields', 'options', 'hidePrice','is_options') ); }