From dd17d89d14588fee338298f156c3c6b802189422 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 23 Dec 2025 16:04:50 +0000 Subject: [PATCH 01/22] Initial plan From 691afcd8db2dfefb9b99fb5b746c22f86466a2a4 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 23 Dec 2025 16:14:16 +0000 Subject: [PATCH 02/22] fix(template): [PCMT-1080] Fix Vue 3 template roots and Vue Router 4 compatibility Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- .../lgw-action-button.html.twig | 36 +++-- .../lgw-action-label.html.twig | 14 +- .../component/lgw-catalog-select/index.js | 2 +- .../lgw-catalog-select.hmtl.twig | 16 --- .../lgw-catalog-select.html.twig | 14 ++ .../lgw-conditional-string-field.html.twig | 50 ++++--- .../lgw-country-icon.html.twig | 18 ++- .../lgw-debug-warning.html.twig | 4 +- .../lgw-description-list-element.html.twig | 40 +++--- .../component/lgw-footer/lgw-footer.html.twig | 40 +++--- .../lgw-free-trial-warning.html.twig | 18 ++- .../lgw-lockable-string-field.html.twig | 38 +++--- .../lgw-order-state-label.html.twig | 8 +- .../lgw-order-type-icon.html.twig | 8 +- .../lgw-update-modal.html.twig | 126 +++++++++--------- .../lgw-update-warning.html.twig | 18 ++- .../lgw-order-list/lgw-order-list.html.twig | 4 +- .../lgw-connection-cms.html.twig | 8 +- .../lgw-connection-home.html.twig | 4 +- .../lgw-dashboard-free-trial.html.twig | 66 +++++---- .../lgw-dashboard-home.html.twig | 126 +++++++++--------- 21 files changed, 313 insertions(+), 345 deletions(-) delete mode 100644 src/Resources/app/administration/src/module/lengow-connector/component/lgw-catalog-select/lgw-catalog-select.hmtl.twig create mode 100644 src/Resources/app/administration/src/module/lengow-connector/component/lgw-catalog-select/lgw-catalog-select.html.twig diff --git a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-action-button/lgw-action-button.html.twig b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-action-button/lgw-action-button.html.twig index 1ca564e..9d2f0a1 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-action-button/lgw-action-button.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-action-button/lgw-action-button.html.twig @@ -1,21 +1,19 @@ {% block lgw_action_button %} - +
+ + {{ buttonContent }} + + {{ tooltipTitle }} +
    +
  • + {{ error }} +
    • +
+ + + +
{% endblock %} \ No newline at end of file diff --git a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-action-label/lgw-action-label.html.twig b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-action-label/lgw-action-label.html.twig index a7b9529..2736973 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-action-label/lgw-action-label.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-action-label/lgw-action-label.html.twig @@ -1,10 +1,8 @@ {% block lgw_action_label %} - +
+ + {{ labelContent }} + + +
{% endblock %} \ No newline at end of file diff --git a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-catalog-select/index.js b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-catalog-select/index.js index 0f6b28a..2c206c3 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-catalog-select/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-catalog-select/index.js @@ -1,4 +1,4 @@ -import template from './lgw-catalog-select.hmtl.twig'; +import template from './lgw-catalog-select.html.twig'; import './lgw-catalog-select.scss'; const { Component } = Shopware; diff --git a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-catalog-select/lgw-catalog-select.hmtl.twig b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-catalog-select/lgw-catalog-select.hmtl.twig deleted file mode 100644 index c7fa557..0000000 --- a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-catalog-select/lgw-catalog-select.hmtl.twig +++ /dev/null @@ -1,16 +0,0 @@ -{% block lgw_catalog_select %} - -{% endblock %} diff --git a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-catalog-select/lgw-catalog-select.html.twig b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-catalog-select/lgw-catalog-select.html.twig new file mode 100644 index 0000000..db3392d --- /dev/null +++ b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-catalog-select/lgw-catalog-select.html.twig @@ -0,0 +1,14 @@ +{% block lgw_catalog_select %} +
+

{{ salesChannel.name }}

+ + +
+{% endblock %} diff --git a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-conditional-string-field/lgw-conditional-string-field.html.twig b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-conditional-string-field/lgw-conditional-string-field.html.twig index e37c2df..32cbc68 100755 --- a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-conditional-string-field/lgw-conditional-string-field.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-conditional-string-field/lgw-conditional-string-field.html.twig @@ -1,28 +1,26 @@ {% block lgw_conditional_string_field %} - +
+ + + + + + +
{% endblock %} diff --git a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-country-icon/lgw-country-icon.html.twig b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-country-icon/lgw-country-icon.html.twig index f7c9293..c8e20f9 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-country-icon/lgw-country-icon.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-country-icon/lgw-country-icon.html.twig @@ -1,12 +1,10 @@ {% block lgw_country_icon %} - +
+ + +
{% endblock %} diff --git a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-debug-warning/lgw-debug-warning.html.twig b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-debug-warning/lgw-debug-warning.html.twig index 0babfa3..44a2807 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-debug-warning/lgw-debug-warning.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-debug-warning/lgw-debug-warning.html.twig @@ -1,5 +1,3 @@ {% block lengow_debug_warning %} - + Debug mode {% endblock %} diff --git a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-description-list-element/lgw-description-list-element.html.twig b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-description-list-element/lgw-description-list-element.html.twig index 5209566..32ba42e 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-description-list-element/lgw-description-list-element.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-description-list-element/lgw-description-list-element.html.twig @@ -1,23 +1,21 @@ {% block lgw_description_list_element %} - +
+
{{ title }}
+
+ +
+ {{ formatDate(content) }} +
+
+ + {{ value }} + +
+ + {{ content }} + +
+
{% endblock %} diff --git a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-footer/lgw-footer.html.twig b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-footer/lgw-footer.html.twig index ef5280c..cd91df5 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-footer/lgw-footer.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-footer/lgw-footer.html.twig @@ -1,24 +1,22 @@ {% block lgw_footer %} - + {% endblock %} diff --git a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-free-trial-warning/lgw-free-trial-warning.html.twig b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-free-trial-warning/lgw-free-trial-warning.html.twig index 30e574f..446909f 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-free-trial-warning/lgw-free-trial-warning.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-free-trial-warning/lgw-free-trial-warning.html.twig @@ -1,12 +1,10 @@ {% block lgw_free_trial_warning %} - + + {{ $tc('lengow-connector.global.trial_1') }} + {{ dayLeft }} + {{ $tc('lengow-connector.global.trial_2') }} + + {{ $tc('lengow-connector.global.upgrade_account') }} + + {% endblock %} diff --git a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-lockable-string-field/lgw-lockable-string-field.html.twig b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-lockable-string-field/lgw-lockable-string-field.html.twig index dcd1b39..f93b7ec 100755 --- a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-lockable-string-field/lgw-lockable-string-field.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-lockable-string-field/lgw-lockable-string-field.html.twig @@ -1,22 +1,20 @@ {% block lgw_lockable_string_field %} - +
+ + + + +
{% endblock %} diff --git a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-order-state-label/lgw-order-state-label.html.twig b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-order-state-label/lgw-order-state-label.html.twig index 29be9bd..0185ae3 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-order-state-label/lgw-order-state-label.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-order-state-label/lgw-order-state-label.html.twig @@ -1,7 +1,5 @@ {% block lgw_order_state_label %} - + + {{ orderStateTranslation }} + {% endblock %} \ No newline at end of file diff --git a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-order-type-icon/lgw-order-type-icon.html.twig b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-order-type-icon/lgw-order-type-icon.html.twig index 9614b43..1840b60 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-order-type-icon/lgw-order-type-icon.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-order-type-icon/lgw-order-type-icon.html.twig @@ -1,7 +1,5 @@ {% block lgw_order_type_icon %} - +
+ +
{% endblock %} \ No newline at end of file diff --git a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-update-modal/lgw-update-modal.html.twig b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-update-modal/lgw-update-modal.html.twig index 5aa1874..fd8383b 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-update-modal/lgw-update-modal.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-update-modal/lgw-update-modal.html.twig @@ -1,73 +1,71 @@ {% block lgw_update_modal %} - + + {% endblock %} diff --git a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-update-warning/lgw-update-warning.html.twig b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-update-warning/lgw-update-warning.html.twig index abf6960..77edc96 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-update-warning/lgw-update-warning.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-update-warning/lgw-update-warning.html.twig @@ -1,12 +1,10 @@ {% block lgw_update_warning %} - + + {{ $tc('lengow-connector.global.new_version_available_1') }} + {{ version }} + {{ $tc('lengow-connector.global.new_version_available_2') }} + + {% endblock %} diff --git a/src/Resources/app/administration/src/module/lengow-connector/page/lgw-order-list/lgw-order-list.html.twig b/src/Resources/app/administration/src/module/lengow-connector/page/lgw-order-list/lgw-order-list.html.twig index 9ff80ef..f820c9e 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/page/lgw-order-list/lgw-order-list.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/page/lgw-order-list/lgw-order-list.html.twig @@ -45,9 +45,9 @@

