From e8b77e2f8340a77f4c043fbaa39cb4ae6bc1406e Mon Sep 17 00:00:00 2001
From: suraj kashyap <suraj.kashyap370@webkul.in>
Date: Tue, 26 Dec 2023 15:54:18 +0530
Subject: [PATCH 1/6] fix configuration multiselect was not working properly.

---
 .../views/configuration/field-type.blade.php  | 47 ++++++++++---------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
index b65e6b26bb4..04fd3e79279 100755
--- a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
@@ -160,34 +160,37 @@ class="text-gray-600 dark:text-gray-300"
         @elseif ($field['type'] == 'multiselect')
             @php $selectedOption = core()->getConfigData($nameKey, $currentChannel->code, $currentLocale->code) ?? ''; @endphp
 
-            <x-admin::form.control-group.control
-                type="select"
-                :name="$name"
-                :id="$name"
-                :rules="$validations"
-                :label="trans($field['title'])"
+            <v-field
+                name="{{ $name }}"
+                name="{{ $name }}"
+                rules="{{ $validations }}"
+                label="{{ trans($field['title']) }}"
                 multiple
             >
-                @if (isset($field['repository']))
-                    @foreach ($value as $key => $option)
-
+                <select
+                    name="{{ $name }}"
+                    class="flex w-full min-h-[39px] py-2 px-3 border rounded-md text-sm text-gray-600 dark:text-gray-300 transition-all hover:border-gray-400 dark:hover:border-gray-400 focus:border-gray-400 dark:focus:border-gray-400 dark:bg-gray-900 dark:border-gray-800"
+                    :class="[errors['{{ $name }}'] ? 'border border-red-600 hover:border-red-600' : '']"
+                    multiple
+                >
+                    @if (isset($field['repository']))
                         <option value="{{ $key }}" {{ in_array($key, explode(',', $selectedOption)) ? 'selected' : ''}}>
                             @lang($value[$key])
                         </option>
+                    @else
+                        @foreach ($field['options'] as $option)
+                            @php
+                                $value = ! isset($option['value']) ? null : ( $value = ! $option['value'] ? 0 : $option['value'] );
+                            @endphp
+
+                            <option value="{{ $value }}" {{ in_array($option['value'], explode(',', $selectedOption)) ? 'selected' : ''}}>
+                                @lang($option['title'])
+                            </option>
+                         @endforeach
+                    @endif
+                </select>
+            </v-field>
 
-                    @endforeach
-                @else
-                    @foreach ($field['options'] as $option)
-                        @php
-                            $value = ! isset($option['value']) ? null : ( $value = ! $option['value'] ? 0 : $option['value'] );
-                        @endphp
-
-                        <option value="{{ $value }}" {{ in_array($option['value'], explode(',', $selectedOption)) ? 'selected' : ''}}>
-                            @lang($option['title'])
-                        </option>
-                    @endforeach
-                @endif
-            </x-admin::form.control-group.control>
 
         <!-- Boolean/Switch input -->
         @elseif ($field['type'] == 'boolean')

From dc863a3c18ad88d3269066b26234147d3ec87d4d Mon Sep 17 00:00:00 2001
From: suraj kashyap <suraj.kashyap370@webkul.in>
Date: Wed, 27 Dec 2023 11:48:39 +0530
Subject: [PATCH 2/6] minor changes.

---
 .../Resources/views/configuration/field-type.blade.php    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
index 04fd3e79279..06fb47f1880 100755
--- a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
@@ -161,16 +161,16 @@ class="text-gray-600 dark:text-gray-300"
             @php $selectedOption = core()->getConfigData($nameKey, $currentChannel->code, $currentLocale->code) ?? ''; @endphp
 
             <v-field
-                name="{{ $name }}"
-                name="{{ $name }}"
+                name="{{ $name }}[]"
+                id="{{ $name }}"
                 rules="{{ $validations }}"
                 label="{{ trans($field['title']) }}"
                 multiple
             >
                 <select
-                    name="{{ $name }}"
+                    name="{{ $name }}[]"
                     class="flex w-full min-h-[39px] py-2 px-3 border rounded-md text-sm text-gray-600 dark:text-gray-300 transition-all hover:border-gray-400 dark:hover:border-gray-400 focus:border-gray-400 dark:focus:border-gray-400 dark:bg-gray-900 dark:border-gray-800"
-                    :class="[errors['{{ $name }}'] ? 'border border-red-600 hover:border-red-600' : '']"
+                    :class="[errors['{{ $name }}[]'] ? 'border border-red-600 hover:border-red-600' : '']"
                     multiple
                 >
                     @if (isset($field['repository']))

From c4f71ce8365d86178e4c2e21d76ac1d61d8d71af Mon Sep 17 00:00:00 2001
From: suraj kashyap <suraj.kashyap370@webkul.in>
Date: Wed, 27 Dec 2023 15:22:35 +0530
Subject: [PATCH 3/6] Minor changes.

