Merge branch 'main' into split_ci_into_steps

Author: pczyzewski5

.github/actions/build/action.yaml

@@ -62,7 +62,7 @@ runs:
                 e2e_js: ${{ inputs.e2e_js }}
                 node_version: "20.x"
             env:
-                DATABASE_URL: "mysql://root:root@127.0.0.1:3306/sylius?serverVersion=${{ matrix.mysql }}"
+                DATABASE_URL: "mysql://root:root@127.0.0.1:3306/sylius?serverVersion=${{ inputs.mysql }}"
 
         -   name: "Save Docker image to cache"
             run: |

.github/workflows/ci.yaml

@@ -49,7 +49,7 @@ jobs:
                     sylius: ${{ matrix.sylius }}
                     symfony: ${{ matrix.symfony }}
                     check_service_definitions: yes
-
+    
     static-analysis:
         name: Static analysis - PHP ${{ matrix.php || '' }}
         needs: [ get-matrix, build ]
@@ -71,7 +71,7 @@ jobs:
 
             -   name: ECS
                 run: vendor/bin/ecs check
-
+    
     unit-tests:
         name: Unit tests - PHP ${{ matrix.php || '' }}
         needs: [ get-matrix, build ]
@@ -94,7 +94,7 @@ jobs:
                 if: always()
                 with:
                     subject: Unit tests - PHP ${{ matrix.php || '' }}
-
+    
     e2e-tests:
         name: E2E tests - PHP ${{ matrix.php || '' }}
         needs: [ get-matrix, build ]
@@ -124,16 +124,15 @@ jobs:
                     e2e: yes
                     e2e_js: yes
 
-            -   name: Install browser drivers
-                run: vendor/bin/bdi detect drivers
-
-            -   run: vendor/bin/phpunit --testsuite e2e --exclude-group requires-fixes --testdox
+            -   run: vendor/bin/phpunit --testsuite e2e --exclude-group requires-fixes --debug
+                timeout-minutes: 10
+                continue-on-error: true
 
             -   uses: ./.github/actions/upload-logs
                 if: always()
                 with:
                     subject: E2E tests - PHP ${{ matrix.php || '' }}
-
+    
     api-tests:
         name: API tests - PHP ${{ matrix.php || '' }}
         needs: [ get-matrix, build ]

assets/shop/js/retry_payment.js

@@ -12,6 +12,12 @@ function showPaymentDetails(paymentCode) {
     .forEach(function(element) {
       element.disabled = false;
     });
+
+  const checkoutButton = document.querySelector('form[name="sylius_checkout_select_payment"] button[type="submit"]');
+  if (checkoutButton) {
+    const hiddenFor = ['tpay_apple_pay', 'tpay_google_pay'];
+    checkoutButton.hidden = hiddenFor.includes(paymentCode);
+  }
 }
 
 function resetPaymentDetails() {

assets/shop/order_show_entrypoint.js

@@ -1,5 +1,6 @@
 import './scss/style.scss';
 import './scss/pay_by_link.scss';
+import './js/apple_pay';
 import './js/blik_code';
 import './js/retry_payment';
 import './js/visa_mobile';

composer.json

@@ -47,9 +47,10 @@
         "phpstan/phpstan-symfony": "^2.0",
         "phpstan/phpstan-webmozart-assert": "^2.0",
         "phpunit/phpunit": "^9.5",
-        "psr/cache": "^3.0",
         "polishsymfonycommunity/symfony-mocker-container": "^1.0",
+        "psr/cache": "^3.0",
         "shipmonk/composer-dependency-analyser": "^1.7",
+        "slevomat/coding-standard": "< 8.23.0",
         "sylius-labs/coding-standard": "^4.2",
         "sylius/refund-plugin": "^2.0",
         "sylius/sylius": "^2.0",

config/services_test.php

@@ -5,6 +5,8 @@
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
 use CommerceWeavers\SyliusTpayPlugin\Test\Payum\Cypher\FakeCypher;
+use Tests\CommerceWeavers\SyliusTpayPlugin\Helper\AlwaysValidChecksumVerifier;
+use Tests\CommerceWeavers\SyliusTpayPlugin\Helper\AlwaysValidSignatureVerifier;
 
 return function(ContainerConfigurator $container): void {
     $services = $container->services();
@@ -14,4 +16,14 @@
             env('PAYUM_CYPHER_KEY'),
         ])
     ;
