Merge pull request #168 from synolia/fix/retry-page-hooks

[SelectPayment] Unify display

Author: Jibbarth

config/twig_hooks/shop.yaml

@@ -20,27 +20,31 @@ sylius_twig_hooks:
                 template: "@PayPlugSyliusPayPlugPlugin/Account/SavedCards/Index/_subcontent.html.twig"
                 priority: 10
 
+
         # TODO: check if this is possible only on select_payment page
         'sylius_shop.checkout#stylesheets':
             select_payment_css:
                 template: '@PayPlugSyliusPayPlugPlugin/stylesheets/select_payment_css.html.twig'
 
+        'sylius_shop.order#stylesheets':
+            select_payment_css:
+                template: '@PayPlugSyliusPayPlugPlugin/stylesheets/select_payment_css.html.twig'
+
         'sylius_shop.shared.form.select_payment.payment.choice.details':
             payplug_choice:
                 template: '@PayPlugSyliusPayPlugPlugin/SyliusShopBundle/Checkout/SelectPayment/_choice.html.twig'
-
-        'sylius_shop.checkout.select_payment.content.form.select_payment.payment.choice.details#payplug':
+        'sylius_shop.shared.form.select_payment.payment.choice.details#payplug':
             payplug_block:
                 template: '@PayPlugSyliusPayPlugPlugin/SyliusShopBundle/Checkout/SelectPayment/_payplug_block.html.twig'
-        'sylius_shop.checkout.select_payment.content.form.select_payment.payment.choice.details#payplug_oney':
+        'sylius_shop.shared.form.select_payment.payment.choice.details#payplug_oney':
             payplug_oney_block:
                 template: '@PayPlugSyliusPayPlugPlugin/SyliusShopBundle/Checkout/SelectPayment/_payplug_oney_block.html.twig'
-        'sylius_shop.checkout.select_payment.content.form.select_payment.payment.choice.details#payplug_bancontact':
+        'sylius_shop.shared.form.select_payment.payment.choice.details#payplug_bancontact':
             payplug_bancontact_block:
                 template: '@PayPlugSyliusPayPlugPlugin/SyliusShopBundle/Checkout/SelectPayment/_payplug_bancontact_block.html.twig'
-        'sylius_shop.checkout.select_payment.content.form.select_payment.payment.choice.details#payplug_apple_pay':
+        'sylius_shop.shared.form.select_payment.payment.choice.details#payplug_apple_pay':
             payplug_apple_pay_block:
                 template: '@PayPlugSyliusPayPlugPlugin/SyliusShopBundle/Checkout/SelectPayment/_payplug_apple_pay_block.html.twig'
-        'sylius_shop.checkout.select_payment.content.form.select_payment.payment.choice.details#payplug_american_express':
+        'sylius_shop.shared.form.select_payment.payment.choice.details#payplug_american_express':
             payplug_american_express_block:
                 template: '@PayPlugSyliusPayPlugPlugin/SyliusShopBundle/Checkout/SelectPayment/_payplug_american_express_block.html.twig'

src/Form/Extension/PaymentTypeExtension.php

@@ -41,6 +41,7 @@ public function buildForm(
         $builder
             ->add('oney_payment_choice', ChoiceType::class, [
                 'mapped' => false,
+                'block_prefix' => 'oney_payment_choice',
                 'choices' => $this->oneySupportedPaymentChoiceProvider->getSupportedPaymentChoices(true),
             ])
             ->add('payplug_card_choice', TextType::class, [

templates/SyliusShopBundle/Checkout/SelectPayment/_choice.html.twig

@@ -9,14 +9,5 @@
 {% set applePayFactoryName = constant('PayPlug\\SyliusPayPlugPlugin\\Gateway\\ApplePayGatewayFactory::FACTORY_NAME') %}
 {% set americanExpressFactoryName = constant('PayPlug\\SyliusPayPlugPlugin\\Gateway\\AmericanExpressGatewayFactory::FACTORY_NAME') %}
 
-{% if factoryName == oneyFactoryName %}
-    {% hook '#payplug_oney' %}
-{% elseif factoryName == payplugFactoryName %}
-    {% hook '#payplug' %}
-{% elseif factoryName == bancontactFactoryName %}
-    {% hook '#payplug_bancontact' %}
-{% elseif factoryName == applePayFactoryName %}
-    {% hook '#payplug_apple_pay' %}
-{% elseif factoryName == americanExpressFactoryName %}
-    {% hook '#payplug_american_express' %}
-{% endif %}
+{% hook '#' ~ factoryName %}
+

templates/form/integrated.html.twig

@@ -92,7 +92,7 @@
     {% endif %}
 
     <div class="payplugIntegratedPayment__container">
-        <button id="paid" class="ui large primary button" type="button">
+        <button id="paid" class="btn btn-primary" type="button">
             {{ 'payplug_sylius_payplug_plugin.ui.integrated_payment.place_order.label'|trans }}
         </button>
     </div>

templates/form/sylius_checkout_select_payment_row.html.twig

@@ -1,4 +1,4 @@
-{% block _sylius_shop_checkout_select_payment_payments_entry_oney_payment_choice_row %}
+{% block oney_payment_choice_row %}
     {% set data = oney_simulation_data() %}
     {% import "@SyliusShop/shared/macro/money.html.twig" as money %}