From 6063c113bf4304881020644d300dd4a677de5a3f Mon Sep 17 00:00:00 2001 From: Jitendra Singh Date: Wed, 11 Mar 2020 12:15:03 +0530 Subject: [PATCH 01/14] Removed static text from shop datagrid --- .../src/Providers/ProductServiceProvider.php | 3 ++- .../Webkul/Shop/src/DataGrids/OrderDataGrid.php | 14 +++++++------- packages/Webkul/Shop/src/Resources/lang/ar/app.php | 9 ++++++++- packages/Webkul/Shop/src/Resources/lang/en/app.php | 9 ++++++++- packages/Webkul/Shop/src/Resources/lang/es/app.php | 9 ++++++++- packages/Webkul/Shop/src/Resources/lang/fa/app.php | 9 ++++++++- packages/Webkul/Shop/src/Resources/lang/nl/app.php | 9 ++++++++- .../Webkul/Shop/src/Resources/lang/pt_BR/app.php | 9 ++++++++- .../Tax/src/Providers/TaxServiceProvider.php | 2 +- 9 files changed, 58 insertions(+), 15 deletions(-) diff --git a/packages/Webkul/Product/src/Providers/ProductServiceProvider.php b/packages/Webkul/Product/src/Providers/ProductServiceProvider.php index 8f8d6a769..32343eb37 100755 --- a/packages/Webkul/Product/src/Providers/ProductServiceProvider.php +++ b/packages/Webkul/Product/src/Providers/ProductServiceProvider.php @@ -49,7 +49,8 @@ class ProductServiceProvider extends ServiceProvider * * @return void */ - public function registerConfig(): void { + public function registerConfig(): void + { $this->mergeConfigFrom( dirname(__DIR__) . '/Config/product_types.php', 'product_types' ); diff --git a/packages/Webkul/Shop/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Shop/src/DataGrids/OrderDataGrid.php index 618879806..a3aca986c 100644 --- a/packages/Webkul/Shop/src/DataGrids/OrderDataGrid.php +++ b/packages/Webkul/Shop/src/DataGrids/OrderDataGrid.php @@ -61,19 +61,19 @@ class OrderDataGrid extends DataGrid 'closure' => true, 'wrapper' => function ($value) { if ($value->status == 'processing') { - return 'Processing'; + return '' . trans('shop::app.customer.account.order.index.processing') . ''; } elseif ($value->status == 'completed') { - return 'Completed'; + return '' . trans('shop::app.customer.account.order.index.completed') . ''; } elseif ($value->status == "canceled") { - return 'Canceled'; + return '' . trans('shop::app.customer.account.order.index.canceled') . ''; } elseif ($value->status == "closed") { - return 'Closed'; + return '' . trans('shop::app.customer.account.order.index.closed') . ''; } elseif ($value->status == "pending") { - return 'Pending'; + return '' . trans('shop::app.customer.account.order.index.pending') . ''; } elseif ($value->status == "pending_payment") { - return 'Pending Payment'; + return '' . trans('shop::app.customer.account.order.index.pending-payment') . ''; } elseif ($value->status == "fraud") { - return 'Fraud'; + return '' . trans('shop::app.customer.account.order.index.fraud') . ''; } }, 'filterable' => true, diff --git a/packages/Webkul/Shop/src/Resources/lang/ar/app.php b/packages/Webkul/Shop/src/Resources/lang/ar/app.php index 8bc5869a6..516f969b3 100644 --- a/packages/Webkul/Shop/src/Resources/lang/ar/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/ar/app.php @@ -243,7 +243,14 @@ return [ 'order_id' => 'ترتيب', 'date' => 'التاريخ', 'status' => 'الحالة', - 'total' => 'المجموع' + 'total' => 'المجموع', + 'processing' => 'Processing', + 'completed' => 'Completed', + 'canceled' => 'Canceled', + 'closed' => 'Closed', + 'pending' => 'Pending', + 'pending-payment' => 'Pending Payment', + 'fraud' => 'Fraud' ], 'view' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php index 3744f7c28..32f5428cb 100755 --- a/packages/Webkul/Shop/src/Resources/lang/en/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php @@ -267,7 +267,14 @@ return [ 'date' => 'Date', 'status' => 'Status', 'total' => 'Total', - 'order_number' => 'Order Number' + 'order_number' => 'Order Number', + 'processing' => 'Processing', + 'completed' => 'Completed', + 'canceled' => 'Canceled', + 'closed' => 'Closed', + 'pending' => 'Pending', + 'pending-payment' => 'Pending Payment', + 'fraud' => 'Fraud' ], 'view' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/es/app.php b/packages/Webkul/Shop/src/Resources/lang/es/app.php index 8e278a306..5951a8f39 100644 --- a/packages/Webkul/Shop/src/Resources/lang/es/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/es/app.php @@ -245,7 +245,14 @@ return [ 'date' => 'Fecha', 'status' => 'Estado', 'total' => 'Total', - 'order_number' => 'Número de pedido' + 'order_number' => 'Número de pedido', + 'processing' => 'Processing', + 'completed' => 'Completed', + 'canceled' => 'Canceled', + 'closed' => 'Closed', + 'pending' => 'Pending', + 'pending-payment' => 'Pending Payment', + 'fraud' => 'Fraud' ], 'view' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/fa/app.php b/packages/Webkul/Shop/src/Resources/lang/fa/app.php index 7b93dcbcc..a61d15cd6 100644 --- a/packages/Webkul/Shop/src/Resources/lang/fa/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/fa/app.php @@ -245,7 +245,14 @@ return [ 'order_id' => 'شماره سفارش', 'date' => 'تاریخ', 'status' => 'وضعیت', - 'total' => 'جمع' + 'total' => 'جمع', + 'processing' => 'Processing', + 'completed' => 'Completed', + 'canceled' => 'Canceled', + 'closed' => 'Closed', + 'pending' => 'Pending', + 'pending-payment' => 'Pending Payment', + 'fraud' => 'Fraud' ], 'view' => [ diff --git a/packages/Webkul/Shop/src/Resources/lang/nl/app.php b/packages/Webkul/Shop/src/Resources/lang/nl/app.php index f04ae1896..17eee1857 100644 --- a/packages/Webkul/Shop/src/Resources/lang/nl/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/nl/app.php @@ -262,7 +262,14 @@ return [ 'date' => 'Datum', 'status' => 'Status', 'total' => 'Totaal', - 'order_number' => 'Bestelnummer' + 'order_number' => 'Bestelnummer', + 'processing' => 'Processing', + 'completed' => 'Completed', + 'canceled' => 'Canceled', + 'closed' => 'Closed', + 'pending' => 'Pending', + 'pending-payment' => 'Pending Payment', + 'fraud' => 'Fraud' ], 'view' => [ 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 42b981e65..525e035e8 100755 --- a/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php +++ b/packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php @@ -244,7 +244,14 @@ return [ 'order_id' => 'Pedido ID', 'date' => 'Data', 'status' => 'Status', - 'total' => 'Total' + 'total' => 'Total', + 'processing' => 'Processing', + 'completed' => 'Completed', + 'canceled' => 'Canceled', + 'closed' => 'Closed', + 'pending' => 'Pending', + 'pending-payment' => 'Pending Payment', + 'fraud' => 'Fraud' ], 'view' => [ diff --git a/packages/Webkul/Tax/src/Providers/TaxServiceProvider.php b/packages/Webkul/Tax/src/Providers/TaxServiceProvider.php index 181258405..227b4f47c 100755 --- a/packages/Webkul/Tax/src/Providers/TaxServiceProvider.php +++ b/packages/Webkul/Tax/src/Providers/TaxServiceProvider.php @@ -22,6 +22,6 @@ class TaxServiceProvider extends ServiceProvider */ public function register() { - $this->loadFactoriesFrom(__DIR__ . '/../Database/Factories'); + // $this->loadFactoriesFrom(__DIR__ . '/../Database/Factories'); } } \ No newline at end of file From 65b5ec92327d66727dec2047fc2f0836e3730e2b Mon Sep 17 00:00:00 2001 From: Annika Wolff Date: Wed, 11 Mar 2020 10:45:18 +0100 Subject: [PATCH 02/14] bugfix: show multiple flash messages in admin panel --- .../src/Resources/views/layouts/master.blade.php | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php index 352d70598..86512323a 100755 --- a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php @@ -55,15 +55,11 @@