+
+    $services->set('commerce_weavers_sylius_tpay.tests.always_valid_signature_verifier', AlwaysValidSignatureVerifier::class);
+
+    $services->set('commerce_weavers_sylius_tpay.tests.always_valid_checksum_verifier', AlwaysValidChecksumVerifier::class);
+
+    $services->set('commerce_weavers_sylius_tpay.tpay.security.notification.verifier.signature')
+        ->alias('commerce_weavers_sylius_tpay.tpay.security.notification.verifier.signature', 'commerce_weavers_sylius_tpay.tests.always_valid_signature_verifier');
+
+    $services->set('commerce_weavers_sylius_tpay.tpay.security.notification.verifier.checksum')
+        ->alias('commerce_weavers_sylius_tpay.tpay.security.notification.verifier.checksum', 'commerce_weavers_sylius_tpay.tests.always_valid_checksum_verifier');
 };

config/twig_hooks/shop/checkout/select_payment.php

@@ -13,6 +13,16 @@
                     'priority' => 150,
                 ],
             ],
+            'sylius_shop.order.show.content.form.select_payment.payment' => [
+                'apple_pay' => [
+                    'template' => '@CommerceWeaversSyliusTpayPlugin/shop/order/pay/apple_pay.html.twig',
+                    'priority' => -300,
+                ],
+                'google_pay' => [
+                    'template' => '@CommerceWeaversSyliusTpayPlugin/shop/order/pay/google_pay.html.twig',
+                    'priority' => -300,
+                ],
+            ],
             'sylius_shop.shared.form.select_payment.payment.choice.details' => [
                 'payment_image' => [
                     'template' => '@CommerceWeaversSyliusTpayPlugin/shop/checkout/select_payment/payment/choice/details/image.html.twig',

public/shop/scripts/order-show.js

@@ -12,4 +12,9 @@ public function getLastCartPayment(): ?PaymentInterface
     {
         return $this->getLastPayment('cart');
     }
+
+    public function getLastNewPayment(): ?PaymentInterface
+    {
+        return $this->getLastPayment('new');
+    }
 }

src/Model/OrderLastNewPaymentAwareTrait.php

@@ -3,14 +3,7 @@
 
 {% if payment is not null and payment.method.gatewayConfig.factoryName == 'tpay_apple_pay' %}
     {% set form = get_hookable_context().form %}
+    {% set gatewayConfig = payment.method.gatewayConfig %}
 
-    <input type="hidden" data-apple-pay-amount value="{{ order.total|cw_tpay_convert_minor_to_major_currency }}">
-    <input type="hidden" data-apple-pay-merchant-identifier value="{{ cw_tpay_get_gateway_config_value(payment.method.gatewayConfig, 'apple_pay_merchant_id') }}">
-    <input type="hidden" data-apple-pay-currency value="{{ order.currencyCode }}">
-    <input type="hidden" data-apple-pay-channel-name value="{{ order.channel.name }}" />
-
-    <apple-pay-button data-apple-pay-button buttonstyle="black" type="plain" locale="{{ order.localeCode|replace({'_': '-'}) }}"></apple-pay-button>
-    {{ form_row(form.tpay.apple_pay_token, { attr: { 'data-apple-pay-token-input': '' } }) }}
-
-    <script crossorigin src="https://applepay.cdn-apple.com/jsapi/1.latest/apple-pay-sdk.js"></script>
+    {% include '@CommerceWeaversSyliusTpayPlugin/shop/partial/apple_pay_button.html.twig' with { order, form, gatewayConfig } %}
 {% endif %}