From 7075bf01371d95277801bd17dc74bd6c4d17f132 Mon Sep 17 00:00:00 2001
From: Devansh Bawari <devansh.bawari419@webkul.in>
Date: Wed, 18 Dec 2024 13:31:36 +0530
Subject: [PATCH] fix: fixed all the mentioned issues

---
 .../Admin/src/Resources/lang/ar/app.php       |  1 +
 .../Admin/src/Resources/lang/bn/app.php       |  1 +
 .../Admin/src/Resources/lang/de/app.php       |  1 +
 .../Admin/src/Resources/lang/en/app.php       |  1 +
 .../Admin/src/Resources/lang/es/app.php       |  1 +
 .../Admin/src/Resources/lang/fa/app.php       |  1 +
 .../Admin/src/Resources/lang/fr/app.php       |  1 +
 .../Admin/src/Resources/lang/he/app.php       |  1 +
 .../Admin/src/Resources/lang/hi_IN/app.php    |  1 +
 .../Admin/src/Resources/lang/it/app.php       |  1 +
 .../Admin/src/Resources/lang/ja/app.php       |  1 +
 .../Admin/src/Resources/lang/nl/app.php       |  1 +
 .../Admin/src/Resources/lang/pl/app.php       |  1 +
 .../Admin/src/Resources/lang/pt_BR/app.php    |  1 +
 .../Admin/src/Resources/lang/ru/app.php       |  1 +
 .../Admin/src/Resources/lang/sin/app.php      |  1 +
 .../Admin/src/Resources/lang/tr/app.php       |  1 +
 .../Admin/src/Resources/lang/uk/app.php       |  1 +
 .../Admin/src/Resources/lang/zh_CN/app.php    |  1 +
 .../edit/customizable-options.blade.php       | 32 +++++++++++++++++--
 ...ate_product_customizable_options_table.php |  1 +
 .../src/Models/ProductCustomizableOption.php  |  1 +
 packages/Webkul/Product/src/Type/Simple.php   | 27 ++++++++++++----
 packages/Webkul/Product/src/Type/Virtual.php  | 16 +++++++---
 .../Http/Controllers/API/CartController.php   |  2 ++
 .../view/customizable-options.blade.php       | 10 +++---
 26 files changed, 91 insertions(+), 17 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/lang/ar/app.php b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
index 808e5e6a862..5d14eb3a39b 100755
--- a/packages/Webkul/Admin/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/ar/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => 'مطلوب',
+                                'max-characters'            => 'الحد الأقصى للأحرف',
                                 'name'                      => 'العنوان',
                                 'no'                        => 'لا',
                                 'price'                     => 'السعر',
diff --git a/packages/Webkul/Admin/src/Resources/lang/bn/app.php b/packages/Webkul/Admin/src/Resources/lang/bn/app.php
index bb48f59bf83..431ad0dd713 100755
--- a/packages/Webkul/Admin/src/Resources/lang/bn/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/bn/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => 'প্রয়োজনীয়',
+                                'max-characters'            => 'সর্বোচ্চ অক্ষর',
                                 'name'                      => 'শিরোনাম',
                                 'no'                        => 'না',
                                 'price'                     => 'মূল্য',
diff --git a/packages/Webkul/Admin/src/Resources/lang/de/app.php b/packages/Webkul/Admin/src/Resources/lang/de/app.php
index 52a8e8abc19..ef57076e581 100755
--- a/packages/Webkul/Admin/src/Resources/lang/de/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/de/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => 'Erforderlich',
+                                'max-characters'            => 'Maximale Zeichen',
                                 'name'                      => 'Titel',
                                 'no'                        => 'Nein',
                                 'price'                     => 'Preis',
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 1bc9d2a91e3..687b21d1e7c 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => 'Is Required',
+                                'max-characters'            => 'Max Characters',
                                 'name'                      => 'Title',
                                 'no'                        => 'No',
                                 'price'                     => 'Price',
