updated commerce_license (+ some modules)

2024-08-14 22:04:30 +02:00
parent 68bcc51409
commit 3bae9dded7
14 changed files with 421 additions and 329 deletions
--- a/composer.json
+++ b/composer.json
@@ -63,29 +63,30 @@
        "ckeditor-plugin/panelbutton": "^4.16.2",
        "composer/installers": "^1.2",
        "drupal/address": "^1.10",
-        "drupal/admin_theme": "^1.x-dev@dev",
-        "drupal/advagg": "^4.x-dev@dev",
+        "drupal/admin_theme": "^1.0",
+        "drupal/advagg": "^6.0@alpha",
        "drupal/advanced_text_formatter": "^3.0@RC",
        "drupal/allowed_formats": "^2.0",
        "drupal/amswap": "^3.0",
        "drupal/audiofield": "^1.10",
-        "drupal/auto_entitylabel": "^3.x-dev@dev",
+        "drupal/auto_entitylabel": "^3.1",
        "drupal/better_messages": "^2.0@alpha",
        "drupal/ckeditor_codemirror": "^2.3",
        "drupal/ckeditor_font": "^1.2",
        "drupal/ckeditor_uploadimage": "^2.0",
        "drupal/colorbutton": "^1.3",
-        "drupal/commerce": "2.x-dev@dev",
+        "drupal/commerce": "^2.0",
        "drupal/commerce_cart_api": "^1.4",
        "drupal/commerce_cart_redirection": "^3.0",
-        "drupal/commerce_email": "1.x-dev@dev",
-        "drupal/commerce_license": "^2.x-dev@dev",
+        "drupal/commerce_email": "^1.5",
+        "drupal/commerce_license": "^2.0",
        "drupal/commerce_migrate": "^3.1",
        "drupal/commerce_monetico": "^1.0",
        "drupal/commerce_pricelist": "^2.x-dev",
        "drupal/commerce_recurring": "^1.x-dev",
        "drupal/commerce_stripe": "^1.x-dev@dev",
        "drupal/commerce_variation_cart_form": "^1.x-dev",
+        "drupal/composer_deploy": "^1.7",
        "drupal/computed_field": "^3.0@alpha",
        "drupal/config_devel": "^1.7",
        "drupal/config_pages": "^2.9",
@@ -136,7 +137,6 @@
        "drupal/printable": "^3.1",
        "drupal/profile": "1.x-dev@dev",
        "drupal/pwa": "^2.1@beta",
-        "drupal/recurring_period": "^1.0",
        "drupal/redirect": "^1.x-dev@dev",
        "drupal/redis": "^1.5",
        "drupal/reroute_email": "^2.1",
@@ -160,7 +160,7 @@
        "drupal/synonyms": "^2.0.0-beta2",
        "drupal/telephone_formatter": "^1.0@beta",
        "drupal/telephone_validation": "^2.1",
-        "drupal/term_reference_tree": "^1",
+        "drupal/term_reference_tree": "1.1.0",
        "drupal/translation_views": "1.x-dev@dev",
        "drupal/ultimate_cron": "^2.x-dev",
        "drupal/unique_content_field_validation": "^1.0",
@@ -269,10 +269,6 @@
            "drupal/stripe": {
              "Stripe is a web service and should be in system.admin_config_services https://www.drupal.org/project/stripe/issues/3090652": "https://www.drupal.org/files/issues/2020-01-08/stripe-link_menu_in_services-3090652-5.patch"
            },
-            "drupal/commerce_license": {
-              "expected argument of type array or Traversable and ArrayAccess, string given https://www.drupal.org/project/commerce_license/issues/3252431":"https://www.drupal.org/files/issues/2021-12-03/commerce_license-expected-argument-of-type-array-3252431-1.patch",
-              "ability to re-purchase a license to extend it https://www.drupal.org/project/commerce_license/issues/2943888": "https://www.drupal.org/files/issues/2022-02-21/reroll-commerce_license-allow-renewal-2943888-141.patch"
-            },
            "drupal/commerce_stripe" : {
              "Allow off_session payment intents for recurring payments https://www.drupal.org/project/commerce_stripe/issues/3171408": "https://www.drupal.org/files/issues/2021-10-04/commerce_stripe-allow-off_session-payment-intents-for-recurring-payments-3171408-34.patch"
            },
