diff --git a/packages/Sarga/Admin/src/DataGrids/OrderDataGrid.php b/packages/Sarga/Admin/src/DataGrids/OrderDataGrid.php index 7c5220ffd..2ff1a7cba 100644 --- a/packages/Sarga/Admin/src/DataGrids/OrderDataGrid.php +++ b/packages/Sarga/Admin/src/DataGrids/OrderDataGrid.php @@ -126,6 +126,10 @@ class OrderDataGrid extends DataGrid return '' . trans('admin::app.sales.orders.order-status-pending-payment') . ''; } elseif ($value->status == 'fraud') { return '' . trans('admin::app.sales.orders.order-status-fraud') . ''; + } elseif ($value->status == 'purchasing'){ + return '' . trans('sarga::app.sales.orders.order-status-purchasing') . ''; + }elseif ($value->status == 'shipping'){ + return '' . trans('sarga::app.sales.orders.order-status-shipping') . ''; } }, ]); diff --git a/packages/Sarga/Admin/src/Resources/lang/en/app.php b/packages/Sarga/Admin/src/Resources/lang/en/app.php index 640a8781d..aa4ef0434 100644 --- a/packages/Sarga/Admin/src/Resources/lang/en/app.php +++ b/packages/Sarga/Admin/src/Resources/lang/en/app.php @@ -27,6 +27,8 @@ return [ 'order-status-pending-payment' => 'Pending Payment', 'order-status-processing' => 'Processing', 'order-status-success' => 'Completed', + 'order-status-purchasing' => 'Purchasing', + 'order-status-shipping' => 'Shipping', 'channel' => 'Channel', 'customer-name' => 'Customer Name', 'email' => 'Email', @@ -207,5 +209,32 @@ return [ 'title' => 'Scrap', 'trendyol' => 'Trendyol', ] - ] + ], + 'notification' => [ + 'notification-title' => 'Notification', + 'title-plural' => 'Notifications', + 'status' => [ + 'all' => 'All', + 'pending' => 'Pending', + 'processing' => 'Processing', + 'canceled' => 'Canceled', + 'closed' => 'Closed', + 'completed' => 'Completed', + ], + 'view-all' => 'View All Notifications', + 'no-record' => 'No Record Found', + 'read-all' => 'Mark as Read', + 'notification-marked-success' => 'Notification Marked Successfully', + 'order-status-messages' => [ + 'completed' => 'Order Completed', + 'closed' => 'Order Closed', + 'canceled' => 'Order Canceled', + 'pending' => 'Order Pending', + 'processing' => 'Order Processing', + 'pending_payment' => 'Pending Payment', + 'purchasing' => "Purchasing", + 'shipping' => "Shipping" + ], + ], + ]; diff --git a/packages/Sarga/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Sarga/Admin/src/Resources/views/sales/orders/view.blade.php index aba1ac6b6..8b8ef8dd0 100644 --- a/packages/Sarga/Admin/src/Resources/views/sales/orders/view.blade.php +++ b/packages/Sarga/Admin/src/Resources/views/sales/orders/view.blade.php @@ -96,7 +96,7 @@ - {{ __('admin::app.notification.order-status-messages.'.strtolower($order->status_label)) }} + {{ __('sarga::app.notification.order-status-messages.'.strtolower($order->status_label)) }}