---
 .../Resources/views/configuration/field-type.blade.php    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
index 06fb47f1880..69c52dfa5b1 100755
--- a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
@@ -174,9 +174,11 @@ class="flex w-full min-h-[39px] py-2 px-3 border rounded-md text-sm text-gray-60
                     multiple
                 >
                     @if (isset($field['repository']))
-                        <option value="{{ $key }}" {{ in_array($key, explode(',', $selectedOption)) ? 'selected' : ''}}>
-                            @lang($value[$key])
-                        </option>
+                        @foreach ($value as $key => $option)
+                            <option value="{{ $key }}" {{ in_array($key, explode(',', $selectedOption)) ? 'selected' : ''}}>
+                                {{ trans($value[$key]) }}
+                            </option>
+                        @endforeach
                     @else
                         @foreach ($field['options'] as $option)
                             @php

From d3a05d0b52d545c466d2cde3ac5723c9bfd41646 Mon Sep 17 00:00:00 2001
From: suraj kashyap <suraj.kashyap370@webkul.in>
Date: Thu, 28 Dec 2023 17:26:13 +0530
Subject: [PATCH 4/6] code refactor.

---
 .../src/Resources/views/configuration/field-type.blade.php  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
index 69c52dfa5b1..d16ec9802df 100755
--- a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
@@ -142,12 +142,8 @@ class="text-gray-600 dark:text-gray-300"
                     @endforeach
                 @else
                     @foreach ($field['options'] as $option)
-                        @php
-                            $value = ! isset($option['value']) ? null : ( $value = ! $option['value'] ? 0 : $option['value'] );
-                        @endphp
-
                         <option
-                            value="{{ $value }}"
+                            value="{{ isset($option['value']) ?? 0 }}"
                             {{ $value == $selectedOption ? 'selected' : ''}}
                         >
                             @lang($option['title'])

From 6c7ea896d5cf9fc997aa418d3183a6c1f541a227 Mon Sep 17 00:00:00 2001
From: suraj kashyap <suraj.kashyap370@webkul.in>
Date: Thu, 28 Dec 2023 17:48:59 +0530
Subject: [PATCH 5/6] code refactor.

---
 .../views/configuration/field-type.blade.php     | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
index d16ec9802df..d686d7434e0 100755
--- a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
@@ -143,7 +143,7 @@ class="text-gray-600 dark:text-gray-300"
                 @else
                     @foreach ($field['options'] as $option)
                         <option
-                            value="{{ isset($option['value']) ?? 0 }}"
+                            value="{{ $option['value'] ?? 0 }}"
                             {{ $value == $selectedOption ? 'selected' : ''}}
                         >
                             @lang($option['title'])
@@ -171,17 +171,19 @@ class="flex w-full min-h-[39px] py-2 px-3 border rounded-md text-sm text-gray-60
                 >
                     @if (isset($field['repository']))
                         @foreach ($value as $key => $option)
-                            <option value="{{ $key }}" {{ in_array($key, explode(',', $selectedOption)) ? 'selected' : ''}}>
+                            <option 
+                                value="{{ $key }}"
+                                {{ in_array($key, explode(',', $selectedOption)) ? 'selected' : ''}}
+                            >
                                 {{ trans($value[$key]) }}
                             </option>
                         @endforeach
                     @else
                         @foreach ($field['options'] as $option)
-                            @php
-                                $value = ! isset($option['value']) ? null : ( $value = ! $option['value'] ? 0 : $option['value'] );
-                            @endphp
-
-                            <option value="{{ $value }}" {{ in_array($option['value'], explode(',', $selectedOption)) ? 'selected' : ''}}>
+                            <option 
+                                value="{{ $option['value'] ?? 0 }}"
+                                {{ in_array($option['value'], explode(',', $selectedOption)) ? 'selected' : ''}}
+                            >
                                 @lang($option['title'])
                             </option>
                          @endforeach

From 3a253b5ce8c25b49d99721c8232bd649b9176cd0 Mon Sep 17 00:00:00 2001
From: suraj kashyap <suraj.kashyap370@webkul.in>
Date: Thu, 28 Dec 2023 18:33:16 +0530
Subject: [PATCH 6/6] handle exception.

---
 .../src/Resources/views/configuration/field-type.blade.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
index d686d7434e0..177e564e515 100755
--- a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
@@ -181,8 +181,8 @@ class="flex w-full min-h-[39px] py-2 px-3 border rounded-md text-sm text-gray-60
                     @else
                         @foreach ($field['options'] as $option)
                             <option 
-                                value="{{ $option['value'] ?? 0 }}"
-                                {{ in_array($option['value'], explode(',', $selectedOption)) ? 'selected' : ''}}
+                                value="{{ $value = $option['value'] ?? 0 }}"
+                                {{ in_array($value, explode(',', $selectedOption)) ? 'selected' : ''}}
                             >
                                 @lang($option['title'])
                             </option>