diff --git a/packages/Webkul/Admin/src/Resources/lang/es/app.php b/packages/Webkul/Admin/src/Resources/lang/es/app.php
index 30c4dc58ae1..958661b5a1c 100755
--- a/packages/Webkul/Admin/src/Resources/lang/es/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/es/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => 'Es obligatorio',
+                                'max-characters'            => 'Máximo de caracteres',
                                 'name'                      => 'Título',
                                 'no'                        => 'No',
                                 'price'                     => 'Precio',
diff --git a/packages/Webkul/Admin/src/Resources/lang/fa/app.php b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
index cf3fc12d721..9c7af2108dc 100755
--- a/packages/Webkul/Admin/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/fa/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => 'الزامی است',
+                                'max-characters'            => 'حداکثر کاراکتر',
                                 'name'                      => 'عنوان',
                                 'no'                        => 'خیر',
                                 'price'                     => 'قیمت',
diff --git a/packages/Webkul/Admin/src/Resources/lang/fr/app.php b/packages/Webkul/Admin/src/Resources/lang/fr/app.php
index 2b6e51f2022..334d6d42acf 100755
--- a/packages/Webkul/Admin/src/Resources/lang/fr/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/fr/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => 'Est requis',
+                                'max-characters'            => 'Nombre maximum de caractères',
                                 'name'                      => 'Titre',
                                 'no'                        => 'Non',
                                 'price'                     => 'Prix',
diff --git a/packages/Webkul/Admin/src/Resources/lang/he/app.php b/packages/Webkul/Admin/src/Resources/lang/he/app.php
index b3554295c95..42fa8080140 100755
--- a/packages/Webkul/Admin/src/Resources/lang/he/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/he/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => 'נדרש',
+                                'max-characters'            => 'מקסימום תווים',
                                 'name'                      => 'כותרת',
                                 'no'                        => 'לא',
                                 'price'                     => 'מחיר',
diff --git a/packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php b/packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php
index f05f7cf5f72..46dff0991a3 100755
--- a/packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/hi_IN/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => 'आवश्यक है',
+                                'max-characters'            => 'अधिकतम वर्ण',
                                 'name'                      => 'शीर्षक',
                                 'no'                        => 'नहीं',
                                 'price'                     => 'मूल्य',
diff --git a/packages/Webkul/Admin/src/Resources/lang/it/app.php b/packages/Webkul/Admin/src/Resources/lang/it/app.php
index f3d9c6c2efb..976cdeb9ba7 100755
--- a/packages/Webkul/Admin/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/it/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => 'È richiesto',
+                                'max-characters'            => 'Caratteri Massimi',
                                 'name'                      => 'Titolo',
                                 'no'                        => 'No',
                                 'price'                     => 'Prezzo',
diff --git a/packages/Webkul/Admin/src/Resources/lang/ja/app.php b/packages/Webkul/Admin/src/Resources/lang/ja/app.php
index 08541d4087a..fd5bd496847 100755
--- a/packages/Webkul/Admin/src/Resources/lang/ja/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/ja/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => '必須',
+                                'max-characters'            => '最大文字数',
                                 'name'                      => 'タイトル',
                                 'no'                        => 'いいえ',
                                 'price'                     => '価格',
diff --git a/packages/Webkul/Admin/src/Resources/lang/nl/app.php b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
index 9db59878009..45ba05dc0ae 100755
--- a/packages/Webkul/Admin/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/nl/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => 'Is verplicht',
+                                'max-characters'            => 'Max. aantal tekens',
                                 'name'                      => 'Titel',
                                 'no'                        => 'Nee',
                                 'price'                     => 'Prijs',
diff --git a/packages/Webkul/Admin/src/Resources/lang/pl/app.php b/packages/Webkul/Admin/src/Resources/lang/pl/app.php
index b6445bd2101..9487049afe7 100755
--- a/packages/Webkul/Admin/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pl/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => 'Wymagane',
+                                'max-characters'            => 'Maksymalna liczba znaków',
                                 'name'                      => 'Tytuł',
                                 'no'                        => 'Nie',
                                 'price'                     => 'Cena',
