From 765cd5dab6ae50c54bbe5aa3392decc9d64b714c Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Thu, 4 Feb 2021 17:05:32 +0530
Subject: [PATCH] missing conditions adeded

---
 .../src/Repositories/DownloadableLinkPurchasedRepository.php  | 1 +
 .../src/Http/Controllers/DownloadableProductController.php    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php b/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php
index 9bec3c655..9036e8758 100644
--- a/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php
+++ b/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php
@@ -107,6 +107,7 @@ class DownloadableLinkPurchasedRepository extends Repository
                     }
 
                     $this->update([
+                        'status' => $purchasedLink->download_used == $totalInvoiceQty ? $status : $purchasedLink->status,
                         'download_canceled' => $purchasedLink->download_bought - $totalInvoiceQty,
                     ], $purchasedLink->id);
                 } else {
diff --git a/packages/Webkul/Shop/src/Http/Controllers/DownloadableProductController.php b/packages/Webkul/Shop/src/Http/Controllers/DownloadableProductController.php
index fcb0dd935..951d369ed 100644
--- a/packages/Webkul/Shop/src/Http/Controllers/DownloadableProductController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/DownloadableProductController.php
@@ -72,14 +72,14 @@ class DownloadableProductController extends Controller
         }
 
         if ($downloadableLinkPurchased->download_bought
-            && ($downloadableLinkPurchased->download_bought - $downloadableLinkPurchased->download_used) <= 0) {
+            && ($downloadableLinkPurchased->download_bought - ($downloadableLinkPurchased->download_used + $downloadableLinkPurchased->download_canceled)) <= 0) {
 
             session()->flash('warning', trans('shop::app.customer.account.downloadable_products.download-error'));
 
             return redirect()->route('customer.downloadable_products.index');
         }
 
-        $remainingDownloads = $downloadableLinkPurchased->download_bought - ($downloadableLinkPurchased->download_used + 1);
+        $remainingDownloads = $downloadableLinkPurchased->download_bought - ($downloadableLinkPurchased->download_used + $downloadableLinkPurchased->download_canceled + 1);
 
         if ($downloadableLinkPurchased->download_bought) {
             $this->downloadableLinkPurchasedRepository->update([