From abcc1f1aad44b262c075b15d2f9cafb84f671f1b Mon Sep 17 00:00:00 2001 From: Akhtar Khan Date: Fri, 21 Jan 2022 16:15:39 +0530 Subject: [PATCH 1/2] =?UTF-8?q?=C2=96Fixed=20Download=20product=20issue=20?= =?UTF-8?q?#5663?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/Http/Controllers/DownloadableProductController.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/Webkul/Shop/src/Http/Controllers/DownloadableProductController.php b/packages/Webkul/Shop/src/Http/Controllers/DownloadableProductController.php index 7652bb4ec..b78082b21 100644 --- a/packages/Webkul/Shop/src/Http/Controllers/DownloadableProductController.php +++ b/packages/Webkul/Shop/src/Http/Controllers/DownloadableProductController.php @@ -65,6 +65,9 @@ class DownloadableProductController extends Controller } } + $orderedQty = $downloadableLinkPurchased->order->total_qty_ordered; + $totalInvoiceQty = $totalInvoiceQty * ($downloadableLinkPurchased->download_bought / $orderedQty); + if ($downloadableLinkPurchased->download_used == $totalInvoiceQty || $downloadableLinkPurchased->download_used > $totalInvoiceQty) { session()->flash('warning', trans('shop::app.customer.account.downloadable_products.payment-error')); From 33b422b29c46c2654aeec1c74e36f84911dfb83a Mon Sep 17 00:00:00 2001 From: Akhtar Khan Date: Tue, 25 Jan 2022 10:47:31 +0530 Subject: [PATCH 2/2] resolve issue of downloadable product when it gets cancelled #5663 --- .../src/Repositories/DownloadableLinkPurchasedRepository.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php b/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php index 9036e8758..af88726dd 100644 --- a/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php +++ b/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php @@ -106,6 +106,9 @@ class DownloadableLinkPurchasedRepository extends Repository $totalInvoiceQty = $totalInvoiceQty + $invoice_item->qty; } + $orderedQty = $purchasedLink->order_item->qty_ordered; + $totalInvoiceQty = $totalInvoiceQty * ($purchasedLink->download_bought / $orderedQty); + $this->update([ 'status' => $purchasedLink->download_used == $totalInvoiceQty ? $status : $purchasedLink->status, 'download_canceled' => $purchasedLink->download_bought - $totalInvoiceQty,