diff --git a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
index b186a3bdfeb..b33b2f45e72 100755
--- a/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/pt_BR/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => 'É obrigatório',
+                                'max-characters'            => 'Máximo de caracteres',
                                 'name'                      => 'Título',
                                 'no'                        => 'Não',
                                 'price'                     => 'Preço',
diff --git a/packages/Webkul/Admin/src/Resources/lang/ru/app.php b/packages/Webkul/Admin/src/Resources/lang/ru/app.php
index 40d470f0d24..4e58bd641f7 100755
--- a/packages/Webkul/Admin/src/Resources/lang/ru/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/ru/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => 'Обязательно',
+                                'max-characters'            => 'Максимальное количество символов',
                                 'name'                      => 'Название',
                                 'no'                        => 'Нет',
                                 'price'                     => 'Цена',
diff --git a/packages/Webkul/Admin/src/Resources/lang/sin/app.php b/packages/Webkul/Admin/src/Resources/lang/sin/app.php
index f5045c768a7..2948dc611f9 100755
--- a/packages/Webkul/Admin/src/Resources/lang/sin/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/sin/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => 'අවශ්‍යයි',
+                                'max-characters'            => 'උපරිම අකුරු',
                                 'name'                      => 'ශීර්ෂය',
                                 'no'                        => 'නැත',
                                 'price'                     => 'මිල',
diff --git a/packages/Webkul/Admin/src/Resources/lang/tr/app.php b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
index 703ea54ebd2..aee3e3b002c 100755
--- a/packages/Webkul/Admin/src/Resources/lang/tr/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/tr/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => 'Gerekli mi',
+                                'max-characters'            => 'Maksimum Karakter',
                                 'name'                      => 'Başlık',
                                 'no'                        => 'Hayır',
                                 'price'                     => 'Fiyat',
diff --git a/packages/Webkul/Admin/src/Resources/lang/uk/app.php b/packages/Webkul/Admin/src/Resources/lang/uk/app.php
index 06ac20b5edd..0242604e18b 100755
--- a/packages/Webkul/Admin/src/Resources/lang/uk/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/uk/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => 'Необхідно',
+                                'max-characters'            => 'Максимальна кількість символів',
                                 'name'                      => 'Назва',
                                 'no'                        => 'Ні',
                                 'price'                     => 'Ціна',
diff --git a/packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php b/packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php
index 50ce519a21d..a3a6305da65 100755
--- a/packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/zh_CN/app.php
@@ -866,6 +866,7 @@
 
                             'update-create' => [
                                 'is-required'               => '是否必填',
+                                'max-characters'            => '最大字符数',
                                 'name'                      => '标题',
                                 'no'                        => '否',
                                 'price'                     => '价格',
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit/customizable-options.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit/customizable-options.blade.php
index a0e8ba8b04e..ec633c1ce27 100644
--- a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit/customizable-options.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit/customizable-options.blade.php
@@ -91,6 +91,13 @@ class="grid"
                                     :value="index"
                                 />
 
+                                <input
+                                    type="hidden"
+                                    :name="'customizable_options[' + element.id + '][max_characters]'"
+                                    :value="element.max_characters"
+                                    v-if="! canHaveMultiplePrices(element.type)"
+                                />
+
                                 <input
                                     type="hidden"
                                     :name="'customizable_options[' + element.id + '][supported_file_extensions]'"
@@ -297,7 +304,23 @@ class="secondary-button text-sm"
                                 </div>
 
                                 <template v-if="! canHaveMultiplePrices(selectedOption.type)">
-                                    <x-admin::form.control-group v-if="selectedOption.type == 'file'">
+                                    <x-admin::form.control-group v-if="['text', 'textarea'].includes(selectedOption.type)">
+                                        <x-admin::form.control-group.label class="required">
+                                            @lang('admin::app.catalog.products.edit.types.simple.customizable-options.update-create.max-characters')
+                                        </x-admin::form.control-group.label>
+
+                                        <x-admin::form.control-group.control
+                                            type="text"
+                                            name="max_characters"
+                                            rules="required|numeric|min_value:1"
+                                            ::value="selectedOption.max_characters"
+                                            :label="trans('admin::app.catalog.products.edit.types.simple.customizable-options.update-create.max-characters')"
+                                        />
+
+                                        <x-admin::form.control-group.error control-name="max_characters" />
+                                    </x-admin::form.control-group>
+
+                                    <x-admin::form.control-group v-else-if="selectedOption.type == 'file'">
                                         <x-admin::form.control-group.label class="required">
                                             @lang('admin::app.catalog.products.edit.types.simple.customizable-options.update-create.supported-file-extensions')
                                         </x-admin::form.control-group.label>
@@ -321,7 +344,7 @@ class="secondary-button text-sm"
                                         <x-admin::form.control-group.control
                                             type="price"
                                             name="price"
-                                            rules="required"
+                                            rules="required|decimal|min_value:0"
                                             ::value="selectedOption.price"
                                             :label="trans('admin::app.catalog.products.edit.types.simple.customizable-options.update-create.price')"
                                         />
@@ -556,7 +579,7 @@ class="secondary-button text-sm"
                                         type="price"
                                         name="price"
                                         ::value="selectedOptionItem.price"
-                                        rules="required"
+                                        rules="required|decimal|min_value:0"
                                         :label="trans('admin::app.catalog.products.edit.types.simple.customizable-options.option.items.update-create.price')"
                                     />
 
@@ -655,6 +678,7 @@ class="primary-button"
                             label: '',
                             type: 'select',
                             is_required: 1,
+                            max_characters: null,
                             supported_file_extensions: null,
                             price: 0,
                         },
