MM-35: Fix issue 'Removed special product price won't sync on Magento side' (#58)

Author: alexandr-parkhomenko

src/Marello/Bundle/PricingBundle/Form/EventListener/ChannelPricingSubscriber.php

@@ -146,14 +146,19 @@ public function postSubmit(FormEvent $event)
             $assembledChannelPriceList->getDefaultPrice()
                 ->setType($this->getPriceType(PriceTypeInterface::DEFAULT_PRICE))
                 ->setCurrency($assembledChannelPriceList->getCurrency());
-            if ($assembledChannelPriceList->getSpecialPrice() !== null &&
-                $assembledChannelPriceList->getSpecialPrice()->getValue() === null) {
-                $assembledChannelPriceList->setSpecialPrice(null);
-            } elseif ($assembledChannelPriceList->getSpecialPrice() !== null) {
+
+            /** Restores currency in case if product price exists */
+            if ($assembledChannelPriceList->getSpecialPrice() !== null) {
                 $assembledChannelPriceList->getSpecialPrice()
                     ->setType($this->getPriceType(PriceTypeInterface::SPECIAL_PRICE))
                     ->setCurrency($assembledChannelPriceList->getCurrency());
             }
+
+            /** Removes product price from price list in case if user clear its value */
+            if ($assembledChannelPriceList->getSpecialPrice() !== null &&
+                $assembledChannelPriceList->getSpecialPrice()->getValue() === null) {
+                $assembledChannelPriceList->setSpecialPrice(null);
+            }
         }
 
         if ($form->has('removeSalesChannels') && !empty($form->get('removeSalesChannels')->getData())) {
@@ -190,7 +195,9 @@ public function postSubmit(FormEvent $event)
     protected function getPricingEnabled(FormInterface $form)
     {
         if (!$form->has(PricingAwareInterface::CHANNEL_PRICING_STATE_KEY)) {
-            throw new \InvalidArgumentException(sprintf('%s form child is missing'));
+            throw new \InvalidArgumentException(
+                sprintf('%s form child is missing', PricingAwareInterface::CHANNEL_PRICING_STATE_KEY)
+            );
         }
 
         $data = $form->get(PricingAwareInterface::CHANNEL_PRICING_STATE_KEY)->getData();

src/Marello/Bundle/PricingBundle/Form/EventListener/PricingSubscriber.php

@@ -116,21 +116,31 @@ public function postSubmit(FormEvent $event)
             $assembledPriceList->getDefaultPrice()
                 ->setType($this->getPriceType(PriceTypeInterface::DEFAULT_PRICE))
                 ->setCurrency($assembledPriceList->getCurrency());
+
+            /** Restores currency in case if product price exists */
+            if ($assembledPriceList->getSpecialPrice() !== null) {
+                $assembledPriceList->getSpecialPrice()
+                    ->setType($this->getPriceType(PriceTypeInterface::SPECIAL_PRICE))
+                    ->setCurrency($assembledPriceList->getCurrency());
+            }
+
+            /** Removes product price from price list in case if user clear its value */
             if ($assembledPriceList->getSpecialPrice() !== null &&
                 $assembledPriceList->getSpecialPrice()->getValue() === null) {
                 $assembledPriceList->setSpecialPrice(null);
-            } elseif ($assembledPriceList->getSpecialPrice() !== null) {
-                $assembledPriceList->getSpecialPrice()
-                    ->setType($this->getPriceType(PriceTypeInterface::SPECIAL_PRICE))
+            }
+
+            /** Restores currency in case if product price exists */
+            if ($assembledPriceList->getMsrpPrice() !== null) {
+                $assembledPriceList->getMsrpPrice()
+                    ->setType($this->getPriceType(PriceTypeInterface::MSRP_PRICE))
                     ->setCurrency($assembledPriceList->getCurrency());
             }
+
+            /** Removes product price from price list in case if user clear its value */
             if ($assembledPriceList->getMsrpPrice() !== null &&
                 $assembledPriceList->getMsrpPrice()->getValue() === null) {
                 $assembledPriceList->setMsrpPrice(null);
-            } elseif ($assembledPriceList->getMsrpPrice() !== null) {
-                $assembledPriceList->getMsrpPrice()
-                    ->setType($this->getPriceType(PriceTypeInterface::MSRP_PRICE))
-                    ->setCurrency($assembledPriceList->getCurrency());
             }
         }