{{ $tc('lengow-connector.order.no_report_sent') }} - + {{ $tc('lengow-connector.order.change_this') }} - +

diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-cms/lgw-connection-cms.html.twig b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-cms/lgw-connection-cms.html.twig index 63c0c7b..9ba2328 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-cms/lgw-connection-cms.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-cms/lgw-connection-cms.html.twig @@ -73,9 +73,9 @@

- + {{ $tc('lengow-connector.connection.cms.success_button_catalog') }} - +
{% endblock %} @@ -93,9 +93,9 @@

- + {{ $tc('lengow-connector.connection.cms.success_button') }} - +
{% endblock %} diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-home/lgw-connection-home.html.twig b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-home/lgw-connection-home.html.twig index b213615..d60e9a6 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-home/lgw-connection-home.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-home/lgw-connection-home.html.twig @@ -23,9 +23,9 @@ {{ $tc('lengow-connector.connection.home.description_fourth') }}

- + {{ $tc('lengow-connector.connection.home.button') }} - +

{{ $tc('lengow-connector.connection.home.no_account') }} diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-dashboard-free-trial/lgw-dashboard-free-trial.html.twig b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-dashboard-free-trial/lgw-dashboard-free-trial.html.twig index 6a1f80c..43e192a 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-dashboard-free-trial/lgw-dashboard-free-trial.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-dashboard-free-trial/lgw-dashboard-free-trial.html.twig @@ -1,38 +1,36 @@ {% block lgw_dashboard_free_trial %} - +

{% endblock %} diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-dashboard-home/lgw-dashboard-home.html.twig b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-dashboard-home/lgw-dashboard-home.html.twig index 8208503..d9732ec 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-dashboard-home/lgw-dashboard-home.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-dashboard-home/lgw-dashboard-home.html.twig @@ -1,71 +1,69 @@ {% block lgw_dashboard_home %} - + {% endblock %} From 34b974b22a60f3b50e7d83388f03e4e6dce0ddcc Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 23 Dec 2025 16:17:34 +0000 Subject: [PATCH 03/22] fix(template): [PCMT-1080] Add keyboard navigation to clickable divs for accessibility Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- .../view/lgw-dashboard-home/lgw-dashboard-home.html.twig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-dashboard-home/lgw-dashboard-home.html.twig b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-dashboard-home/lgw-dashboard-home.html.twig index d9732ec..64fb1c7 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-dashboard-home/lgw-dashboard-home.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-dashboard-home/lgw-dashboard-home.html.twig @@ -19,7 +19,7 @@
-
+

{{ $tc('lengow-connector.dashboard.products.title') }}

{{ $tc('lengow-connector.dashboard.products.desc') }}

@@ -28,7 +28,7 @@
-
+

{{ $tc('lengow-connector.dashboard.orders.title') }}

{{ $tc('lengow-connector.dashboard.orders.desc') }}

@@ -37,7 +37,7 @@
-
+

{{ $tc('lengow-connector.dashboard.settings.title') }}

{{ $tc('lengow-connector.dashboard.settings.desc') }}

