From 77ff0b09fa559305d0d2d9c8e2a11993ef794636 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Tue, 3 Aug 2021 11:05:25 +0300
Subject: [PATCH 01/10] #4061 ads configration improvments

---
 .../resources/css/new-create-new.scss         | 27 +++++++++-
 .../resources/images/create/close.svg         |  6 +++
 .../resources/images/create/plus.svg          | 12 +++++
 .../advs-module/resources/js/new-create.js    | 32 +++++++++++-
 .../advs-module/resources/lang/en/button.php  |  1 +
 .../advs-module/resources/lang/tr/button.php  |  2 +
 .../resources/views/new-ad/new-create.twig    |  7 ++-
 .../new-ad/partials/configuration-modal.twig  | 52 +++++++++++++++++++
 .../views/new-ad/preview/preview.twig         | 14 -----
 .../src/Adv/Command/IsOptionsByCategory.php   |  2 +-
 .../src/AdvsModuleServiceProvider.php         |  6 +++
 .../src/Http/Controller/AdvsController.php    |  7 +--
 .../OptionConfigurationController.php         | 25 +++++++++
 ...OptionConfigurationRepositoryInterface.php |  2 +
 .../Form/OptionConfigurationFormBuilder.php   |  3 ++
 .../Form/OptionConfigurationFormFields.php    | 18 ++++---
 .../OptionConfigurationRepository.php         |  5 +-
 17 files changed, 190 insertions(+), 31 deletions(-)
 create mode 100644 addons/default/visiosoft/advs-module/resources/images/create/close.svg
 create mode 100644 addons/default/visiosoft/advs-module/resources/images/create/plus.svg
 create mode 100644 addons/default/visiosoft/advs-module/resources/views/new-ad/partials/configuration-modal.twig

diff --git a/addons/default/visiosoft/advs-module/resources/css/new-create-new.scss b/addons/default/visiosoft/advs-module/resources/css/new-create-new.scss
index 9fe3ff8d5..f93008c30 100644
--- a/addons/default/visiosoft/advs-module/resources/css/new-create-new.scss
+++ b/addons/default/visiosoft/advs-module/resources/css/new-create-new.scss
@@ -261,4 +261,29 @@ label {
       }
     }
   }
-}
\ No newline at end of file
+}
+
+.btn-configuration {
+  background-color: #6E5DDB;
+  padding: 1rem 2rem;
+  font-family: 'Poppins', sans-serif;
+  font-size: calc(18rem / 16);
+  border-radius: .25rem;
+  border: 0;
+  color: #fff;
+  display: inline-flex;
+  align-items: center;
+  margin-bottom: 2rem;
+
+  &:hover,
+  &:active,
+  &:focus {
+    background-color: #6E5DDB;
+    color: #fff;
+  }
+
+  svg {
+    width: 1.5rem;
+    height: auto;
+  }
+}
diff --git a/addons/default/visiosoft/advs-module/resources/images/create/close.svg b/addons/default/visiosoft/advs-module/resources/images/create/close.svg
new file mode 100644
index 000000000..85882199b
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/resources/images/create/close.svg
@@ -0,0 +1,6 @@
+<svg id="Group_42321" data-name="Group 42321" xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30">
+    <g id="Group_15874" data-name="Group 15874">
+        <path id="Path_10381" data-name="Path 10381" d="M15,0A15,15,0,1,1,0,15,15,15,0,0,1,15,0Z" fill="#f8f8f8"/>
+        <path id="close" d="M10.557.6l-.6-.6L5.278,4.675.6,0,0,.6,4.675,5.278,0,9.953l.6.6L5.278,5.882l4.675,4.675.6-.6L5.882,5.278Z" transform="translate(9.5 9.5)" fill="#c7c7c7" stroke="#c7c7c7" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.7"/>
+    </g>
+</svg>
diff --git a/addons/default/visiosoft/advs-module/resources/images/create/plus.svg b/addons/default/visiosoft/advs-module/resources/images/create/plus.svg
new file mode 100644
index 000000000..dc901980f
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/resources/images/create/plus.svg
@@ -0,0 +1,12 @@
+<svg id="add_5_" data-name="add (5)" xmlns="http://www.w3.org/2000/svg" width="19.96" height="19.96" viewBox="0 0 19.96 19.96">
+    <g id="Group_16519" data-name="Group 16519">
+        <g id="Group_16518" data-name="Group 16518">
+            <path id="Path_10382" data-name="Path 10382" d="M9.98,0a9.98,9.98,0,1,0,9.98,9.98A9.991,9.991,0,0,0,9.98,0Zm0,18.414A8.434,8.434,0,1,1,18.414,9.98,8.444,8.444,0,0,1,9.98,18.414Z" fill="#fff"/>
+        </g>
+    </g>
+    <g id="Group_16521" data-name="Group 16521" transform="translate(5.342 5.272)">
+        <g id="Group_16520" data-name="Group 16520">
+            <path id="Path_10383" data-name="Path 10383" d="M145.526,139.1h-3.092v-3.092a.773.773,0,0,0-1.546,0V139.1H137.8a.773.773,0,0,0,0,1.546h3.092v3.092a.773.773,0,0,0,1.546,0v-3.092h3.092a.773.773,0,1,0,0-1.546Z" transform="translate(-137.022 -135.238)" fill="#fff"/>
+        </g>
+    </g>
+</svg>
diff --git a/addons/default/visiosoft/advs-module/resources/js/new-create.js b/addons/default/visiosoft/advs-module/resources/js/new-create.js
index 9166a6519..feb51dbd1 100644
--- a/addons/default/visiosoft/advs-module/resources/js/new-create.js
+++ b/addons/default/visiosoft/advs-module/resources/js/new-create.js
@@ -3,8 +3,6 @@ function showLoader() {
 }
 
 
