Bunch of PR comment fixes

config/packages/events.php → config/config/events.php

@@ -9,12 +9,9 @@
         'events' => [
             'sylius.shop.checkout.complete.summary' => [
                 'blocks' => [
-                    'my_block_name' => [
+                    'blik' => [
                         'template' => '@CommerceWeaversSyliusTpayPlugin/blik.html.twig',
                         'priority' => 5,
-                        'context' => [
-                            'message' => 'Hello!',
-                        ],
                     ],
                 ],
             ],

config/services/form.php

@@ -26,10 +26,5 @@
 
     $services->set(PreventSavingEmptyClientSecretListener::class);
 
-    $services->set(CompleteTypeExtension::class)
-        ->tag(
-            'form.type_extension',
-            ['extended_type' => CompleteType::class]
-        )
-    ;
+    $services->set(CompleteTypeExtension::class)->tag('form.type_extension');
 };

config/services/payum/action.php

@@ -4,6 +4,7 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
+use CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api\CreateBlik0TransactionAction;
 use CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api\CreateTransactionAction;
 use CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api\NotifyAction;
 use CommerceWeavers\SyliusTpayPlugin\Payum\Action\CaptureAction;

src/Form/DataTransformer/PaymentDetailsTransformer.php

@@ -18,6 +18,6 @@ public function transform($value): string
     }
     public function reverseTransform($value): array
     {
-        return ['blik' => $value];
+        return $value ? ['blik' => $value] : [];
     }
 }

src/Form/Type/CompleteTypeExtension.php

@@ -22,7 +22,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             'label' => 'commerce_weavers_sylius_tpay.payment.blik.token',
             // TODO missing validation
             'property_path' => 'payments[0].details', // TODO looks awfull and what about other payments?
-//            'mapped' => false,
             'required' => false,
         ]);
     }

src/Payum/Action/Api/CreateBlik0TransactionAction.php

@@ -50,7 +50,7 @@ public function execute($request): void
             ],
         ]);
 
-        // blik token could be removed here from $details
+        unset($details['blik']);
         $details['tpay']['transaction_id'] = $response['transactionId'];
 
         $model->setDetails($details);

src/Payum/Action/CaptureAction.php

@@ -5,6 +5,7 @@
 namespace CommerceWeavers\SyliusTpayPlugin\Payum\Action;
 
 use CommerceWeavers\SyliusTpayPlugin\Payum\Factory\CreateTransactionFactoryInterface;
+use CommerceWeavers\SyliusTpayPlugin\Payum\Request\Api\CreateBlik0Transaction;
 use Payum\Core\Action\ActionInterface;
 use Payum\Core\GatewayAwareInterface;
 use Payum\Core\GatewayAwareTrait;
@@ -31,7 +32,7 @@ public function execute($request): void
 
         if ($this->transactionIsBlik($model)) {
             $this->gateway->execute(
-                new CreateBlik0Transaction($request->getToken()->getAfterUrl(), $model),
+                new CreateBlik0Transaction($request->getToken()),
             );
 
             return;

src/Payum/Request/Api/CreateBlik0Transaction.php

@@ -9,14 +9,8 @@
 class CreateBlik0Transaction extends Generic
 {
     public function __construct (
-        private string $afterUrl,
         mixed $model,
     ) {
         parent::__construct($model);
     }
-
-    public function getAfterUrl(): string
-    {
-        return $this->afterUrl;
-    }
 }

templates/blik.html.twig

@@ -20,10 +20,6 @@
                     <p {{ sylius_test_html_attribute('payment-price') }}>{{ money.format(payment.amount, payment.currencyCode) }}</p>
 
                     {{ form_row(form.others) }}
-                    <label for="blik-token">
-                        {{ 'commerce_weavers_sylius_tpay.payment.blik.token'|trans }}
-                    </label>
-                    <input id="blik-token" name="blik token" type="text" minlength="6" maxlength="6" required />
 
                     {% if state != 'cart' %}
                         <p id="payment-status" {{ sylius_test_html_attribute('payment-state') }}>

translations/messages.en.yaml

@@ -8,5 +8,5 @@ commerce_weavers_sylius_tpay:
 
     payment:
         blik:
-            token: 'BLIK token'
+            token: 'BLIK code'
 

translations/messages.pl.yaml

@@ -8,4 +8,4 @@ commerce_weavers_sylius_tpay:
 
     payment:
         blik:
-            token: 'Token BLIK'
+            token: 'Kod BLIK'