Merge pull request #57 from Setono/fix-bug

Fix 'compound discount' bug

Author: loevgaard

composer.json

@@ -18,7 +18,7 @@
         "doctrine/event-manager": "^1.1",
         "doctrine/orm": "^2.7",
         "knplabs/knp-menu": "^3.2",
-        "setono/job-status-bundle": "^0.2.1",
+        "setono/job-status-bundle": "^0.2.3",
         "sylius/registry": "^1.6",
         "sylius/resource-bundle": "^1.6",
         "symfony/config": "^4.4 || ^5.0",

src/Doctrine/ORM/ChannelPricingRepositoryTrait.php

@@ -27,9 +27,21 @@ public function resetMultiplier(DateTimeInterface $dateTime, string $bulkIdentif
             $connection->beginTransaction();
 
             try {
-                $ids = $this->createQueryBuilder('o')
+                $qb = $this->createQueryBuilder('o');
+                $ids = $qb
                     ->select('o.id')
-                    ->andWhere('o.multiplier != 1')
+                    ->andWhere('o.bulkIdentifier != :bulkIdentifier') // this ensures that the loop we are in doesn't turn into an infinite loop
+                    ->andWhere(
+                        $qb->expr()->orX(
+                            // if the multiplier is different from 1 we know that it was discounted before
+                            'o.multiplier != 1',
+
+                            // if the previous job timed out, the bulk identifier will be different from the
+                            // bulk identifier for this run. This will ensure that they will also be handled in this run
+                            'o.bulkIdentifier is not null',
+                        )
+                    )
+                    ->setParameter('bulkIdentifier', $bulkIdentifier)
                     ->setMaxResults(100)
                     ->getQuery()
                     ->getResult()
@@ -83,6 +95,22 @@ public function updateMultiplier(
         $qb->update()
             ->andWhere('channelPricing.productVariant IN (:productVariantIds)')
             ->andWhere('channelPricing.channelCode IN (:channelCodes)')
+            // this 'or' is a safety check. If the previous run timed out, but managed to update some multipliers
+            // this will end up in discounts being compounded. With this check we ensure we only operate on pricings
+            // from this run or pricings that haven't been touched
+            ->andWhere($qb->expr()->orX(
+                'channelPricing.bulkIdentifier is null',
+                'channelPricing.bulkIdentifier = :bulkIdentifier',
+            ))
+            // here is another safety check. If the promotion code is already applied,
+            // do not select this pricing for a discount
+            ->andWhere($qb->expr()->orX(
+                'channelPricing.appliedPromotions IS NULL',
+                $qb->expr()->andX(
+                    'channelPricing.appliedPromotions NOT LIKE :promotionEnding',
+                    'channelPricing.appliedPromotions NOT LIKE :promotionMiddle',
+                )
+            ))
             ->set('channelPricing.updatedAt', ':date')
             ->set('channelPricing.bulkIdentifier', ':bulkIdentifier')
             ->set('channelPricing.appliedPromotions', "CONCAT(COALESCE(channelPricing.appliedPromotions, ''), CONCAT(',', :promotion))")
@@ -91,6 +119,12 @@ public function updateMultiplier(
             ->setParameter('date', $dateTime)
             ->setParameter('bulkIdentifier', $bulkIdentifier)
             ->setParameter('promotion', $promotionCode)
+            // if you are checking for the promo code 'all_10_percent' there are two options for the applied_promotions column:
+            // 1. ,single_tshirt,all_10_percent
+            // 2. ,all_10_percent,single_tshirt
+            // and these two wildcards selections will handle those two options
+            ->setParameter('promotionEnding', '%,' . $promotionCode)
+            ->setParameter('promotionMiddle', '%,' . $promotionCode . ',%')
         ;
 
         if ($manuallyDiscountedProductsExcluded) {