From 9344641bcef174d898f2c57892a4cf8b274877d5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Dec 2025 07:53:48 +0000 Subject: [PATCH 04/22] fix(entity): [PCMT-1080] Add getEntityName() method for Shopware 6.7 compatibility Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- src/EntityExtension/Extension/ProductExtension.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/EntityExtension/Extension/ProductExtension.php b/src/EntityExtension/Extension/ProductExtension.php index 8d86619..ec67e0d 100644 --- a/src/EntityExtension/Extension/ProductExtension.php +++ b/src/EntityExtension/Extension/ProductExtension.php @@ -31,4 +31,12 @@ public function getDefinitionClass(): string { return ProductDefinition::class; } + + /** + * @return string + */ + public function getEntityName(): string + { + return 'product'; + } } \ No newline at end of file From 6175e633b158074f0497fc08537aad452fa90466 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Dec 2025 08:05:35 +0000 Subject: [PATCH 05/22] fix(entity): [PCMT-1080] Make createdAt/updatedAt nullable for Shopware 6.7 compatibility Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- src/Entity/Lengow/Product/ProductEntity.php | 10 +++++----- src/Entity/Lengow/Settings/SettingsEntity.php | 20 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/Entity/Lengow/Product/ProductEntity.php b/src/Entity/Lengow/Product/ProductEntity.php index f795cde..b9020af 100644 --- a/src/Entity/Lengow/Product/ProductEntity.php +++ b/src/Entity/Lengow/Product/ProductEntity.php @@ -26,7 +26,7 @@ class ProductEntity extends Entity protected $salesChannel; /** - * @var DateTimeInterface + * @var DateTimeInterface|null */ protected $createdAt; @@ -63,17 +63,17 @@ public function setSalesChannel(ShopwareSalesChannelEntity $salesChannel): void } /** - * @return DateTimeInterface + * @return DateTimeInterface|null */ - public function getCreatedAt(): DateTimeInterface + public function getCreatedAt(): ?DateTimeInterface { return $this->createdAt; } /** - * @param DateTimeInterface $createdAt + * @param DateTimeInterface|null $createdAt */ - public function setCreatedAt(DateTimeInterface $createdAt): void + public function setCreatedAt(?DateTimeInterface $createdAt): void { $this->createdAt = $createdAt; } diff --git a/src/Entity/Lengow/Settings/SettingsEntity.php b/src/Entity/Lengow/Settings/SettingsEntity.php index 2984d29..f1cfd07 100644 --- a/src/Entity/Lengow/Settings/SettingsEntity.php +++ b/src/Entity/Lengow/Settings/SettingsEntity.php @@ -32,12 +32,12 @@ class SettingsEntity extends Entity protected $value; /** - * @var DateTimeInterface + * @var DateTimeInterface|null */ protected $createdAt; /** - * @var DateTimeInterface + * @var DateTimeInterface|null */ protected $updatedAt; @@ -90,33 +90,33 @@ public function setValue(?string $value): void } /** - * @return DateTimeInterface + * @return DateTimeInterface|null */ - public function getCreatedAt(): DateTimeInterface + public function getCreatedAt(): ?DateTimeInterface { return $this->createdAt; } /** - * @param DateTimeInterface $createdAt + * @param DateTimeInterface|null $createdAt */ - public function setCreatedAt(DateTimeInterface $createdAt): void + public function setCreatedAt(?DateTimeInterface $createdAt): void { $this->createdAt = $createdAt; } /** - * @return DateTimeInterface + * @return DateTimeInterface|null */ - public function getUpdatedAt(): DateTimeInterface + public function getUpdatedAt(): ?DateTimeInterface { return $this->updatedAt; } /** - * @param DateTimeInterface $updatedAt + * @param DateTimeInterface|null $updatedAt */ - public function setUpdatedAt(DateTimeInterface $updatedAt): void + public function setUpdatedAt(?DateTimeInterface $updatedAt): void { $this->updatedAt = $updatedAt; } From 29ec8d5f013a7fd7ae70a4d62cc0d2e5a5bc91a0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Dec 2025 08:28:06 +0000 Subject: [PATCH 06/22] fix(dbal): [PCMT-1080] Replace deprecated executeUpdate with executeStatement for Doctrine DBAL 3+ compatibility Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- src/LengowConnector.php | 6 ++--- src/Migration/Migration1606313662Init.php | 22 +++++++++---------- .../Migration1624606589Update102.php | 2 +- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/LengowConnector.php b/src/LengowConnector.php index 5d37428..81a5e0e 100644 --- a/src/LengowConnector.php +++ b/src/LengowConnector.php @@ -70,9 +70,9 @@ public function uninstall(UninstallContext $uninstallContext): void if (!$uninstallContext->keepUserData()) { $connection = $this->container->get(Connection::class); - $connection->executeUpdate('DROP TABLE IF EXISTS `lengow_order`, `lengow_order_line`, `lengow_order_error`, `lengow_action`, `lengow_settings`, `lengow_product`;'); + $connection->executeStatement('DROP TABLE IF EXISTS `lengow_order`, `lengow_order_line`, `lengow_order_error`, `lengow_action`, `lengow_settings`, `lengow_product`;'); - $connection->executeUpdate(' + $connection->executeStatement(' DELETE FROM state_machine_transition WHERE to_state_id = ( SELECT id FROM state_machine_state WHERE technical_name = "lengow_technical_error" @@ -81,7 +81,7 @@ public function uninstall(UninstallContext $uninstallContext): void ); '); - $connection->executeUpdate(' + $connection->executeStatement(' DELETE FROM state_machine_state WHERE technical_name = "lengow_technical_error"; '); diff --git a/src/Migration/Migration1606313662Init.php b/src/Migration/Migration1606313662Init.php index e833daa..7a49156 100644 --- a/src/Migration/Migration1606313662Init.php +++ b/src/Migration/Migration1606313662Init.php @@ -21,7 +21,7 @@ public function update(Connection $connection): void * order (FK order_id) * sales_channel (FK sales_channel_id) */ - $connection->executeUpdate(' + $connection->executeStatement(' CREATE TABLE IF NOT EXISTS `lengow_order` ( `id` BINARY(16) NOT NULL, `order_id` BINARY(16) NULL DEFAULT NULL, @@ -73,7 +73,7 @@ public function update(Connection $connection): void * order (FK order_id) * product (FK product_id) */ - $connection->executeUpdate(' + $connection->executeStatement(' CREATE TABLE IF NOT EXISTS `lengow_order_line` ( `id` BINARY(16) NOT NULL, `order_id` BINARY(16) NOT NULL, @@ -91,7 +91,7 @@ public function update(Connection $connection): void * this table reference another lengow table : * lengow_order (FK lengow_order_id) */ - $connection->executeUpdate(' + $connection->executeStatement(' CREATE TABLE IF NOT EXISTS `lengow_order_error` ( `id` BINARY(16) NOT NULL, `lengow_order_id` BINARY(16) NOT NULL, @@ -111,7 +111,7 @@ public function update(Connection $connection): void * this table reference 1 shopware base table : * order (FK order_id) */ - $connection->executeUpdate(' + $connection->executeStatement(' CREATE TABLE IF NOT EXISTS `lengow_action` ( `id` BINARY(16) NOT NULL, `order_id` BINARY(16) NOT NULL, @@ -133,7 +133,7 @@ public function update(Connection $connection): void * this table reference 1 shopware base table : * sales_channel (FK sales_channel_id) */ - $connection->executeUpdate(' + $connection->executeStatement(' CREATE TABLE IF NOT EXISTS `lengow_settings` ( `id` BINARY(16) NOT NULL, `sales_channel_id` BINARY(16) NULL DEFAULT NULL, @@ -153,7 +153,7 @@ public function update(Connection $connection): void * product (FK product_id) * sales_channel (FK sales_channel_id) */ - $connection->executeUpdate(' + $connection->executeStatement(' CREATE TABLE IF NOT EXISTS `lengow_product` ( `id` BINARY(16) NOT NULL, `product_id` BINARY(16) NOT NULL, @@ -171,7 +171,7 @@ public function update(Connection $connection): void * order state are linked to state_machine (order.state here) */ $StateUuid = Uuid::randomHex(); // Generate new uuid for insert - $connection->executeUpdate(' + $connection->executeStatement(' INSERT IGNORE INTO state_machine_state VALUES ( UNHEX("' . $StateUuid . '"), "lengow_technical_error", @@ -197,7 +197,7 @@ public function update(Connection $connection): void */ $uuid = Uuid::randomHex(); // Generate new uuid for insert $availableStateUuid = Uuid::fromBytesToHex($state['id']); - $connection->executeUpdate(' + $connection->executeStatement(' INSERT IGNORE INTO state_machine_transition VALUES ( UNHEX("' . $uuid . '"), "technical_error", @@ -219,7 +219,7 @@ public function update(Connection $connection): void '); } $uuid = Uuid::randomHex(); // Generate new uuid for insert - $connection->executeUpdate(' + $connection->executeStatement(' INSERT IGNORE INTO state_machine_transition VALUES ( UNHEX("' . $uuid . '"), "cancel_technical_error", @@ -252,7 +252,7 @@ public function update(Connection $connection): void foreach ($languageAvailable as $language) { $languageId = Uuid::fromBytesToHex($language['id']); if ($languageId) { - $connection->executeUpdate(' + $connection->executeStatement(' INSERT IGNORE INTO state_machine_state_translation VALUES ( UNHEX("' . $languageId . '"), ( @@ -272,7 +272,7 @@ public function update(Connection $connection): void public function updateDestructive(Connection $connection): void { - $connection->executeUpdate(' + $connection->executeStatement(' DROP TABLE IF EXISTS `lengow_settings`, `lengow_product`, diff --git a/src/Migration/Migration1624606589Update102.php b/src/Migration/Migration1624606589Update102.php index ce75256..3122447 100644 --- a/src/Migration/Migration1624606589Update102.php +++ b/src/Migration/Migration1624606589Update102.php @@ -15,7 +15,7 @@ public function getCreationTimestamp(): int public function update(Connection $connection): void { // modifying the value field to be able to store JSON data - $connection->executeUpdate('ALTER TABLE `lengow_settings` CHANGE `value` `value` TEXT NULL DEFAULT NULL'); + $connection->executeStatement('ALTER TABLE `lengow_settings` CHANGE `value` `value` TEXT NULL DEFAULT NULL'); } public function updateDestructive(Connection $connection): void From 0db3fa4cb4d4c310b2495c32803ba619fcc8f93a Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Dec 2025 08:39:09 +0000 Subject: [PATCH 07/22] fix(entity): [PCMT-1080] Use PHP typed properties with default null for createdAt/updatedAt Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- src/Entity/Lengow/Product/ProductEntity.php | 8 ++++---- src/Entity/Lengow/Settings/SettingsEntity.php | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Entity/Lengow/Product/ProductEntity.php b/src/Entity/Lengow/Product/ProductEntity.php index b9020af..d66fa74 100644 --- a/src/Entity/Lengow/Product/ProductEntity.php +++ b/src/Entity/Lengow/Product/ProductEntity.php @@ -26,9 +26,9 @@ class ProductEntity extends Entity protected $salesChannel; /** - * @var DateTimeInterface|null + * @var \DateTimeInterface|null */ - protected $createdAt; + protected ?\DateTimeInterface $createdAt = null; /** * @return string @@ -63,7 +63,7 @@ public function setSalesChannel(ShopwareSalesChannelEntity $salesChannel): void } /** - * @return DateTimeInterface|null + * @return \DateTimeInterface|null */ public function getCreatedAt(): ?DateTimeInterface { @@ -71,7 +71,7 @@ public function getCreatedAt(): ?DateTimeInterface } /** - * @param DateTimeInterface|null $createdAt + * @param \DateTimeInterface|null $createdAt */ public function setCreatedAt(?DateTimeInterface $createdAt): void { diff --git a/src/Entity/Lengow/Settings/SettingsEntity.php b/src/Entity/Lengow/Settings/SettingsEntity.php index f1cfd07..314cad1 100644 --- a/src/Entity/Lengow/Settings/SettingsEntity.php +++ b/src/Entity/Lengow/Settings/SettingsEntity.php @@ -32,14 +32,14 @@ class SettingsEntity extends Entity protected $value; /** - * @var DateTimeInterface|null + * @var \DateTimeInterface|null */ - protected $createdAt; + protected ?\DateTimeInterface $createdAt = null; /** - * @var DateTimeInterface|null + * @var \DateTimeInterface|null */ - protected $updatedAt; + protected ?\DateTimeInterface $updatedAt = null; /** * @return ShopwareSalesChannelEntity|null @@ -90,7 +90,7 @@ public function setValue(?string $value): void } /** - * @return DateTimeInterface|null + * @return \DateTimeInterface|null */ public function getCreatedAt(): ?DateTimeInterface { @@ -98,7 +98,7 @@ public function getCreatedAt(): ?DateTimeInterface } /** - * @param DateTimeInterface|null $createdAt + * @param \DateTimeInterface|null $createdAt */ public function setCreatedAt(?DateTimeInterface $createdAt): void { @@ -106,7 +106,7 @@ public function setCreatedAt(?DateTimeInterface $createdAt): void } /** - * @return DateTimeInterface|null + * @return \DateTimeInterface|null */ public function getUpdatedAt(): ?DateTimeInterface { @@ -114,7 +114,7 @@ public function getUpdatedAt(): ?DateTimeInterface } /** - * @param DateTimeInterface|null $updatedAt + * @param \DateTimeInterface|null $updatedAt */ public function setUpdatedAt(?DateTimeInterface $updatedAt): void { From d6719e6d866bb014fbfdbbc03db6f9698c0c568d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Dec 2025 08:59:06 +0000 Subject: [PATCH 08/22] fix(vue): [PCMT-1080] Add fallback for mapGetters/mapState compatibility with Shopware 6.7 Vue 3 Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- .../page/lgw-toolbox/index.js | 8 ++++++-- .../view/lgw-connection-catalog/index.js | 14 ++++++++++++-- .../view/lgw-connection-cms/index.js | 8 ++++++-- .../view/lgw-toolbox-base/index.js | 19 +++++++++++++++---- .../view/lgw-toolbox-checksum/index.js | 14 +++++++++++--- .../view/lgw-toolbox-log/index.js | 14 +++++++++++--- 6 files changed, 61 insertions(+), 16 deletions(-) diff --git a/src/Resources/app/administration/src/module/lengow-connector/page/lgw-toolbox/index.js b/src/Resources/app/administration/src/module/lengow-connector/page/lgw-toolbox/index.js index 9aeb6c4..982288e 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/page/lgw-toolbox/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/page/lgw-toolbox/index.js @@ -3,7 +3,7 @@ import './lgw-toolbox.scss'; import lgwToolboxState from './state'; const { Component } = Shopware; -const { mapGetters } = Shopware.Component.getComponentHelper(); +const { mapGetters } = Shopware.Component.getComponentHelper() || {}; Component.register('lgw-toolbox', { template, @@ -35,7 +35,11 @@ Component.register('lgw-toolbox', { }, computed: { - ...mapGetters('lgwToolbox', ['isLoading']) + ...(mapGetters ? mapGetters('lgwToolbox', ['isLoading']) : { + isLoading() { + return Shopware.State.getters['lgwToolbox/isLoading']; + } + }) }, methods: { diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-catalog/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-catalog/index.js index b42eacb..3c1fad5 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-catalog/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-catalog/index.js @@ -5,7 +5,7 @@ const { Filter, Data: { Criteria } } = Shopware; -const { mapState } = Shopware.Component.getComponentHelper(); +const { mapState } = Shopware.Component.getComponentHelper() || {}; Component.register('lgw-connection-catalog', { template, @@ -30,7 +30,17 @@ Component.register('lgw-connection-catalog', { }, computed: { - ...mapState('lgwConnection', ['catalogList', 'catalogSelected', 'optionIsLoading']), + ...(mapState ? mapState('lgwConnection', ['catalogList', 'catalogSelected', 'optionIsLoading']) : { + catalogList() { + return Shopware.State.get('lgwConnection').catalogList; + }, + catalogSelected() { + return Shopware.State.get('lgwConnection').catalogSelected; + }, + optionIsLoading() { + return Shopware.State.get('lgwConnection').optionIsLoading; + } + }), assetFilter() { return Filter.getByName('asset'); diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-cms/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-cms/index.js index 54fe6e0..efb7d0d 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-cms/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-cms/index.js @@ -8,7 +8,7 @@ const { Data: { Criteria } } = Shopware; -const { mapState } = Shopware.Component.getComponentHelper(); +const { mapState } = Shopware.Component.getComponentHelper() || {}; Component.register('lgw-connection-cms', { template, @@ -40,7 +40,11 @@ Component.register('lgw-connection-cms', { assetFilter() { return Filter.getByName('asset'); }, - ...mapState('lgwConnection', ['catalogList']), + ...(mapState ? mapState('lgwConnection', ['catalogList']) : { + catalogList() { + return Shopware.State.get('lgwConnection').catalogList; + } + }), lengowConfigRepository() { return this.repositoryFactory.create('lengow_settings'); } diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js index f7162db..71a8663 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js @@ -1,7 +1,7 @@ import template from './lgw-toolbox-base.html.twig'; const { Component } = Shopware; -const { mapState, mapGetters } = Shopware.Component.getComponentHelper(); +const { mapState, mapGetters } = Shopware.Component.getComponentHelper() || {}; Component.register('lgw-toolbox-base', { template, @@ -17,9 +17,20 @@ Component.register('lgw-toolbox-base', { created() {}, computed: { - ...mapState('lgwToolbox', ['overviewData', 'loading']), - - ...mapGetters('lgwToolbox', ['isLoading']) + ...(mapState ? mapState('lgwToolbox', ['overviewData', 'loading']) : { + overviewData() { + return Shopware.State.get('lgwToolbox').overviewData; + }, + loading() { + return Shopware.State.get('lgwToolbox').loading; + } + }), + + ...(mapGetters ? mapGetters('lgwToolbox', ['isLoading']) : { + isLoading() { + return Shopware.State.getters['lgwToolbox/isLoading']; + } + }) }, methods: {} diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-checksum/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-checksum/index.js index 71dcbe4..81ab876 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-checksum/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-checksum/index.js @@ -2,7 +2,7 @@ import template from './lgw-toolbox-checksum.html.twig'; import './lgw-toolbox-checksum.scss'; const { Component } = Shopware; -const { mapState, mapGetters } = Shopware.Component.getComponentHelper(); +const { mapState, mapGetters } = Shopware.Component.getComponentHelper() || {}; Component.register('lgw-toolbox-checksum', { template, @@ -34,10 +34,18 @@ Component.register('lgw-toolbox-checksum', { }, computed: { - ...mapState('lgwToolbox', ['checksumData']), + ...(mapState ? mapState('lgwToolbox', ['checksumData']) : { + checksumData() { + return Shopware.State.get('lgwToolbox').checksumData; + } + }), - ...mapGetters('lgwToolbox', { + ...(mapGetters ? mapGetters('lgwToolbox', { isToolboxLoading: 'isLoading' + }) : { + isToolboxLoading() { + return Shopware.State.getters['lgwToolbox/isLoading']; + } }) }, diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-log/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-log/index.js index b7e829a..3b8d775 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-log/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-log/index.js @@ -2,7 +2,7 @@ import template from './lgw-toolbox-log.html.twig'; import './lgw-toolbox-log.scss'; const { Component } = Shopware; -const { mapState, mapGetters } = Shopware.Component.getComponentHelper(); +const { mapState, mapGetters } = Shopware.Component.getComponentHelper() || {}; Component.register('lgw-toolbox-log', { template, @@ -26,10 +26,18 @@ Component.register('lgw-toolbox-log', { }, computed: { - ...mapState('lgwToolbox', ['logData']), + ...(mapState ? mapState('lgwToolbox', ['logData']) : { + logData() { + return Shopware.State.get('lgwToolbox').logData; + } + }), - ...mapGetters('lgwToolbox', { + ...(mapGetters ? mapGetters('lgwToolbox', { isToolboxLoading: 'isLoading' + }) : { + isToolboxLoading() { + return Shopware.State.getters['lgwToolbox/isLoading']; + } }) }, From fc8deec72f84a65e1f902ce85820891d59dfedbe Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Dec 2025 09:13:18 +0000 Subject: [PATCH 09/22] fix(vue): [PCMT-1080] Add null safety checks to Vuex state fallback accessors Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- .../view/lgw-connection-catalog/index.js | 9 ++++++--- .../lengow-connector/view/lgw-connection-cms/index.js | 3 ++- .../lengow-connector/view/lgw-toolbox-base/index.js | 6 ++++-- .../lengow-connector/view/lgw-toolbox-checksum/index.js | 3 ++- .../lengow-connector/view/lgw-toolbox-log/index.js | 3 ++- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-catalog/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-catalog/index.js index 3c1fad5..60bd61a 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-catalog/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-catalog/index.js @@ -32,13 +32,16 @@ Component.register('lgw-connection-catalog', { computed: { ...(mapState ? mapState('lgwConnection', ['catalogList', 'catalogSelected', 'optionIsLoading']) : { catalogList() { - return Shopware.State.get('lgwConnection').catalogList; + const state = Shopware.State.get('lgwConnection'); + return state ? state.catalogList : []; }, catalogSelected() { - return Shopware.State.get('lgwConnection').catalogSelected; + const state = Shopware.State.get('lgwConnection'); + return state ? state.catalogSelected : []; }, optionIsLoading() { - return Shopware.State.get('lgwConnection').optionIsLoading; + const state = Shopware.State.get('lgwConnection'); + return state ? state.optionIsLoading : false; } }), diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-cms/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-cms/index.js index efb7d0d..3e3286f 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-cms/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-cms/index.js @@ -42,7 +42,8 @@ Component.register('lgw-connection-cms', { }, ...(mapState ? mapState('lgwConnection', ['catalogList']) : { catalogList() { - return Shopware.State.get('lgwConnection').catalogList; + const state = Shopware.State.get('lgwConnection'); + return state ? state.catalogList : []; } }), lengowConfigRepository() { diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js index 71a8663..15a06b7 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js @@ -19,10 +19,12 @@ Component.register('lgw-toolbox-base', { computed: { ...(mapState ? mapState('lgwToolbox', ['overviewData', 'loading']) : { overviewData() { - return Shopware.State.get('lgwToolbox').overviewData; + const state = Shopware.State.get('lgwToolbox'); + return state ? state.overviewData : {}; }, loading() { - return Shopware.State.get('lgwToolbox').loading; + const state = Shopware.State.get('lgwToolbox'); + return state ? state.loading : {}; } }), diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-checksum/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-checksum/index.js index 81ab876..42c345c 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-checksum/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-checksum/index.js @@ -36,7 +36,8 @@ Component.register('lgw-toolbox-checksum', { computed: { ...(mapState ? mapState('lgwToolbox', ['checksumData']) : { checksumData() { - return Shopware.State.get('lgwToolbox').checksumData; + const state = Shopware.State.get('lgwToolbox'); + return state ? state.checksumData : {}; } }), diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-log/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-log/index.js index 3b8d775..6a4857d 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-log/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-log/index.js @@ -28,7 +28,8 @@ Component.register('lgw-toolbox-log', { computed: { ...(mapState ? mapState('lgwToolbox', ['logData']) : { logData() { - return Shopware.State.get('lgwToolbox').logData; + const state = Shopware.State.get('lgwToolbox'); + return state ? state.logData : []; } }), From c78f4a3fa27765d07adf15278ceb1719d9057b37 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Dec 2025 09:26:02 +0000 Subject: [PATCH 10/22] fix(vue): [PCMT-1080] Remove Vuex helper dependencies and use direct state access for Shopware 6.7 Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- .../component/lgw-catalog-select/index.js | 16 ++++++++-- .../page/lgw-toolbox/index.js | 9 ++---- .../view/lgw-connection-catalog/index.js | 29 +++++++++--------- .../view/lgw-connection-cms/index.js | 14 ++++----- .../view/lgw-toolbox-base/index.js | 30 ++++++++----------- .../view/lgw-toolbox-checksum/index.js | 21 +++++-------- .../view/lgw-toolbox-log/index.js | 21 +++++-------- 7 files changed, 64 insertions(+), 76 deletions(-) diff --git a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-catalog-select/index.js b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-catalog-select/index.js index 2c206c3..a6a9fc9 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/component/lgw-catalog-select/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/component/lgw-catalog-select/index.js @@ -2,7 +2,6 @@ import template from './lgw-catalog-select.html.twig'; import './lgw-catalog-select.scss'; const { Component } = Shopware; -const { mapState } = Shopware.Component.getComponentHelper(); Component.register('lgw-catalog-select', { template, @@ -39,7 +38,20 @@ Component.register('lgw-catalog-select', { }, computed: { - ...mapState('lgwConnection', ['catalogList', 'catalogSelected', 'catalogSelectionChanged']) + catalogList() { + const state = Shopware.State.get('lgwConnection'); + return state && state.catalogList ? state.catalogList : []; + }, + + catalogSelected() { + const state = Shopware.State.get('lgwConnection'); + return state && state.catalogSelected ? state.catalogSelected : {}; + }, + + catalogSelectionChanged() { + const state = Shopware.State.get('lgwConnection'); + return state && state.catalogSelectionChanged ? state.catalogSelectionChanged : false; + } }, watch: { diff --git a/src/Resources/app/administration/src/module/lengow-connector/page/lgw-toolbox/index.js b/src/Resources/app/administration/src/module/lengow-connector/page/lgw-toolbox/index.js index 982288e..5de08ec 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/page/lgw-toolbox/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/page/lgw-toolbox/index.js @@ -3,7 +3,6 @@ import './lgw-toolbox.scss'; import lgwToolboxState from './state'; const { Component } = Shopware; -const { mapGetters } = Shopware.Component.getComponentHelper() || {}; Component.register('lgw-toolbox', { template, @@ -35,11 +34,9 @@ Component.register('lgw-toolbox', { }, computed: { - ...(mapGetters ? mapGetters('lgwToolbox', ['isLoading']) : { - isLoading() { - return Shopware.State.getters['lgwToolbox/isLoading']; - } - }) + isLoading() { + return Shopware.State.getters['lgwToolbox/isLoading']; + } }, methods: { diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-catalog/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-catalog/index.js index 60bd61a..44ab8e8 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-catalog/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-catalog/index.js @@ -5,7 +5,6 @@ const { Filter, Data: { Criteria } } = Shopware; -const { mapState } = Shopware.Component.getComponentHelper() || {}; Component.register('lgw-connection-catalog', { template, @@ -30,20 +29,20 @@ Component.register('lgw-connection-catalog', { }, computed: { - ...(mapState ? mapState('lgwConnection', ['catalogList', 'catalogSelected', 'optionIsLoading']) : { - catalogList() { - const state = Shopware.State.get('lgwConnection'); - return state ? state.catalogList : []; - }, - catalogSelected() { - const state = Shopware.State.get('lgwConnection'); - return state ? state.catalogSelected : []; - }, - optionIsLoading() { - const state = Shopware.State.get('lgwConnection'); - return state ? state.optionIsLoading : false; - } - }), + catalogList() { + const state = Shopware.State.get('lgwConnection'); + return state && state.catalogList ? state.catalogList : []; + }, + + catalogSelected() { + const state = Shopware.State.get('lgwConnection'); + return state && state.catalogSelected ? state.catalogSelected : []; + }, + + optionIsLoading() { + const state = Shopware.State.get('lgwConnection'); + return state && state.optionIsLoading ? state.optionIsLoading : false; + }, assetFilter() { return Filter.getByName('asset'); diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-cms/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-cms/index.js index 3e3286f..1225374 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-cms/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-connection-cms/index.js @@ -8,8 +8,6 @@ const { Data: { Criteria } } = Shopware; -const { mapState } = Shopware.Component.getComponentHelper() || {}; - Component.register('lgw-connection-cms', { template, @@ -40,12 +38,12 @@ Component.register('lgw-connection-cms', { assetFilter() { return Filter.getByName('asset'); }, - ...(mapState ? mapState('lgwConnection', ['catalogList']) : { - catalogList() { - const state = Shopware.State.get('lgwConnection'); - return state ? state.catalogList : []; - } - }), + + catalogList() { + const state = Shopware.State.get('lgwConnection'); + return state && state.catalogList ? state.catalogList : []; + }, + lengowConfigRepository() { return this.repositoryFactory.create('lengow_settings'); } diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js index 15a06b7..5ca419f 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js @@ -1,7 +1,6 @@ import template from './lgw-toolbox-base.html.twig'; const { Component } = Shopware; -const { mapState, mapGetters } = Shopware.Component.getComponentHelper() || {}; Component.register('lgw-toolbox-base', { template, @@ -17,22 +16,19 @@ Component.register('lgw-toolbox-base', { created() {}, computed: { - ...(mapState ? mapState('lgwToolbox', ['overviewData', 'loading']) : { - overviewData() { - const state = Shopware.State.get('lgwToolbox'); - return state ? state.overviewData : {}; - }, - loading() { - const state = Shopware.State.get('lgwToolbox'); - return state ? state.loading : {}; - } - }), - - ...(mapGetters ? mapGetters('lgwToolbox', ['isLoading']) : { - isLoading() { - return Shopware.State.getters['lgwToolbox/isLoading']; - } - }) + overviewData() { + const state = Shopware.State.get('lgwToolbox'); + return state && state.overviewData ? state.overviewData : {}; + }, + + loading() { + const state = Shopware.State.get('lgwToolbox'); + return state && state.loading ? state.loading : {}; + }, + + isLoading() { + return Shopware.State.getters['lgwToolbox/isLoading']; + } }, methods: {} diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-checksum/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-checksum/index.js index 42c345c..3878c1b 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-checksum/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-checksum/index.js @@ -2,7 +2,6 @@ import template from './lgw-toolbox-checksum.html.twig'; import './lgw-toolbox-checksum.scss'; const { Component } = Shopware; -const { mapState, mapGetters } = Shopware.Component.getComponentHelper() || {}; Component.register('lgw-toolbox-checksum', { template, @@ -34,20 +33,14 @@ Component.register('lgw-toolbox-checksum', { }, computed: { - ...(mapState ? mapState('lgwToolbox', ['checksumData']) : { - checksumData() { - const state = Shopware.State.get('lgwToolbox'); - return state ? state.checksumData : {}; - } - }), + checksumData() { + const state = Shopware.State.get('lgwToolbox'); + return state && state.checksumData ? state.checksumData : {}; + }, - ...(mapGetters ? mapGetters('lgwToolbox', { - isToolboxLoading: 'isLoading' - }) : { - isToolboxLoading() { - return Shopware.State.getters['lgwToolbox/isLoading']; - } - }) + isToolboxLoading() { + return Shopware.State.getters['lgwToolbox/isLoading']; + } }, watch: { diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-log/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-log/index.js index 6a4857d..83f120b 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-log/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-log/index.js @@ -2,7 +2,6 @@ import template from './lgw-toolbox-log.html.twig'; import './lgw-toolbox-log.scss'; const { Component } = Shopware; -const { mapState, mapGetters } = Shopware.Component.getComponentHelper() || {}; Component.register('lgw-toolbox-log', { template, @@ -26,20 +25,14 @@ Component.register('lgw-toolbox-log', { }, computed: { - ...(mapState ? mapState('lgwToolbox', ['logData']) : { - logData() { - const state = Shopware.State.get('lgwToolbox'); - return state ? state.logData : []; - } - }), + logData() { + const state = Shopware.State.get('lgwToolbox'); + return state && state.logData ? state.logData : []; + }, - ...(mapGetters ? mapGetters('lgwToolbox', { - isToolboxLoading: 'isLoading' - }) : { - isToolboxLoading() { - return Shopware.State.getters['lgwToolbox/isLoading']; - } - }) + isToolboxLoading() { + return Shopware.State.getters['lgwToolbox/isLoading']; + } }, watch: { From 735a4fa8e2e2d9b5dd101b775d74b1b733f74769 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Dec 2025 10:13:36 +0000 Subject: [PATCH 11/22] fix(settings): [PCMT-1080] Replace sw-select-field with sw-single-select for Shopware 6.7 compatibility Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- .../view/lgw-setting-export/index.js | 7 ++- .../lgw-setting-export.html.twig | 12 ++--- .../view/lgw-setting-import/index.js | 25 ++++++++++- .../lgw-setting-import.html.twig | 45 ++++++------------- 4 files changed, 47 insertions(+), 42 deletions(-) diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-export/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-export/index.js index 287af3f..d7fd2f3 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-export/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-export/index.js @@ -109,10 +109,15 @@ Component.register('lgw-setting-export', { salesChannelId: salesChannel.id, salesChannelName: salesChannel.name, name: shippingMethod.name, - value: shippingMethod.id + value: shippingMethod.id, + label: shippingMethod.name }]; }); }); + }, + + getShippingMethodsForSalesChannel(salesChannelId) { + return this.shippingMethods.filter(method => method.salesChannelId === salesChannelId); } } }); diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-export/lgw-setting-export.html.twig b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-export/lgw-setting-export.html.twig index 5a5ece5..f9e28f2 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-export/lgw-setting-export.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-export/lgw-setting-export.html.twig @@ -44,19 +44,15 @@ :text="$tc('lengow-connector.setting.lengow_export_setting.shipping.description')" :width="200" tooltipPosition="right"/> - - - + diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-general/lgw-setting-general.html.twig b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-general/lgw-setting-general.html.twig index 7020d78..890ee73 100755 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-general/lgw-setting-general.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-general/lgw-setting-general.html.twig @@ -10,8 +10,7 @@ @@ -101,9 +100,8 @@ diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-import/lgw-setting-import.html.twig b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-import/lgw-setting-import.html.twig index 4d52d5f..f2347ac 100755 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-import/lgw-setting-import.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-import/lgw-setting-import.html.twig @@ -53,9 +53,8 @@ :key="salesChannel.salesChannelId" :label="salesChannel.label" :options="getShippingMethodsForSalesChannel(salesChannel.salesChannelId)" - v-model="salesChannel.defaultShippingMethod" + v-model:value="salesChannel.defaultShippingMethod" @update:value="onSaveSettings($event, 'lengowImportDefaultShippingMethod', salesChannel.salesChannelId)" - @change="onSaveSettings($event, 'lengowImportDefaultShippingMethod', salesChannel.salesChannelId)" > @@ -158,23 +157,20 @@ + v-model:value="lengowWaitingShipmentOrderId" + @update:value="onSaveSettings($event, 'lengowWaitingShipmentOrderId')"> + v-model:value="lengowShippedOrderId" + @update:value="onSaveSettings($event, 'lengowShippedOrderId')"> + v-model:value="lengowCanceledOrderId" + @update:value="onSaveSettings($event, 'lengowCanceledOrderId')"> {% endblock %} From 247372b101087101d7adce3cb559ffde2cc7af6c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Dec 2025 11:44:57 +0000 Subject: [PATCH 14/22] fix(settings): [PCMT-1080] Fix prop types for onSaveSettings and onChangeStatus to Function Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- .../module/lengow-connector/view/lgw-setting-export/index.js | 2 +- .../module/lengow-connector/view/lgw-setting-general/index.js | 2 +- .../module/lengow-connector/view/lgw-setting-import/index.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-export/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-export/index.js index d7fd2f3..008327b 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-export/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-export/index.js @@ -18,7 +18,7 @@ Component.register('lgw-setting-export', { default: {} }, onSaveSettings: { - type: Object, + type: Function, required: true } }, diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-general/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-general/index.js index 8500770..9168271 100755 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-general/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-general/index.js @@ -21,7 +21,7 @@ Component.register('lgw-setting-general', { default: {} }, onSaveSettings: { - type: Object, + type: Function, required: true } }, diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-import/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-import/index.js index 24650c4..4004430 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-import/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-import/index.js @@ -18,11 +18,11 @@ Component.register('lgw-setting-import', { default: {} }, onSaveSettings: { - type: Object, + type: Function, required: true }, onChangeStatus: { - type: Object, + type: Function, required: true } }, From 9bed38a691ca062988e9839cb456a719d2443812 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Dec 2025 12:08:07 +0000 Subject: [PATCH 15/22] fix(product): [PCMT-1080] Fix grid visibility and Active column with proper v-model:value binding Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- .../page/lgw-product-list/lgw-product-list.html.twig | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Resources/app/administration/src/module/lengow-connector/page/lgw-product-list/lgw-product-list.html.twig b/src/Resources/app/administration/src/module/lengow-connector/page/lgw-product-list/lgw-product-list.html.twig index d88e6d8..bea8d17 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/page/lgw-product-list/lgw-product-list.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/page/lgw-product-list/lgw-product-list.html.twig @@ -66,10 +66,9 @@
@@ -155,10 +154,9 @@ {% endblock %} @@ -227,7 +225,6 @@ :options="isActiveOptions" :label="$tc('lengow-connector.product.filter.active_filter_label')" @update:value="onActiveFilter" - @change="onActiveFilter" > {% endblock %} @@ -237,7 +234,6 @@ :options="isWithStockOptions" :label="$tc('lengow-connector.product.filter.stock_filter_label')" @update:value="onStockFilter" - @change="onStockFilter" > {% endblock %} From 8a2463663edb9263daa6323d29246c20b3aa8afc Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Dec 2025 12:30:12 +0000 Subject: [PATCH 16/22] fix(settings): [PCMT-1080] Fix all switch fields with v-model:value and remove duplicate @change handlers Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- .../lgw-setting-export.html.twig | 10 ++-- .../lgw-setting-general.html.twig | 3 +- .../lgw-setting-import.html.twig | 46 ++++++++----------- 3 files changed, 23 insertions(+), 36 deletions(-) diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-export/lgw-setting-export.html.twig b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-export/lgw-setting-export.html.twig index c7b5e8a..e200c51 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-export/lgw-setting-export.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-export/lgw-setting-export.html.twig @@ -11,9 +11,8 @@ @@ -25,9 +24,8 @@ diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-general/lgw-setting-general.html.twig b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-general/lgw-setting-general.html.twig index 890ee73..f2545c2 100755 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-general/lgw-setting-general.html.twig +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-setting-general/lgw-setting-general.html.twig @@ -77,9 +77,8 @@ @@ -35,9 +33,8 @@ tooltipPosition="right"/> @@ -75,15 +72,13 @@ :value="lengowImportDays" :digits="2" :label="$tc('lengow-connector.setting.lengow_import_setting.import_days.label')" - @update:value="onSaveSettings($event, 'lengowImportDays')" - @change="onSaveSettings($event, 'lengowImportDays')" + @update:value="onSaveSettings($event, 'lengowImportDays')" > + v-model:value="lengowAnonymizeEmail" + @update:value="onSaveSettings($event, 'lengowAnonymizeEmail'), onSwitchChange($event)">
+ v-model:value="lengowEncryptEmail" + @update:value="onSaveSettings($event, 'lengowEncryptEmail')">
From d20624e19615a53b3dc0dbd7fd0853725fcf4171 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Dec 2025 12:36:10 +0000 Subject: [PATCH 17/22] fix(toolbox): [PCMT-1080] Add proper default structure for overviewData to prevent undefined errors Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- .../lengow-connector/view/lgw-toolbox-base/index.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js index 5ca419f..7876c95 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js @@ -18,7 +18,12 @@ Component.register('lgw-toolbox-base', { computed: { overviewData() { const state = Shopware.State.get('lgwToolbox'); - return state && state.overviewData ? state.overviewData : {}; + return state && state.overviewData ? state.overviewData : { + checklist: {}, + plugin: {}, + synchronization: {}, + shops: [] + }; }, loading() { @@ -27,7 +32,8 @@ Component.register('lgw-toolbox-base', { }, isLoading() { - return Shopware.State.getters['lgwToolbox/isLoading']; + const getters = Shopware.State.getters['lgwToolbox/isLoading']; + return getters !== undefined ? getters : false; } }, From 12ef4fa7efeee19c7b00a6f81ec12cdc1a124206 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Dec 2025 12:45:29 +0000 Subject: [PATCH 18/22] fix(toolbox): [PCMT-1080] Provide complete default structure for all overviewData properties Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- .../view/lgw-toolbox-base/index.js | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js index 7876c95..c9a7a98 100644 --- a/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js +++ b/src/Resources/app/administration/src/module/lengow-connector/view/lgw-toolbox-base/index.js @@ -19,9 +19,33 @@ Component.register('lgw-toolbox-base', { overviewData() { const state = Shopware.State.get('lgwToolbox'); return state && state.overviewData ? state.overviewData : { - checklist: {}, - plugin: {}, - synchronization: {}, + checklist: { + curl_activated: false, + simple_xml_activated: false, + json_activated: false, + md5_success: false + }, + plugin: { + cms_version: '', + plugin_version: '', + php_version: '', + debug_mode_disable: false, + server_ip: '', + authorized_ip_enable: false, + authorized_ips: [], + write_permission: false, + toolbox_url: '' + }, + synchronization: { + cms_token: '', + cron_url: '', + synchronization_in_progress: false, + last_synchronization: '', + last_synchronization_type: '', + number_orders_imported: 0, + number_orders_waiting_shipment: 0, + number_orders_in_error: 0 + }, shops: [] }; }, From ad56e6629a9f96096f8fba29a51312764a6f788b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Dec 2025 13:03:07 +0000 Subject: [PATCH 19/22] fix(entity): [PCMT-1080] Fix OrderEntity DateTimeInterface compatibility with typed properties Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- src/Entity/Lengow/Order/OrderEntity.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Entity/Lengow/Order/OrderEntity.php b/src/Entity/Lengow/Order/OrderEntity.php index 4eb835d..a94f0a2 100644 --- a/src/Entity/Lengow/Order/OrderEntity.php +++ b/src/Entity/Lengow/Order/OrderEntity.php @@ -163,14 +163,14 @@ class OrderEntity extends Entity protected $message; /** - * @var DateTimeInterface|null + * @var \DateTimeInterface|null */ - protected $createdAt; + protected ?\DateTimeInterface $createdAt = null; /** - * @var DateTimeInterface|null + * @var \DateTimeInterface|null */ - protected $updatedAt; + protected ?\DateTimeInterface $updatedAt = null; /** * @var DateTimeInterface|null From 521d9b950ed4d6e401b649c5ab880dd3278e3cc8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Dec 2025 13:10:05 +0000 Subject: [PATCH 20/22] fix(import): [PCMT-1080] Add required technicalName field to payment method creation for Shopware 6.7 Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- src/Service/LengowImportOrder.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Service/LengowImportOrder.php b/src/Service/LengowImportOrder.php index 0d99c43..46b61cc 100755 --- a/src/Service/LengowImportOrder.php +++ b/src/Service/LengowImportOrder.php @@ -1807,6 +1807,7 @@ public function getOrCreateLengowPaymentMethodForSalesChannel( [ 'id' => $paymentMethodId, 'name' => $paymentMethodName, + 'technicalName' => 'lengow_' . strtolower(str_replace(' ', '_', $marketplaceName)) . '_payment', 'description' => 'Payment method for Lengow marketplace: ' . $marketplaceName, 'active' => false, 'afterOrderEnabled' => false, From 52a99bf24f60d87da1dabcec18dbee8a34921647 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Dec 2025 13:12:28 +0000 Subject: [PATCH 21/22] fix(payment): [PCMT-1080] Add technicalName to main payment method and improve sanitization Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- src/LengowConnector.php | 1 + src/Service/LengowImportOrder.php | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/LengowConnector.php b/src/LengowConnector.php index 81a5e0e..11ba1d9 100644 --- a/src/LengowConnector.php +++ b/src/LengowConnector.php @@ -106,6 +106,7 @@ private function addPaymentMethod(Context $context): void // payment handler will be selected by the identifier 'handlerIdentifier' => LengowPayment::class, 'name' => 'Lengow payment', + 'technicalName' => 'lengow_payment', 'description' => 'Lengow payment, DO NOT activate NOR delete', 'pluginId' => $pluginId, 'afterOrderEnabled' => false, diff --git a/src/Service/LengowImportOrder.php b/src/Service/LengowImportOrder.php index 46b61cc..037ae0d 100755 --- a/src/Service/LengowImportOrder.php +++ b/src/Service/LengowImportOrder.php @@ -1803,11 +1803,16 @@ public function getOrCreateLengowPaymentMethodForSalesChannel( $paymentMethodId = Uuid::randomHex(); $pluginId = $this->pluginIdProvider->getPluginIdByBaseClass(\Lengow\Connector\LengowConnector::class, $context); + // Generate a technical name with proper sanitization + $sanitizedMarketplace = preg_replace('/[^a-z0-9]/', '_', strtolower($marketplaceName)); + $sanitizedMarketplace = preg_replace('/_+/', '_', $sanitizedMarketplace); // Remove duplicate underscores + $sanitizedMarketplace = trim($sanitizedMarketplace, '_'); // Remove leading/trailing underscores + $this->paymentMethodRepository->create([ [ 'id' => $paymentMethodId, 'name' => $paymentMethodName, - 'technicalName' => 'lengow_' . strtolower(str_replace(' ', '_', $marketplaceName)) . '_payment', + 'technicalName' => 'lengow_' . $sanitizedMarketplace . '_payment', 'description' => 'Payment method for Lengow marketplace: ' . $marketplaceName, 'active' => false, 'afterOrderEnabled' => false, From e3243a91b6f91cd71061602895b177a00f98ca4f Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 24 Dec 2025 13:17:16 +0000 Subject: [PATCH 22/22] fix(entity): [PCMT-1080] Fix DateTimeInterface compatibility for OrderError, OrderLine, and Action entities Co-authored-by: michaelmaslengow <147600733+michaelmaslengow@users.noreply.github.com> --- src/Entity/Lengow/Action/ActionEntity.php | 8 ++++---- src/Entity/Lengow/OrderError/OrderErrorEntity.php | 8 ++++---- src/Entity/Lengow/OrderLine/OrderLineEntity.php | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Entity/Lengow/Action/ActionEntity.php b/src/Entity/Lengow/Action/ActionEntity.php index 1402491..61e6948 100644 --- a/src/Entity/Lengow/Action/ActionEntity.php +++ b/src/Entity/Lengow/Action/ActionEntity.php @@ -52,14 +52,14 @@ class ActionEntity extends Entity protected $state; /** - * @var DateTimeInterface|null + * @var \DateTimeInterface|null */ - protected $createdAt; + protected ?\DateTimeInterface $createdAt = null; /** - * @var DateTimeInterface|null + * @var \DateTimeInterface|null */ - protected $updatedAt; + protected ?\DateTimeInterface $updatedAt = null; /** * @return ShopwareOrderEntity diff --git a/src/Entity/Lengow/OrderError/OrderErrorEntity.php b/src/Entity/Lengow/OrderError/OrderErrorEntity.php index 79a238e..31bc10f 100644 --- a/src/Entity/Lengow/OrderError/OrderErrorEntity.php +++ b/src/Entity/Lengow/OrderError/OrderErrorEntity.php @@ -42,14 +42,14 @@ class OrderErrorEntity extends Entity protected $mail; /** - * @var DateTimeInterface|null + * @var \DateTimeInterface|null */ - protected $createdAt; + protected ?\DateTimeInterface $createdAt = null; /** - * @var DateTimeInterface|null + * @var \DateTimeInterface|null */ - protected $updatedAt; + protected ?\DateTimeInterface $updatedAt = null; /** * @return LengowOrderEntity diff --git a/src/Entity/Lengow/OrderLine/OrderLineEntity.php b/src/Entity/Lengow/OrderLine/OrderLineEntity.php index 1962736..364156e 100644 --- a/src/Entity/Lengow/OrderLine/OrderLineEntity.php +++ b/src/Entity/Lengow/OrderLine/OrderLineEntity.php @@ -33,14 +33,14 @@ class OrderLineEntity extends Entity protected $orderLineId; /** - * @var DateTimeInterface|null + * @var \DateTimeInterface|null */ - protected $createdAt; + protected ?\DateTimeInterface $createdAt = null; /** - * @var DateTimeInterface|null + * @var \DateTimeInterface|null */ - protected $updatedAt; + protected ?\DateTimeInterface $updatedAt = null; /** * @return ShopwareOrderEntity