merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2629 from jitendra-webkul/1.0 

Removed static text from shop datagrid
This commit is contained in:
Jitendra Singh 2020-03-11 12:29:42 +05:30 committed by GitHub
parent 5859d8dfc2 6063c113bf
commit 0b946d6d89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 58 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/Webkul/Product/src/Providers/ProductServiceProvider.php
View File

@ -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'
);

14
packages/Webkul/Shop/src/DataGrids/OrderDataGrid.php
View File

@ -61,19 +61,19 @@ class OrderDataGrid extends DataGrid
'closure' => true,
'wrapper' => function ($value) {
if ($value->status == 'processing') {
return '<span class="badge badge-md badge-success">Processing</span>';
return '<span class="badge badge-md badge-success">' . trans('shop::app.customer.account.order.index.processing') . '</span>';
} elseif ($value->status == 'completed') {
return '<span class="badge badge-md badge-success">Completed</span>';
return '<span class="badge badge-md badge-success">' . trans('shop::app.customer.account.order.index.completed') . '</span>';
} elseif ($value->status == "canceled") {
return '<span class="badge badge-md badge-danger">Canceled</span>';
return '<span class="badge badge-md badge-danger">' . trans('shop::app.customer.account.order.index.canceled') . '</span>';
} elseif ($value->status == "closed") {
return '<span class="badge badge-md badge-info">Closed</span>';
return '<span class="badge badge-md badge-info">' . trans('shop::app.customer.account.order.index.closed') . '</span>';
} elseif ($value->status == "pending") {
return '<span class="badge badge-md badge-warning">Pending</span>';
return '<span class="badge badge-md badge-warning">' . trans('shop::app.customer.account.order.index.pending') . '</span>';
} elseif ($value->status == "pending_payment") {
return '<span class="badge badge-md badge-warning">Pending Payment</span>';
return '<span class="badge badge-md badge-warning">' . trans('shop::app.customer.account.order.index.pending-payment') . '</span>';
} elseif ($value->status == "fraud") {
return '<span class="badge badge-md badge-danger">Fraud</span>';
return '<span class="badge badge-md badge-danger">' . trans('shop::app.customer.account.order.index.fraud') . '</span>';
}
},
'filterable' => true,

9
packages/Webkul/Shop/src/Resources/lang/ar/app.php
View File

@ -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' => [

9
packages/Webkul/Shop/src/Resources/lang/en/app.php
View File

@ -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' => [

9
packages/Webkul/Shop/src/Resources/lang/es/app.php
View File

@ -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' => [

9
packages/Webkul/Shop/src/Resources/lang/fa/app.php
View File

@ -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' => [

9
packages/Webkul/Shop/src/Resources/lang/nl/app.php
View File

@ -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' => [

9
packages/Webkul/Shop/src/Resources/lang/pt_BR/app.php
View File

@ -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' => [

2
packages/Webkul/Tax/src/Providers/TaxServiceProvider.php
View File

@ -22,6 +22,6 @@ class TaxServiceProvider extends ServiceProvider
*/
public function register()
{
$this->loadFactoriesFrom(__DIR__ . '/../Database/Factories');
// $this->loadFactoriesFrom(__DIR__ . '/../Database/Factories');
}
}