From 87317d0cd1f62b8382b6245204ad21b1d292bb3a Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Mon, 6 Dec 2021 12:10:15 +0300
Subject: [PATCH 1/2] #4966 Options value editing - Text input

---
 ...t.module.advs__add_custom-option-value.php | 20 +++++++++++++++++++
 .../new-ad/partials/configuration-modal.twig  |  4 ++--
 .../Form/OptionConfigurationFormFields.php    | 10 +++++++---
 .../Form/OptionConfigurationFormHandler.php   |  2 +-
 .../OptionConfigurationModel.php              |  2 ++
 .../OptionConfigurationRepository.php         |  2 ++
 6 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 addons/default/visiosoft/advs-module/migrations/2021_12_06_074706_visiosoft.module.advs__add_custom-option-value.php

diff --git a/addons/default/visiosoft/advs-module/migrations/2021_12_06_074706_visiosoft.module.advs__add_custom-option-value.php b/addons/default/visiosoft/advs-module/migrations/2021_12_06_074706_visiosoft.module.advs__add_custom-option-value.php
new file mode 100644
index 000000000..7b8a705d8
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/migrations/2021_12_06_074706_visiosoft.module.advs__add_custom-option-value.php
@@ -0,0 +1,20 @@
+<?php
+
+use Anomaly\Streams\Platform\Database\Migration\Migration;
+
+class VisiosoftModuleAdvsAddCustomOptionValue extends Migration
+{
+    protected $stream = [
+        'slug' => 'option_configuration',
+    ];
+
+    protected $fields = [
+        'custom_option' => [
+            'type' => 'anomaly.field_type.text',
+        ],
+    ];
+
+    protected $assignments = [
+        'custom_option'
+    ];
+}
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
index 683123791..bcdefbffa 100644
--- 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
@@ -11,10 +11,10 @@
                 </button>
             </div>
             <div class="modal-body">
-                <div class="">
+                <div class="flex-row">
                     {% set configurationForm = form('configuration_form').entry(adv.id).get() %}
 
-                    {{ form_open({id: 'configurationForm',class: 'd-flex justify-content-between'})|raw }}
+                    {{ form_open({id: 'configurationForm',class: 'd-flex justify-content-between flex-column flex-lg-row'})|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">
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 ec06b2ee6..e258d4459 100644
--- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormFields.php
+++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormFields.php
@@ -35,14 +35,18 @@ class OptionConfigurationFormFields
                             'attributes' => [
                                 'data-id' => $option->getId(),
                             ],
-                            'config' => [
-                                'options' => $optionValue->pluck('title','id')->all(),
-                            ]
                         ];
                     }
                 }
             }
 
+            $options_fields['custom_option'] = [
+                'type' => 'anomaly.field_type.text',
+                'class' => 'form-control product-custom-fields',
+                'required' => false,
+                'label' => 'Custom',
+            ];
+
             $fields = array_merge($options_fields, ['price', 'currency', 'stock']);
 
             $builder->setFields($fields);
diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormHandler.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormHandler.php
index da93db1c2..342bdfab0 100644
--- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormHandler.php
+++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormHandler.php
@@ -19,7 +19,7 @@ class OptionConfigurationFormHandler
 		$option_json = array();
 
 		foreach ($parameters as $key => $parameter_value) {
-			if (substr($key, 0, 7) === "option-") {
+			if (strpos($key, "option-") === 0) {
 				$option_id = substr($key, 7);
 				$option_json[$option_id] = $parameter_value;
 				unset($parameters[$key]);
diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php
index 7b11c9080..71dc43ae2 100644
--- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php
+++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationModel.php
@@ -29,6 +29,8 @@ class OptionConfigurationModel extends AdvsOptionConfigurationEntryModel impleme
 
             $name = trim($option_group_value, ' ');
 
+            $name .= ' ' . $this->custom_option;
+
             return ($add_name) ? $adv->name . ' | ' . $name : $name;
         }
         return null;
diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php
index b5b842cbc..8cf109107 100644
--- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php
+++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php
@@ -62,6 +62,8 @@ class OptionConfigurationRepository extends EntryRepository implements OptionCon
                 $value_entry = $this->productOptionsValueRepository->find($value);
                 $option_group_value .= " " . $value_entry->getName();
             }
+            $option_group_value .= " " . $product_configuration->custom_option;
+
             $configurations[$product_configuration->getId()] = [
                 'name' => $option_group_value,
                 'price' => $product_configuration->price,

From 6f0486adafe1397b159dad3a401dc46e01d07d48 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Mon, 6 Dec 2021 12:14:21 +0300
Subject: [PATCH 2/2] #4966 Options value editing - Text input

---
 .../default/visiosoft/advs-module/resources/lang/en/field.php | 1 +
 .../Form/OptionConfigurationFormFields.php                    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/field.php b/addons/default/visiosoft/advs-module/resources/lang/en/field.php
index 00ba46d7f..eae68dd27 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php
@@ -396,4 +396,5 @@ return [
     'page' => 'Page',
     'undefined_page' => 'Undefined Page',
     'id' => 'ID',
+    'custom_field' => 'Custom Field',
 ];
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 e258d4459..e696eea43 100644
--- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormFields.php
+++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Form/OptionConfigurationFormFields.php
@@ -25,7 +25,7 @@ class OptionConfigurationFormFields
 
                 foreach ($options as $option)
                 {
-                    if($optionValue = $productoptionsValueRepository->getWithOptionsId([$option->id]))
+                    if($productoptionsValueRepository->getWithOptionsId([$option->id]))
                     {
                         $options_fields['option-'.$option->getId()] = [
                             'type' => 'anomaly.field_type.select',
@@ -44,7 +44,7 @@ class OptionConfigurationFormFields
                 'type' => 'anomaly.field_type.text',
                 'class' => 'form-control product-custom-fields',
                 'required' => false,
-                'label' => 'Custom',
+                'label' => trans('visiosoft.module.advs::field.custom_field'),
             ];
 
             $fields = array_merge($options_fields, ['price', 'currency', 'stock']);