-
-
 var filter = {};
 
 // TODO will be unified
@@ -265,4 +263,34 @@ $(document).ready(function () {
 
         return true;
     })
+
+    $('#configurationForm').submit(function (e) {
+        e.preventDefault();
+        crudAjax($(this).serialize(), '/advs/configuration/ajax/create', 'POST', function (callback) {
+            $('.configuration-table').append(`<tr id="configuration-${callback.id}">
+                                        <td>${callback.option_name}</td>
+                                        <td>${callback.stock}</td>
+                                        <td>${callback.currency_price}</td>
+                                        <td class="text-right">
+                                            <a href="javascript:void(0)" class="btn btn-sm remove-conf" data-id="${callback.id}"><svg id="Group_42321" data-name="Group 42321" xmlns="http://www.w3.org/2000/svg" width="30" height="30" viewBox="0 0 30 30">
+                                                <g id="Group_15874" data-name="Group 15874">
+                                                    <path id="Path_10381" data-name="Path 10381" d="M15,0A15,15,0,1,1,0,15,15,15,0,0,1,15,0Z" fill="#f8f8f8"></path>
+                                                    <path id="close" d="M10.557.6l-.6-.6L5.278,4.675.6,0,0,.6,4.675,5.278,0,9.953l.6.6L5.278,5.882l4.675,4.675.6-.6L5.882,5.278Z" transform="translate(9.5 9.5)" fill="#c7c7c7" stroke="#c7c7c7" stroke-linecap="round" stroke-linejoin="round" stroke-width="0.7"></path>
+                                                </g>
+                                            </svg>
+                                            </a>
+                                        </td>
+                                    </tr>`);
+            $('#configurationForm').trigger("reset");
+        })
+    });
+
+    $(document).on('click', '.remove-conf', function () {
+        const id = $(this).data('id');
+
+        crudAjax({id: id}, '/advs/configuration/ajax/delete', 'POST', function (callback) {
+            $('#configuration-' + id).remove();
+        })
+    });
+
 });
diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/button.php b/addons/default/visiosoft/advs-module/resources/lang/en/button.php
index c37d791c5..d3c185309 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/button.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/button.php
@@ -1,6 +1,7 @@
 <?php
 
 return [
+    'add' => 'Add',
     'new_adv' => 'New classified',
     'new_classified' => 'New classified',
     'new_category' => 'New Category',
diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/button.php b/addons/default/visiosoft/advs-module/resources/lang/tr/button.php
index 6902810bf..d653c135b 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/tr/button.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/tr/button.php
@@ -1,6 +1,7 @@
 <?php
 
 return [
+    'add' => 'Ekle',
     'new_adv' => 'Yeni ürün/ilan',
     'new_classified' => 'Yeni ürün/ilan',
     'new_category' => 'Yeni kategori',
@@ -33,6 +34,7 @@ return [
         'name' => 'Kategori Güncelle'
     ],
     'new_option' => 'Yeni Seçenek',
+    'options' => 'Seçenekler',
 	'export' => 'Dışa aktar',
     'new_productoption' => 'Yeni Üretim',
     'new_productoptions_value' => 'Yeni Ürün seçeneği değeri',
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 4c0f772aa..a92142253 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
@@ -225,7 +225,11 @@
                                                     {{ trans('visiosoft.module.advs::field.product_option.name') }}
                                                 </label>
                                                 <div class="mt-3 form-group mb-0">
-                                                    {{ form.fields.product_options_value.configSet('cat1', adv.cat1).input|raw }}
+                                                    <button type="button" class="btn btn-primary btn-configuration" data-toggle="modal" data-target="#configurationModal">
+                                                        {{ img('visiosoft.module.advs::images/create/plus.svg').data|raw }}
+                                                        &nbsp;
+                                                        {{ trans('visiosoft.module.advs::button.new_options_configuration') }}
+                                                    </button>
                                                 </div>
                                             </div>
                                         {% endif %}
@@ -316,6 +320,7 @@
         </div>
     </section>
     {% include "visiosoft.module.advs::new-ad/partials/modals" %}
+    {% include "visiosoft.module.advs::new-ad/partials/configuration-modal" %}
     {{ addBlock('new-ad/modals')|raw }}
     <script>
         var default_country = "{{ setting_value('visiosoft.module.location::default_country') }}";
diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/configuration-modal.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/configuration-modal.twig
new file mode 100644
index 000000000..cb00dff04
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/configuration-modal.twig
@@ -0,0 +1,52 @@
+<div class="modal fade" id="configurationModal" tabindex="-1" role="dialog" aria-labelledby="configurationModalLabel"
+     aria-hidden="true">
+    <div class="modal-dialog modal-xl" role="document">
+        <div class="modal-content rounded-0">
+            <div class="modal-header border-0">
+                <h5 class="modal-title" id="configurationModalLabel">
+                    {{ trans('visiosoft.module.advs::stream.product_options.name') }}
+                </h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="">
+                    {% set configurationForm = form('configuration_form').entry(adv.id).get() %}
+
+                    {{ form_open({id: 'configurationForm',class: 'd-flex justify-content-between'})|raw }}
+                    <input type="text" name="parent_adv_id" value="{{ adv.id }}" hidden>
+                    {{ configurationForm.fields|raw }}
+                    <button type="submit" class="btn btn-primary btn-configuration my-auto form-control w-auto">
+                        {{ trans('visiosoft.module.advs::button.add') }}
+                    </button>
+                    {{ form_close() }}
+                </div>
+
+                <table class="table">
+                    <thead>
+                    <tr>
+                        <th scope="col">{{ trans('visiosoft.module.advs::field.options') }}</th>
+                        <th scope="col">{{ trans('visiosoft.module.advs::field.stock.name') }}</th>
+                        <th scope="col">{{ trans('visiosoft.module.advs::field.price.name') }}</th>
+                        <th scope=""></th>
+                    </tr>
+                    </thead>
+                    <tbody class="configuration-table">
+                    {% for key, configuration in configurations %}
+                        <tr id="configuration-{{ key }}">
+                            <td>{{ configuration.name }}</td>
+                            <td>{{ configuration.stock }}</td>
+                            <td>{{ currency_format(configuration.price,configuration.currency) }}</td>
+                            <td class="text-right">
+                                <a href="javascript:void(0)" class="btn btn-sm remove-conf"
+                                   data-id="{{ key }}">{{ img('visiosoft.module.advs::images/create/close.svg').data|raw }}</a>
+                            </td>
+                        </tr>
+                    {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
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..f57c797e4 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
@@ -24,14 +24,6 @@
         {% else %}
             {% set continueLink = url_route('adv_detail_seo', [adv.slug, adv.id]) %}
         {% endif %}
-        {% if not setting_value('visiosoft.module.advs::hide_configurations') %}
-            {% if setting_value('visiosoft.module.advs::detailed_product_options') %}
-                <a href="{{ route('visiosoft.module.advs::user.configrations.create') }}?ad={{ adv.id }}"
-                   class="btn btn-warning shadow-sm mr-4 text-white">
-                    {{ trans('visiosoft.module.advs::button.create_configurations') }}
-                </a>
-            {% endif %}
-        {% endif %}
         <a href="{{ url_route('visiosoft.module.advs::edit_adv', [adv.id]) }}"
            class="btn preview-edit shadow-sm border">
             {{ trans('visiosoft.module.advs::field.edit') }}
@@ -45,12 +37,6 @@
         <div class="preview-overlay position-absolute"></div>
     </div>
     <div class="preview-actions text-center">
-        {% if not setting_value('visiosoft.module.advs::hide_configurations') %}
-            <a href="{{ route('visiosoft.module.advs::user.configrations.create') }}?ad={{ adv.id }}"
-               class="btn btn-warning shadow-sm mr-4 text-white">
-                {{ trans('visiosoft.module.advs::button.create_configurations') }}
-            </a>
-        {% endif %}
         <a href="{{ url_route('visiosoft.module.advs::edit_adv', [adv.id]) }}"
            class="btn preview-edit shadow-sm border">
             {{ trans('visiosoft.module.advs::field.edit') }}
diff --git a/addons/default/visiosoft/advs-module/src/Adv/Command/IsOptionsByCategory.php b/addons/default/visiosoft/advs-module/src/Adv/Command/IsOptionsByCategory.php
index 27de8eab1..7bb213415 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Command/IsOptionsByCategory.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Command/IsOptionsByCategory.php
@@ -20,6 +20,6 @@ class IsOptionsByCategory
 
         $options_id = $option_repository->getWithCategoryId($this->cat_id)->pluck('id')->all();
 
-        return count($value_repository->getWithOptionsId($options_id));
+        return $value_repository->getWithOptionsId($options_id);
     }
 }
diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
index 73ebc37ee..d73c8d622 100644
--- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
+++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
@@ -19,6 +19,7 @@ use Visiosoft\AdvsModule\Listener\AddTotalSales;
 use Visiosoft\AdvsModule\Option\Contract\OptionRepositoryInterface;
 use Visiosoft\AdvsModule\Option\OptionRepository;
 use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationRepositoryInterface;
+use Visiosoft\AdvsModule\OptionConfiguration\Form\OptionConfigurationFormBuilder;
 use Visiosoft\AdvsModule\OptionConfiguration\OptionConfigurationRepository;
 use Visiosoft\AdvsModule\Productoption\Contract\ProductoptionRepositoryInterface;
 use Visiosoft\AdvsModule\Productoption\ProductoptionRepository;
@@ -217,6 +218,10 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
             'as' => 'visiosoft.module.advs::user.configrations.create',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\OptionConfigurationController@create',
         ],