@@ -669,6 +693,7 @@ class="primary-button"
                                 label: option.label,
                                 type: option.type,
                                 is_required: option.is_required,
+                                max_characters: option.max_characters,
                                 supported_file_extensions: option.supported_file_extensions,
                                 price_id: option.customizable_option_prices[0].id,
                                 price: option.customizable_option_prices[0].price,
@@ -681,6 +706,7 @@ class="primary-button"
                             label: option.label,
                             type: option.type,
                             is_required: option.is_required,
+                            max_characters: option.max_characters,
                             supported_file_extensions: option.supported_file_extensions,
                             price: 0,
                             customizable_option_prices: option.customizable_option_prices,
diff --git a/packages/Webkul/Product/src/Database/Migrations/2024_10_11_135010_create_product_customizable_options_table.php b/packages/Webkul/Product/src/Database/Migrations/2024_10_11_135010_create_product_customizable_options_table.php
index 49930284803..9d9ab783cba 100644
--- a/packages/Webkul/Product/src/Database/Migrations/2024_10_11_135010_create_product_customizable_options_table.php
+++ b/packages/Webkul/Product/src/Database/Migrations/2024_10_11_135010_create_product_customizable_options_table.php
@@ -18,6 +18,7 @@ public function up()
             $table->integer('product_id')->unsigned();
             $table->string('type');
             $table->boolean('is_required')->default(1);
+            $table->text('max_characters')->nullable();
             $table->text('supported_file_extensions')->nullable();
             $table->integer('sort_order')->default(0);
 
