diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php index 65e0b823e..ff11441ea 100644 --- a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php @@ -77,7 +77,7 @@ class AttributeDataGrid 'name' => 'admin_name', 'alias' => 'attributeAdminName', 'type' => 'string', - 'label' => 'AdminName', + 'label' => 'Name', 'sortable' => true, ], [ diff --git a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php index 1429b7407..6846f4c8e 100644 --- a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php @@ -93,26 +93,6 @@ class OrderShipmentsDataGrid 'type' => 'date', 'label' => 'Order Date', 'sortable' => true - ], [ - 'name' => 'ship.status', - 'alias' => 'shipstatus', - 'type' => 'string', - 'label' => 'Status', - 'sortable' => true, - 'wrapper' => function ($value) { - if($value == 'processing') - return 'Processing'; - else if($value == 'completed') - return 'Completed'; - else if($value == "canceled") - return 'Canceled'; - else if($value == "closed") - return 'Closed'; - else if($value == "pending") - return 'Pending'; - else - return 'Un-Attended'; - }, ], [ 'name' => 'ship.created_at', 'alias' => 'ship_date',