+
+        'advs/configuration/ajax/create' => 'Visiosoft\AdvsModule\Http\Controller\OptionConfigurationController@ajaxCreate',
+        'advs/configuration/ajax/delete' => 'Visiosoft\AdvsModule\Http\Controller\OptionConfigurationController@ajaxDelete',
+
         'conf/addCart' => [
             'as' => 'configuration::add_cart',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\OptionConfigurationController@confAddCart',
@@ -257,6 +262,7 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
         AdvsAdvsEntryModel::class => AdvModel::class,
         AdvsStatusEntryModel::class => StatusModel::class,
         'my_form' => AdvFormBuilder::class,
+        'configuration_form' => OptionConfigurationFormBuilder::class,
     ];
 
     protected $singletons = [
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 5cbe78018..0dca9e7b6 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
@@ -784,7 +784,7 @@ class AdvsController extends PublicController
             $is_new_create = ($adv->slug == "") ? true : false;
 
             //Set Old Price
-            $old_price = ($adv->slug == "") ? $this->request->price : $adv->price;
+            $old_price = $is_new_create ? $this->request->price : $adv->price;
             $adv->old_price = $old_price;
 
 
@@ -999,10 +999,11 @@ class AdvsController extends PublicController
          * Added to query if there are product options.
          */
         $is_options = dispatch_now(new IsOptionsByCategory($adv['cat1']));
+        $configurations = app(OptionConfigurationRepositoryInterface::class)->getConf($adv['id']);
 
         return $this->view->make(
             'visiosoft.module.advs::new-ad/new-create',
-            compact('id', 'cats_d', 'cats', 'adv', 'custom_fields', 'options', 'hidePrice','is_options')
+            compact('id', 'cats_d', 'cats', 'adv', 'custom_fields', 'options', 'hidePrice','is_options', 'configurations')
         );
     }
 
