Merge pull request #20 from Setono/add-line-error

Fix adding order line error
Setono · Jun 24, 2024 · 2cde246 · 2cde246
2 parents 7aee0f5 + f6a3873
commit 2cde246
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 16 deletions.
diff --git a/src/Form/Extension/OrderTypeExtension.php b/src/Form/Extension/OrderTypeExtension.php
@@ -17,15 +17,17 @@ final class OrderTypeExtension extends AbstractTypeExtension
 {
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        $builder
-            ->add('items', OrderItemCollectionType::class)
-        ;
-
         $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event): void {
             $form = $event->getForm();
             /** @var OrderInterface $order */
             $order = $event->getData();
 
+            $form
+                ->add('items', OrderItemCollectionType::class, [
+                    'entry_options' => ['currency_code' => $order->getCurrencyCode()],
+                ])
+            ;
+
             $form->add('discounts', OrderDiscountCollectionType::class, [
                 'property_path' => 'adjustments',
                 'entry_options' => [

diff --git a/src/Form/Type/OrderItemCollectionType.php b/src/Form/Type/OrderItemCollectionType.php
@@ -17,6 +17,7 @@ public function configureOptions(OptionsResolver $resolver): void
             'allow_add' => true,
             'allow_delete' => true,
             'by_reference' => false,
+            'prototype' => true,
         ]);
     }
 

diff --git a/src/Form/Type/OrderItemType.php b/src/Form/Type/OrderItemType.php
@@ -5,7 +5,6 @@
 namespace Setono\SyliusOrderEditPlugin\Form\Type;
 
 use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
-use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\OrderItemInterface;
 use Sylius\Component\Core\Model\ProductVariant;
 use Sylius\Component\Order\Modifier\OrderItemQuantityModifierInterface;
@@ -14,6 +13,7 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 final class OrderItemType extends AbstractResourceType
 {
@@ -44,21 +44,16 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             ])
         ;
 
-        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event): void {
-            $form = $event->getForm();
-            /** @var OrderItemInterface|null $orderItem */
-            $orderItem = $event->getData();
-            if ($orderItem === null) {
-                return;
-            }
+        /** @var string $currencyCode */
+        $currencyCode = $options['currency_code'];
 
-            /** @var OrderInterface $order */
-            $order = $orderItem->getOrder();
+        $builder->addEventListener(FormEvents::PRE_SET_DATA, function (FormEvent $event) use ($currencyCode): void {
+            $form = $event->getForm();
 
             $form->add('discounts', OrderItemDiscountCollectionType::class, [
                 'property_path' => 'adjustments',
                 'entry_options' => [
-                    'currency' => $order->getCurrencyCode(),
+                    'currency' => $currencyCode,
                 ],
                 'button_add_label' => 'setono_sylius_order_edit.ui.add_discount',
             ]);
@@ -73,4 +68,12 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             $event->setData($orderItem);
         });
     }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        parent::configureOptions($resolver);
+
+        $resolver->setRequired('currency_code');
+        $resolver->setAllowedTypes('currency_code', 'string');
+    }
 }
diff --git a/tests/Application/templates/bundles/SyliusAdminBundle/Order/Show/Summary/_item.html.twig b/tests/Application/templates/bundles/SyliusAdminBundle/Order/Show/Summary/_item.html.twig
@@ -49,11 +49,14 @@
         {{ money.format(item.total, order.currencyCode) }}
     </td>
 </tr>
+{% set discounts = item.getAdjustments(adminOrderItemDiscountAdjustment) %}
+{% if discounts is not empty %}
 <tr>
     <td colspan="9">
         <strong>{{ 'setono_sylius_order_edit.ui.discounts'|trans }}:</strong>
-        {% for discount in item.getAdjustments(adminOrderItemDiscountAdjustment) %}
+        {% for discount in discounts %}
             {{ money.format(discount.amount, order.currencyCode) }}{% if not loop.last %}, {% endif %}
         {% endfor %}
     </td>
 </tr>
+{% endif %}