From fe84dbb2fc6cafc8b941b1dc8ed5a124c698be35 Mon Sep 17 00:00:00 2001
From: VaD1ke <vl.slesarenko@gmail.com>
Date: Sat, 11 Apr 2020 13:03:31 +0300
Subject: [PATCH 01/11] Translate mass-update for review status in admin grid

---
 .../Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php
index 257d3c8a8..3c66b9a11 100755
--- a/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/CustomerReviewDataGrid.php
@@ -117,9 +117,9 @@ class CustomerReviewDataGrid extends DataGrid
             'action'  => route('admin.customer.review.massupdate'),
             'method'  => 'PUT',
             'options' => [
-                'Pending'    => 0,
-                'Approve'    => 1,
-                'Disapprove' => 2,
+                trans('admin::app.customers.reviews.pending')     => 0,
+                trans('admin::app.customers.reviews.approved')    => 1,
+                trans('admin::app.customers.reviews.disapproved') => 2,
             ],
         ]);
     }

From e1ae7216d5f98d862111959a6b97910019e370ed Mon Sep 17 00:00:00 2001
From: VaD1ke <vl.slesarenko@gmail.com>
Date: Sat, 11 Apr 2020 13:09:20 +0300
Subject: [PATCH 02/11] Fix save-category btn translation for langs with noun
 case

---
 .../src/Resources/views/catalog/categories/create.blade.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php
index c0ba24c98..e6ec8ce36 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/categories/create.blade.php
@@ -20,7 +20,7 @@
 
                 <div class="page-action">
                     <button type="submit" class="btn btn-lg btn-primary">
-                        {{ __('admin::app.save') }} {{ __('admin::app.category') }}
+                        {{ __('admin::app.catalog.categories.save-btn-title') }}
                     </button>
                 </div>
             </div>

From e293fbfce25ce57c62a5709dcd29b76b9f3f9fdf Mon Sep 17 00:00:00 2001
From: Carlos Augusto Gartner <contato@carlosgartner.com.br>
Date: Sun, 12 Apr 2020 21:36:37 -0300
Subject: [PATCH 03/11] Added more view_render_events in the customer account
 views

---
 .../account/address/create.blade.php          | 16 +++++++++++++
 .../customers/account/address/edit.blade.php  | 16 +++++++++++++
 .../customers/account/orders/view.blade.php   |  8 ++++---
 .../customers/account/profile/edit.blade.php  | 14 +++++++++++
 .../customers/account/profile/index.blade.php |  8 +++++++
 .../views/customers/signup/index.blade.php    |  8 +++++++
 .../account/address/create.blade.php          | 16 +++++++++++++
 .../customers/account/address/edit.blade.php  | 17 +++++++++++++-
 .../customers/account/orders/view.blade.php   |  8 ++++---
 .../customers/account/profile/edit.blade.php  | 23 ++++++++++++++++---
 .../customers/account/profile/index.blade.php |  8 +++++++
 .../shop/customers/signup/index.blade.php     |  8 +++++++
 12 files changed, 140 insertions(+), 10 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
index 82a649047..19bb5b69c 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/create.blade.php
@@ -32,18 +32,24 @@
                         <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.company_name.after') !!}
+
                     <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
                         <label for="first_name" class="required">{{ __('shop::app.customer.account.address.create.first_name') }}</label>
                         <input value="{{ old('first_name') }}" type="text" class="control" name="first_name" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.first_name') }}&quot;">
                         <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.first_name.after') !!}
+
                     <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
                         <label for="last_name" class="required">{{ __('shop::app.customer.account.address.create.last_name') }}</label>
                         <input value="{{ old('last_name') }}" type="text" class="control" name="last_name" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.last_name') }}&quot;">
                         <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.last_name.after') !!}
+
                     <div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
                         <label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}
                             <span class="help-note">{{ __('shop::app.customer.account.address.create.vat_help_note') }}</span>
