From 51f0eec90810616835fc79a54deed70acaaaaac6 Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Sat, 29 Jun 2019 11:05:58 +0530 Subject: [PATCH] Added column in preorder datagrid and corrected the spelling in customer document --- packages/Webkul/CustomerDocument/src/Resources/lang/en/app.php | 2 +- packages/Webkul/SAASPreOrder/src/DataGrids/Admin/PreOrder.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/Webkul/CustomerDocument/src/Resources/lang/en/app.php b/packages/Webkul/CustomerDocument/src/Resources/lang/en/app.php index 607646353..d51a82581 100644 --- a/packages/Webkul/CustomerDocument/src/Resources/lang/en/app.php +++ b/packages/Webkul/CustomerDocument/src/Resources/lang/en/app.php @@ -30,7 +30,7 @@ return [ 'type' => 'Type', 'status' => 'Status', 'active' => 'Active', - 'in-active' => 'Inacvtive', + 'in-active' => 'Inactive', 'product' => 'Product', 'marketing' => 'Marketing', 'add-document' => 'Add Document', diff --git a/packages/Webkul/SAASPreOrder/src/DataGrids/Admin/PreOrder.php b/packages/Webkul/SAASPreOrder/src/DataGrids/Admin/PreOrder.php index bb3697aac..57006b6cf 100644 --- a/packages/Webkul/SAASPreOrder/src/DataGrids/Admin/PreOrder.php +++ b/packages/Webkul/SAASPreOrder/src/DataGrids/Admin/PreOrder.php @@ -28,6 +28,7 @@ class PreOrder extends DataGrid $this->addFilter('id', 'pre_order_items.id'); $this->addFilter('status', 'pre_order_items.status'); + $this->addFilter('order_id', 'pre_order_items.order_id'); $this->addFilter('payment_order_id', 'payment_order_items.order_id'); $this->addFilter('product_name', 'order_items.name'); $this->addFilter('customer_name', DB::raw('CONCAT(orders.customer_first_name, " ", orders.customer_last_name)'));