From 4b3dc5ffcaaecd26889770347e1c2c8bb0ff5d2c Mon Sep 17 00:00:00 2001 From: GardenLawn-at-366966045602 Date: Thu, 30 Oct 2025 14:38:11 +0100 Subject: [PATCH 1/4] Correction of the required smartmage/inpost module --- README.md | 4 ++-- composer.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8c600c3..144399e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Hyvä Checkout Inpost -Hyvä Magewire Checkout compatibility module for `smartmage/module-inpost-paczkomaty` +Hyvä Magewire Checkout compatibility module for `smartmage/inpost` ## Hyvä Checkout @@ -10,4 +10,4 @@ See more at [hyva.io](https://www.hyva.io/hyva-checkout.html) ## InPost carrier This module extends original Magento2 module for [InPost](https://inpost.pl/) to be able to use it within Hyvä Magewire Checkout. -See original module at [InPost Integration Page](https://inpost.pl/integracja-z-inpost) \ No newline at end of file +See original module at [InPost Integration Page](https://inpost.pl/integracja-z-inpost) diff --git a/composer.json b/composer.json index b47ec79..43b71d3 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Hyva Checkout compatybility module for Inpost", "type": "magento2-module", "require": { - "smartmage/module-inpost-paczkomaty": "*" + "smartmage/inpost": "*" }, "autoload": { "files": [ From bd529621ab666fc58cd41a1ba830d3affb2a9e40 Mon Sep 17 00:00:00 2001 From: GardenLawn-at-366966045602 Date: Thu, 30 Oct 2025 18:58:43 +0100 Subject: [PATCH 2/4] Correction of the required smartmage/inpost module --- README.md | 0 composer.json | 0 src/Magewire/Locker.php | 0 src/Observer/ConvertQuoteToOrder.php | 0 src/Plugin/RemovePickupPoint.php | 0 src/etc/frontend/di.xml | 0 src/etc/frontend/events.xml | 0 src/etc/module.xml | 0 src/i18n/pl_PL.csv | 0 src/registration.php | 0 src/view/frontend/layout/hyva_checkout.xml | 0 src/view/frontend/layout/hyva_checkout_components.xml | 0 src/view/frontend/layout/hyva_checkout_index_index.xml | 0 src/view/frontend/tailwind/tailwind.config.js | 0 src/view/frontend/templates/geowidget-script.phtml | 0 .../templates/inpostlocker-standardcod/geowidget-modal.phtml | 0 .../frontend/templates/inpostlocker-standardcod/geowidget.phtml | 0 src/view/frontend/templates/inpostlocker-standardcod/locker.phtml | 0 .../templates/inpostlocker_standard/geowidget-modal.phtml | 0 src/view/frontend/templates/inpostlocker_standard/geowidget.phtml | 0 src/view/frontend/templates/inpostlocker_standard/locker.phtml | 0 src/view/frontend/templates/locker-js.phtml | 0 src/view/frontend/templates/validate-inpost-locker.phtml | 0 23 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 README.md mode change 100644 => 100755 composer.json mode change 100644 => 100755 src/Magewire/Locker.php mode change 100644 => 100755 src/Observer/ConvertQuoteToOrder.php mode change 100644 => 100755 src/Plugin/RemovePickupPoint.php mode change 100644 => 100755 src/etc/frontend/di.xml mode change 100644 => 100755 src/etc/frontend/events.xml mode change 100644 => 100755 src/etc/module.xml mode change 100644 => 100755 src/i18n/pl_PL.csv mode change 100644 => 100755 src/registration.php mode change 100644 => 100755 src/view/frontend/layout/hyva_checkout.xml mode change 100644 => 100755 src/view/frontend/layout/hyva_checkout_components.xml mode change 100644 => 100755 src/view/frontend/layout/hyva_checkout_index_index.xml mode change 100644 => 100755 src/view/frontend/tailwind/tailwind.config.js mode change 100644 => 100755 src/view/frontend/templates/geowidget-script.phtml mode change 100644 => 100755 src/view/frontend/templates/inpostlocker-standardcod/geowidget-modal.phtml mode change 100644 => 100755 src/view/frontend/templates/inpostlocker-standardcod/geowidget.phtml mode change 100644 => 100755 src/view/frontend/templates/inpostlocker-standardcod/locker.phtml mode change 100644 => 100755 src/view/frontend/templates/inpostlocker_standard/geowidget-modal.phtml mode change 100644 => 100755 src/view/frontend/templates/inpostlocker_standard/geowidget.phtml mode change 100644 => 100755 src/view/frontend/templates/inpostlocker_standard/locker.phtml mode change 100644 => 100755 src/view/frontend/templates/locker-js.phtml mode change 100644 => 100755 src/view/frontend/templates/validate-inpost-locker.phtml diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/composer.json b/composer.json old mode 100644 new mode 100755 diff --git a/src/Magewire/Locker.php b/src/Magewire/Locker.php old mode 100644 new mode 100755 diff --git a/src/Observer/ConvertQuoteToOrder.php b/src/Observer/ConvertQuoteToOrder.php old mode 100644 new mode 100755 diff --git a/src/Plugin/RemovePickupPoint.php b/src/Plugin/RemovePickupPoint.php old mode 100644 new mode 100755 diff --git a/src/etc/frontend/di.xml b/src/etc/frontend/di.xml old mode 100644 new mode 100755 diff --git a/src/etc/frontend/events.xml b/src/etc/frontend/events.xml old mode 100644 new mode 100755 diff --git a/src/etc/module.xml b/src/etc/module.xml old mode 100644 new mode 100755 diff --git a/src/i18n/pl_PL.csv b/src/i18n/pl_PL.csv old mode 100644 new mode 100755 diff --git a/src/registration.php b/src/registration.php old mode 100644 new mode 100755 diff --git a/src/view/frontend/layout/hyva_checkout.xml b/src/view/frontend/layout/hyva_checkout.xml old mode 100644 new mode 100755 diff --git a/src/view/frontend/layout/hyva_checkout_components.xml b/src/view/frontend/layout/hyva_checkout_components.xml old mode 100644 new mode 100755 diff --git a/src/view/frontend/layout/hyva_checkout_index_index.xml b/src/view/frontend/layout/hyva_checkout_index_index.xml old mode 100644 new mode 100755 diff --git a/src/view/frontend/tailwind/tailwind.config.js b/src/view/frontend/tailwind/tailwind.config.js old mode 100644 new mode 100755 diff --git a/src/view/frontend/templates/geowidget-script.phtml b/src/view/frontend/templates/geowidget-script.phtml old mode 100644 new mode 100755 diff --git a/src/view/frontend/templates/inpostlocker-standardcod/geowidget-modal.phtml b/src/view/frontend/templates/inpostlocker-standardcod/geowidget-modal.phtml old mode 100644 new mode 100755 diff --git a/src/view/frontend/templates/inpostlocker-standardcod/geowidget.phtml b/src/view/frontend/templates/inpostlocker-standardcod/geowidget.phtml old mode 100644 new mode 100755 diff --git a/src/view/frontend/templates/inpostlocker-standardcod/locker.phtml b/src/view/frontend/templates/inpostlocker-standardcod/locker.phtml old mode 100644 new mode 100755 diff --git a/src/view/frontend/templates/inpostlocker_standard/geowidget-modal.phtml b/src/view/frontend/templates/inpostlocker_standard/geowidget-modal.phtml old mode 100644 new mode 100755 diff --git a/src/view/frontend/templates/inpostlocker_standard/geowidget.phtml b/src/view/frontend/templates/inpostlocker_standard/geowidget.phtml old mode 100644 new mode 100755 diff --git a/src/view/frontend/templates/inpostlocker_standard/locker.phtml b/src/view/frontend/templates/inpostlocker_standard/locker.phtml old mode 100644 new mode 100755 diff --git a/src/view/frontend/templates/locker-js.phtml b/src/view/frontend/templates/locker-js.phtml old mode 100644 new mode 100755 diff --git a/src/view/frontend/templates/validate-inpost-locker.phtml b/src/view/frontend/templates/validate-inpost-locker.phtml old mode 100644 new mode 100755 From 8e8be312f353acc602366d4c88ca71d824932dc9 Mon Sep 17 00:00:00 2001 From: GardenLawn-at-366966045602 Date: Thu, 13 Nov 2025 12:06:33 +0100 Subject: [PATCH 3/4] Migrate existing code to CSP-compliant code. https://docs.hyva.io/hyva-themes/writing-code/csp/migration-tool.html --- composer.json | 31 ++++++++++--------- .../geowidget-modal.phtml | 12 ++++++- .../inpostlocker-standardcod/locker.phtml | 12 ++++++- .../geowidget-modal.phtml | 12 ++++++- .../inpostlocker_standard/locker.phtml | 12 ++++++- 5 files changed, 60 insertions(+), 19 deletions(-) diff --git a/composer.json b/composer.json index 43b71d3..12b585d 100755 --- a/composer.json +++ b/composer.json @@ -1,16 +1,17 @@ { - "name": "snowdog/module-hyva-checkout-inpost", - "description": "Hyva Checkout compatybility module for Inpost", - "type": "magento2-module", - "require": { - "smartmage/inpost": "*" - }, - "autoload": { - "files": [ - "src/registration.php" - ], - "psr-4": { - "Snowdog\\Hyva\\Checkout\\Inpost\\": "src" - } - } -} + "name": "snowdog/module-hyva-checkout-inpost", + "description": "Hyva Checkout compatybility module for Inpost", + "type": "magento2-module", + "require": { + "smartmage/inpost": "*", + "hyva-themes/magento2-theme-module": "^1.3.11" + }, + "autoload": { + "files": [ + "src/registration.php" + ], + "psr-4": { + "Snowdog\\Hyva\\Checkout\\Inpost\\": "src" + } + } +} \ No newline at end of file diff --git a/src/view/frontend/templates/inpostlocker-standardcod/geowidget-modal.phtml b/src/view/frontend/templates/inpostlocker-standardcod/geowidget-modal.phtml index 934c34f..6b859eb 100755 --- a/src/view/frontend/templates/inpostlocker-standardcod/geowidget-modal.phtml +++ b/src/view/frontend/templates/inpostlocker-standardcod/geowidget-modal.phtml @@ -23,8 +23,18 @@ $modalBlock = $modal->getContentRenderer(); $modalBlock->setData('token', $viewModel->getGeoToken()); ?>
+ +registerInlineScript() ?> \ No newline at end of file diff --git a/src/view/frontend/templates/inpostlocker-standardcod/locker.phtml b/src/view/frontend/templates/inpostlocker-standardcod/locker.phtml index af073df..54a19ac 100755 --- a/src/view/frontend/templates/inpostlocker-standardcod/locker.phtml +++ b/src/view/frontend/templates/inpostlocker-standardcod/locker.phtml @@ -23,7 +23,7 @@ $heroIcons = $viewModels->require(HeroiconsOutline::class);
locker): ?> @@ -55,3 +55,13 @@ $heroIcons = $viewModels->require(HeroiconsOutline::class); escapeHtml(__('Choose locker')) ?>
+ +registerInlineScript() ?> \ No newline at end of file diff --git a/src/view/frontend/templates/inpostlocker_standard/geowidget-modal.phtml b/src/view/frontend/templates/inpostlocker_standard/geowidget-modal.phtml index 619cd95..2e51a17 100755 --- a/src/view/frontend/templates/inpostlocker_standard/geowidget-modal.phtml +++ b/src/view/frontend/templates/inpostlocker_standard/geowidget-modal.phtml @@ -23,8 +23,18 @@ $modalBlock = $modal->getContentRenderer(); $modalBlock->setData('token', $viewModel->getGeoToken()); ?>
+ +registerInlineScript() ?> \ No newline at end of file diff --git a/src/view/frontend/templates/inpostlocker_standard/locker.phtml b/src/view/frontend/templates/inpostlocker_standard/locker.phtml index f2b4f97..a5f8383 100755 --- a/src/view/frontend/templates/inpostlocker_standard/locker.phtml +++ b/src/view/frontend/templates/inpostlocker_standard/locker.phtml @@ -17,7 +17,7 @@ $heroIcons = $viewModels->require(\Hyva\Theme\ViewModel\HeroiconsOutline::class)
locker): ?> @@ -49,3 +49,13 @@ $heroIcons = $viewModels->require(\Hyva\Theme\ViewModel\HeroiconsOutline::class) escapeHtml(__('Choose locker')) ?>
+ +registerInlineScript() ?> \ No newline at end of file From 0d7a02ee1b9f61090859351ee436e2f9afeb434e Mon Sep 17 00:00:00 2001 From: GardenLawn-at-366966045602 Date: Thu, 13 Nov 2025 12:31:06 +0100 Subject: [PATCH 4/4] Migrate existing code to CSP-compliant code. https://docs.hyva.io/hyva-themes/writing-code/csp/migration-tool.html --- composer.json | 31 ++++++++++--------- src/Magewire/Locker.php | 0 src/Observer/ConvertQuoteToOrder.php | 0 src/Plugin/RemovePickupPoint.php | 0 src/etc/frontend/di.xml | 0 src/etc/frontend/events.xml | 0 src/etc/module.xml | 0 src/i18n/pl_PL.csv | 0 src/registration.php | 0 src/view/frontend/layout/hyva_checkout.xml | 0 .../layout/hyva_checkout_components.xml | 0 .../layout/hyva_checkout_index_index.xml | 0 src/view/frontend/tailwind/tailwind.config.js | 0 .../frontend/templates/geowidget-script.phtml | 0 .../geowidget-modal.phtml | 0 .../inpostlocker-standardcod/geowidget.phtml | 0 .../inpostlocker-standardcod/locker.phtml | 0 .../geowidget-modal.phtml | 0 .../inpostlocker_standard/geowidget.phtml | 0 .../inpostlocker_standard/locker.phtml | 0 src/view/frontend/templates/locker-js.phtml | 0 .../templates/validate-inpost-locker.phtml | 0 22 files changed, 16 insertions(+), 15 deletions(-) mode change 100755 => 100644 src/Magewire/Locker.php mode change 100755 => 100644 src/Observer/ConvertQuoteToOrder.php mode change 100755 => 100644 src/Plugin/RemovePickupPoint.php mode change 100755 => 100644 src/etc/frontend/di.xml mode change 100755 => 100644 src/etc/frontend/events.xml mode change 100755 => 100644 src/etc/module.xml mode change 100755 => 100644 src/i18n/pl_PL.csv mode change 100755 => 100644 src/registration.php mode change 100755 => 100644 src/view/frontend/layout/hyva_checkout.xml mode change 100755 => 100644 src/view/frontend/layout/hyva_checkout_components.xml mode change 100755 => 100644 src/view/frontend/layout/hyva_checkout_index_index.xml mode change 100755 => 100644 src/view/frontend/tailwind/tailwind.config.js mode change 100755 => 100644 src/view/frontend/templates/geowidget-script.phtml mode change 100755 => 100644 src/view/frontend/templates/inpostlocker-standardcod/geowidget-modal.phtml mode change 100755 => 100644 src/view/frontend/templates/inpostlocker-standardcod/geowidget.phtml mode change 100755 => 100644 src/view/frontend/templates/inpostlocker-standardcod/locker.phtml mode change 100755 => 100644 src/view/frontend/templates/inpostlocker_standard/geowidget-modal.phtml mode change 100755 => 100644 src/view/frontend/templates/inpostlocker_standard/geowidget.phtml mode change 100755 => 100644 src/view/frontend/templates/inpostlocker_standard/locker.phtml mode change 100755 => 100644 src/view/frontend/templates/locker-js.phtml mode change 100755 => 100644 src/view/frontend/templates/validate-inpost-locker.phtml diff --git a/composer.json b/composer.json index 43b71d3..12b585d 100644 --- a/composer.json +++ b/composer.json @@ -1,16 +1,17 @@ { - "name": "snowdog/module-hyva-checkout-inpost", - "description": "Hyva Checkout compatybility module for Inpost", - "type": "magento2-module", - "require": { - "smartmage/inpost": "*" - }, - "autoload": { - "files": [ - "src/registration.php" - ], - "psr-4": { - "Snowdog\\Hyva\\Checkout\\Inpost\\": "src" - } - } -} + "name": "snowdog/module-hyva-checkout-inpost", + "description": "Hyva Checkout compatybility module for Inpost", + "type": "magento2-module", + "require": { + "smartmage/inpost": "*", + "hyva-themes/magento2-theme-module": "^1.3.11" + }, + "autoload": { + "files": [ + "src/registration.php" + ], + "psr-4": { + "Snowdog\\Hyva\\Checkout\\Inpost\\": "src" + } + } +} \ No newline at end of file diff --git a/src/Magewire/Locker.php b/src/Magewire/Locker.php old mode 100755 new mode 100644 diff --git a/src/Observer/ConvertQuoteToOrder.php b/src/Observer/ConvertQuoteToOrder.php old mode 100755 new mode 100644 diff --git a/src/Plugin/RemovePickupPoint.php b/src/Plugin/RemovePickupPoint.php old mode 100755 new mode 100644 diff --git a/src/etc/frontend/di.xml b/src/etc/frontend/di.xml old mode 100755 new mode 100644 diff --git a/src/etc/frontend/events.xml b/src/etc/frontend/events.xml old mode 100755 new mode 100644 diff --git a/src/etc/module.xml b/src/etc/module.xml old mode 100755 new mode 100644 diff --git a/src/i18n/pl_PL.csv b/src/i18n/pl_PL.csv old mode 100755 new mode 100644 diff --git a/src/registration.php b/src/registration.php old mode 100755 new mode 100644 diff --git a/src/view/frontend/layout/hyva_checkout.xml b/src/view/frontend/layout/hyva_checkout.xml old mode 100755 new mode 100644 diff --git a/src/view/frontend/layout/hyva_checkout_components.xml b/src/view/frontend/layout/hyva_checkout_components.xml old mode 100755 new mode 100644 diff --git a/src/view/frontend/layout/hyva_checkout_index_index.xml b/src/view/frontend/layout/hyva_checkout_index_index.xml old mode 100755 new mode 100644 diff --git a/src/view/frontend/tailwind/tailwind.config.js b/src/view/frontend/tailwind/tailwind.config.js old mode 100755 new mode 100644 diff --git a/src/view/frontend/templates/geowidget-script.phtml b/src/view/frontend/templates/geowidget-script.phtml old mode 100755 new mode 100644 diff --git a/src/view/frontend/templates/inpostlocker-standardcod/geowidget-modal.phtml b/src/view/frontend/templates/inpostlocker-standardcod/geowidget-modal.phtml old mode 100755 new mode 100644 diff --git a/src/view/frontend/templates/inpostlocker-standardcod/geowidget.phtml b/src/view/frontend/templates/inpostlocker-standardcod/geowidget.phtml old mode 100755 new mode 100644 diff --git a/src/view/frontend/templates/inpostlocker-standardcod/locker.phtml b/src/view/frontend/templates/inpostlocker-standardcod/locker.phtml old mode 100755 new mode 100644 diff --git a/src/view/frontend/templates/inpostlocker_standard/geowidget-modal.phtml b/src/view/frontend/templates/inpostlocker_standard/geowidget-modal.phtml old mode 100755 new mode 100644 diff --git a/src/view/frontend/templates/inpostlocker_standard/geowidget.phtml b/src/view/frontend/templates/inpostlocker_standard/geowidget.phtml old mode 100755 new mode 100644 diff --git a/src/view/frontend/templates/inpostlocker_standard/locker.phtml b/src/view/frontend/templates/inpostlocker_standard/locker.phtml old mode 100755 new mode 100644 diff --git a/src/view/frontend/templates/locker-js.phtml b/src/view/frontend/templates/locker-js.phtml old mode 100755 new mode 100644 diff --git a/src/view/frontend/templates/validate-inpost-locker.phtml b/src/view/frontend/templates/validate-inpost-locker.phtml old mode 100755 new mode 100644