diff --git a/packages/Webkul/Product/src/Models/ProductCustomizableOption.php b/packages/Webkul/Product/src/Models/ProductCustomizableOption.php
index 62ce3c40d70..28b41f06b70 100644
--- a/packages/Webkul/Product/src/Models/ProductCustomizableOption.php
+++ b/packages/Webkul/Product/src/Models/ProductCustomizableOption.php
@@ -28,6 +28,7 @@ class ProductCustomizableOption extends TranslatableModel implements ProductCust
      */
     protected $fillable = [
         'is_required',
+        'max_characters',
         'product_id',
         'sort_order',
         'supported_file_extensions',
diff --git a/packages/Webkul/Product/src/Type/Simple.php b/packages/Webkul/Product/src/Type/Simple.php
index c26bb3ee8eb..d20c3d05d59 100644
--- a/packages/Webkul/Product/src/Type/Simple.php
+++ b/packages/Webkul/Product/src/Type/Simple.php
@@ -342,13 +342,13 @@ public function getAdditionalOptions($data)
                 if (in_array($option['type'], ['checkbox', 'multiselect'])) {
                     $data['attributes'][] = [
                         'attribute_type' => $option['type'],
-                        'attribute_name' => $option['label'][app()->getLocale()],
+                        'attribute_name' => $option['label'][app()->getLocale()] ?? $option['label'][app()->getFallbackLocale()],
                         'option_label'   => collect($option['prices'])->pluck('label')->join(', ', ' and '),
                     ];
                 } else {
                     $data['attributes'][] = [
                         'attribute_type' => $option['type'],
-                        'attribute_name' => $option['label'][app()->getLocale()],
+                        'attribute_name' => $option['label'][app()->getLocale()] ?? $option['label'][app()->getFallbackLocale()],
                         'option_label'   => $option['prices'][0]['label'],
                     ];
                 }
@@ -412,16 +412,16 @@ protected function formatRequestedCustomizableOptions(array $requestedCustomizab
             ->get();
 
         foreach ($customizableOptions as $customizableOption) {
-            if (! $customizableOption->is_required && empty($requestedCustomizableOptions[$customizableOption->id])) {
-                continue;
-            }
-
             switch ($customizableOption->type) {
                 case 'text':
                 case 'textarea':
                 case 'date':
                 case 'datetime':
                 case 'time':
+                    if (! $customizableOption->is_required && empty($requestedCustomizableOptions[$customizableOption->id][0])) {
+                        continue 2;
+                    }
+
                     $optionPrice = $customizableOption->customizable_option_prices->first();
 
                     $formattedCustomizableOptions[] = [
@@ -442,6 +442,17 @@ protected function formatRequestedCustomizableOptions(array $requestedCustomizab
                 case 'radio':
                 case 'select':
                 case 'multiselect':
+                    if (! $customizableOption->is_required && empty($requestedCustomizableOptions[$customizableOption->id])) {
+                        continue 2;
+                    }
+
+                    /**
+                     * If the option is not required and the user has selected the `None` option, then we will skip this option.
+                     */
+                    if (in_array(0, $requestedCustomizableOptions[$customizableOption->id])) {
+                        continue 2;
+                    }
+
                     $optionPrices = $customizableOption->customizable_option_prices
                         ->whereIn('id', $requestedCustomizableOptions[$customizableOption->id]);
 
@@ -460,6 +471,10 @@ protected function formatRequestedCustomizableOptions(array $requestedCustomizab
                     break;
 
                 case 'file':
+                    if (! $customizableOption->is_required && empty($requestedCustomizableOptions[$customizableOption->id][0])) {
+                        continue 2;
+                    }
+
                     $optionPrice = $customizableOption->customizable_option_prices->first();
 
                     /**
diff --git a/packages/Webkul/Product/src/Type/Virtual.php b/packages/Webkul/Product/src/Type/Virtual.php
index 06d152ae0cb..9db8264cf4d 100644
--- a/packages/Webkul/Product/src/Type/Virtual.php
+++ b/packages/Webkul/Product/src/Type/Virtual.php
@@ -435,16 +435,16 @@ protected function formatRequestedCustomizableOptions(array $requestedCustomizab
             ->get();
 
         foreach ($customizableOptions as $customizableOption) {
-            if (! $customizableOption->is_required && empty($requestedCustomizableOptions[$customizableOption->id])) {
-                continue;
-            }
-
             switch ($customizableOption->type) {
                 case 'text':
                 case 'textarea':
                 case 'date':
                 case 'datetime':
                 case 'time':
+                    if (! $customizableOption->is_required && empty($requestedCustomizableOptions[$customizableOption->id][0])) {
+                        continue 2;
+                    }
+
                     $optionPrice = $customizableOption->customizable_option_prices->first();
 
                     $formattedCustomizableOptions[] = [
@@ -465,6 +465,10 @@ protected function formatRequestedCustomizableOptions(array $requestedCustomizab
                 case 'radio':
                 case 'select':
                 case 'multiselect':
+                    if (! $customizableOption->is_required && empty($requestedCustomizableOptions[$customizableOption->id])) {
+                        continue 2;
+                    }
+
                     $optionPrices = $customizableOption->customizable_option_prices
                         ->whereIn('id', $requestedCustomizableOptions[$customizableOption->id]);
 
@@ -483,6 +487,10 @@ protected function formatRequestedCustomizableOptions(array $requestedCustomizab
                     break;
 
                 case 'file':
+                    if (! $customizableOption->is_required && empty($requestedCustomizableOptions[$customizableOption->id][0])) {
+                        continue 2;
+                    }
+
                     $optionPrice = $customizableOption->customizable_option_prices->first();
 
                     /**
diff --git a/packages/Webkul/Shop/src/Http/Controllers/API/CartController.php b/packages/Webkul/Shop/src/Http/Controllers/API/CartController.php
index e086c57e58a..1df924df47b 100755
--- a/packages/Webkul/Shop/src/Http/Controllers/API/CartController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/API/CartController.php
@@ -73,6 +73,8 @@ public function store()
                 'message' => trans('shop::app.checkout.cart.item-add-to-cart'),
             ], $response));
         } catch (\Exception $exception) {
+            dd($exception);
+
             return response()->json([
                 'redirect_uri' => route('shop.product_or_category.index', $product->url_key),
                 'message'      => $exception->getMessage(),
diff --git a/packages/Webkul/Shop/src/Resources/views/products/view/customizable-options.blade.php b/packages/Webkul/Shop/src/Resources/views/products/view/customizable-options.blade.php
index 65251169963..1f110df5c72 100644
--- a/packages/Webkul/Shop/src/Resources/views/products/view/customizable-options.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/view/customizable-options.blade.php
@@ -66,7 +66,7 @@ class="!mt-0 max-sm:!mb-2.5"
                             ::name="'customizable_options[' + option.id + '][]'"
                             ::value="option.id"
                             v-model="selectedItems"
-                            ::rules="{'required': Boolean(option.is_required)}"
+                            ::rules="{ 'required': Boolean(option.is_required), 'max': option.max_characters }"
                             ::label="option.label"
                         />
                     </template>
@@ -89,7 +89,7 @@ class="!mt-0 max-sm:!mb-2.5"
                             ::name="'customizable_options[' + option.id + '][]'"
                             ::value="option.id"
                             v-model="selectedItems"
-                            ::rules="{'required': Boolean(option.is_required)}"
+                            ::rules="{ 'required': Boolean(option.is_required), 'max': option.max_characters }"
                             ::label="option.label"
                         />
                     </template>
@@ -116,7 +116,7 @@ class="flex select-none items-center gap-x-4 max-sm:gap-x-1.5"
                                     ::id="'customizable_options[' + option.id + '][' + index + ']'"
                                     v-model="selectedItems"
                                     ::rules="{'required': Boolean(option.is_required)}"
-                                    ::label="item.label"
+                                    ::label="option.label"
                                 />
 
                                 <label
@@ -180,7 +180,7 @@ class="flex select-none items-center gap-x-4 max-sm:gap-x-1.5"
                                     ::id="'customizable_options[' + option.id + '][' + index + ']'"
                                     v-model="selectedItems"
                                     ::rules="{'required': Boolean(option.is_required)}"
-                                    ::label="item.label"
+                                    ::label="option.label"
                                 />
 
                                 <label
@@ -388,6 +388,7 @@ class="!mt-0 max-sm:!mb-2.5"
                                 label: option.label,
                                 type: option.type,
                                 is_required: option.is_required,
+                                max_characters: option.max_characters,
                                 supported_file_extensions: option.supported_file_extensions,
                                 price_id: option.customizable_option_prices[0].id,
                                 price: option.customizable_option_prices[0].price,
@@ -399,6 +400,7 @@ class="!mt-0 max-sm:!mb-2.5"
                             label: option.label,
                             type: option.type,
                             is_required: option.is_required,
+                            max_characters: option.max_characters,
                             supported_file_extensions: option.supported_file_extensions,
                             price: 0,
                         };