From 8e03aaa1e377686d21880bc744cddf2f7cfdc77a Mon Sep 17 00:00:00 2001
From: Henning Leutz <leutz@pcsg.de>
Date: Tue, 26 May 2020 10:25:33 +0200
Subject: [PATCH] fix: candyman-gmbh/projektplanung#121 - consider order
creation -> discount check during creation is disabled
---
src/QUI/ERP/Coupons/Events.php | 31 ++++++++++++++++++++++++++-----
1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/QUI/ERP/Coupons/Events.php b/src/QUI/ERP/Coupons/Events.php
index c61dc0c..2287283 100644
--- a/src/QUI/ERP/Coupons/Events.php
+++ b/src/QUI/ERP/Coupons/Events.php
@@ -109,11 +109,29 @@ public static function onQuiqqerOrderBasketToOrder(
return;
}
+ if (empty($coupons)) {
+ return;
+ }
+
$PriceFactors = $Products->getPriceFactors();
$products = $Products->toArray();
$productCount = $Products->count();
$subSum = $products['calculations']['subSum'];
+ $checkRedeemable = !$Order->isSuccessful(); // if order is successful we dont need a check
+ $OrderInProcess = $Order->getAttribute('OrderInProcess');
+ $added = false;
+
+ if ($Order->getAttribute('inOrderCreation')) {
+ $checkRedeemable = false;
+ }
+
+ if ($OrderInProcess instanceof QUI\ERP\Order\OrderInProcess
+ && $OrderInProcess->getAttribute('inOrderCreation')
+ ) {
+ $checkRedeemable = false;
+ }
+
foreach ($coupons as $coupon) {
/* @var $Coupon CouponCode */
try {
@@ -123,7 +141,7 @@ public static function onQuiqqerOrderBasketToOrder(
}
// coupon check
- if (!$Coupon->isRedeemable($Order->getCustomer())) {
+ if ($checkRedeemable && !$Coupon->isRedeemable($Order->getCustomer())) {
continue;
}
@@ -165,14 +183,17 @@ public static function onQuiqqerOrderBasketToOrder(
continue;
}
+ $added = true;
$PriceFactors->addToEnd($PriceFactor);
}
}
- try {
- $Products->recalculation();
- } catch (QUI\Exception $Exception) {
- QUI\System\Log::writeDebugException($Exception);
+ if ($added) {
+ try {
+ $Products->recalculation();
+ } catch (QUI\Exception $Exception) {
+ QUI\System\Log::writeDebugException($Exception);
+ }
}
}
--
GitLab