From a9994a314311efa974511b1e54073e81f70f2519 Mon Sep 17 00:00:00 2001
From: Prashant Singh <prashant.singh852@webkul.com>
Date: Fri, 19 Jul 2019 10:49:19 +0530
Subject: [PATCH] Translation issue fixes for cart rule create and edit forms

---
 .../Admin/src/Resources/lang/en/app.php       | 18 ++++++++-
 .../promotions/cart-rule/create.blade.php     | 38 +++++++++---------
 .../views/promotions/cart-rule/edit.blade.php | 40 +++++++++++--------
 3 files changed, 59 insertions(+), 37 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 2a3fb1937..fd5e6b7a5 100755
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -824,6 +824,17 @@ return [
         'cannot-activate-catalog-rule' => 'Cannot activate catalog rule',
         'catalog-rule-already-activated' => 'Catalog rule is already activated',
         'catalog-rule-activated' => 'Catalog rule is activated',
+        'select-attribute' => 'Select :attribute',
+        'enter-attribute' => 'Enter :attribute',
+        'add-condition' => 'Add Condition',
+        'cart-properties' => 'Cart Properties',
+        'yes' => 'Yes',
+        'no' => 'No',
+        'note' => 'Note',
+        'rule-name' => 'Enter Rule Name',
+        'rule-desc' => 'Enter Rule Description',
+        'convert-x-note' => 'If this section is left empty, then rule will get applied to all the products in the cart.',
+        'add-attr-condition' => 'Add Attribute Condition',
         'general-info' => [
             'sku-like' => 'SKU Like',
             'on-shipping' => 'If applied on shipping',
@@ -865,7 +876,12 @@ return [
             'is-guest' => 'For Guests',
             'disc_qty' => 'Max. Quantity Allowed To Be Discounted',
             'test-mode' => 'Choose how to test conditions',
-            'labels' => 'Labels'
+            'labels' => 'Labels',
+            'prefix' => 'Prefix',
+            'suffix' => 'Suffix',
+            'code' => 'Code',
+            'global-label' => 'Global Label',
+            'label' => 'Label'
         ],
 
         'status' => [
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php
index 2b121259d..def9eaee2 100644
--- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/create.blade.php
@@ -78,7 +78,7 @@
                                         <label for="customer_groups" class="required">{{ __('admin::app.promotion.general-info.cust-groups') }}</label>
 
                                         <select type="text" class="control" name="customer_groups[]" v-model="customer_groups" v-validate="'required'" value="{{ old('customer_groups[]') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.cust-groups') }}&quot;" multiple="multiple">
-                                            <option disabled="disabled">Select Customer Groups</option>
+                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribtue', ['attrbibute' => 'Customer Group']) }}</option>
                                             @foreach(app('Webkul\Customer\Repositories\CustomerGroupRepository')->all() as $channel)
                                                 <option value="{{ $channel->id }}">{{ $channel->name }}</option>
                                             @endforeach
@@ -91,7 +91,7 @@
                                         <label for="channels" class="required">{{ __('admin::app.promotion.general-info.channels') }}</label>
 
                                         <select type="text" class="control" name="channels[]" v-model="channels" v-validate="'required'" value="{{ old('channels') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.channels-req') }}&quot;" multiple="multiple">
-                                            <option disabled="disabled">Select Channels</option>
+                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribtue', ['attrbibute' => 'Channels']) }}</option>
                                             @foreach(app('Webkul\Core\Repositories\ChannelRepository')->all() as $channel)
                                                 <option value="{{ $channel->id }}">{{ $channel->name }}</option>
                                             @endforeach
@@ -104,7 +104,7 @@
                                         <label for="status" class="required">{{ __('admin::app.promotion.general-info.status') }}</label>
 
                                         <select type="text" class="control" name="status" v-model="status" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.status') }}&quot;">
-                                            <option disabled="disabled">Select status</option>
+                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribtue', ['attrbibute' => 'Status']) }}</option>
                                             <option value="1">Yes</option>
                                             <option value="0">No</option>
                                         </select>
@@ -169,7 +169,7 @@
                                             <label for="criteria" class="required">{{ __('admin::app.promotion.general-info.add-condition') }}</label>
 
                                             <select type="text" class="control" v-model="criteria">
-                                                <option value="cart">Cart Properties</option>
+                                                <option value="cart">{{ __('admin::app.promotion.cart-properties') }}</option>
                                             </select>
                                         </div>
                                     </div> --}}
@@ -189,7 +189,7 @@
                                         <!-- Cart Attributes -->
                                         <div class="control-container mt-20" v-for="(condition, index) in conditions_list" :key="index">
                                             <select class="control" name="cart_attributes[]" v-model="conditions_list[index].attribute" title="You Can Make Multiple Selections Here" style="margin-right: 15px; width: 30%;" v-on:change="enableCondition($event, index)">
-                                                <option disabled="disabled">Select Option</option>
+                                                <option disabled="disabled">{{ __('admin::app.promotion.select-attribtue', ['attrbibute' => 'Option']) }}</option>
                                                 <option v-for="(cart_ip, index1) in cart_input" :value="cart_ip.code" :key="index1">@{{ cart_ip.name }}</option>
                                             </select>
 
@@ -200,7 +200,7 @@
 
                                                 <div v-if='conditions_list[index].attribute == "shipping_state"'>
                                                     <select class="control" v-model="conditions_list[index].value">
-                                                        <option disabled="disabled">Select State</option>
+                                                        <option disabled="disabled">{{ __('admin::app.promotion.select-attribtue', ['attrbibute' => 'State']) }}</option>
                                                         <optgroup v-for='(state, code) in country_and_states.states' :label="code">
                                                             <option v-for="(stateObj, index) in state" :value="stateObj.code">@{{ stateObj.default_name }}</option>
                                                         </optgroup>
@@ -209,7 +209,7 @@
 
                                                 <div v-if='conditions_list[index].attribute == "shipping_country"'>
                                                     <select class="control" v-model="conditions_list[index].value">
-                                                        <option disabled="disabled">Select Country</option>
+                                                        <option disabled="disabled">{{ __('admin::app.promotion.select-attribtue', ['attrbibute' => 'Country']) }}</option>
                                                         <option v-for="(country, index) in country_and_states.countries" :value="country.code">@{{ country.name }}</option>
                                                     </select>
                                                 </div>
@@ -229,7 +229,7 @@
                                         </div>
                                     </div>
 
-                                    <span class="btn btn-primary btn-lg mt-20" v-on:click="addCondition">Add Condition</span>
+                                    <span class="btn btn-primary btn-lg mt-20" v-on:click="addCondition">{{ __('admin::app.promotion.add-condition') }}</span>
                                 </div>
                             </accordian>
 
@@ -313,17 +313,17 @@
 
                                     {{-- <div v-if="!auto_generation">
                                         <div class="control-group" :class="[errors.has('prefix') ? 'has-error' : '']">
-                                            <label for="prefix" class="required">Prefix</label>
+                                            <label for="prefix" class="required">{{ __('admin::app.promotion.general-info.prefix') }}</label>
 
-                                            <input type="text" class="control" name="prefix" v-model="prefix" v-validate="'alpha'" value="{{ old('prefix') }}" data-vv-as="&quot;Prefix&quot;">
+                                            <input type="text" class="control" name="prefix" v-model="prefix" v-validate="'alpha'" value="{{ old('prefix') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.prefix') }}&quot;">
 
                                             <span class="control-error" v-if="errors.has('prefix')">@{{ errors.first('prefix') }}</span>
                                         </div>
 
                                         <div class="control-group" :class="[errors.has('suffix') ? 'has-error' : '']"">
-                                            <label for="suffix" class="required">Suffix</label>
+                                            <label for="suffix" class="required">{{ __('admin::app.promotion.general-info.suffix') }}</label>
 
-                                            <input type="text" class="control" name="suffix" v-model="suffix" v-validate="'alpha'" value="{{ old('suffix') }}" data-vv-as="&quot;suffix&quot;">
+                                            <input type="text" class="control" name="suffix" v-model="suffix" v-validate="'alpha'" value="{{ old('suffix') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.suffix') }}&quot;">
 
                                             <span class="control-error" v-if="errors.has('suffix')">@{{ errors.first('suffix') }}</span>
                                         </div>
@@ -331,9 +331,9 @@
 
                                     <div>
                                         <div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
-                                            <label for="code" class="required">Code</label>
+                                            <label for="code" class="required">{{ __('admin::app.promotion.general-info.code') }}</label>
 
-                                            <input type="text" class="control" name="code" v-model="code" v-validate="'required'" value="{{ old('code') }}" data-vv-as="&quot;Code&quot;">
+                                            <input type="text" class="control" name="code" v-model="code" v-validate="'required'" value="{{ old('code') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.code') }}&quot;">
 
                                             <span class="control-error" v-if="errors.has('code')">@{{ errors.first('code') }}</span>
                                         </div>
@@ -357,7 +357,7 @@
 
                                     <div class="control-container mt-20" v-for="(condition, index) in attribute_values" :key="index">
                                         <select class="control" v-model="attribute_values[index].attribute" title="You Can Make Multiple Selections Here" style="margin-right: 15px; width: 30%;" v-on:change="enableAttributeCondition($event, index)">
-                                            <option disabled="disabled">Select Option</option>
+                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Option']) }}</option>
 
                                             <option v-for="(attr_ip, index1) in attribute_input" :value="attr_ip.code" :key="index1">@{{ attr_ip.name }}</option>
                                         </select>
@@ -385,16 +385,16 @@
                                         <span class="icon trash-icon" v-on:click="removeAttr(index)"></span>
                                     </div>
 
-                                    <span class="btn btn-primary btn-lg mt-20" v-on:click="addAttributeCondition">Add Attribute Condition</span>
+                                    <span class="btn btn-primary btn-lg mt-20" v-on:click="addAttributeCondition">{{ __('admin::app.promotion.add-attr-condition') }}</span>
                                 </div>
                             </accordian>
 
                             <accordian :active="false" :title="'{{ __('admin::app.promotion.general-info.labels') }}'">
                                 <div slot="body">
                                     <div class="control-group" :class="[errors.has('label') ? 'has-error' : '']" v-if="dedicated_label">
-                                        <label for="label">Global Label</label>
+                                        <label for="label">{{ __('admin::app.promotion.general-info.global-label') }}</label>
 
-                                        <input type="text" class="control" name="label[global]" v-model="label.global" data-vv-as="&quot;label&quot;">
+                                        <input type="text" class="control" name="label[global]" v-model="label.global" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.label') }}&quot;">
 
                                         <span class="control-error" v-if="errors.has('label')">@{{ errors.first('label') }}</span>
                                     </div>
@@ -405,7 +405,7 @@
                                             <div class="control-group" :class="[errors.has('label') ? 'has-error' : '']">
                                                 <label for="code"><span class="locale">[{{ $channel->code }} - {{ $locale->code }}]</span></label>
 
-                                                <input type="text" class="control" name="label[{{ $channel->code }}][{{ $locale->code }}]" v-model="label.{{ $channel->code }}.{{ $locale->code }}" data-vv-as="&quot;Label&quot;">
+                                                <input type="text" class="control" name="label[{{ $channel->code }}][{{ $locale->code }}]" v-model="label.{{ $channel->code }}.{{ $locale->code }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.label') }}&quot;">
 
                                                 <span class="control-error" v-if="errors.has('label')">@{{ errors.first('label') }}</span>
                                             </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php
index 003416415..b9abf4378 100644
--- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rule/edit.blade.php
@@ -80,7 +80,7 @@
                                         <label for="customer_groups" class="required">{{ __('admin::app.promotion.general-info.cust-groups') }}</label>
 
                                         <select type="text" class="control" name="customer_groups[]" v-model="customer_groups" v-validate="'required'" value="{{ old('customer_groups[]') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.cust-groups') }}&quot;" multiple="multiple">
-                                            <option disabled="disabled">Select Customer Groups</option>
+                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Customer Group']) }}</option>
                                             @foreach(app('Webkul\Customer\Repositories\CustomerGroupRepository')->all() as $customerGroup)
                                                 <option value="{{ $customerGroup->id }}">{{ $customerGroup->name }}</option>
                                             @endforeach
@@ -93,7 +93,7 @@
                                         <label for="channels" class="required">{{ __('admin::app.promotion.general-info.channels') }}</label>
 
                                         <select type="text" class="control" name="channels[]" v-model="channels" v-validate="'required'" value="{{ old('channels[]') }}" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.channels-req') }}&quot;" multiple="multiple">
-                                            <option disabled="disabled">Select Channels</option>
+                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Channels']) }}</option>
                                             @foreach(app('Webkul\Core\Repositories\ChannelRepository')->all() as $channel)
                                                 <option value="{{ $channel->id }}">{{ $channel->name }}</option>
                                             @endforeach
@@ -106,9 +106,9 @@
                                         <label for="status" class="required">{{ __('admin::app.promotion.general-info.status') }}</label>
 
                                         <select type="text" class="control" name="status" v-model="status" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.promotion.general-info.status') }}&quot;">
-                                            <option disabled="disabled">Select status</option>
-                                            <option value="1">Yes</option>
-                                            <option value="0">No</option>
+                                            <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Status']) }}</option>
+                                            <option value="1">{{ __('admin::app.promotion.yes') }}</option>
+                                            <option value="0">{{ __('admin::app.promotion.no') }}</option>
                                         </select>
 
                                         <span class="control-error" v-if="errors.has('status')">@{{ errors.first('status') }}</span>
@@ -195,7 +195,7 @@
                                         <!-- Cart Attributes -->
                                         <div class="control-container mt-20" v-for="(condition, index) in conditions_list" :key="index">
                                             <select class="control" name="cart_attributes[]" v-model="conditions_list[index].attribute" title="You Can Make Multiple Selections Here" style="margin-right: 15px; width: 30%;" v-on:change="enableCondition($event, index)">
-                                                <option disabled="disabled">Select Option</option>
+                                                <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Option']) }}</option>
                                                 <option v-for="(cart_ip, index1) in cart_input" :value="cart_ip.code" :key="index1">@{{ cart_ip.name }}</option>
                                             </select>
 
@@ -206,7 +206,7 @@
 
                                                 <div v-if='conditions_list[index].attribute == "shipping_state"'>
                                                     <select class="control" v-model="conditions_list[index].value">
-                                                        <option disabled="disabled">Select State</option>
+                                                        <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'State']) }}</option>
                                                         <optgroup v-for='(state, code) in country_and_states.states' :label="code">
                                                             <option v-for="(stateObj, index) in state" :value="stateObj.code">@{{ stateObj.default_name }}</option>
                                                         </optgroup>
