[CatalogPromotion] Fix editing catalog promotion by changing its action

Sylius · Nov 24, 2021 · 3478fe3 · 3478fe3
1 parent 19df9ba
commit 3478fe3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingCatalogPromotionsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingCatalogPromotionsContext.php
@@ -561,14 +561,14 @@ public function iEditCatalogPromotionToHaveFixedDiscountInTheChannel(
         ChannelInterface $channel
     ): void {
         $this->client->buildUpdateRequest($catalogPromotion->getCode());
-        $scopes = [[
+        $content = $this->client->getContent();
+
+        $content['actions'] = [[
             'type' => CatalogPromotionActionInterface::TYPE_FIXED_DISCOUNT,
-            'configuration' => [
-                'amount' => $amount,
-            ],
+            'configuration' => [$channel->getCode() => ['amount' => $amount]],
         ]];
 
-        $this->client->updateRequestData(['actions' => $scopes]);
+        $this->client->setRequestData($content);
         $this->client->update();
     }
 
@@ -801,7 +801,7 @@ public function thisCatalogPromotionShouldHaveFixedDiscountInTheChannel(int $amo
         $catalogPromotionActions = $this->responseChecker->getValue($this->client->getLastResponse(), 'actions');
 
         Assert::same($catalogPromotionActions[0]['type'], CatalogPromotionActionInterface::TYPE_FIXED_DISCOUNT);
-        Assert::same($catalogPromotionActions[0]['configuration']['amount'], $amount);
+        Assert::same($catalogPromotionActions[0]['configuration'][$channel->getCode()]['amount'], $amount);
     }
 
     /**
@@ -1036,6 +1036,7 @@ public function iShouldBeNotifiedThatItHasBeenSuccessfullyCreated(): void
      */
     public function iShouldBeNotifiedThatItHasBeenSuccessfullyEdited(): void
     {
+        $res = $this->client->getLastResponse();
         Assert::true(
             $this->responseChecker->isUpdateSuccessful($this->client->getLastResponse()),
             'Catalog promotion could not be edited'

diff --git a/src/Sylius/Behat/Context/Ui/Admin/ManagingCatalogPromotionsContext.php b/src/Sylius/Behat/Context/Ui/Admin/ManagingCatalogPromotionsContext.php
@@ -14,6 +14,7 @@
 namespace Sylius\Behat\Context\Ui\Admin;
 
 use Behat\Behat\Context\Context;
+use http\Exception\InvalidArgumentException;
 use Sylius\Behat\Element\Admin\CatalogPromotion\FormElementInterface;
 use Sylius\Behat\NotificationType;
 use Sylius\Behat\Page\Admin\CatalogPromotion\CreatePageInterface;

diff --git a/src/Sylius/Bundle/PromotionBundle/Form/Type/CatalogPromotionActionType.php b/src/Sylius/Bundle/PromotionBundle/Form/Type/CatalogPromotionActionType.php
@@ -50,12 +50,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->addEventListener(FormEvents::PRE_SET_DATA, function(FormEvent $event): void {
                 /** @var CatalogPromotionActionInterface|null $data */
                 $data = $event->getData();
-                $form = $event->getForm();
-
                 if ($data === null) {
                     return;
                 }
 
+                $form = $event->getForm();
+
                 $actionConfigurationType = $this->actionConfigurationTypes[$data->getType()];
                 $form->add('configuration', $actionConfigurationType, [
                     'label' => false,
@@ -64,12 +64,18 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->addEventListener(FormEvents::PRE_SUBMIT, function(FormEvent $event): void {
                 /** @var array|null $data */
                 $data = $event->getData();
-                $form = $event->getForm();
-
                 if ($data === null) {
                     return;
                 }
 
+                $form = $event->getForm();
+                $formData = $form->getData();
+                if ($formData !== null) {
+                    $formData->setType($data['type']);
+                    $formData->setConfiguration($data['configuration']);
+                    $form->setData($formData);
+                }
+
                 $actionConfigurationType = $this->actionConfigurationTypes[$data['type']];
                 $form->add('configuration', $actionConfigurationType, [
                     'label' => false,