merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1601 from jitendra-webkul/jitendra 

Issue #1587 fixed
This commit is contained in:
Jitendra Singh 2019-10-11 12:19:02 +05:30 committed by GitHub
parent f8f7df4125 41a78c87b3
commit d184c375cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/Webkul/Shop/src/DataGrids/DownloadableProductDataGrid.php
View File

@ -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,

2
packages/Webkul/Shop/src/DataGrids/OrderDataGrid.php
View File

@ -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);