@@ -215,12 +215,12 @@
 
                                                 <div v-if='conditions_list[index].attribute == "shipping_country"'>
                                                     <select class="control" v-model="conditions_list[index].value">
-                                                        <option disabled="disabled">Select Country</option>
+                                                        <option disabled="disabled">{{ __('admin::app.promotion.select-attribute', ['attribute' => 'Country']) }}</option>
                                                         <option v-for="(country, index) in country_and_states.countries" :value="country.code">@{{ country.name }}</option>
                                                     </select>
                                                 </div>
 
-                                                <input class="control" type="text" name="cart_attributes[]" v-model="conditions_list[index].value" placeholder="Enter Value" v-if='conditions_list[index].attribute != "shipping_state" && conditions_list[index].attribute != "shipping_country"'>
+                                                <input class="control" type="text" name="cart_attributes[]" v-model="conditions_list[index].value" placeholder="{{ __('admin::app.promotion.enter-attribtue', ['attrbibute' => 'Value']) }}" v-if='conditions_list[index].attribute != "shipping_state" && conditions_list[index].attribute != "shipping_country"'>
                                             </div>
 
                                             <div v-if='conditions_list[index].type == "numeric"' style="display: flex">
@@ -228,21 +228,21 @@
                                                     <option v-for="(condition, index) in conditions.numeric" :value="index" :key="index">@{{ condition }}</option>
                                                 </select>
 
