diff --git a/packages/Webkul/Shop/src/DataGrids/DownloadableProductDataGrid.php b/packages/Webkul/Shop/src/DataGrids/DownloadableProductDataGrid.php index ed723c068..5677d8735 100644 --- a/packages/Webkul/Shop/src/DataGrids/DownloadableProductDataGrid.php +++ b/packages/Webkul/Shop/src/DataGrids/DownloadableProductDataGrid.php @@ -15,9 +15,11 @@ class DownloadableProductDataGrid extends DataGrid { $queryBuilder = DB::table('downloadable_link_purchased') ->leftJoin('orders', 'downloadable_link_purchased.order_id', '=', 'orders.id') - ->addSelect('downloadable_link_purchased.*', 'orders.increment_id') + ->leftJoin('invoices', 'downloadable_link_purchased.order_id', '=', 'invoices.order_id') + ->addSelect('downloadable_link_purchased.*', 'invoices.state', 'orders.increment_id') ->addSelect(DB::raw('(' . DB::getTablePrefix() . 'downloadable_link_purchased.download_bought - ' . DB::getTablePrefix() . 'downloadable_link_purchased.download_used) as remaining_downloads')) - ->where('downloadable_link_purchased.customer_id', auth()->guard('customer')->user()->id); + ->where('downloadable_link_purchased.customer_id', auth()->guard('customer')->user()->id) + ->where('invoices.state', 'paid'); $this->addFilter('status', 'downloadable_link_purchased.status'); $this->addFilter('created_at', 'downloadable_link_purchased.created_at');