From e4f7c8bb771c8cff1e8cf350e704a6b715c2266f Mon Sep 17 00:00:00 2001 From: Glenn Hermans Date: Thu, 19 Aug 2021 21:39:07 +0200 Subject: [PATCH 1/2] temp fix #5041 --- packages/Webkul/Sales/src/Models/Order.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/Webkul/Sales/src/Models/Order.php b/packages/Webkul/Sales/src/Models/Order.php index 9e39f9803..60582b017 100755 --- a/packages/Webkul/Sales/src/Models/Order.php +++ b/packages/Webkul/Sales/src/Models/Order.php @@ -261,6 +261,14 @@ class Order extends Model implements OrderContract */ public function canCancel(): bool { + if ($this->status == 'cashondelivery' && core()->getConfigData('sales.paymentmethods.cashondelivery.generate_invoice')) { + return false; + } + + if ($this->status == 'moneytransfer' && core()->getConfigData('sales.paymentmethods.moneytransfer.generate_invoice')) { + return false; + } + if ($this->status === self::STATUS_FRAUD) { return false; } From 18dcaf5763430fc0b6fd691ebec8e201047c0668 Mon Sep 17 00:00:00 2001 From: Glenn Hermans Date: Thu, 19 Aug 2021 23:14:48 +0200 Subject: [PATCH 2/2] fixed typo --- packages/Webkul/Sales/src/Models/Order.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/Webkul/Sales/src/Models/Order.php b/packages/Webkul/Sales/src/Models/Order.php index 60582b017..e9df0aecd 100755 --- a/packages/Webkul/Sales/src/Models/Order.php +++ b/packages/Webkul/Sales/src/Models/Order.php @@ -261,11 +261,11 @@ class Order extends Model implements OrderContract */ public function canCancel(): bool { - if ($this->status == 'cashondelivery' && core()->getConfigData('sales.paymentmethods.cashondelivery.generate_invoice')) { + if ($this->payment->method == 'cashondelivery' && core()->getConfigData('sales.paymentmethods.cashondelivery.generate_invoice')) { return false; } - if ($this->status == 'moneytransfer' && core()->getConfigData('sales.paymentmethods.moneytransfer.generate_invoice')) { + if ($this->payment->method == 'moneytransfer' && core()->getConfigData('sales.paymentmethods.moneytransfer.generate_invoice')) { return false; }