-                                                <input class="control" type="number" step="0.1000" name="cart_attributes[]" v-model="conditions_list[index].value" placeholder="Enter Value">
+                                                <input class="control" type="number" step="0.1000" name="cart_attributes[]" v-model="conditions_list[index].value" placeholder="{{ __('admin::app.promotion.enter-attribtue', ['attrbibute' => 'Value']) }}">
                                             </div>
 
                                             <span class="icon trash-icon" v-on:click="removeCartAttr(index)"></span>
                                         </div>
                                     </div>
 
-                                    <span class="btn btn-primary btn-lg mt-20" v-on:click="addCondition">Add Condition</span>
+                                    <span class="btn btn-primary btn-lg mt-20" v-on:click="addCondition">{{ __('admin::app.promotion.add-condition') }}</span>
                                 </div>
                             </accordian>
 
                             <accordian :active="false" title="Actions">
                                 <div slot="body">
                                     <div class="control-group" :class="[errors.has('action_type') ? 'has-error' : '']">
-                                        <label for="action_type" class="required">Apply</label>
+                                        <label for="action_type" class="required">{{ __('admin::app.promotion.general-info.apply') }}</label>
 
                                         <select class="control" name="action_type" v-model="action_type" v-validate="'required'" value="{{ old('action_type') }}" data-vv-as="&quot;Apply As&quot;" v-on:change="detectApply">
                                             <option v-for="(action, index) in actions" :value="index">@{{ action }}</option>
