Merge pull request #1242 from openclassify/4966

#4966 Options value editing - Text input

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'
+    ];
+}

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',
 ];

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">

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',
@@ -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' => trans('visiosoft.module.advs::field.custom_field'),
+            ];
+
             $fields = array_merge($options_fields, ['price', 'currency', 'stock']);
 
             $builder->setFields($fields);

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]);

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;

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,