@@ -313,6 +309,10 @@
        "archived-patches": {
          "drupal/structure_sync": {
            "With no blocks, clicking on the Custom Blocks tab crashes site https://www.drupal.org/project/structure_sync/issues/3070414":"https://www.drupal.org/files/issues/2022-03-23/PluginNotFoundException-3070414-3.patch"
+          },
+          "drupal/commerce_license": {
+            "ability to re-purchase a license to extend it https://www.drupal.org/project/commerce_license/issues/2943888": "https://www.drupal.org/files/issues/2022-02-21/reroll-commerce_license-allow-renewal-2943888-141.patch",
+            "ability to re-purchase a license to extend it https://www.drupal.org/project/commerce_license/issues/2943888": "https://www.drupal.org/files/issues/2022-02-21/reroll-commerce_license-allow-renewal-2943888-141.patch"
          }
        },
        "drupal-scaffold": {
--- a/composer.lock
+++ b/composer.lock
--- a/config/devel/composer_deploy.settings.yml
+++ b/config/devel/composer_deploy.settings.yml
@@ -0,0 +1,4 @@
+_core:
+  default_config_hash: FDmXqAGlITLYpZe80ONLw6Y1KEMSvqcMJX1pj2dk6nw
+prefixes:
+  - drupal
--- a/config/sync/config_split.config_split.devel.yml
+++ b/config/sync/config_split.config_split.devel.yml
@@ -11,6 +11,7 @@ no_patching: false
 storage: folder
 folder: ../config/devel
 module:
+  composer_deploy: 0
  config_devel: 0
  context_ui: 0
  devel: 0
--- a/config/sync/core.entity_form_display.commerce_order.default.default.yml
+++ b/config/sync/core.entity_form_display.commerce_order.default.default.yml
@@ -35,6 +35,16 @@ content:
    settings:
      display_label: true
    third_party_settings: {  }
+  coupons:
+    type: entity_reference_autocomplete
+    weight: 5
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
  order_items:
    type: inline_entity_form_complex
    weight: 1
@@ -47,6 +57,7 @@ content:
      allow_new: true
      allow_existing: false
      match_operator: CONTAINS
+      removed_reference: delete
    third_party_settings: {  }
 hidden:
  created: true
--- a/config/sync/core.entity_form_display.commerce_order.materio_order_type.default.yml
+++ b/config/sync/core.entity_form_display.commerce_order.materio_order_type.default.yml
@@ -34,6 +34,16 @@ content:
    settings:
      display_label: true
    third_party_settings: {  }
+  coupons:
+    type: entity_reference_autocomplete
+    weight: 5
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
  field_mailjet_campaign_id:
    type: number
    weight: 6
@@ -63,6 +73,7 @@ content:
      collapsible: false
      collapsed: false
      revision: false
+      removed_reference: delete
    third_party_settings: {  }
 hidden:
  ip_address: true
--- a/config/sync/core.entity_form_display.commerce_order.recurring.default.yml
+++ b/config/sync/core.entity_form_display.commerce_order.recurring.default.yml
@@ -29,6 +29,16 @@ content:
    region: content
    settings: {  }
    third_party_settings: {  }
+  coupons:
+    type: entity_reference_autocomplete
+    weight: 5
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
  field_mailjet_campaign_id:
    type: number
    weight: 6
@@ -48,6 +58,7 @@ content:
      allow_new: true
      allow_existing: false
      match_operator: CONTAINS
+      removed_reference: delete
    third_party_settings: {  }
 hidden:
  billing_period: true
--- a/config/sync/field.field.commerce_product_variation.default.license_expiration.yml
+++ b/config/sync/field.field.commerce_product_variation.default.license_expiration.yml
@@ -18,4 +18,4 @@ translatable: false
 default_value: {  }
 default_value_callback: null
 settings: {  }
-field_type: 'commerce_plugin_item:recurring_period'
+field_type: 'commerce_plugin_item:commerce_license_period'
--- a/config/sync/field.field.commerce_product_variation.materio_product_licence_variatio.license_expiration.yml
+++ b/config/sync/field.field.commerce_product_variation.materio_product_licence_variatio.license_expiration.yml
@@ -18,4 +18,4 @@ translatable: false
 default_value: {  }
 default_value_callback: null
 settings: {  }
-field_type: 'commerce_plugin_item:recurring_period'
+field_type: 'commerce_plugin_item:commerce_license_period'
--- a/config/sync/field.field.commerce_product_variation.materio_product_variation_type.license_expiration.yml
+++ b/config/sync/field.field.commerce_product_variation.materio_product_variation_type.license_expiration.yml
@@ -18,4 +18,4 @@ translatable: false
 default_value: {  }
 default_value_callback: null
 settings: {  }
-field_type: 'commerce_plugin_item:recurring_period'
+field_type: 'commerce_plugin_item:commerce_license_period'
--- a/config/sync/field.storage.commerce_product_variation.license_expiration.yml
+++ b/config/sync/field.storage.commerce_product_variation.license_expiration.yml
@@ -8,7 +8,7 @@ dependencies:
 id: commerce_product_variation.license_expiration
 field_name: license_expiration
 entity_type: commerce_product_variation
-type: 'commerce_plugin_item:recurring_period'
+type: 'commerce_plugin_item:commerce_license_period'
 settings: {  }
 module: commerce
 locked: true
--- a/config/sync/system.action.commerce_license_delete_action.yml
+++ b/config/sync/system.action.commerce_license_delete_action.yml
@@ -0,0 +1,14 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - commerce_license
+  module:
+    - commerce_license
+    - entity
+id: commerce_license_delete_action
+label: 'Delete license'
+type: commerce_license
+plugin: 'entity:delete_action:commerce_license'
+configuration: {  }
--- a/config/sync/views.view.commerce_order_item_table.yml
+++ b/config/sync/views.view.commerce_order_item_table.yml
@@ -11,7 +11,7 @@ id: commerce_order_item_table
 label: 'Order items'
 module: views
 description: 'Display a set of order items in a table.'
-tag: ''
+tag: commerce_order_item_table
 base_table: commerce_order_item
 base_field: order_item_id
 display:
--- a/web/profiles/d8-starterkit-profile
+++ b/web/profiles/d8-starterkit-profile