From 5099687ebf56a15974a6c61ae17d0bf956792796 Mon Sep 17 00:00:00 2001 From: rahulshukla-home Date: Mon, 18 May 2020 18:47:00 +0530 Subject: [PATCH] Issue #3079 --- packages/Webkul/Shop/src/Resources/lang/ar/app.php | 3 ++- packages/Webkul/Shop/src/Resources/lang/en/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/es/app.php | 3 ++- packages/Webkul/Shop/src/Resources/lang/fa/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/it/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/ja/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/nl/app.php | 1 + packages/Webkul/Shop/src/Resources/lang/pl/app.php | 1 + .../Webkul/Shop/src/Resources/lang/pt_BR/app.php | 1 + .../views/customers/account/orders/view.blade.php | 14 ++++++++++++++ .../shop/customers/account/orders/view.blade.php | 14 ++++++++++++++ 11 files changed, 39 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Shop/src/Resources/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php index a8e396832..2112a00a9 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' => 'تكلفة تعديلات عملية الإسترجاع', + 'tracking-number' => 'Tracking Number', ] ], diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index 64b5dc703..7281653f3 100755 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -314,6 +314,7 @@ return [ 'adjustment-refund' => 'Adjustment Refund', 'adjustment-fee' => 'Adjustment Fee', 'cancel-btn-title' => 'Cancel', + 'tracking-number' => 'Tracking Number', ] ], diff --git a/packages/Webkul/Shop/src/Resources/lang/es/app.php b/packages/Webkul/Shop/src/Resources/lang/es/app.php index f9e89b018..410c5baf6 100644 --- a/packages/Webkul/Shop/src/Resources/lang/es/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/es/app.php @@ -295,7 +295,8 @@ return [ 'order-date' => 'Fecha pedido', 'bill-to' => 'Facturar a', 'ship-to' => 'Envío a', - 'contact' => 'Contacto' + 'contact' => 'Contacto', + 'tracking-number' => 'Tracking Number', ] ], diff --git a/packages/Webkul/Shop/src/Resources/lang/fa/app.php b/packages/Webkul/Shop/src/Resources/lang/fa/app.php index f1091c5f8..ae9039e54 100644 --- a/packages/Webkul/Shop/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/fa/app.php @@ -313,6 +313,7 @@ return [ 'individual-refund' => '#:refund_id بازپرداخت', 'adjustment-refund' => 'بازپرداخت تنظیم', 'adjustment-fee' => 'هزینه تنظیم', + 'tracking-number' => 'Tracking Number', ] ], diff --git a/packages/Webkul/Shop/src/Resources/lang/it/app.php b/packages/Webkul/Shop/src/Resources/lang/it/app.php index 838521f48..c4e6c48f8 100644 --- a/packages/Webkul/Shop/src/Resources/lang/it/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/it/app.php @@ -314,6 +314,7 @@ return [ 'adjustment-refund' => 'Rimborso', 'adjustment-fee' => 'Commissione di rimborso', 'cancel-btn-title' => 'Cancella', + 'tracking-number' => 'Tracking Number' ] ], diff --git a/packages/Webkul/Shop/src/Resources/lang/ja/app.php b/packages/Webkul/Shop/src/Resources/lang/ja/app.php index 7f524a5b7..5a91b0dd5 100644 --- a/packages/Webkul/Shop/src/Resources/lang/ja/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/ja/app.php @@ -293,6 +293,7 @@ return [ 'individual-refund' => '返金 #:refund_id', 'adjustment-refund' => '返金調整', 'adjustment-fee' => '調整手数料', + 'tracking-number' => 'Tracking Number', ] ], diff --git a/packages/Webkul/Shop/src/Resources/lang/nl/app.php b/packages/Webkul/Shop/src/Resources/lang/nl/app.php index 5a66d05d4..dacd2e089 100644 --- a/packages/Webkul/Shop/src/Resources/lang/nl/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/nl/app.php @@ -318,6 +318,7 @@ return [ 'individual-refund' => 'Terugbetaling #:refund_id', 'adjustment-refund' => 'Aanpassing restitutie', 'adjustment-fee' => 'Aanpassingskosten', + 'tracking-number' => 'Tracking Number', ] ], diff --git a/packages/Webkul/Shop/src/Resources/lang/pl/app.php b/packages/Webkul/Shop/src/Resources/lang/pl/app.php index 781ab6b90..2313ff7c5 100644 --- a/packages/Webkul/Shop/src/Resources/lang/pl/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/pl/app.php @@ -313,6 +313,7 @@ return [ 'adjustment-refund' => 'Wyrównania kosztów zwrotu', 'adjustment-fee' => 'Opłata za dostosowanie', 'cancel-btn-title' => 'Anuluj', + 'tracking-number' => 'Tracking Number', ] ], 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 a039f706a..bb8a4e055 100755 --- a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php @@ -306,6 +306,7 @@ return [ 'individual-refund' => 'Refund #:refund_id', 'adjustment-refund' => 'Adjustment Refund', 'adjustment-fee' => 'Adjustment Fee', + 'tracking-number' => 'Tracking Number', ] ], 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..3e810a1a7 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 @@ -314,6 +314,20 @@ @foreach ($order->shipments as $shipment) +
+
+
+ + {{ __('shop::app.customer.account.order.view.tracking-number') }} + + + + {{ $shipment->track_number }} + +
+
+
+
{{ __('shop::app.customer.account.order.view.individual-shipment', ['shipment_id' => $shipment->id]) }} 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 12ddce006..af23e496f 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 @@ -333,6 +333,20 @@ @foreach ($order->shipments as $shipment) +
+
+
+ + + + {{ $shipment->track_number }} + +
+
+
+
{{ __('shop::app.customer.account.order.view.individual-shipment', ['shipment_id' => $shipment->id]) }}