@@ -318,7 +318,7 @@
                                 <div slot="body">
                                     {{-- <div v-if="!auto_generation">
                                         <div class="control-group" :class="[errors.has('prefix') ? 'has-error' : '']">
-                                            <label for="prefix" class="required">Prefix</label>
+                                            <label for="prefix" class="required">{{ __('admin::app.promotion.general-info.prefix') }}</label>
 
                                             <input type="text" class="control" name="prefix" v-model="prefix" value="{{ old('prefix') }}" data-vv-as="&quot;Prefix&quot;">
 
@@ -336,7 +336,7 @@
 
                                     {{-- <div v-if="auto_generation != 0"> --}}
                                     <div class="control-group" :class="[errors.has('code') ? 'has-error' : '']">
-                                        <label for="code" class="required">Code</label>
+                                        <label for="code" class="required">{{ __('admin::app.promotion.general-info.code') }}</label>
 
                                         <input type="text" class="control" name="code" v-model="code" v-validate="'required'" value="{{ old('code') }}" data-vv-as="&quot;Code&quot;">
 
@@ -350,6 +350,12 @@
                                 <div slot="body">
                                     <input type="hidden" name="all_attributes" v-model="all_attributes">
 
+                                    <span class="info mb-20" style="display: block;">
+                                        <b>{{ __('admin::app.promotion.note') }}:</b>
+
+                                        {{ __('admin::app.promotion.convert-x-note') }}
+                                    </span>
+
                                     <div class="control-group" :class="[errors.has('category_values') ? 'has-error' : '']">
                                         <label class="mb-10" for="categories">{{ __('admin::app.promotion.select-category') }}</label>
 
@@ -362,7 +368,7 @@
 
                                     <div class="control-container mt-20" v-for="(condition, index) in attribute_values" :key="index">
                                         <select class="control" v-model="attribute_values[index].attribute" title="You Can Make Multiple Selections Here" style="margin-right: 15px; width: 30%;" v-on:change="enableAttributeCondition($event, index)">
-                                            <option disabled="disabled">Select Option</option>
+                                            <option disabled="disabled">{{ __('admin::app.promotion.select-option') }}</option>
 
                                             <option v-for="(attr_ip, index1) in attribute_input" :value="attr_ip.code" :key="index1">@{{ attr_ip.name }}</option>
                                         </select>
@@ -422,8 +428,8 @@
 
                 data () {
                     return {
-                        name: 'Name of rule',
-                        description: 'Enter Some Description',
+                        name: '{{ __('admin::app.promotion.rule-name') }}',
+                        description: '{{ __('admin::app.promotion.rule-desc') }}',
                         channels: [],
                         customer_groups: [],
                         ends_till: null,