From 9fd5ff7f47a155db95a6a86c0a46d71e6ac76ee4 Mon Sep 17 00:00:00 2001 From: Annika Wolff Date: Fri, 27 Dec 2019 10:03:01 +0100 Subject: [PATCH] small refactor on checks if downloadable product --- packages/Webkul/Checkout/src/Models/Cart.php | 5 +++-- .../src/Repositories/DownloadableLinkPurchasedRepository.php | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/Webkul/Checkout/src/Models/Cart.php b/packages/Webkul/Checkout/src/Models/Cart.php index 01cddea2b..2c040496c 100755 --- a/packages/Webkul/Checkout/src/Models/Cart.php +++ b/packages/Webkul/Checkout/src/Models/Cart.php @@ -118,15 +118,16 @@ class Cart extends Model implements CartContract } /** - * Checks if cart have downloadable items + * Checks if cart has downloadable items * * @return boolean */ public function haveDownloadableItems() { foreach ($this->items as $item) { - if ($item->type == 'downloadable') + if (stristr($item->type,'downloadable') !== false) { return true; + } } return false; diff --git a/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php b/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php index 204798d43..ac3a901b5 100644 --- a/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php +++ b/packages/Webkul/Sales/src/Repositories/DownloadableLinkPurchasedRepository.php @@ -55,7 +55,7 @@ class DownloadableLinkPurchasedRepository extends Repository */ public function saveLinks($orderItem) { - if (! $this->isDownloadableProduct($orderItem)) { + if (! $this->isValidDownloadableProduct($orderItem)) { return; } @@ -85,7 +85,7 @@ class DownloadableLinkPurchasedRepository extends Repository * @param mixed $orderItem Webkul\Sales\Models\OrderItem; * @return bool */ - private function isDownloadableProduct($orderItem) : bool { + private function isValidDownloadableProduct($orderItem) : bool { if (stristr($orderItem->type,'downloadable') !== false && isset($orderItem->additional['links'])) { return true; }