From 1dc4afc4ee232c94308e60022293b4574f53c242 Mon Sep 17 00:00:00 2001
From: Pranshu Tomar <pranshutomar@Pranshus-MacBook-Air.local>
Date: Wed, 20 May 2020 12:21:16 +0530
Subject: [PATCH] Issue #3095 fixed

---
 packages/Webkul/Shop/src/Resources/lang/ar/app.php             | 3 ++-
 .../Resources/views/customers/account/orders/view.blade.php    | 2 +-
 .../Webkul/Ui/src/Resources/assets/js/directives/alert.vue     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Shop/src/Resources/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
index 13a90fe68..cdbb27044 100644
--- a/packages/Webkul/Shop/src/Resources/lang/ar/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/ar/app.php
@@ -312,7 +312,8 @@ return [
                     'refunds' => 'المسترجع',
                     'individual-refund' => '#:refund_id مسترجع',
                     'adjustment-refund' => 'تعديلات عملية الإسترجاع',
-                    'adjustment-fee' => 'تكلفة تعديلات عملية الإسترجاع'
+                    'adjustment-fee' => 'تكلفة تعديلات عملية الإسترجاع',
+                    'cancel-confirm-msg' => 'هل أنت متأكد من أنك تريد إلغاء هذا الطلب ؟',
                 ]
             ],
 
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 490a58fd9..f14d1673f 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
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)) {