diff --git a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
index 0a8db6bac..941d9a714 100755
--- a/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/catalog/attributes/edit.blade.php
@@ -429,22 +429,22 @@
                     this.optionRowCount++;
 
                     var row = {
-                            'id': '{{ $option->id }}',
-                            'admin_name': '{{ $option->admin_name }}',
-                            'sort_order': '{{ $option->sort_order }}',
-                            'swatch_value': '{{ $option->swatch_value }}',
-                            'swatch_value_url': '{{ $option->swatch_value_url }}',
+                            'id': @json($option->id),
+                            'admin_name': @json($option->admin_name),
+                            'sort_order': @json($option->sort_order),
+                            'swatch_value': @json($option->swatch_value),
+                            'swatch_value_url': @json($option->swatch_value_url),
                             'notRequired': ''
                         };
 
                     @if (empty($option->label))
                         this.isNullOptionChecked = true;
-                        this.idNullOption = '{{ $option->id }}';
+                        this.idNullOption = @json($option->id);
                         row['notRequired'] = true;
                     @endif
 
                     @foreach (app('Webkul\Core\Repositories\LocaleRepository')->all() as $locale)
-                        row['{{ $locale->code }}'] = "{{ $option->translate($locale->code)['label'] ?? '' }}";
+                        row['{{ $locale->code }}'] = @json($option->translate($locale->code)['label'] ?? '');
                     @endforeach
 
                     this.optionRows.push(row);
diff --git a/packages/Webkul/Shop/src/Resources/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
index 00cb1d30e..f1889495b 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
@@ -313,7 +313,9 @@ return [
                     'individual-refund' => '#:refund_id مسترجع',
                     'adjustment-refund' => 'تعديلات عملية الإسترجاع',
                     'adjustment-fee' => 'تكلفة تعديلات عملية الإسترجاع',
+                    'cancel-confirm-msg' => 'هل أنت متأكد من أنك تريد إلغاء هذا الطلب ؟',
                     'tracking-number' => 'Tracking Number',
+                    'cancel-confirm-msg' => 'هل أنت متأكد أنك تريد إلغاء هذا الطلب ?'
                 ]
             ],
 
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index bb42da80b..9d58783ec 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -315,6 +315,7 @@ return [
                     'adjustment-fee' => 'Adjustment Fee',
                     'cancel-btn-title' => 'Cancel',
                     'tracking-number' => 'Tracking Number',
+                    'cancel-confirm-msg' => 'Are you sure you want to cancel this order ?'
                 ]
             ],
 
diff --git a/packages/Webkul/Shop/src/Resources/lang/es/app.php b/packages/Webkul/Shop/src/Resources/lang/es/app.php
index c02c2017c..15eaf697e 100644
--- a/packages/Webkul/Shop/src/Resources/lang/es/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/es/app.php
@@ -297,6 +297,7 @@ return [
                     'ship-to' => 'Envío a',
                     'contact' => 'Contacto',
                     'tracking-number' => 'Tracking Number',
+                    'cancel-confirm-msg' => 'Estás segura de que deseas cancelar este pedido ?'
                 ]
             ],
 
diff --git a/packages/Webkul/Shop/src/Resources/lang/fa/app.php b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
index 9ea949903..58d2b4103 100644
--- a/packages/Webkul/Shop/src/Resources/lang/fa/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/fa/app.php
@@ -314,6 +314,7 @@ return [
                     'adjustment-refund' => 'بازپرداخت تنظیم',
                     'adjustment-fee' => 'هزینه تنظیم',
                     'tracking-number' => 'Tracking Number',
+                    'cancel-confirm-msg' => 'Are you sure you want to cancel this order ?'
                 ]
             ],
 
diff --git a/packages/Webkul/Shop/src/Resources/lang/it/app.php b/packages/Webkul/Shop/src/Resources/lang/it/app.php
index c4e6c48f8..0ce55e0c4 100644
--- a/packages/Webkul/Shop/src/Resources/lang/it/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/it/app.php
@@ -314,7 +314,8 @@ return [
                     'adjustment-refund' => 'Rimborso',
                     'adjustment-fee' => 'Commissione di rimborso',
                     'cancel-btn-title' => 'Cancella',
-                    'tracking-number' => 'Tracking Number'
+                    'tracking-number' => 'Tracking Number',
+                    'cancel-confirm-msg' => 'Sei sicuro di voler annullare questo ordine ?'
                 ]
             ],
 
diff --git a/packages/Webkul/Shop/src/Resources/lang/ja/app.php b/packages/Webkul/Shop/src/Resources/lang/ja/app.php
index 5a91b0dd5..49dc95224 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ja/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ja/app.php
@@ -293,7 +293,8 @@ return [
                     'individual-refund' => '返金 #:refund_id',
                     'adjustment-refund' => '返金調整',
                     'adjustment-fee' => '調整手数料',
-                    'tracking-number' => 'Tracking Number',
+                    'tracking-number' => '追跡番号',
+                    'cancel-confirm-msg' => 'この注文をキャンセルしてもよろしいですか ?'
                 ]
             ],
 
