SYL-3329 Install PayPalPlugin

.github/workflows/build.yml

@@ -197,18 +197,22 @@ jobs:
 
             -
                 name: Run managing catalog promotion scenarios
-                run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@todo&&~@cli&&@managing_catalog_promotions"
+                run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@mink:chromedriver&&~@todo&&~@cli&&@managing_catalog_promotions"
 
             -
                 name: Run managing exchange rates scenarios
-                run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@todo&&~@cli&&@managing_exchange_rates"
+                run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@mink:chromedriver&&~@todo&&~@cli&&@managing_exchange_rates"
 
             -
                 name: Run non-JS Behat (without managing catalog promotion scenarios and exchange rates)
-                run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@todo&&~@cli&&~@managing_catalog_promotions&&~@managing_exchange_rates"
+                run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@mink:chromedriver&&~@todo&&~@cli&&~@managing_catalog_promotions&&~@managing_exchange_rates"
 
             -
-                name: Run JS Behat
+                name: Run JS Behat (Chromedriver)
+                run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@mink:chromedriver&&~@todo&&~@cli" || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@mink:chromedriver&&~@todo&&~@cli" --rerun || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@mink:chromedriver&&~@todo&&~@cli" --rerun
+
+            -
+                name: Run JS Behat (Panther)
                 run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" --rerun || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" --rerun
 
             -

composer.json

@@ -25,10 +25,11 @@
     ],
     "require": {
         "php": "^8.1",
+        "sylius/paypal-plugin": "dev-master",
         "sylius/sylius": "1.13.x-dev",
         "symfony/dotenv": "^5.4 || ^6.4",
-        "symfony/runtime": "^5.4 || ^6.4",
-        "symfony/flex": "^2.4"
+        "symfony/flex": "^2.4",
+        "symfony/runtime": "^5.4 || ^6.4"
     },
     "require-dev": {
         "behat/behat": "^3.7",
@@ -76,7 +77,8 @@
             "dealerdirect/phpcodesniffer-composer-installer": false,
             "phpstan/extension-installer": false,
             "symfony/thanks": false,
-            "symfony/runtime": true
+            "symfony/runtime": true,
+            "php-http/discovery": true
         }
     },
     "extra": {

config/bundles.php

@@ -57,8 +57,8 @@
     Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
     Sylius\Bundle\ApiBundle\SyliusApiBundle::class => ['all' => true],
     SyliusLabs\DoctrineMigrationsExtraBundle\SyliusLabsDoctrineMigrationsExtraBundle::class => ['all' => true],
-//    Sylius\PayPalPlugin\SyliusPayPalPlugin::class => ['all' => true], // Restore before Sylius 1.13 release
     SyliusLabs\Polyfill\Symfony\Security\Bundle\SyliusLabsPolyfillSymfonySecurityBundle::class => ['all' => true],
     League\FlysystemBundle\FlysystemBundle::class => ['all' => true],
     Symfony\WebpackEncoreBundle\WebpackEncoreBundle::class => ['all' => true],
+    Sylius\PayPalPlugin\SyliusPayPalPlugin::class => ['all' => true],
 ];

config/packages/_sylius.yaml

@@ -6,8 +6,7 @@ imports:
 
     - { resource: "@SyliusShopBundle/Resources/config/app/config.yml" }
 
-# Restore before Sylius 1.13 release
-#    - { resource: "@SyliusPayPalPlugin/Resources/config/config.yaml" }
+    - { resource: "@SyliusPayPalPlugin/Resources/config/config.yaml" }
     - { resource: "../parameters.yaml" }
 
 parameters:

config/routes.yaml

@@ -1,3 +1,2 @@
-# Restore before Sylius 1.13 release
-#sylius_paypal_webhook:
-#    resource: "@SyliusPayPalPlugin/Resources/config/webhook_routing.yaml"
+sylius_paypal_webhook:
+    resource: "@SyliusPayPalPlugin/Resources/config/webhook_routing.yaml"

config/routes/sylius_admin.yaml

@@ -2,7 +2,6 @@ sylius_admin:
     resource: "@SyliusAdminBundle/Resources/config/routing.yml"
     prefix: '/%sylius_admin.path_name%'
 
-# Restore before Sylius 1.13 release
-#sylius_paypal_admin:
-#    resource: "@SyliusPayPalPlugin/Resources/config/admin_routing.yml"
-#    prefix: '/%sylius_admin.path_name%'
+sylius_paypal_admin:
+    resource: "@SyliusPayPalPlugin/Resources/config/admin_routing.yml"
+    prefix: '/%sylius_admin.path_name%'

config/routes/sylius_shop.yaml

@@ -13,12 +13,11 @@ sylius_shop_default_locale:
     defaults:
         _controller: sylius.controller.shop.locale_switch::switchAction
 
