From 8a8a20c4bb283d730befda0414554508daa8c272 Mon Sep 17 00:00:00 2001 From: Daniel Bohnhardt Date: Wed, 17 May 2023 15:12:59 +0200 Subject: [PATCH 1/4] update for new sylius version --- README.md | 5 ++--- src/Controller/Action/AmazonPayStartAction.php | 2 +- .../views/AmazonPay/AddressBook/_widget.html.twig | 2 +- src/Resources/views/AmazonPay/Summary/_widget.html.twig | 2 +- src/Resources/views/AmazonPay/Wallet/_widget.html.twig | 2 +- src/Resources/views/AmazonPay/amazonPayStart.html.twig | 9 ++++----- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 8bde85f..68b8858 100644 --- a/README.md +++ b/README.md @@ -61,12 +61,11 @@ This **open-source plugin was developed to help the Sylius community**. If you h 4. Add routing to sylius_shop.yml: ```yaml sylius_shop_checkout_start: - path: /{_locale}/checkout-start + path: / methods: [GET] defaults: _controller: bitbag_sylius_amazon_pay_plugin.controller.action.checkout_start - requirements: - _locale: ^[a-z]{2}(?:_[A-Z]{2})?$ + ``` 5. Please add the Webpack build configuration to your `config/packages/webpack_encore.yaml` file: diff --git a/src/Controller/Action/AmazonPayStartAction.php b/src/Controller/Action/AmazonPayStartAction.php index d25fabe..20c2e1f 100644 --- a/src/Controller/Action/AmazonPayStartAction.php +++ b/src/Controller/Action/AmazonPayStartAction.php @@ -35,7 +35,7 @@ public function __construct(Environment $templating) public function __invoke(Request $request): Response { return new Response( - $this->templating->render('BitBagSyliusAmazonPayPlugin:AmazonPay:amazonPayStart.html.twig') + $this->templating->render('@BitBagSyliusAmazonPayPlugin/AmazonPay/amazonPayStart.html.twig') ); } } diff --git a/src/Resources/views/AmazonPay/AddressBook/_widget.html.twig b/src/Resources/views/AmazonPay/AddressBook/_widget.html.twig index 9e3bc2d..a366682 100644 --- a/src/Resources/views/AmazonPay/AddressBook/_widget.html.twig +++ b/src/Resources/views/AmazonPay/AddressBook/_widget.html.twig @@ -1,4 +1,4 @@ -{% include '@SyliusUi/_javascripts.html.twig' with {'path': 'assets/shop/js/app.js'} %} +{{ encore_entry_script_tags('shop-entry', null, 'shop') }} diff --git a/src/Resources/views/AmazonPay/Summary/_widget.html.twig b/src/Resources/views/AmazonPay/Summary/_widget.html.twig index d4c2965..a7f4f2c 100644 --- a/src/Resources/views/AmazonPay/Summary/_widget.html.twig +++ b/src/Resources/views/AmazonPay/Summary/_widget.html.twig @@ -1,7 +1,7 @@
-{% include '@SyliusUi/_javascripts.html.twig' with {'path': 'assets/shop/js/app.js'} %} +{{ encore_entry_script_tags('shop-entry', null, 'shop') }} diff --git a/src/Resources/views/AmazonPay/Wallet/_widget.html.twig b/src/Resources/views/AmazonPay/Wallet/_widget.html.twig index c5e93c7..e108941 100644 --- a/src/Resources/views/AmazonPay/Wallet/_widget.html.twig +++ b/src/Resources/views/AmazonPay/Wallet/_widget.html.twig @@ -1,6 +1,6 @@
-{% include '@SyliusUi/_javascripts.html.twig' with {'path': 'assets/shop/js/app.js'} %} +{{ encore_entry_script_tags('shop-entry', null, 'shop') }} diff --git a/src/Resources/views/AmazonPay/amazonPayStart.html.twig b/src/Resources/views/AmazonPay/amazonPayStart.html.twig index c71a26c..3de54cd 100644 --- a/src/Resources/views/AmazonPay/amazonPayStart.html.twig +++ b/src/Resources/views/AmazonPay/amazonPayStart.html.twig @@ -1,5 +1,3 @@ -{% include '@SyliusUi/_javascripts.html.twig' with {'path': 'assets/shop/js/app.js'} %} - From 1d78404b54905c9da30c2c6316ce29c0a4ab0e1f Mon Sep 17 00:00:00 2001 From: Daniel Moebius Date: Fri, 25 Aug 2023 13:56:37 +0200 Subject: [PATCH 2/4] fixed post request and sylius data --- .../views/AmazonPay/AddressBook/_widget.html.twig | 2 +- src/Resources/views/AmazonPay/Summary/_widget.html.twig | 2 +- src/Resources/views/AmazonPay/Wallet/_widget.html.twig | 2 +- src/Resources/views/AmazonPay/amazonPayStart.html.twig | 7 +++++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Resources/views/AmazonPay/AddressBook/_widget.html.twig b/src/Resources/views/AmazonPay/AddressBook/_widget.html.twig index a366682..063de1a 100644 --- a/src/Resources/views/AmazonPay/AddressBook/_widget.html.twig +++ b/src/Resources/views/AmazonPay/AddressBook/_widget.html.twig @@ -1,4 +1,4 @@ -{{ encore_entry_script_tags('shop-entry', null, 'shop') }} +{{ encore_entry_script_tags('app-shop-entry', null, 'app.shop') }} diff --git a/src/Resources/views/AmazonPay/Summary/_widget.html.twig b/src/Resources/views/AmazonPay/Summary/_widget.html.twig index a7f4f2c..92e5365 100644 --- a/src/Resources/views/AmazonPay/Summary/_widget.html.twig +++ b/src/Resources/views/AmazonPay/Summary/_widget.html.twig @@ -1,7 +1,7 @@
-{{ encore_entry_script_tags('shop-entry', null, 'shop') }} +{{ encore_entry_script_tags('app-shop-entry', null, 'app.shop') }} diff --git a/src/Resources/views/AmazonPay/Wallet/_widget.html.twig b/src/Resources/views/AmazonPay/Wallet/_widget.html.twig index e108941..410a9d1 100644 --- a/src/Resources/views/AmazonPay/Wallet/_widget.html.twig +++ b/src/Resources/views/AmazonPay/Wallet/_widget.html.twig @@ -1,6 +1,6 @@
-{{ encore_entry_script_tags('shop-entry', null, 'shop') }} +{{ encore_entry_script_tags('app-shop-entry', null, 'app.shop') }} diff --git a/src/Resources/views/AmazonPay/amazonPayStart.html.twig b/src/Resources/views/AmazonPay/amazonPayStart.html.twig index 3de54cd..a5a2463 100644 --- a/src/Resources/views/AmazonPay/amazonPayStart.html.twig +++ b/src/Resources/views/AmazonPay/amazonPayStart.html.twig @@ -6,15 +6,18 @@ ; } - let accessToken = getURLParameter("access_token", location.hash); + let accessToken = getURLParameter('access_token', location.hash); if (typeof accessToken === 'string' && accessToken.match(/^Atza/)) { document.cookie = "amazon_Login_accessToken=" + accessToken; } + let formData = new FormData(); + formData.append('accessToken', accessToken); + fetch('{{ path('bitbag_sylius_amazon_pay_initialize') }}', { method: 'POST', - accessToken: accessToken + body: formData }).then(function (data) { window.location.replace("{{ path('sylius_shop_checkout_address') }}" + location.hash); }).catch(function (data) { From 342305b27a3a9b053cc10f471cccc95166b0dbea Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 23 Oct 2023 12:41:43 +0200 Subject: [PATCH 3/4] Prevent empty payment after voucher is initalized --- src/Controller/Action/CheckoutStartAction.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controller/Action/CheckoutStartAction.php b/src/Controller/Action/CheckoutStartAction.php index 9dcfd17..837bbb9 100644 --- a/src/Controller/Action/CheckoutStartAction.php +++ b/src/Controller/Action/CheckoutStartAction.php @@ -54,7 +54,7 @@ public function __invoke(Request $request): Response $order = $this->cartContext->getCart(); /** @var PaymentMethodInterface $paymentMethod */ - $paymentMethod = $order->getLastPayment()->getMethod(); + $paymentMethod = $order->getLastPayment()?->getMethod(); if ( null !== $paymentMethod && From f0c505b4bb5c404f58b07260f3eaf0062b011d70 Mon Sep 17 00:00:00 2001 From: Daniel Date: Thu, 26 Oct 2023 09:54:09 +0200 Subject: [PATCH 4/4] Prevent empty payment error --- src/Twig/Extension/RenderSummaryWidgetExtension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Twig/Extension/RenderSummaryWidgetExtension.php b/src/Twig/Extension/RenderSummaryWidgetExtension.php index 4497646..69e46be 100644 --- a/src/Twig/Extension/RenderSummaryWidgetExtension.php +++ b/src/Twig/Extension/RenderSummaryWidgetExtension.php @@ -61,7 +61,7 @@ public function renderSummaryWidget(): string $order = $this->cartContext->getCart(); /** @var PaymentMethod $paymentMethodCurrent */ - $paymentMethodCurrent = $order->getLastPayment()->getMethod(); + $paymentMethodCurrent = $order->getLastPayment()?->getMethod(); if ( null === $paymentMethodCurrent ||