diff --git a/packages/Webkul/Shop/src/Resources/lang/nl/app.php b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
index b9664bd5d..3e84b9069 100644
--- a/packages/Webkul/Shop/src/Resources/lang/nl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/nl/app.php
@@ -318,7 +318,8 @@ return [
                     'individual-refund' => 'Terugbetaling #:refund_id',
                     'adjustment-refund' => 'Aanpassing restitutie',
                     'adjustment-fee' => 'Aanpassingskosten',
-                    'tracking-number' => 'Tracking Number',
+                    'tracking-number' => 'Volg nummer',
+                    'cancel-confirm-msg' => 'Weet u zeker dat u deze bestelling wilt annuleren ?'
                 ]
             ],
 
diff --git a/packages/Webkul/Shop/src/Resources/lang/pl/app.php b/packages/Webkul/Shop/src/Resources/lang/pl/app.php
index 2313ff7c5..2bc65429c 100644
--- a/packages/Webkul/Shop/src/Resources/lang/pl/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pl/app.php
@@ -313,7 +313,8 @@ return [
                     'adjustment-refund' => 'Wyrównania kosztów zwrotu',
                     'adjustment-fee' => 'Opłata za dostosowanie',
                     'cancel-btn-title' => 'Anuluj',
-                    'tracking-number' => 'Tracking Number',
+                    'tracking-number' => 'numer przesyłki',
+                    'cancel-confirm-msg' => 'Czy na pewno chcesz anulować to zamówienie ?'
                 ]
             ],
 
diff --git a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
index 65e1f9cb7..5c04ccaaf 100755
--- a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
@@ -306,7 +306,8 @@ return [
                     'individual-refund' => 'Refund #:refund_id',
                     'adjustment-refund' => 'Adjustment Refund',
                     'adjustment-fee' => 'Adjustment Fee',
-                    'tracking-number' => 'Tracking Number',
+                    'tracking-number' => 'Numero de rastreio',
+                    'cancel-confirm-msg'  => 'Tem certeza de que deseja cancelar este pedido ?'
                 ]
             ],
 
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 3e810a1a7..4a862cd3a 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
@@ -21,7 +21,7 @@
 
 
                 @if ($order->canCancel())
-                    <a href="{{ route('customer.orders.cancel', $order->id) }}" class="btn btn-lg btn-primary" v-alert:message="'{{ __('admin::app.sales.orders.cancel-confirm-msg') }}'" style="float: right">
+                    <a href="{{ route('customer.orders.cancel', $order->id) }}" class="btn btn-lg btn-primary" v-alert:message="'{{ __('shop::app.customer.account.order.view.cancel-confirm-msg') }}'" style="float: right">
                         {{ __('shop::app.customer.account.order.view.cancel-btn-title') }}
                     </a>
                 @endif
@@ -409,7 +409,7 @@
 
                                                     @if (! $refund->items->count())
                                                         <tr>
-                                                            <td class="empty" colspan="7">{{ __('admin::app.common.no-result-found') }}</td>
+                                                            <td class="empty" colspan="7">{{ __('shop::app.common.no-result-found') }}</td>
                                                         <tr>
                                                     @endif
                                                 </tbody>
diff --git a/packages/Webkul/Ui/src/Resources/assets/js/directives/alert.vue b/packages/Webkul/Ui/src/Resources/assets/js/directives/alert.vue
index 7c7c5fd0b..3fc30763b 100755
--- a/packages/Webkul/Ui/src/Resources/assets/js/directives/alert.vue
+++ b/packages/Webkul/Ui/src/Resources/assets/js/directives/alert.vue
@@ -6,7 +6,7 @@
 
                 var message = "Are your sure you want to perform this action ?";
 
-                if(binding.value && binding.value != '')
+                if (binding.value && binding.value != '')
                     message = binding.value;
 
                 if (confirm(message)) {
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 af23e496f..51c51e3a2 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
@@ -28,7 +28,7 @@
 
                 @if ($order->canCancel())
                     <span class="account-action">
-                        <a href="{{ route('customer.orders.cancel', $order->id) }}" class="theme-btn light unset pull-right" v-alert:message="'{{ __('admin::app.sales.orders.cancel-confirm-msg') }}'" style="float: right">
+                        <a href="{{ route('customer.orders.cancel', $order->id) }}" class="theme-btn light unset pull-right" v-alert:message="'{{ __('shop::app.customer.account.order.view.cancel-confirm-msg') }}'" style="float: right">
                             {{ __('shop::app.customer.account.order.view.cancel-btn-title') }}
                         </a>
                     </span>
@@ -428,7 +428,7 @@
 
                                                     @if (! $refund->items->count())
                                                         <tr>
-                                                            <td class="empty" colspan="7">{{ __('admin::app.common.no-result-found') }}</td>
+                                                            <td class="empty" colspan="7">{{ __('shop::app.common.no-result-found') }}</td>
                                                         <tr>
                                                     @endif
                                                 </tbody>