-# Restore before Sylius 1.13 release
-#sylius_paypal:
-#    resource: "@SyliusPayPalPlugin/Resources/config/shop_routing.yaml"
-#    prefix: /{_locale}
-#    requirements:
-#        _locale: ^[A-Za-z]{2,4}(_([A-Za-z]{4}|[0-9]{3}))?(_([A-Za-z]{2}|[0-9]{3}))?$     
+sylius_paypal:
+    resource: "@SyliusPayPalPlugin/Resources/config/shop_routing.yaml"
+    prefix: /{_locale}
+    requirements:
+        _locale: ^[A-Za-z]{2,4}(_([A-Za-z]{4}|[0-9]{3}))?(_([A-Za-z]{2}|[0-9]{3}))?$     
 
 # see https://web.dev/change-password-url/
 sylius_shop_request_password_reset_token_redirect:

symfony.lock

@@ -332,6 +332,18 @@
     "phar-io/version": {
         "version": "1.0.1"
     },
+    "php-http/discovery": {
+        "version": "1.19",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "1.18",
+            "ref": "f45b5dd173a27873ab19f5e3180b2f661c21de02"
+        },
+        "files": [
+            "config/packages/http_discovery.yaml"
+        ]
+    },
     "php-http/guzzle6-adapter": {
         "version": "v1.1.1"
     },
@@ -533,6 +545,9 @@
     "sylius/mailer-bundle": {
         "version": "v1.4.4"
     },
+    "sylius/paypal-plugin": {
+        "version": "dev-support-sylius-dev-version"
+    },
     "sylius/registry": {
         "version": "v1.4.1"
     },

templates/bundles/SyliusAdminBundle/Order/Show/_payment.html.twig

@@ -32,16 +32,15 @@
             </form>
         </div>
     {% endif %}
-    {# Restore before Sylius 1.13 release #}
-{#    {% if#}
-{#        payment.method.gatewayConfig.factoryName == 'sylius.pay_pal' and#}
-{#        payment.state == 'refunded'#}
-{#    %}#}
-{#        <div class="ui icon mini message">#}
-{#            <i class="paypal icon"></i>#}
-{#            <div class="content">#}
-{#                <p>{{ 'sylius.pay_pal.tender_type'|trans }}</p>#}
-{#            </div>#}
-{#        </div>#}
-{#    {% endif %}#}
+    {% if
+        payment.method.gatewayConfig.factoryName == 'sylius.pay_pal' and
+        payment.state == 'refunded'
+    %}
+        <div class="ui icon mini message">
+            <i class="paypal icon"></i>
+            <div class="content">
+                <p>{{ 'sylius.pay_pal.tender_type'|trans }}</p>
+            </div>
+        </div>
+    {% endif %}
 </div>

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

@@ -11,9 +11,8 @@
                 <p>{{ method.description }}</p>
             </div>
         {% endif %}
-{# Restore before Sylius 1.13 release #}
-{#        {% if method.gatewayConfig.factoryName == 'sylius.pay_pal' %}#}
-{#            {{ render(controller('Sylius\\PayPalPlugin\\Controller\\PayPalButtonsController::renderPaymentPageButtonsAction', {'orderId': order.id})) }}#}
-{#        {% endif %}#}
+        {% if method.gatewayConfig.factoryName == 'sylius.pay_pal' %}
+            {{ render(controller('Sylius\\PayPalPlugin\\Controller\\PayPalButtonsController::renderPaymentPageButtonsAction', {'orderId': order.id})) }}
+        {% endif %}
     </div>
 </div>

templates/bundles/SyliusShopBundle/Common/Order/_addresses.html.twig

@@ -12,13 +12,12 @@
         {% endif %}
     </div>
 </div>
-{# Restore before Sylius 1.13 release #}
-{#{% if sylius_is_billing_address_missing(order) %}#}
-{#<div class="ui icon message">#}
-{#    <i class="address card icon"></i>#}
-{#    <div class="content">#}
-{#        <div class="header">{{ 'sylius.pay_pal.missing_billing_address_header'|trans }}</div>#}
-{#        <p>{{ 'sylius.pay_pal.missing_billing_address_content'|trans }}</p>#}
-{#    </div>#}
-{#</div>#}
-{#{% endif %}#}
+{% if sylius_is_billing_address_missing(order) %}
+<div class="ui icon message">
+    <i class="address card icon"></i>
+    <div class="content">
+        <div class="header">{{ 'sylius.pay_pal.missing_billing_address_header'|trans }}</div>
+        <p>{{ 'sylius.pay_pal.missing_billing_address_content'|trans }}</p>
+    </div>
+</div>
+{% endif %}