From 41a78c87b3f06f4bffce84dc2f92bd19b823a579 Mon Sep 17 00:00:00 2001
From: jitendra <jitendra@webkul.com>
Date: Fri, 11 Oct 2019 12:18:19 +0530
Subject: [PATCH] Issue #1587 fixed

---
 .../Shop/src/DataGrids/DownloadableProductDataGrid.php     | 7 ++++---
 packages/Webkul/Shop/src/DataGrids/OrderDataGrid.php       | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Shop/src/DataGrids/DownloadableProductDataGrid.php b/packages/Webkul/Shop/src/DataGrids/DownloadableProductDataGrid.php
index 88a5920ce..232a59b42 100644
--- a/packages/Webkul/Shop/src/DataGrids/DownloadableProductDataGrid.php
+++ b/packages/Webkul/Shop/src/DataGrids/DownloadableProductDataGrid.php
@@ -20,9 +20,10 @@ class DownloadableProductDataGrid extends DataGrid
     public function prepareQueryBuilder()
     {
         $queryBuilder = DB::table('downloadable_link_purchased')
-                ->addSelect('downloadable_link_purchased.*')
+                ->leftJoin('orders', 'downloadable_link_purchased.order_id', '=', 'orders.id')
+                ->addSelect('downloadable_link_purchased.*', 'orders.increment_id')
                 ->addSelect(DB::raw('(downloadable_link_purchased.download_bought - downloadable_link_purchased.download_used) as remaining_downloads'))
-                ->where('customer_id', auth()->guard('customer')->user()->id);
+                ->where('downloadable_link_purchased.customer_id', auth()->guard('customer')->user()->id);
 
         $this->setQueryBuilder($queryBuilder);
     }
@@ -30,7 +31,7 @@ class DownloadableProductDataGrid extends DataGrid
     public function addColumns()
     {
         $this->addColumn([
-            'index' => 'order_id',
+            'index' => 'increment_id',
             'label' => trans('shop::app.customer.account.downloadable_products.order-id'),
             'type' => 'number',
             'searchable' => false,
diff --git a/packages/Webkul/Shop/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Shop/src/DataGrids/OrderDataGrid.php
index 847098bab..634c1e609 100644
--- a/packages/Webkul/Shop/src/DataGrids/OrderDataGrid.php
+++ b/packages/Webkul/Shop/src/DataGrids/OrderDataGrid.php
@@ -20,7 +20,7 @@ class OrderDataGrid extends DataGrid
     public function prepareQueryBuilder()
     {
         $queryBuilder = DB::table('orders as order')
-                ->addSelect('order.id','order.increment_id', 'order.status', 'order.created_at', 'order.grand_total', 'order.order_currency_code')
+                ->addSelect('order.id', 'order.increment_id', 'order.status', 'order.created_at', 'order.grand_total', 'order.order_currency_code')
                 ->where('customer_id', auth()->guard('customer')->user()->id);
 
         $this->setQueryBuilder($queryBuilder);