@@ -1191,4 +1192,4 @@ class AdvsController extends PublicController
         $response['maxQuantity'] = $adv->stock;
         return $response;
     }
-}
\ No newline at end of file
+}
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php
index 133422108..86491f7d7 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php
@@ -4,6 +4,7 @@ use Anomaly\Streams\Platform\Http\Controller\PublicController;
 use Visiosoft\AdvsModule\Adv\AdvModel;
 use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationRepositoryInterface;
 use Visiosoft\AdvsModule\OptionConfiguration\Form\OptionConfigurationFormBuilder;
+use Visiosoft\AdvsModule\Support\Command\Currency;
 use Visiosoft\CartsModule\Cart\CartRepository;
 use Visiosoft\CartsModule\Cart\Command\GetCart;
 
@@ -31,6 +32,30 @@ class OptionConfigurationController extends PublicController
         return $form->render();
     }
 
+    public function ajaxCreate(OptionConfigurationRepositoryInterface $optionConfigurationRepository){
+        $parameters = $this->request->all();
+        $option_json = array();
+        foreach ($parameters as $key => $parameter_value) {
+            if ((strpos($key, "option-") === 0)) {
+                if ($parameter_value !== '') {
+                    $option_id = substr($key, 7);
+                    $option_json[$option_id] = $parameter_value;
+                }
+                unset($parameters[$key]);
+            }
+        }
+        $option_json = ['option_json' => json_encode($option_json)];
+        $configration = array_merge($parameters, $option_json);
+        $entry = $optionConfigurationRepository->create($configration);
+        $entry['currency_price'] = app(Currency::class)->format($entry->price, $entry->currency);
+
+        return $this->response->json($entry);
+    }
+
+    public function ajaxDelete(OptionConfigurationRepositoryInterface $optionConfigurationRepository){
+        return $optionConfigurationRepository->deleteConfig($this->request->id);
+    }
+
     public function confAddCart()
     {
         if ($conf = $this->optionConfigurationRepository->find($this->request->configuration)) {
diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php
index 400efc70f..ea13ee9f8 100644
--- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php
+++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php
@@ -13,4 +13,6 @@ interface OptionConfigurationRepositoryInterface extends EntryRepositoryInterfac
 	public function deleteUnusedConfigs($adsIDs);
 
 	public function deleteAdsConfigs($adID);
+
+    public function deleteConfig($id);
 }
diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormBuilder.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormBuilder.php
index e3f69f98a..0590e1203 100644
--- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormBuilder.php
+++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormBuilder.php
@@ -4,4 +4,7 @@ use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
 
 class OptionConfigurationFormBuilder extends FormBuilder
 {
+    protected $actions = [
+        'save',
+    ];
 }
diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormFields.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormFields.php
index 7c1bce60d..558bbeae6 100644
--- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormFields.php
+++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormFields.php
@@ -2,32 +2,34 @@
 
 use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface;
 use Visiosoft\AdvsModule\Productoption\Contract\ProductoptionRepositoryInterface;
+use Visiosoft\AdvsModule\ProductoptionsValue\Contract\ProductoptionsValueRepositoryInterface;
 
 class OptionConfigurationFormFields
 {
 	public function handle(
 		OptionConfigurationFormBuilder $builder,
 		AdvRepositoryInterface $advRepository,
-		ProductoptionRepositoryInterface $productOptionRepository)
+		ProductoptionRepositoryInterface $productOptionRepository,
+        ProductoptionsValueRepositoryInterface $productoptionsValueRepository
+    )
 	{
-		if(request()->has('ad'))
+		if(request()->has('ad') || $builder->getEntry())
 		{
-			$ad = $advRepository->find(request('ad'));
-
-			$options = $ad->getProductOptionsValues()->groupBy('product_option_id');
+			$ad = $advRepository->find(request('ad') ?? $builder->getEntry());
+            $options = $productOptionRepository->getWithCategoryId($ad->cat1);
 
 			$options_fields = array();
 
-			foreach ($options as $option_id => $option_values)
+			foreach ($options as $option)
 			{
-				if($option = $productOptionRepository->find($option_id))
+				if($optionValue = $productoptionsValueRepository->getWithOptionsId([$option->id]))
 				{
 					$options_fields['option-'.$option->getId()] = [
 						'type' => 'anomaly.field_type.select',
 						'label' => $option->getName(),
 						'required' => true,
 						'config' => [
-							'options' => $option_values->pluck('name','id')->all(),
+							'options' => $optionValue->pluck('name','id')->all(),
 						]
 					];
 				}
diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php
index 27c9d2847..72b7406e7 100644
--- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php
+++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php
@@ -1,6 +1,5 @@
 <?php namespace Visiosoft\AdvsModule\OptionConfiguration;
 
-use Anomaly\Streams\Platform\Model\Configuration\ConfigurationConfigurationEntryModel;
 use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface;
 use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationRepositoryInterface;
 use Anomaly\Streams\Platform\Entry\EntryRepository;
@@ -93,4 +92,8 @@ class OptionConfigurationRepository extends EntryRepository implements OptionCon
     {
         return $this->newQuery()->where('parent_adv_id', $adID)->delete();
     }
+
+    public function deleteConfig($id){
+        return $this->newQuery()->find($id)->delete();
+    }
 }

From d0f1e3e13a25ae1052c834674d6bfa062e093dc9 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Tue, 3 Aug 2021 11:45:45 +0300
Subject: [PATCH 02/10] #4061 ads configration improvments

---
 .../advs-module/src/AdvsModuleServiceProvider.php    | 10 ++++++++--
 .../OptionConfigurationRepository.php                | 12 ++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
index d73c8d622..8b96de2d9 100644
--- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
+++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
@@ -219,8 +219,14 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\OptionConfigurationController@create',
         ],
 
-        'advs/configuration/ajax/create' => 'Visiosoft\AdvsModule\Http\Controller\OptionConfigurationController@ajaxCreate',
-        'advs/configuration/ajax/delete' => 'Visiosoft\AdvsModule\Http\Controller\OptionConfigurationController@ajaxDelete',
+        'advs/configuration/ajax/create' => [
+            'middleware' => 'auth',
+            'uses' => 'Visiosoft\AdvsModule\Http\Controller\OptionConfigurationController@ajaxCreate'
+        ],
+        'advs/configuration/ajax/delete' => [
+            'middleware' => 'auth',
+            'uses' => 'Visiosoft\AdvsModule\Http\Controller\OptionConfigurationController@ajaxDelete'
+        ],
 
         'conf/addCart' => [
             'as' => 'configuration::add_cart',
diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php
index 72b7406e7..b5b842cbc 100644
--- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php
+++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php
@@ -1,5 +1,6 @@
 <?php namespace Visiosoft\AdvsModule\OptionConfiguration;
 
+use Illuminate\Support\Facades\Auth;
 use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface;
 use Visiosoft\AdvsModule\OptionConfiguration\Contract\OptionConfigurationRepositoryInterface;
 use Anomaly\Streams\Platform\Entry\EntryRepository;
@@ -93,7 +94,14 @@ class OptionConfigurationRepository extends EntryRepository implements OptionCon
         return $this->newQuery()->where('parent_adv_id', $adID)->delete();
     }
 
-    public function deleteConfig($id){
-        return $this->newQuery()->find($id)->delete();
+    public function deleteConfig($id)
+    {
+        if ($conf = ($this->newQuery()->find($id))) {
+            if ($conf->created_by_id === Auth::user()->getAuthIdentifier()) {
+                return $conf->delete();
+            }
+            return response()->json(['status' => 'error'], 403);
+        }
+        return response()->json(['status' => 'error'], 404);
     }
 }

From 946647bf9a4a17c81905aba6fc28dbb6ba27c66f Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Thu, 5 Aug 2021 13:23:57 +0300
Subject: [PATCH 03/10] #4392 customfields area edit

---
 .../advs-module/resources/views/new-ad/new-create.twig          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 a92142253..6b5c99e48 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
@@ -280,7 +280,7 @@
                                 <h5 class="mt-5 pb-1 border-bottom">
                                     {{ trans('visiosoft.module.advs::field.additional_fields') }}
                                 </h5>
-                                <div class="bg-light p-4">
+                                <div class="bg-light p-4 row">
                                     {{ other_fields|raw }}
                                 </div>
                             {% endif %}

From a2c17028fc573fd60ff0e86a48ccf9d5c67ae4ec Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Thu, 5 Aug 2021 13:36:20 +0300
Subject: [PATCH 04/10] #4396 language dropdown design problem

---
 .../resources/views/form/partials/translations.twig           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig b/addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig
index 319d09ee6..3045f8e79 100644
--- a/addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/form/partials/translations.twig
@@ -1,9 +1,9 @@
 {% if config_get('streams::locales.enabled')|length > 1 %}
-    <div class="btn-group px-1" style="display: inline-block;">
+    <div class="btn-group" style="display: inline-block;">
         {% if setting_value('visiosoft.module.advs::show_input_flag') %}
             {{ img('visiosoft.module.advs::images/flags/' ~ field_type.locale ~ '.svg').width(20)|raw }}
         {% endif %}
-        <a href="#" class="btn btn-xs btn-default dropdown-toggle px-0" data-dropdown="locales" data-toggle="dropdown">
+        <a href="#" class="btn btn-xs btn-default dropdown-toggle px-1 mx-0" data-dropdown="locales" data-toggle="dropdown">
             {{ trans('streams::locale.' ~ field_type.locale ~ '.name') }}
         </a>
         <div class="dropdown-menu">

From 4cbba9463c11e68c02fda28400ad98239156fb32 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Thu, 5 Aug 2021 13:40:44 +0300
Subject: [PATCH 05/10] #4363 openclassify profile no log out

---
 .../resources/views/profile/partials/navigation.twig            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig b/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig
index 091a774ac..c976af485 100644
--- a/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig
+++ b/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig
@@ -44,7 +44,7 @@
             <p>{{ trans('visiosoft.module.profile::field.password.name') }}</p>
         </a>
         <a href="{{ url('logout') }}"
-           class="px-3 link-unstyled d-flex d-md-none">
+           class="px-3 link-unstyled">
             {{ img('visiosoft.module.profile::images/logout.svg').data|raw }}
             <p>{{ trans('visiosoft.theme.base::field.logout.name') }}</p>
         </a>

From 5544ad5c85842b6cce22a4d0fa09aa45bf109d15 Mon Sep 17 00:00:00 2001
From: diashalabi <diahshalabi@hotmail.com>
Date: Thu, 5 Aug 2021 13:54:53 +0300
Subject: [PATCH 06/10] #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 <diahshalabi@hotmail.com>
Date: Fri, 6 Aug 2021 12:14:21 +0300
Subject: [PATCH 07/10] #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 1f018e8acdcfa2e9f31ffa1a41540cfea15105a7 Mon Sep 17 00:00:00 2001
From: diashalabi <diahshalabi@hotmail.com>
Date: Mon, 9 Aug 2021 12:46:11 +0300
Subject: [PATCH 08/10] #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 %}
+    <link rel="canonical" href="{{ url() }}"/>
+
     {{ asset_style('visiosoft.theme.base::css/login.css') }}
 {% endblock %}
 
@@ -103,4 +105,4 @@
         </div>
     </div>
     {{ 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 <diahshalabi@hotmail.com>
Date: Tue, 10 Aug 2021 13:04:29 +0300
Subject: [PATCH 09/10] #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 1577e87438d13531b786cd3f2575486087755c82 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Tue, 10 Aug 2021 14:17:59 +0300
Subject: [PATCH 10/10] product configuration error fix

---
 .../OptionConfiguration/Form/OptionConfigurationFormFields.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormFields.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormFields.php
index 558bbeae6..a56c41387 100644
--- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormFields.php
+++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormFields.php
@@ -29,7 +29,7 @@ class OptionConfigurationFormFields
 						'label' => $option->getName(),
 						'required' => true,
 						'config' => [
-							'options' => $optionValue->pluck('name','id')->all(),
+							'options' => $optionValue->pluck('title','id')->all(),
 						]
 					];
 				}