From bcda2568a70d7b80f7d7c7381010e3f478c197dc Mon Sep 17 00:00:00 2001 From: bach Date: Tue, 14 Oct 2025 16:02:11 +0200 Subject: [PATCH] updated M contrib modules, patched mailjet --- composer.json | 3 + composer.lock | 66 +++++++++---------- ...display.commerce_order.default.default.yml | 1 + ...display.commerce_order.default.default.yml | 14 +++- ...ew_display.commerce_order.default.user.yml | 14 +++- ...s.simplenews_mailjet_subsciption.19125.yml | 2 - ...s.simplenews_mailjet_subsciption.22839.yml | 2 - ...s.simplenews_mailjet_subsciption.24787.yml | 2 - 8 files changed, 59 insertions(+), 45 deletions(-) diff --git a/composer.json b/composer.json index 1c0977af..34cf2d24 100644 --- a/composer.json +++ b/composer.json @@ -281,6 +281,9 @@ }, "drupal/flag": { "remove flag hooks to allow site to be accessible again https://www.drupal.org/project/flag/issues/3200806": "./patches/flag-commenthooks.patch" + }, + "drupal/mailjet": { + "MailjetConfigurationAccessCheck blocks access to all pages for users except admin https://www.drupal.org/project/mailjet/issues/3539776": "https://www.drupal.org/files/issues/2025-08-05/0001-fix-mailjetconfigurationaccesscheck-blocking-access.patch" } }, "archived-patches": { diff --git a/composer.lock b/composer.lock index 02251de9..83b6e650 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "445d8e41c8bdc4ff207e8f7c23dfa6f4", + "content-hash": "58bd244ec4c2784483b7afd435f4fbf8", "packages": [ { "name": "algolia/places", @@ -9245,17 +9245,17 @@ }, { "name": "drupal/maxlength", - "version": "2.1.3", + "version": "2.1.6", "source": { "type": "git", "url": "https://git.drupalcode.org/project/maxlength.git", - "reference": "2.1.3" + "reference": "2.1.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/maxlength-2.1.3.zip", - "reference": "2.1.3", - "shasum": "1be72277e071331455aa0402e227b85668c8dda5" + "url": "https://ftp.drupal.org/files/projects/maxlength-2.1.6.zip", + "reference": "2.1.6", + "shasum": "f58a36a8138792895e55b90dc0b1d8b3abc328e4" }, "require": { "drupal/core": "^9.5 || ^10" @@ -9263,8 +9263,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.3", - "datestamp": "1716993829", + "version": "2.1.6", + "datestamp": "1756373151", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -9320,26 +9320,26 @@ }, { "name": "drupal/menu_admin_per_menu", - "version": "1.6.0", + "version": "1.7.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/menu_admin_per_menu.git", - "reference": "8.x-1.6" + "reference": "8.x-1.7" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/menu_admin_per_menu-8.x-1.6.zip", - "reference": "8.x-1.6", - "shasum": "8ebbab26f0dad2b1f79d7aa185295ca033eece7a" + "url": "https://ftp.drupal.org/files/projects/menu_admin_per_menu-8.x-1.7.zip", + "reference": "8.x-1.7", + "shasum": "ce9faed09c95de7c7a57653aab66c5afc3e946a2" }, "require": { - "drupal/core": "^10.2 || ^11.0" + "drupal/core": "^10.2 || ^11.0 || ^12" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.6", - "datestamp": "1726150514", + "version": "8.x-1.7", + "datestamp": "1750246188", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -9380,17 +9380,17 @@ }, { "name": "drupal/menu_block", - "version": "1.13.0", + "version": "1.14.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/menu_block.git", - "reference": "8.x-1.13" + "reference": "8.x-1.14" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/menu_block-8.x-1.13.zip", - "reference": "8.x-1.13", - "shasum": "693a932cba9bd5767bdeee506de446228bc4cc8c" + "url": "https://ftp.drupal.org/files/projects/menu_block-8.x-1.14.zip", + "reference": "8.x-1.14", + "shasum": "c71e60acaba8a7553e8cf423a56328771cbdedf4" }, "require": { "drupal/core": "^10.1 || ^11" @@ -9398,8 +9398,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.13", - "datestamp": "1722579322", + "version": "8.x-1.14", + "datestamp": "1740624449", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -9412,7 +9412,7 @@ ], "authors": [ { - "name": "Dave Reid", + "name": "dave reid", "homepage": "https://www.drupal.org/user/53892" }, { @@ -9420,7 +9420,7 @@ "homepage": "https://www.drupal.org/user/160302" }, { - "name": "JohnAlbin", + "name": "johnalbin", "homepage": "https://www.drupal.org/user/32095" }, { @@ -9507,26 +9507,26 @@ }, { "name": "drupal/modules_weight", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/modules_weight.git", - "reference": "3.0.1" + "reference": "3.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/modules_weight-3.0.1.zip", - "reference": "3.0.1", - "shasum": "9986169506c2a78714634e678a404c86ee786068" + "url": "https://ftp.drupal.org/files/projects/modules_weight-3.0.2.zip", + "reference": "3.0.2", + "shasum": "d46e68421a31e8775d3bbd5dbb769867e68570a4" }, "require": { - "drupal/core": "^9.0|| ^10.0" + "drupal/core": "^10 || ^11" }, "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.1", - "datestamp": "1709671544", + "version": "3.0.2", + "datestamp": "1737650714", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/config/sync/core.entity_form_display.commerce_order.default.default.yml b/config/sync/core.entity_form_display.commerce_order.default.default.yml index a5ac25b4..2b3683a4 100644 --- a/config/sync/core.entity_form_display.commerce_order.default.default.yml +++ b/config/sync/core.entity_form_display.commerce_order.default.default.yml @@ -61,6 +61,7 @@ content: third_party_settings: { } hidden: created: true + customer_comments: true field_mailjet_campaign_id: true field_mailjet_campaign_name: true ip_address: true diff --git a/config/sync/core.entity_view_display.commerce_order.default.default.yml b/config/sync/core.entity_view_display.commerce_order.default.default.yml index 2dde36f9..905643db 100644 --- a/config/sync/core.entity_view_display.commerce_order.default.default.yml +++ b/config/sync/core.entity_view_display.commerce_order.default.default.yml @@ -66,13 +66,21 @@ content: weight: 2 region: content coupons: - label: above type: entity_reference_label + label: above settings: link: true - region: content - weight: 10 third_party_settings: { } + weight: 10 + region: content + customer_comments: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 11 + region: content ip_address: type: string label: inline diff --git a/config/sync/core.entity_view_display.commerce_order.default.user.yml b/config/sync/core.entity_view_display.commerce_order.default.user.yml index 64765da4..dce95222 100644 --- a/config/sync/core.entity_view_display.commerce_order.default.user.yml +++ b/config/sync/core.entity_view_display.commerce_order.default.user.yml @@ -47,13 +47,21 @@ content: weight: 2 region: content coupons: - label: above type: entity_reference_label + label: above settings: link: true - region: content - weight: 7 third_party_settings: { } + weight: 7 + region: content + customer_comments: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 8 + region: content mail: type: basic_string label: inline diff --git a/config/sync/simplenews_mailjet_subscriptions.simplenews_mailjet_subsciption.19125.yml b/config/sync/simplenews_mailjet_subscriptions.simplenews_mailjet_subsciption.19125.yml index 416cfafc..755ee6e3 100644 --- a/config/sync/simplenews_mailjet_subscriptions.simplenews_mailjet_subsciption.19125.yml +++ b/config/sync/simplenews_mailjet_subscriptions.simplenews_mailjet_subsciption.19125.yml @@ -4,8 +4,6 @@ status: true dependencies: { } id: '19125' title: ZeDaily -api_key: null -secret_key: null mapping_table: - simplenews_news: ze_daily_materio_ diff --git a/config/sync/simplenews_mailjet_subscriptions.simplenews_mailjet_subsciption.22839.yml b/config/sync/simplenews_mailjet_subscriptions.simplenews_mailjet_subsciption.22839.yml index 4d904257..67cca140 100644 --- a/config/sync/simplenews_mailjet_subscriptions.simplenews_mailjet_subsciption.22839.yml +++ b/config/sync/simplenews_mailjet_subscriptions.simplenews_mailjet_subsciption.22839.yml @@ -4,8 +4,6 @@ status: true dependencies: { } id: '22839' title: "materio' newsletter" -api_key: null -secret_key: null mapping_table: - simplenews_news: materio_newsletter diff --git a/config/sync/simplenews_mailjet_subscriptions.simplenews_mailjet_subsciption.24787.yml b/config/sync/simplenews_mailjet_subscriptions.simplenews_mailjet_subsciption.24787.yml index bd3536e1..0f57e578 100644 --- a/config/sync/simplenews_mailjet_subscriptions.simplenews_mailjet_subsciption.24787.yml +++ b/config/sync/simplenews_mailjet_subscriptions.simplenews_mailjet_subsciption.24787.yml @@ -4,8 +4,6 @@ status: true dependencies: { } id: '24787' title: Compagnie -api_key: null -secret_key: null mapping_table: - simplenews_news: companies