From 61da74ee2bcb7b71635272d052a000bfd2cfd064 Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Thu, 12 Sep 2019 16:25:51 +0530
Subject: [PATCH] Issue #1447

---
 .../Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php | 9 ++++++++-
 .../Admin/src/DataGrids/OrderShipmentsDataGrid.php       | 2 +-
 .../src/Resources/views/sales/invoices/pdf.blade.php     | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php
index ae11bfa55..dd68697ad 100755
--- a/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/OrderInvoicesDataGrid.php
@@ -19,7 +19,14 @@ class OrderInvoicesDataGrid extends DataGrid
 
     public function prepareQueryBuilder()
     {
-        $queryBuilder = DB::table('invoices')->select('id', 'order_id', 'state', 'base_grand_total', 'created_at');
+        $queryBuilder = DB::table('invoices')
+                        ->leftJoin('orders as ors', 'invoices.order_id', '=', 'ors.id')
+                        ->select('invoices.id as id', 'ors.increment_id as order_id', 'invoices.state as state', 'invoices.base_grand_total as base_grand_total', 'invoices.created_at as created_at');
+
+        $this->addFilter('id', 'invoices.id');
+        $this->addFilter('order_id', 'ors.increment_id');
+        $this->addFilter('base_grand_total', 'invoices.base_grand_total');
+        $this->addFilter('invoices.created_at', 'invoices.created_at');
 
         $this->setQueryBuilder($queryBuilder);
     }
diff --git a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php
index 55eeb9423..0a82d8706 100755
--- a/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/OrderShipmentsDataGrid.php
@@ -26,7 +26,7 @@ class OrderShipmentsDataGrid extends DataGrid
                 })
                 ->leftJoin('orders as ors', 'shipments.order_id', '=', 'ors.id')
                 ->leftJoin('inventory_sources as is', 'shipments.inventory_source_id', '=', 'is.id')
-                ->select('shipments.id as shipment_id', 'shipments.order_id as shipment_order_id', 'shipments.total_qty as shipment_total_qty', 'is.name as inventory_source_name', 'ors.created_at as order_date', 'shipments.created_at as shipment_created_at')
+                ->select('shipments.id as shipment_id', 'ors.increment_id as shipment_order_id', 'shipments.total_qty as shipment_total_qty', 'is.name as inventory_source_name', 'ors.created_at as order_date', 'shipments.created_at as shipment_created_at')
                 ->addSelect(DB::raw('CONCAT(order_address_shipping.first_name, " ", order_address_shipping.last_name) as shipped_to'));
 
         $this->addFilter('shipment_id', 'shipments.id');
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php
index efed8f233..ab7e1c401 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php
@@ -90,7 +90,7 @@
 
                 <div class="row">
                     <span class="label">{{ __('admin::app.sales.invoices.order-id') }} -</span>
-                    <span class="value">#{{ $invoice->order_id }}</span>
+                    <span class="value">#{{ $invoice->order->increment_id }}</span>
                 </div>
 
                 <div class="row">