@@ -53,6 +59,8 @@
                         <span class="control-error" v-if="errors.has('vat_id')">@{{ errors.first('vat_id') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.vat_id.after') !!}
+
                     <div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
                         <label for="address1" class="required">{{ __('shop::app.customer.account.address.create.street-address') }}</label>
                         <input type="text" class="control" name="address1[]" value="{{ old('address1') }}" id="address1" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
@@ -67,20 +75,28 @@
                         </div>
                     @endif
 
+                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.street-address.after') !!}
+
                     @include ('shop::customers.account.address.country-state', ['countryCode' => old('country'), 'stateCode' => old('state')])
 
+                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.country-state.after') !!}
+
                     <div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
                         <label for="city" class="required">{{ __('shop::app.customer.account.address.create.city') }}</label>
                         <input value="{{ old('city') }}" type="text" class="control" name="city" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
                         <span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.city.after') !!}
+
                     <div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
                         <label for="postcode" class="required">{{ __('shop::app.customer.account.address.create.postcode') }}</label>
                         <input value="{{ old('postcode') }}" type="text" class="control" name="postcode" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.postcode') }}&quot;">
                         <span class="control-error" v-if="errors.has('postcode')">@{{ errors.first('postcode') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.postcode.after') !!}
+
                     <div class="control-group" :class="[errors.has('phone') ? 'has-error' : '']">
                         <label for="phone" class="required">{{ __('shop::app.customer.account.address.create.phone') }}</label>
                         <input value="{{ old('phone') }}" type="text" class="control" name="phone" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.phone') }}&quot;">
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
index 1a42f2476..db6b41e48 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/address/edit.blade.php
@@ -33,18 +33,24 @@
                         <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.company_name.after') !!}
+
                     <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
                         <label for="first_name" class="required">{{ __('shop::app.customer.account.address.create.first_name') }}</label>
                         <input type="text" class="control" name="first_name" v-validate="'required'" value="{{ old('first_name') ?: $address->first_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.first_name') }}&quot;">
                         <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.first_name.after') !!}
+
                     <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
                         <label for="last_name" class="required">{{ __('shop::app.customer.account.address.create.last_name') }}</label>
                         <input type="text" class="control" name="last_name" v-validate="'required'" value="{{ old('last_name') ?: $address->last_name }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.last_name') }}&quot;">
                         <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.last_name.after') !!}
+
                     <div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
                         <label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}
                             <span class="help-note">{{ __('shop::app.customer.account.address.create.vat_help_note') }}</span>
@@ -54,6 +60,8 @@
                         <span class="control-error" v-if="errors.has('vat_id')">@{{ errors.first('vat_id') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.vat_id.after') !!}
+
                     <?php $addresses = explode(PHP_EOL, $address->address1); ?>
 
                     <div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
@@ -70,20 +78,28 @@
                         </div>
                     @endif
 
+                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.street-addres.after') !!}
+
                     @include ('shop::customers.account.address.country-state', ['countryCode' => old('country') ?? $address->country, 'stateCode' => old('state') ?? $address->state])
 
+                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.country-state.after') !!}
+
                     <div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
                         <label for="city" class="required">{{ __('shop::app.customer.account.address.create.city') }}</label>
                         <input type="text" class="control" name="city" v-validate="'required|alpha_spaces'" value="{{ old('city') ?: $address->city }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
                         <span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.create.after') !!}
+
                     <div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
                         <label for="postcode" class="required">{{ __('shop::app.customer.account.address.create.postcode') }}</label>
                         <input type="text" class="control" name="postcode" v-validate="'required'" value="{{ old('postcode') ?: $address->postcode }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.postcode') }}&quot;">
                         <span class="control-error" v-if="errors.has('postcode')">@{{ errors.first('postcode') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.postcode.after') !!}
+
                     <div class="control-group" :class="[errors.has('phone') ? 'has-error' : '']">
                         <label for="phone" class="required">{{ __('shop::app.customer.account.address.create.phone') }}</label>
                         <input type="text" class="control" name="phone" v-validate="'required'" value="{{ old('phone') ?: $address->phone }}" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.phone') }}&quot;">
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
index 3b52ae1a2..ca051fac3 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
@@ -463,9 +463,9 @@
                                 </div>
 
                                 <div class="box-content">
-
                                     @include ('admin::sales.address', ['address' => $order->billing_address])
 
+                                    {!! view_render_event('bagisto.shop.customers.account.orders.view.billing-address.after', ['order' => $order]) !!}
                                 </div>
                             </div>
 
@@ -476,9 +476,9 @@
                                     </div>
 
                                     <div class="box-content">
-
                                         @include ('admin::sales.address', ['address' => $order->shipping_address])
 
+                                        {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-address.after', ['order' => $order]) !!}
                                     </div>
                                 </div>
 
@@ -488,9 +488,9 @@
                                     </div>
 
                                     <div class="box-content">
-
                                         {{ $order->shipping_title }}
 
+                                        {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-method.after', ['order' => $order]) !!}
                                     </div>
                                 </div>
                             @endif
@@ -502,6 +502,8 @@
 
                                 <div class="box-content">
                                     {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+
+                                    {!! view_render_event('bagisto.shop.customers.account.orders.view.payment-method.after', ['order' => $order]) !!}
                                 </div>
                             </div>
                         </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
index a824509a3..64ed2bf50 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/edit.blade.php
@@ -35,6 +35,8 @@
                         <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.first_name.after') !!}
+
                     <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
                         <label for="last_name" class="required">{{ __('shop::app.customer.account.profile.lname') }}</label>
 
@@ -42,6 +44,8 @@
                         <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.last_name.after') !!}
+
                     <div class="control-group" :class="[errors.has('gender') ? 'has-error' : '']">
                         <label for="email" class="required">{{ __('shop::app.customer.account.profile.gender') }}</label>
 
@@ -54,24 +58,32 @@
                         <span class="control-error" v-if="errors.has('gender')">@{{ errors.first('gender') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.gender.after') !!}
+
                     <div class="control-group"  :class="[errors.has('date_of_birth') ? 'has-error' : '']">
                         <label for="date_of_birth">{{ __('shop::app.customer.account.profile.dob') }}</label>
                         <input type="date" class="control" name="date_of_birth" value="{{ old('date_of_birth') ?? $customer->date_of_birth }}" v-validate="" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.dob') }}&quot;">
                         <span class="control-error" v-if="errors.has('date_of_birth')">@{{ errors.first('date_of_birth') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.date_of_birth.after') !!}
+
                     <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
                         <label for="email" class="required">{{ __('shop::app.customer.account.profile.email') }}</label>
                         <input type="email" class="control" name="email" value="{{ old('email') ?? $customer->email }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.email') }}&quot;">
                         <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.email.after') !!}
+
                     <div class="control-group" :class="[errors.has('oldpassword') ? 'has-error' : '']">
                         <label for="password">{{ __('shop::app.customer.account.profile.opassword') }}</label>
                         <input type="password" class="control" name="oldpassword" data-vv-as="&quot;{{ __('shop::app.customer.account.profile.opassword') }}&quot;" v-validate="'min:6'">
                         <span class="control-error" v-if="errors.has('oldpassword')">@{{ errors.first('oldpassword') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.oldpassword.after') !!}
+
                     <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
                         <label for="password">{{ __('shop::app.customer.account.profile.password') }}</label>
 
@@ -79,6 +91,8 @@
                         <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
                     </div>
 
+                    {!! view_render_event('bagisto.shop.customers.account.profile.edit.password.after') !!}
+
                     <div class="control-group" :class="[errors.has('password_confirmation') ? 'has-error' : '']">
                         <label for="password">{{ __('shop::app.customer.account.profile.cpassword') }}</label>
 
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
index 02abd9341..8cdc148ed 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/profile/index.blade.php
@@ -38,21 +38,29 @@
                         <td>{{ $customer->first_name }}</td>
                     </tr>
 
+                    {!! view_render_event('bagisto.shop.customers.account.profile.view.table.first_name.after') !!}
+
                     <tr>
                         <td>{{ __('shop::app.customer.account.profile.lname') }}</td>
                         <td>{{ $customer->last_name }}</td>
                     </tr>
 
+                    {!! view_render_event('bagisto.shop.customers.account.profile.view.table.last_name.after') !!}
+
                     <tr>
                         <td>{{ __('shop::app.customer.account.profile.gender') }}</td>
                         <td>{{ $customer->gender }}</td>
                     </tr>
 
+                    {!! view_render_event('bagisto.shop.customers.account.profile.view.table.gender.after') !!}
+
                     <tr>
                         <td>{{ __('shop::app.customer.account.profile.dob') }}</td>
                         <td>{{ $customer->date_of_birth }}</td>
                     </tr>
 
+                    {!! view_render_event('bagisto.shop.customers.account.profile.view.table.date_of_birth.after') !!}
+
                     <tr>
                         <td>{{ __('shop::app.customer.account.profile.email') }}</td>
                         <td>{{ $customer->email }}</td>
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php
index 60e774254..9f4fc1b53 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/signup/index.blade.php
@@ -27,24 +27,32 @@
                 <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
             </div>
 
+            {!! view_render_event('bagisto.shop.customers.signup_form_controls.firstname.after') !!}
+
             <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
                 <label for="last_name" class="required">{{ __('shop::app.customer.signup-form.lastname') }}</label>
                 <input type="text" class="control" name="last_name" v-validate="'required'" value="{{ old('last_name') }}" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.lastname') }}&quot;">
                 <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
             </div>
 
+            {!! view_render_event('bagisto.shop.customers.signup_form_controls.lastname.after') !!}
+
             <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
                 <label for="email" class="required">{{ __('shop::app.customer.signup-form.email') }}</label>
                 <input type="email" class="control" name="email" v-validate="'required|email'" value="{{ old('email') }}" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.email') }}&quot;">
                 <span class="control-error" v-if="errors.has('email')">@{{ errors.first('email') }}</span>
             </div>
 
+            {!! view_render_event('bagisto.shop.customers.signup_form_controls.email.after') !!}
+
             <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
                 <label for="password" class="required">{{ __('shop::app.customer.signup-form.password') }}</label>
                 <input type="password" class="control" name="password" v-validate="'required|min:6'" ref="password" value="{{ old('password') }}" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.password') }}&quot;">
                 <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
             </div>
 
+            {!! view_render_event('bagisto.shop.customers.signup_form_controls.password.after') !!}
+
             <div class="control-group" :class="[errors.has('password_confirmation') ? 'has-error' : '']">
                 <label for="password_confirmation" class="required">{{ __('shop::app.customer.signup-form.confirm_pass') }}</label>
                 <input type="password" class="control" name="password_confirmation"  v-validate="'required|min:6|confirmed:password'" data-vv-as="&quot;{{ __('shop::app.customer.signup-form.confirm_pass') }}&quot;">
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
index e35d3d737..7330d22b8 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/create.blade.php
@@ -26,18 +26,24 @@
                     <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
                 </div>
 
+                {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.company_name.after') !!}
+
                 <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
                     <label for="first_name" class="mandatory">{{ __('shop::app.customer.account.address.create.first_name') }}</label>
                     <input type="text" class="control" name="first_name" value="{{ old('first_name') }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.first_name') }}&quot;">
                     <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
                 </div>
 
+                {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.first_name.after') !!}
+
                 <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
                     <label for="last_name" class="mandatory">{{ __('shop::app.customer.account.address.create.last_name') }}</label>
                     <input type="text" class="control" name="last_name" value="{{ old('last_name') }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.last_name') }}&quot;">
                     <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
                 </div>
 
+                {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.last_name.after') !!}
+
                 <div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
                     <label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}
                         <span class="help-note">{{ __('shop::app.customer.account.address.create.vat_help_note') }}</span>
@@ -46,6 +52,8 @@
                     <span class="control-error" v-if="errors.has('vat_id')">@{{ errors.first('vat_id') }}</span>
                 </div>
 
+                {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.vat_id.after') !!}
+
                 @php
                     $addresses = explode(PHP_EOL, (old('address1') ?? ''));
                 @endphp
@@ -64,20 +72,28 @@
                     @endfor
                 @endif
 
+                {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.street-address.after') !!}
+
                 @include ('shop::customers.account.address.country-state', ['countryCode' => old('country'), 'stateCode' => old('state')])
 
+                {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.country-state.after') !!}
+
                 <div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
                     <label for="city" class="mandatory">{{ __('shop::app.customer.account.address.create.city') }}</label>
                     <input type="text" class="control" name="city" value="{{ old('city') }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
                     <span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
                 </div>
 
+                {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.city.after') !!}
+
                 <div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
                     <label for="postcode" class="mandatory">{{ __('shop::app.customer.account.address.create.postcode') }}</label>
                     <input type="text" class="control" name="postcode" value="{{ old('postcode') }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.postcode') }}&quot;">
                     <span class="control-error" v-if="errors.has('postcode')">@{{ errors.first('postcode') }}</span>
                 </div>
 
+                {!! view_render_event('bagisto.shop.customers.account.address.create_form_controls.postcode.after') !!}
+
                 <div class="control-group" :class="[errors.has('phone') ? 'has-error' : '']">
                     <label for="phone" class="mandatory">{{ __('shop::app.customer.account.address.create.phone') }}</label>
                     <input type="text" class="control" name="phone" value="{{ old('phone') }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.phone') }}&quot;">
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
index b82de5902..d08718025 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/address/edit.blade.php
@@ -21,7 +21,6 @@
 
             {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.before', ['address' => $address]) !!}
 
-
             <?php $addresses = explode(PHP_EOL, (old('address1') ?? $address->address1)); ?>
 
             <div class="control-group" :class="[errors.has('company_name') ? 'has-error' : '']">
@@ -30,18 +29,24 @@
                 <span class="control-error" v-if="errors.has('company_name')">@{{ errors.first('company_name') }}</span>
             </div>
 
+            {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.company_name.after') !!}
+
             <div class="control-group" :class="[errors.has('first_name') ? 'has-error' : '']">
                 <label for="first_name" class="mandatory">{{ __('shop::app.customer.account.address.create.first_name') }}</label>
                 <input type="text" class="control" name="first_name" value="{{ old('first_name') ?? $address->first_name }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.first_name') }}&quot;">
                 <span class="control-error" v-if="errors.has('first_name')">@{{ errors.first('first_name') }}</span>
             </div>
 
+            {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.first_name.after') !!}
+
             <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
                 <label for="last_name" class="mandatory">{{ __('shop::app.customer.account.address.create.last_name') }}</label>
                 <input type="text" class="control" name="last_name" value="{{ old('last_name') ?? $address->last_name }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.last_name') }}&quot;">
                 <span class="control-error" v-if="errors.has('last_name')">@{{ errors.first('last_name') }}</span>
             </div>
 
+            {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.last_name.after') !!}
+
             <div class="control-group" :class="[errors.has('vat_id') ? 'has-error' : '']">
                 <label for="vat_id">{{ __('shop::app.customer.account.address.create.vat_id') }}
                     <span class="help-note">{{ __('shop::app.customer.account.address.create.vat_help_note') }}</span>
@@ -50,6 +55,8 @@
                 <span class="control-error" v-if="errors.has('vat_id')">@{{ errors.first('vat_id') }}</span>
             </div>
 
+            {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.vat_id.after') !!}
+
             <div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
                 <label for="address_0" class="mandatory">{{ __('shop::app.customer.account.address.edit.street-address') }}</label>
                 <input type="text" class="control" name="address1[]" value="{{ isset($addresses[0]) ? $addresses[0] : '' }}" id="address_0" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.street-address') }}&quot;">
@@ -64,20 +71,28 @@
                 @endfor
             @endif
 
+            {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.street-addres.after') !!}
+
             @include ('shop::customers.account.address.country-state', ['countryCode' => old('country') ?? $address->country, 'stateCode' => old('state') ?? $address->state])
 
+            {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.country-state.after') !!}
+
             <div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
                 <label for="city" class="mandatory">{{ __('shop::app.customer.account.address.create.city') }}</label>
                 <input type="text" class="control" name="city" value="{{ old('city') ?? $address->city }}" v-validate="'required|alpha_spaces'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.city') }}&quot;">
                 <span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
             </div>
 
+            {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.create.after') !!}
+
             <div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
                 <label for="postcode" class="mandatory">{{ __('shop::app.customer.account.address.create.postcode') }}</label>
                 <input type="text" class="control" name="postcode" value="{{ old('postcode') ?? $address->postcode }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.postcode') }}&quot;">
                 <span class="control-error" v-if="errors.has('postcode')">@{{ errors.first('postcode') }}</span>
             </div>
 
+            {!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.postcode.after') !!}
+
             <div class="control-group" :class="[errors.has('phone') ? 'has-error' : '']">
                 <label for="phone" class="mandatory">{{ __('shop::app.customer.account.address.create.phone') }}</label>
                 <input type="text" class="control" name="phone" value="{{ old('phone') ?? $address->phone }}" v-validate="'required'" data-vv-as="&quot;{{ __('shop::app.customer.account.address.create.phone') }}&quot;">
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php
index b30980d7c..91746b66e 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/orders/view.blade.php
@@ -489,9 +489,9 @@
                                 </div>
 
                                 <div class="box-content">
-
                                     @include ('admin::sales.address', ['address' => $order->billing_address])
 
+                                    {!! view_render_event('bagisto.shop.customers.account.orders.view.billing-address.after', ['order' => $order]) !!}
                                 </div>
                             </div>
 
@@ -502,9 +502,9 @@
                                     </div>
 
                                     <div class="box-content">
-
                                         @include ('admin::sales.address', ['address' => $order->shipping_address])
 
+                                        {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-address.after', ['order' => $order]) !!}
                                     </div>
                                 </div>
 
@@ -514,9 +514,9 @@
                                     </div>
 
                                     <div class="box-content">
-
                                         {{ $order->shipping_title }}
 
+                                        {!! view_render_event('bagisto.shop.customers.account.orders.view.shipping-method.after', ['order' => $order]) !!}
                                     </div>
                                 </div>
                             @endif
@@ -528,6 +528,8 @@
 
                                 <div class="box-content">
                                     {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
+
+                                    {!! view_render_event('bagisto.shop.customers.account.orders.view.payment-method.after', ['order' => $order]) !!}
                                 </div>
                             </div>
                         </div>
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php
index ba66a4bec..b5f33f26d 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/edit.blade.php
@@ -15,7 +15,7 @@
         </h1>
     </div>
 
-    {!! view_render_event('bagisto.shop.customers.account.profile.view.before', ['customer' => $customer]) !!}
+    {!! view_render_event('bagisto.shop.customers.account.profile.edit.before', ['customer' => $customer]) !!}
 
         <div class="profile-update-form">
             <form
@@ -23,9 +23,10 @@
                 @submit.prevent="onSubmit"
                 class="account-table-content"
                 action="{{ route('customer.profile.edit') }}">
-
                 @csrf
 
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit.before', ['customer' => $customer]) !!}
+
                 <div :class="`row ${errors.has('first_name') ? 'has-error' : ''}`">
                     <label class="col-12 mandatory">
                         {{ __('shop::app.customer.account.profile.fname') }}
@@ -37,6 +38,8 @@
                     </div>
                 </div>
 
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit.first_name.after') !!}
+
                 <div class="row">
                     <label class="col-12">
                         {{ __('shop::app.customer.account.profile.lname') }}
@@ -47,6 +50,8 @@
                     </div>
                 </div>
 
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit.last_name.after') !!}
+
                 <div :class="`row ${errors.has('gender') ? 'has-error' : ''}`">
                     <label class="col-12 mandatory">
                         {{ __('shop::app.customer.account.profile.gender') }}
@@ -93,6 +98,8 @@
                     </div>
                 </div>
 
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit.gender.after') !!}
+
                 <div :class="`row ${errors.has('date_of_birth') ? 'has-error' : ''}`">
                     <label class="col-12">
                         {{ __('shop::app.customer.account.profile.dob') }}
@@ -112,6 +119,8 @@
                     </div>
                 </div>
 
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit.date_of_birth.after') !!}
+
                 <div class="row">
                     <label class="col-12 mandatory">
                         {{ __('shop::app.customer.account.profile.email') }}
@@ -123,6 +132,8 @@
                     </div>
                 </div>
 
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit.email.after') !!}
+
                 <div class="row">
                     <label class="col-12">
                         {{ __('velocity::app.shop.general.enter-current-password') }}
@@ -133,6 +144,8 @@
                     </div>
                 </div>
 
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit.oldpassword.after') !!}
+
                 <div class="row">
                     <label class="col-12">
                         {{ __('velocity::app.shop.general.new-password') }}
@@ -151,6 +164,8 @@
                     </div>
                 </div>
 
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit.password.after') !!}
+
                 <div class="row">
                     <label class="col-12">
                         {{ __('velocity::app.shop.general.confirm-new-password') }}
@@ -166,6 +181,8 @@
                     </div>
                 </div>
 
+                {!! view_render_event('bagisto.shop.customers.account.profile.edit_form_controls.after', ['customer' => $customer]) !!}
+
                 <button
                     type="submit"
                     class="theme-btn mb20">
@@ -174,5 +191,5 @@
             </form>
         </div>
 
-    {!! view_render_event('bagisto.shop.customers.account.profile.view.after', ['customer' => $customer]) !!}
+    {!! view_render_event('bagisto.shop.customers.account.profile.edit.after', ['customer' => $customer]) !!}
 @endsection
\ No newline at end of file
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/index.blade.php
index 267bd0ee5..63bfebce8 100644
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/account/profile/index.blade.php
@@ -46,21 +46,29 @@
                         <td>{{ $customer->first_name }}</td>
                     </tr>
 
+                    {!! view_render_event('bagisto.shop.customers.account.profile.view.table.first_name.after') !!}
+
                     <tr>
                         <td>{{ __('shop::app.customer.account.profile.lname') }}</td>
                         <td>{{ $customer->last_name }}</td>
                     </tr>
 
+                    {!! view_render_event('bagisto.shop.customers.account.profile.view.table.last_name.after') !!}
+
                     <tr>
                         <td>{{ __('shop::app.customer.account.profile.gender') }}</td>
                         <td>{{ $customer->gender ?? '-' }}</td>
                     </tr>
 
+                    {!! view_render_event('bagisto.shop.customers.account.profile.view.table.gender.after') !!}
+
                     <tr>
                         <td>{{ __('shop::app.customer.account.profile.dob') }}</td>
                         <td>{{ $customer->date_of_birth ?? '-' }}</td>
                     </tr>
 
+                    {!! view_render_event('bagisto.shop.customers.account.profile.view.table.date_of_birth.after') !!}
+
                     <tr>
                         <td>{{ __('shop::app.customer.account.profile.email') }}</td>
                         <td>{{ $customer->email }}</td>
diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/customers/signup/index.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/customers/signup/index.blade.php
index 5db14c627..f723eac95 100755
--- a/packages/Webkul/Velocity/src/Resources/views/shop/customers/signup/index.blade.php
+++ b/packages/Webkul/Velocity/src/Resources/views/shop/customers/signup/index.blade.php
@@ -58,6 +58,8 @@
                             </span>
                         </div>
 
+                        {!! view_render_event('bagisto.shop.customers.signup_form_controls.firstname.after') !!}
+
                         <div class="control-group" :class="[errors.has('last_name') ? 'has-error' : '']">
                             <label for="last_name" class="required label-style">
                                 {{ __('shop::app.customer.signup-form.lastname') }}
@@ -76,6 +78,8 @@
                             </span>
                         </div>
 
+                        {!! view_render_event('bagisto.shop.customers.signup_form_controls.lastname.after') !!}
+
                         <div class="control-group" :class="[errors.has('email') ? 'has-error' : '']">
                             <label for="email" class="required label-style">
                                 {{ __('shop::app.customer.signup-form.email') }}
@@ -94,6 +98,8 @@
                             </span>
                         </div>
 
+                        {!! view_render_event('bagisto.shop.customers.signup_form_controls.email.after') !!}
+
                         <div class="control-group" :class="[errors.has('password') ? 'has-error' : '']">
                             <label for="password" class="required label-style">
                                 {{ __('shop::app.customer.signup-form.password') }}
@@ -113,6 +119,8 @@
                             </span>
                         </div>
 
+                        {!! view_render_event('bagisto.shop.customers.signup_form_controls.password.after') !!}
+
                         <div class="control-group" :class="[errors.has('password_confirmation') ? 'has-error' : '']">
                             <label for="password_confirmation" class="required label-style">
                                 {{ __('shop::app.customer.signup-form.confirm_pass') }}

From 5a3e1919d753b3288d044f93e0378151b4f0c2fe Mon Sep 17 00:00:00 2001
From: Carlos Augusto Gartner <contato@carlosgartner.com.br>
Date: Sun, 12 Apr 2020 21:55:07 -0300
Subject: [PATCH 04/11] Added view_render_event to admin order view

---
 .../Admin/src/Resources/views/sales/orders/view.blade.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
index 24eee8937..09755ea48 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
@@ -146,9 +146,9 @@
                                     </div>
 
                                     <div class="section-content">
-
                                         @include ('admin::sales.address', ['address' => $order->billing_address])
 
+                                        {!! view_render_event('sales.order.billing-address.after', ['order' => $order]) !!}
                                     </div>
                                 </div>
 
@@ -159,9 +159,9 @@
                                         </div>
 
                                         <div class="section-content">
-
                                             @include ('admin::sales.address', ['address' => $order->shipping_address])
 
+                                            {!! view_render_event('sales.order.shipping-address.after', ['order' => $order]) !!}
                                         </div>
                                     </div>
                                 @endif
@@ -197,6 +197,8 @@
                                                 {{ $order->order_currency_code }}
                                             </span>
                                         </div>
+
+                                        {!! view_render_event('sales.order.payment-method.after', ['order' => $order]) !!}
                                     </div>
                                 </div>
 
@@ -226,6 +228,8 @@
                                                     {{ core()->formatBasePrice($order->base_shipping_amount) }}
                                                 </span>
                                             </div>
+
+                                            {!! view_render_event('sales.order.shipping-method.after', ['order' => $order]) !!}
                                         </div>
                                     </div>
                                 @endif

From 1f30769a98607ef1596a1913de58a50b43e7dae8 Mon Sep 17 00:00:00 2001
From: Carlos Augusto Gartner <contato@carlosgartner.com.br>
Date: Sun, 12 Apr 2020 22:08:51 -0300
Subject: [PATCH 05/11] Created new view_render_events for admin order and
 invoice view

---
 .../views/sales/invoices/view.blade.php       | 30 +++++++++++++++++--
 .../views/sales/orders/view.blade.php         | 24 +++++++++++++--
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
index d46a2a43e..95a0a1a15 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
@@ -12,16 +12,24 @@
         <div class="page-header">
             <div class="page-title">
                 <h1>
+                    {!! view_render_event('sales.invoice.title.before', ['order' => $order]) !!}
+
                     <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
 
                     {{ __('admin::app.sales.invoices.view-title', ['invoice_id' => $invoice->id]) }}
+
+                    {!! view_render_event('sales.invoice.title.after', ['order' => $order]) !!}
                 </h1>
             </div>
 
             <div class="page-action">
+                {!! view_render_event('sales.invoice.page_action.before', ['order' => $order]) !!}
+
                 <a href="{{ route('admin.sales.invoices.print', $invoice->id) }}" class="btn btn-lg btn-primary">
                     {{ __('admin::app.sales.invoices.print') }}
                 </a>
+
+                {!! view_render_event('sales.invoice.page_action.after', ['order' => $order]) !!}
             </div>
         </div>
 
@@ -47,6 +55,8 @@
                                     </span>
                                 </div>
 
+                                {!! view_render_event('sales.invoice.increment_id.after', ['order' => $order]) !!}
+
                                 <div class="row">
                                     <span class="title">
                                         {{ __('admin::app.sales.orders.order-date') }}
@@ -57,6 +67,8 @@
                                     </span>
                                 </div>
 
+                                {!! view_render_event('sales.invoice.created_at.after', ['order' => $order]) !!}
+
                                 <div class="row">
                                     <span class="title">
                                         {{ __('admin::app.sales.orders.order-status') }}
@@ -67,6 +79,8 @@
                                     </span>
                                 </div>
 
+                                {!! view_render_event('sales.invoice.status_label.after', ['order' => $order]) !!}
+
                                 <div class="row">
                                     <span class="title">
                                         {{ __('admin::app.sales.orders.channel') }}
@@ -76,6 +90,8 @@
                                         {{ $order->channel_name }}
                                     </span>
                                 </div>
+
+                                {!! view_render_event('sales.invoice.channel_name.after', ['order' => $order]) !!}
                             </div>
                         </div>
 
@@ -95,6 +111,8 @@
                                     </span>
                                 </div>
 
+                                {!! view_render_event('sales.invoice.customer_name.after', ['order' => $order]) !!}
+
                                 <div class="row">
                                     <span class="title">
                                         {{ __('admin::app.sales.orders.email') }}
@@ -104,6 +122,8 @@
                                         {{ $invoice->address->email }}
                                     </span>
                                 </div>
+
+                                {!! view_render_event('sales.invoice.customer_email.after', ['order' => $order]) !!}
                             </div>
                         </div>
 
@@ -119,9 +139,9 @@
                             </div>
 
                             <div class="section-content">
-
                                 @include ('admin::sales.address', ['address' => $order->billing_address])
 
+                                {!! view_render_event('sales.invoice.billing_address.after', ['order' => $order]) !!}
                             </div>
                         </div>
 
@@ -132,9 +152,9 @@
                                 </div>
 
                                 <div class="section-content">
-
                                     @include ('admin::sales.address', ['address' => $order->shipping_address])
 
+                                    {!! view_render_event('sales.invoice.shipping_address.after', ['order' => $order]) !!}
                                 </div>
                             </div>
                         @endif
@@ -170,6 +190,8 @@
                                         {{ $order->order_currency_code }}
                                     </span>
                                 </div>
+
+                                {!! view_render_event('sales.invoice.payment-method.after', ['order' => $order]) !!}
                             </div>
                         </div>
 
@@ -199,6 +221,8 @@
                                             {{ core()->formatBasePrice($order->base_shipping_amount) }}
                                         </span>
                                     </div>
+
+                                    {!! view_render_event('sales.invoice.shipping-method.after', ['order' => $order]) !!}
                                 </div>
                             </div>
                         @endif
@@ -236,7 +260,7 @@
 
                                                 @if (isset($item->additional['attributes']))
                                                     <div class="item-options">
-                                                        
+
                                                         @foreach ($item->additional['attributes'] as $attribute)
                                                             <b>{{ $attribute['attribute_name'] }} : </b>{{ $attribute['option_label'] }}</br>
                                                         @endforeach
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
index 09755ea48..e0d986c37 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
@@ -12,13 +12,19 @@
 
             <div class="page-title">
                 <h1>
+                    {!! view_render_event('sales.order.title.before', ['order' => $order]) !!}
+
                     <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
 
                     {{ __('admin::app.sales.orders.view-title', ['order_id' => $order->increment_id]) }}
+
+                    {!! view_render_event('sales.order.title.after', ['order' => $order]) !!}
                 </h1>
             </div>
 
             <div class="page-action">
+                {!! view_render_event('sales.order.page_action.before', ['order' => $order]) !!}
+
                 @if ($order->canCancel())
                     <a href="{{ route('admin.sales.orders.cancel', $order->id) }}" class="btn btn-lg btn-primary" v-alert:message="'{{ __('admin::app.sales.orders.cancel-confirm-msg') }}'">
                         {{ __('admin::app.sales.orders.cancel-btn-title') }}
@@ -42,6 +48,8 @@
                         {{ __('admin::app.sales.orders.shipment-btn-title') }}
                     </a>
                 @endif
+
+                {!! view_render_event('sales.order.page_action.after', ['order' => $order]) !!}
             </div>
         </div>
 
@@ -72,6 +80,8 @@
                                             </span>
                                         </div>
 
+                                        {!! view_render_event('sales.order.created_at.after', ['order' => $order]) !!}
+
                                         <div class="row">
                                             <span class="title">
                                                 {{ __('admin::app.sales.orders.order-status') }}
@@ -82,6 +92,8 @@
                                             </span>
                                         </div>
 
+                                        {!! view_render_event('sales.order.status_label.after', ['order' => $order]) !!}
+
                                         <div class="row">
                                             <span class="title">
                                                 {{ __('admin::app.sales.orders.channel') }}
@@ -91,6 +103,8 @@
                                                 {{ $order->channel_name }}
                                             </span>
                                         </div>
+
+                                        {!! view_render_event('sales.order.channel_name.after', ['order' => $order]) !!}
                                     </div>
                                 </div>
 
@@ -110,6 +124,8 @@
                                             </span>
                                         </div>
 
+                                        {!! view_render_event('sales.order.customer_full_name.after', ['order' => $order]) !!}
+
                                         <div class="row">
                                             <span class="title">
                                                 {{ __('admin::app.sales.orders.email') }}
@@ -120,6 +136,8 @@
                                             </span>
                                         </div>
 
+                                        {!! view_render_event('sales.order.customer_email.after', ['order' => $order]) !!}
+
                                         @if (! is_null($order->customer))
                                             <div class="row">
                                                 <span class="title">
@@ -131,6 +149,8 @@
                                                 </span>
                                             </div>
                                         @endif
+
+                                        {!! view_render_event('sales.order.customer_group.after', ['order' => $order]) !!}
                                     </div>
                                 </div>
 
@@ -148,7 +168,7 @@
                                     <div class="section-content">
                                         @include ('admin::sales.address', ['address' => $order->billing_address])
 
-                                        {!! view_render_event('sales.order.billing-address.after', ['order' => $order]) !!}
+                                        {!! view_render_event('sales.order.billing_address.after', ['order' => $order]) !!}
                                     </div>
                                 </div>
 
@@ -161,7 +181,7 @@
                                         <div class="section-content">
                                             @include ('admin::sales.address', ['address' => $order->shipping_address])
 
-                                            {!! view_render_event('sales.order.shipping-address.after', ['order' => $order]) !!}
+                                            {!! view_render_event('sales.order.shipping_address.after', ['order' => $order]) !!}
                                         </div>
                                     </div>
                                 @endif

From 3d7d1ab57427645cdb79f2460417aa2d7d38a87b Mon Sep 17 00:00:00 2001
From: Pranshu Tomar <pranshutomar@Pranshus-MacBook-Air.local>
Date: Mon, 13 Apr 2020 16:50:05 +0530
Subject: [PATCH 06/11] Issue #2784 fixed

---
 .../BookingProduct/src/Helpers/DefaultSlot.php      |  4 +++-
 .../catalog/products/accordians/booking.blade.php   | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php b/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php
index b49e52c99..30d7786c7 100644
--- a/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php
+++ b/packages/Webkul/BookingProduct/src/Helpers/DefaultSlot.php
@@ -62,8 +62,10 @@ class DefaultSlot extends Booking
     {
         $slots = [];
 
+        $dayOfWeek = $requestedDate->dayOfWeek;
+
         foreach ($bookingProductSlot->slots as $timeDuration) {
-            if ($requestedDate->dayOfWeek != $timeDuration['from_day']) {
+            if ($dayOfWeek != $timeDuration['from_day']) {
                 continue;
             }
 
diff --git a/packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking.blade.php b/packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking.blade.php
index cf075f47f..3bca1b92f 100644
--- a/packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking.blade.php
+++ b/packages/Webkul/BookingProduct/src/Resources/views/admin/catalog/products/accordians/booking.blade.php
@@ -4,6 +4,19 @@
             margin-top: -13px;
             left: 100%;
         }
+        
+        .has-control-group .control-group {
+            width: 50%;
+            float: left;
+        }
+
+        .has-control-group .control-group:first-child {
+            padding-right: 10px;
+        }
+
+        .has-control-group .control-group:last-child {
+            padding-left: 10px;
+        }
     </style>
 @stop
 

From 57d2def00f2d621fdd95cea0a9f50c1d45619e3e Mon Sep 17 00:00:00 2001
From: Pranshu Tomar <pranshutomar@Pranshus-MacBook-Air.local>
Date: Mon, 13 Apr 2020 16:54:32 +0530
Subject: [PATCH 07/11] Updated changelog

---
 CHANGELOG for v1.x.x.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG for v1.x.x.md
index 22893ab88..f2323409f 100644
--- a/CHANGELOG for v1.x.x.md	
+++ b/CHANGELOG for v1.x.x.md	
@@ -52,6 +52,8 @@
 
 * #2781 [fixed] - Mobile menu is not showing correct sub-menu
 
+* #2784 [fixed] - One booking for many days slot time issue
+
 * #2785 [fixed] - missing address details in checkout page
 
 * #2786 [fixed] - Getting error message on adding product to compare product from search page.

From dd46e23628718add6fbcac8e94761b9bb0488ea4 Mon Sep 17 00:00:00 2001
From: Pranshu Tomar <pranshutomar@Pranshus-MacBook-Air.local>
Date: Mon, 13 Apr 2020 20:58:34 +0530
Subject: [PATCH 08/11] Issue #2871 fixed

---
 CHANGELOG for v1.x.x.md                                       | 2 ++
 .../Admin/src/Http/Controllers/Sales/RefundController.php     | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG for v1.x.x.md
index f2323409f..5639fdaf5 100644
--- a/CHANGELOG for v1.x.x.md	
+++ b/CHANGELOG for v1.x.x.md	
@@ -118,6 +118,8 @@
 
 * #2856 [fixed] - Issue with Sort by functionality, when open any category it by defaults show Newest First but after changing sort by when again select newest first it shows different product.
 
+* #2871 [fixed] - Refund throws "Undefined index: shipping" error
+
 
 
 ## **v1.1.0 (24th of March 2020)** - *Release*
diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/RefundController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/RefundController.php
index 48a23125b..a41566f35 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Sales/RefundController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/RefundController.php
@@ -107,6 +107,10 @@ class RefundController extends Controller
 
         $data = request()->all();
 
+        if (! $data['refund']['shipping']) {
+            $data['refund']['shipping'] = 0;
+        }
+
         $totals = $this->refundRepository->getOrderItemsRefundSummary($data['refund']['items'], $orderId);
 
         $maxRefundAmount = $totals['grand_total']['price'] - $order->refunds()->sum('base_adjustment_refund');

From b88e239ad2775e83d70ed905b3cb214cde4c1830 Mon Sep 17 00:00:00 2001
From: rahulshukla-home <rahulcs0082@gmail.com>
Date: Mon, 13 Apr 2020 23:03:45 +0530
Subject: [PATCH 09/11] Issue #2543 fixed

---
 .../Admin/src/DataGrids/SliderDataGrid.php    | 33 ++++++++++-
 .../views/settings/sliders/create.blade.php   | 14 +++++
 .../views/settings/sliders/edit.blade.php     |  7 +++
 .../views/settings/sliders/index.blade.php    | 56 ++++++++++++++++++-
 ..._13_224524_add_locale_in_sliders_table.php | 32 +++++++++++
 .../src/Http/Controllers/SliderController.php |  4 +-
 packages/Webkul/Core/src/Models/Slider.php    |  1 +
 .../src/Http/Controllers/HomeController.php   | 10 +++-
 8 files changed, 150 insertions(+), 7 deletions(-)
 create mode 100644 packages/Webkul/Core/src/Database/Migrations/2020_04_13_224524_add_locale_in_sliders_table.php

diff --git a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
index f0fa7fd78..6d5b6009a 100755
--- a/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/SliderDataGrid.php
@@ -11,11 +11,31 @@ class SliderDataGrid extends DataGrid
 
     protected $sortOrder = 'desc';
 
+    protected $locale = 'all';
+
+    protected $channel = 'all';
+
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->locale = request()->get('locale') ?? 'all';
+        $this->channel = request()->get('channel') ?? 'all';
+    }
+
     public function prepareQueryBuilder()
     {
         $queryBuilder = DB::table('sliders as sl')
-            ->addSelect('sl.id as slider_id', 'sl.title', 'ch.name')
-            ->leftJoin('channels as ch', 'sl.channel_id', '=', 'ch.id');
+          ->addSelect('sl.id as slider_id', 'sl.title', 'sl.locale', 'ch.name', 'ch.code')
+          ->leftJoin('channels as ch', 'sl.channel_id', '=', 'ch.id');
+
+        if ($this->locale !== 'all') {
+            $queryBuilder->where('locale', $this->locale);
+        }
+
+        if ($this->channel !== 'all') {
+            $queryBuilder->where('ch.code', $this->channel);
+        }
 
         $this->addFilter('slider_id', 'sl.id');
         $this->addFilter('channel_name', 'ch.name');
@@ -51,6 +71,15 @@ class SliderDataGrid extends DataGrid
             'sortable'   => true,
             'filterable' => true,
         ]);
+
+        $this->addColumn([
+            'index' => 'locale',
+            'label' => trans('admin::app.datagrid.locale'),
+            'type' => 'string',
+            'searchable' => true,
+            'sortable' => true,
+            'filterable' => true
+        ]);
     }
 
     public function prepareActions()
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
index f67421151..51aa1266c 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
@@ -34,6 +34,20 @@
 
                     {!! view_render_event('bagisto.admin.settings.slider.create.before') !!}
 
+                    <div class="control-group" :class="[errors.has('locale') ? 'has-error' : '']">
+                        <label for="locale">{{ __('admin::app.datagrid.locale') }}</label>
+                        
+                        <select class="control" id="locale" name="locale" data-vv-as="&quot;{{ __('admin::app.datagrid.locale') }}&quot;" value="" v-validate="'required'">
+                            @foreach (core()->getAllLocales() as $localeModel)
+
+                                <option value="{{ $localeModel->code }}" {{ ($localeModel->code) == $locale ? 'selected' : '' }}>
+                                    {{ $localeModel->name }}
+                                </option>
+
+                            @endforeach
+                        </select>
+                    </div>
+
                     <div class="control-group" :class="[errors.has('title') ? 'has-error' : '']">
                         <label for="title" class="required">{{ __('admin::app.settings.sliders.name') }}</label>
                         <input type="text" class="control" name="title" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.settings.sliders.name') }}&quot;">
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
index af5e28126..ae15896e9 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
@@ -6,6 +6,8 @@
 
 @section('content')
     <div class="content">
+        <?php $locale = request()->get('locale') ?: app()->getLocale(); ?>
+
         <form method="POST" action="{{ route('admin.sliders.update', $slider->id) }}" @submit.prevent="onSubmit" enctype="multipart/form-data">
             <div class="page-header">
                 <div class="page-title">
@@ -13,6 +15,11 @@
                         <i class="icon angle-left-icon back-link" onclick="history.length > 1 ? history.go(-1) : window.location = '{{ url('/admin/dashboard') }}';"></i>
 
                         {{ __('admin::app.settings.sliders.edit-title') }}
+
+                        @if ($slider->locale)
+                            <span class="locale">[{{ $slider->locale }}]</span>
+                        @endif
+                        
                     </h1>
                 </div>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php
index c9f2b1d3f..05b1fed18 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/index.blade.php
@@ -6,11 +6,49 @@
 
 @section('content')
 
-
     <div class="content">
+
+      <?php $locale = request()->get('locale') ?: null; ?>
+      <?php $channel = request()->get('channel') ?: null; ?>
+
         <div class="page-header">
             <div class="page-title">
                 <h1>{{ __('admin::app.settings.sliders.title') }}</h1>
+
+                <div class="control-group">
+                    <select class="control" id="channel-switcher" name="channel" onchange="reloadPage('channel', this.value)" >
+                        <option value="all" {{ ! isset($channel) ? 'selected' : '' }}>
+                            {{ __('admin::app.admin.system.all-channels') }}
+                        </option>
+
+                        @foreach (core()->getAllChannels() as $channelModel)
+
+                            <option
+                                    value="{{ $channelModel->code }}" {{ (isset($channel) && ($channelModel->code) == $channel) ? 'selected' : '' }}>
+                                {{ $channelModel->name }}
+                            </option>
+
+                        @endforeach
+                    </select>
+                </div>
+
+                <div class="control-group">
+                    <select class="control" id="locale-switcher" name="locale" onchange="reloadPage('locale', this.value)" >
+                        <option value="all" {{ ! isset($locale) ? 'selected' : '' }}>
+                            {{ __('admin::app.admin.system.all-locales') }}
+                        </option>
+
+                        @foreach (core()->getAllLocales() as $localeModel)
+
+                            <option
+                                    value="{{ $localeModel->code }}" {{ (isset($locale) && ($localeModel->code) == $locale) ? 'selected' : '' }}>
+                                {{ $localeModel->name }}
+                            </option>
+
+                        @endforeach
+                    </select>
+                </div>
+
             </div>
 
             <div class="page-action">
@@ -25,4 +63,18 @@
             {!! $sliders->render() !!}
         </div>
     </div>
-@stop
\ No newline at end of file
+@stop
+
+
+@push('scripts')
+    <script>
+
+        function reloadPage(getVar, getVal) {
+            let url = new URL(window.location.href);
+            url.searchParams.set(getVar, getVal);
+
+            window.location.href = url.href;
+        }
+
+    </script>
+@endpush
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Database/Migrations/2020_04_13_224524_add_locale_in_sliders_table.php b/packages/Webkul/Core/src/Database/Migrations/2020_04_13_224524_add_locale_in_sliders_table.php
new file mode 100644
index 000000000..3a6a428c2
--- /dev/null
+++ b/packages/Webkul/Core/src/Database/Migrations/2020_04_13_224524_add_locale_in_sliders_table.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddLocaleInSlidersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('sliders', function (Blueprint $table) {
+            $table->string('locale');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('sliders', function (Blueprint $table) {
+            $table->string('locale');
+        });
+    }
+}
diff --git a/packages/Webkul/Core/src/Http/Controllers/SliderController.php b/packages/Webkul/Core/src/Http/Controllers/SliderController.php
index 997eea8aa..04a0621d9 100755
--- a/packages/Webkul/Core/src/Http/Controllers/SliderController.php
+++ b/packages/Webkul/Core/src/Http/Controllers/SliderController.php
@@ -57,7 +57,9 @@ class SliderController extends Controller
     {
         $channels = core()->getAllChannels();
 
-        return view($this->_config['view']);
+        $locale = request()->get('locale') ?: core()->getCurrentLocale();
+        
+        return view($this->_config['view'])->with("locale", $locale);
     }
 
     /**
diff --git a/packages/Webkul/Core/src/Models/Slider.php b/packages/Webkul/Core/src/Models/Slider.php
index 24815b6a3..923146c1c 100755
--- a/packages/Webkul/Core/src/Models/Slider.php
+++ b/packages/Webkul/Core/src/Models/Slider.php
@@ -20,6 +20,7 @@ class Slider extends Model implements SliderContract
         'path',
         'content',
         'channel_id',
+        'locale'
     ];
 
     /**
diff --git a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php
index f56ad2c30..0aa287cd2 100755
--- a/packages/Webkul/Shop/src/Http/Controllers/HomeController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/HomeController.php
@@ -35,8 +35,14 @@ use Webkul\Core\Repositories\SliderRepository;
     public function index()
     {
         $currentChannel = core()->getCurrentChannel();
-        
-        $sliderData = $this->sliderRepository->findByField('channel_id', $currentChannel->id)->toArray();
+
+        $currentLocale = core()->getCurrentLocale();
+
+        $sliderData = $this->sliderRepository
+          ->where('channel_id', $currentChannel->id)
+          ->where('locale', $currentLocale->code)
+          ->get()
+          ->toArray();
 
         return view($this->_config['view'], compact('sliderData'));
     }

From 6758bc4804e28deb43fffffbe8e60ad64f3c30ec Mon Sep 17 00:00:00 2001
From: Pranshu Tomar <pranshutomar@Pranshus-MacBook-Air.local>
Date: Tue, 14 Apr 2020 12:22:21 +0530
Subject: [PATCH 10/11] Updated changelog

---
 CHANGELOG for v1.x.x.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CHANGELOG for v1.x.x.md b/CHANGELOG for v1.x.x.md
index 5639fdaf5..ef6004129 100644
--- a/CHANGELOG for v1.x.x.md	
+++ b/CHANGELOG for v1.x.x.md	
@@ -12,6 +12,12 @@
 
 * #2329 [fixed] - Getting exception on frontend after updating meta data.
 
+* #2354 [fixed] - possible integrate this payment
+
+* #2543 [fixed] - Sliders Text should be translatable
+
+* #2558 [fixed] - Sliders Text should be translatable
+
 * #2619 [fixed] - Issue when category slug & product slug are same
 
 * #2684 [fixed] - API checkout/cart returns null for guest user
@@ -114,12 +120,20 @@
 
 * #2849 [fixed] - Can not add my stylesheet to Velocity theme
 
+* #2850 [fixed] - admin crash on save configration
+
 * #2851 [fixed] - Fix date picker icon layout at dashboard
 
 * #2856 [fixed] - Issue with Sort by functionality, when open any category it by defaults show Newest First but after changing sort by when again select newest first it shows different product.
 
+* #2865 [fixed] - Save order taking so long time 30s
+
+* #2866 [fixed] - ayout issue when customer save addresses form
+
 * #2871 [fixed] - Refund throws "Undefined index: shipping" error
 
+* #2876 [fixed] - Place order is disable at checkout when select shipping address
+
 
 
 ## **v1.1.0 (24th of March 2020)** - *Release*

From 1d502be93937d1491c69e718f9e9ff9cfacc3f4b Mon Sep 17 00:00:00 2001
From: rahulshukla-home <rahulcs0082@gmail.com>
Date: Wed, 15 Apr 2020 15:11:08 +0530
Subject: [PATCH 11/11] Issue #2890

---
 .../Resources/views/promotions/cart-rules/create.blade.php    | 4 ++--
 .../src/Resources/views/promotions/cart-rules/edit.blade.php  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php
index 087a84a4c..caeef7f04 100644
--- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php
@@ -447,10 +447,10 @@
                                 'operator': '<=',
                                 'label': '{{ __('admin::app.promotions.cart-rules.equals-or-less-than') }}'
                             }, {
-                                'operator': '<=',
+                                'operator': '>',
                                 'label': '{{ __('admin::app.promotions.cart-rules.greater-than') }}'
                             }, {
-                                'operator': '<=',
+                                'operator': '<',
                                 'label': '{{ __('admin::app.promotions.cart-rules.less-than') }}'
                             }],
                         'decimal': [{
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php
index 1decb83af..82c45f2c8 100644
--- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php
@@ -535,10 +535,10 @@
                                 'operator': '<=',
                                 'label': '{{ __('admin::app.promotions.cart-rules.equals-or-less-than') }}'
                             }, {
-                                'operator': '<=',
+                                'operator': '>',
                                 'label': '{{ __('admin::app.promotions.cart-rules.greater-than') }}'
                             }, {
-                                'operator': '<=',
+                                'operator': '<',
                                 'label': '{{ __('admin::app.promotions.cart-rules.less-than') }}'
                             }],
                         'decimal': [{