Merge pull request #8211 from suraj-webkul/Issue#8207#8206

Issue #8207 #8206
bagisto · Sep 7, 2023 · b47b50b · b47b50b
2 parents 25d847d + 5a2a4f3
commit b47b50b
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/products/edit/price/group.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/products/edit/price/group.blade.php
@@ -38,7 +38,7 @@ class="flex flex-col gap-[8px] py-[10px]"
 
                     <input type="hidden" :name="'customer_group_prices[' + item.id + '][value_type]'" :value="item.value_type"/>
 
-                    <input type="hidden" :name="'customer_group_prices[' + item.id + '][value]'" :value="item.amount"/>
+                    <input type="hidden" :name="'customer_group_prices[' + item.id + '][value]'" :value="item.value"/>
 
                     <div class="flex justify-between">
                         <p class="text-gray-600 font-semibold">
@@ -57,14 +57,14 @@ class="text-blue-600 cursor-pointer transition-all hover:underline"
                         class="text-gray-600"
                         v-if="item.value_type == 'fixed'"
                     >
-                        @{{ "@lang('admin::app.catalog.products.edit.price.group.fixed-group-price-info')".replace(':qty', item.qty).replace(':price', item.amount) }}
+                        @{{ "@lang('admin::app.catalog.products.edit.price.group.fixed-group-price-info')".replace(':qty', item.qty).replace(':price', item.value) }}
                     </p>
 
                     <p
                         class="text-gray-600"
                         v-else
                     >
-                        @{{ "@lang('admin::app.catalog.products.edit.price.group.fixed-group-price-info')".replace(':qty', item.qty).replace(':price', item.amount) }}
+                        @{{ "@lang('admin::app.catalog.products.edit.price.group.discount-group-price-info')".replace(':qty', item.qty).replace(':price', item.value) }}
                     </p>
                 </div>
 
@@ -193,14 +193,14 @@ class="text-[18px] text-gray-800 font-bold"
 
                                         <x-admin::form.control-group.control
                                             type="text"
-                                            name="amount"
-                                            v-model="selectedPrice.amount"
+                                            name="value"
+                                            v-model="selectedPrice.value"
                                             ::rules="{required: true, decimal: true, min_value: 0, ...(selectedPrice.value_type === 'discount' ? {max_value: 100} : {})}"
                                             :label="trans('admin::app.catalog.products.edit.price.group.create.price')"
                                         >
                                         </x-admin::form.control-group.control>
 
-                                        <x-admin::form.control-group.error control-name="amount"></x-admin::form.control-group.error>
+                                        <x-admin::form.control-group.error control-name="value"></x-admin::form.control-group.error>
                                     </x-admin::form.control-group>
                                 </div>
 
@@ -248,7 +248,7 @@ class="primary-button"
                         customer_group_id: null,
                         qty: 0,
                         value_type: 'fixed',
-                        amount: 0,
+                        value: 0,
                     }
                 }
             },
@@ -281,7 +281,7 @@ class="primary-button"
                         customer_group_id: null,
                         qty: 0,
                         value_type: 'fixed',
-                        amount: 0,
+                        value: 0,
                     };
                 },