[CatalogPromotion] fix pricing clearer

features/promotion/applying_catalog_promotions/reapplying_catalog_promotions_on_variant_once_its_prices_changes.feature

@@ -23,3 +23,9 @@ Feature: Reapplying catalog promotions on variant once its prices changes
         When I change the original price of the "PHP T-Shirt" product variant to "$50.00" in "Web-US" channel
         Then the visitor should see "$17.50" as the price of the "T-Shirt" product in the "Web-US" channel
         And the visitor should see "$50.00" as the original price of the "T-Shirt" product in the "Web-US" channel
+
+    @api @ui
+    Scenario: Removing the original price of the variant
+        When I remove the original price of the "PHP T-Shirt" product variant in "Web-US" channel
+        Then the visitor should see "$12.25" as the price of the "T-Shirt" product in the "Web-US" channel
+        And the visitor should see "$35.00" as the original price of the "T-Shirt" product in the "Web-US" channel

src/Sylius/Behat/Context/Api/Admin/ManagingProductVariantsContext.php

@@ -49,10 +49,20 @@ public function iChangeTheOriginalPriceOfTheProductVariantInChannel(
         $this->updateChannelPricingField($variant, $channel, $originalPrice, 'originalPrice');
     }
 
+    /**
+     * @When /^I remove the original price of the ("[^"]+" product variant) in ("[^"]+" channel)$/
+     */
+    public function iRemoveTheOriginalPriceOfTheProductVariantInChannel(
+        ProductVariantInterface $variant,
+        ChannelInterface $channel
+    ): void {
+        $this->updateChannelPricingField($variant, $channel, null, 'originalPrice');
+    }
+
     private function updateChannelPricingField(
         ProductVariantInterface $variant,
         ChannelInterface $channel,
-        int $price,
+        ?int $price,
         string $field
     ): void {
         $this->client->buildUpdateRequest($variant->getCode());

src/Sylius/Behat/Context/Ui/Admin/ManagingProductVariantsPricesContext.php

@@ -53,4 +53,16 @@ public function iChangeTheOriginalPriceOfTheProductVariantInChannel(
         $this->updatePage->specifyOriginalPrice($originalPrice, $channel);
         $this->updatePage->saveChanges();
     }
+
+    /**
+     * @When /^I remove the original price of the ("[^"]+" product variant) in ("[^"]+" channel)$/
+     */
+    public function iRemoveTheOriginalPriceOfTheProductVariantInChannel(
+        ProductVariantInterface $variant,
+        ChannelInterface $channel
+    ): void {
+        $this->updatePage->open(['productId' => $variant->getProduct()->getId(), 'id' => $variant->getId()]);
+        $this->updatePage->specifyOriginalPrice(null, $channel);
+        $this->updatePage->saveChanges();
+    }
 }

src/Sylius/Behat/Page/Admin/ProductVariant/UpdatePage.php

@@ -39,7 +39,7 @@ public function specifyPrice(int $price, ?ChannelInterface $channel = null): voi
         $this->getElement('price', ['%channelCode%' => $channel->getCode()])->setValue($price);
     }
 
-    public function specifyOriginalPrice(int $originalPrice, ?ChannelInterface $channel = null): void
+    public function specifyOriginalPrice(?int $originalPrice, ?ChannelInterface $channel = null): void
     {
         if ($channel === null) {
             $this->getDocument()->fillField('Original price', $originalPrice);

src/Sylius/Behat/Page/Admin/ProductVariant/UpdatePageInterface.php

@@ -51,7 +51,7 @@ public function specifyCurrentStock(int $amount): void;
 
     public function specifyPrice(int $price, ?ChannelInterface $channelName = null): void;
 
-    public function specifyOriginalPrice(int $originalPrice, ?ChannelInterface $channel = null): void;
+    public function specifyOriginalPrice(?int $originalPrice, ?ChannelInterface $channel = null): void;
 
     public function disable(): void;
 

src/Sylius/Bundle/CoreBundle/Processor/CatalogPromotionClearer.php

@@ -47,7 +47,9 @@ public function clearChannelPricing(ChannelPricingInterface $channelPricing): vo
             return;
         }
 
-        $channelPricing->setPrice($channelPricing->getOriginalPrice());
+        if ($channelPricing->getOriginalPrice() !== null) {
+            $channelPricing->setPrice($channelPricing->getOriginalPrice());
+        }
         $channelPricing->clearAppliedPromotions();
     }
 }

src/Sylius/Bundle/CoreBundle/spec/Processor/CatalogPromotionClearerSpec.php

@@ -15,6 +15,7 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use PhpSpec\ObjectBehavior;
+use Prophecy\Argument;
 use Sylius\Bundle\CoreBundle\Processor\CatalogPromotionClearerInterface;
 use Sylius\Component\Core\Model\ChannelPricingInterface;
 use Sylius\Component\Core\Model\ProductVariantInterface;
@@ -87,4 +88,15 @@ function it_clears_given_channel_pricing_with_catalog_promotions_applied(
 
         $this->clearChannelPricing($channelPricing);
     }
+
+    function it_does_not_copy_update_price_when_original_price_is_null(
+        ChannelPricingInterface $channelPricing
+    ): void {
+        $channelPricing->getAppliedPromotions()->willReturn(['winter_sale' => ['en_US' => ['name' => 'Winter sale']]]);
+        $channelPricing->getOriginalPrice()->willReturn(null);
+        $channelPricing->setPrice(Argument::any())->shouldNotBeCalled();
+        $channelPricing->clearAppliedPromotions()->shouldBeCalled();
+
+        $this->clearChannelPricing($channelPricing);
+    }
 }