From 3bae9dded7256121b6c9ebc3005d6f326b1e3941 Mon Sep 17 00:00:00 2001 From: bach Date: Wed, 14 Aug 2024 22:04:30 +0200 Subject: [PATCH] updated commerce_license (+ some modules) --- composer.json | 24 +- composer.lock | 662 ++++++++++-------- config/devel/composer_deploy.settings.yml | 4 + .../sync/config_split.config_split.devel.yml | 1 + ...display.commerce_order.default.default.yml | 11 + ...merce_order.materio_order_type.default.yml | 11 + ...splay.commerce_order.recurring.default.yml | 11 + ...t_variation.default.license_expiration.yml | 2 +- ...ct_licence_variatio.license_expiration.yml | 2 +- ...duct_variation_type.license_expiration.yml | 2 +- ...e_product_variation.license_expiration.yml | 2 +- ....action.commerce_license_delete_action.yml | 14 + .../views.view.commerce_order_item_table.yml | 2 +- web/profiles/d8-starterkit-profile | 2 +- 14 files changed, 421 insertions(+), 329 deletions(-) create mode 100644 config/devel/composer_deploy.settings.yml create mode 100644 config/sync/system.action.commerce_license_delete_action.yml diff --git a/composer.json b/composer.json index c991a052..76d350d0 100644 --- 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": { diff --git a/composer.lock b/composer.lock index eaf82ff4..744af2b8 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": "0aac6bf39dfa6e076c015d68213e6fce", + "content-hash": "5d5fd0a93b04bf7e3e3a69d9e0dd1f89", "packages": [ { "name": "algolia/places", @@ -369,29 +369,29 @@ }, { "name": "commerceguys/intl", - "version": "v1.1.1", + "version": "v2.0.6", "source": { "type": "git", "url": "https://github.com/commerceguys/intl.git", - "reference": "cab3b55dbf8c1753fe54457404082c777a8c154f" + "reference": "53d10f3f2f7375fa20ad83314c3eb5a272ce246d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/commerceguys/intl/zipball/cab3b55dbf8c1753fe54457404082c777a8c154f", - "reference": "cab3b55dbf8c1753fe54457404082c777a8c154f", + "url": "https://api.github.com/repos/commerceguys/intl/zipball/53d10f3f2f7375fa20ad83314c3eb5a272ce246d", + "reference": "53d10f3f2f7375fa20ad83314c3eb5a272ce246d", "shasum": "" }, "require": { - "php": ">=7.1.3" + "php": ">=8.0" }, "require-dev": { "mikey179/vfsstream": "1.*", - "phpunit/phpunit": "^7.5" + "phpunit/phpunit": "^10" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { @@ -406,14 +406,17 @@ "authors": [ { "name": "Bojan Zivanovic" + }, + { + "name": "Jonathan Sacksick" } ], "description": "Internationalization library powered by CLDR data.", "support": { "issues": "https://github.com/commerceguys/intl/issues", - "source": "https://github.com/commerceguys/intl/tree/v1.1.1" + "source": "https://github.com/commerceguys/intl/tree/v2.0.6" }, - "time": "2021-10-30T18:07:14+00:00" + "time": "2024-07-12T07:51:53+00:00" }, { "name": "commercie/currency", @@ -1543,32 +1546,34 @@ }, { "name": "doctrine/collections", - "version": "1.8.0", + "version": "2.2.2", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "2b44dd4cbca8b5744327de78bafef5945c7e7b5e" + "reference": "d8af7f248c74f195f7347424600fd9e17b57af59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/2b44dd4cbca8b5744327de78bafef5945c7e7b5e", - "reference": "2b44dd4cbca8b5744327de78bafef5945c7e7b5e", + "url": "https://api.github.com/repos/doctrine/collections/zipball/d8af7f248c74f195f7347424600fd9e17b57af59", + "reference": "d8af7f248c74f195f7347424600fd9e17b57af59", "shasum": "" }, "require": { - "doctrine/deprecations": "^0.5.3 || ^1", - "php": "^7.1.3 || ^8.0" + "doctrine/deprecations": "^1", + "php": "^8.1" }, "require-dev": { - "doctrine/coding-standard": "^9.0 || ^10.0", - "phpstan/phpstan": "^1.4.8", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.1.5", - "vimeo/psalm": "^4.22" + "doctrine/coding-standard": "^12", + "ext-json": "*", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^10.5", + "vimeo/psalm": "^5.11" }, "type": "library", "autoload": { "psr-4": { - "Doctrine\\Common\\Collections\\": "lib/Doctrine/Common/Collections" + "Doctrine\\Common\\Collections\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1607,9 +1612,23 @@ ], "support": { "issues": "https://github.com/doctrine/collections/issues", - "source": "https://github.com/doctrine/collections/tree/1.8.0" + "source": "https://github.com/doctrine/collections/tree/2.2.2" }, - "time": "2022-09-01T20:12:10+00:00" + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcollections", + "type": "tidelift" + } + ], + "time": "2024-04-18T06:56:21+00:00" }, { "name": "doctrine/common", @@ -2347,27 +2366,30 @@ }, { "name": "drupal/admin_theme", - "version": "dev-1.x", + "version": "1.0.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/admin_theme.git", - "reference": "1e3555135dab4bcab3924b876dac0b8bc9540e8e" + "reference": "8.x-1.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/admin_theme-8.x-1.0.zip", + "reference": "8.x-1.0", + "shasum": "5dafd7457840963609502567d60f7fdf0b3e81c3" }, "require": { - "drupal/core": "^8 || ^9", + "drupal/core": "^8.8 || ^9 || ^10", "php": ">=5.5.9" }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, "drupal": { - "version": "8.x-1.0-beta1+1-dev", - "datestamp": "1599619343", + "version": "8.x-1.0", + "datestamp": "1681407048", "security-coverage": { - "status": "not-covered", - "message": "Dev releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } } }, @@ -2534,32 +2556,35 @@ }, { "name": "drupal/advagg", - "version": "dev-4.x", + "version": "6.0.0-alpha1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/advagg.git", - "reference": "622c7ea34cfd96fc3c35fef948f7bbff974b849a" + "reference": "6.0.0-alpha1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/advagg-6.0.0-alpha1.zip", + "reference": "6.0.0-alpha1", + "shasum": "cadfe490b2b0c3fe099087f1c767ab7eaa73160a" }, "require": { - "drupal/core": "^8.8 || ^9", + "drupal/core": "^9.3 || ^10", "tubalmartin/cssmin": "^4.1" }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-4.x": "4.x-dev" - }, "drupal": { - "version": "8.x-4.1+9-dev", - "datestamp": "1625837803", + "version": "6.0.0-alpha1", + "datestamp": "1672698356", "security-coverage": { "status": "not-covered", - "message": "Dev releases are not covered by Drupal security advisories." + "message": "Alpha releases are not covered by Drupal security advisories." } }, "drush": { "services": { - "drush.services.yml": "^9" + "drush.services.yml": "^9 || ^10 || ^11" } } }, @@ -2585,12 +2610,12 @@ "role": "Contributors" }, { - "name": "iamcarrico", - "homepage": "https://www.drupal.org/user/1300542" + "name": "NickDickinsonWilde", + "homepage": "https://www.drupal.org/user/3094661" }, { - "name": "mikeytown2", - "homepage": "https://www.drupal.org/user/282446" + "name": "poker10", + "homepage": "https://www.drupal.org/user/272316" }, { "name": "rupl", @@ -2599,6 +2624,10 @@ { "name": "thalles", "homepage": "https://www.drupal.org/user/3589086" + }, + { + "name": "Wim Leers", + "homepage": "https://www.drupal.org/user/99777" } ], "description": "Improved aggregation of CSS/JS files to speed up page load times.", @@ -2908,29 +2937,32 @@ }, { "name": "drupal/auto_entitylabel", - "version": "dev-3.x", + "version": "3.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/auto_entitylabel.git", - "reference": "daee20fa2e6bc336d5df01d2d6a12a910cd077d4" + "reference": "8.x-3.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/auto_entitylabel-8.x-3.1.zip", + "reference": "8.x-3.1", + "shasum": "c2aad97b43bdda72bdd25d4cbc2e877efe53fcf0" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^9.3 || ^10" }, "require-dev": { "drupal/token": "^1.0" }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-3.x": "3.x-dev" - }, "drupal": { - "version": "8.x-3.0-beta4+3-dev", - "datestamp": "1645408730", + "version": "8.x-3.1", + "datestamp": "1717510049", "security-coverage": { - "status": "not-covered", - "message": "Dev releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } } }, @@ -2939,18 +2971,6 @@ "GPL-2.0-or-later" ], "authors": [ - { - "name": "Pravin Ajaaz", - "homepage": "https://www.drupal.org/user/2910049" - }, - { - "name": "RenatoG", - "homepage": "https://www.drupal.org/user/3326031" - }, - { - "name": "VladimirAus", - "homepage": "https://www.drupal.org/user/673120" - }, { "name": "bforchhammer", "homepage": "https://www.drupal.org/user/216396" @@ -2960,12 +2980,32 @@ "homepage": "https://www.drupal.org/user/58704" }, { - "name": "diqidoq", + "name": "dqd", "homepage": "https://www.drupal.org/user/1001934" }, + { + "name": "japerry", + "homepage": "https://www.drupal.org/user/45640" + }, + { + "name": "mandclu", + "homepage": "https://www.drupal.org/user/52136" + }, + { + "name": "Pravin Ajaaz", + "homepage": "https://www.drupal.org/user/2910049" + }, { "name": "purushotam.rai", "homepage": "https://www.drupal.org/user/3193859" + }, + { + "name": "renatog", + "homepage": "https://www.drupal.org/user/3326031" + }, + { + "name": "VladimirAus", + "homepage": "https://www.drupal.org/user/673120" } ], "description": "Allows hiding of entity label fields and automatic label creation.", @@ -3426,10 +3466,10 @@ "source": { "type": "git", "url": "https://git.drupalcode.org/project/bulkdelete.git", - "reference": "36e12429e99606463b9ef15203c2018de69965b2" + "reference": "95a7ff49f152021be88ba562c247347ff36392c7" }, "require": { - "drupal/core": "^8.7.7 || ^9" + "drupal/core": "^8.7.7 || ^9 || ^10" }, "type": "drupal-module", "extra": { @@ -3438,7 +3478,7 @@ }, "drupal": { "version": "8.x-1.x-dev", - "datestamp": "1590300128", + "datestamp": "1655322426", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -3867,16 +3907,22 @@ }, { "name": "drupal/commerce", - "version": "dev-2.x", + "version": "2.36.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/commerce.git", - "reference": "48c9dcc538557958f1dcea4bf38e0ba912b8261b" + "reference": "8.x-2.36" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/commerce-8.x-2.36.zip", + "reference": "8.x-2.36", + "shasum": "4114db573120036d5075c027e3bb9a61d3bdb582" }, "require": { - "commerceguys/intl": "^1.0.0", + "commerceguys/intl": "^2.0.2", "drupal/address": "^1.7", - "drupal/core": "^9.2 || ^10", + "drupal/core": "^9.3 || ^10", "drupal/entity": "^1.0", "drupal/entity_reference_revisions": "~1.0", "drupal/inline_entity_form": "^1.0@RC", @@ -3884,10 +3930,11 @@ "drupal/state_machine": "^1.5", "drupal/token": "^1.7", "ext-bcmath": "*", - "php": "^7.3 || ^8.0" + "php": "^8.0" }, "conflict": { - "drupal/commerce_shipping": "<2.1" + "drupal/commerce_shipping": "<2.1", + "drupal/physical": "<1.3" }, "require-dev": { "drupal/commerce_cart": "*", @@ -3905,64 +3952,9 @@ }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-2.x": "2.x-dev" - }, "drupal": { - "version": "8.x-2.x-dev", - "datestamp": "1647003334", - "security-coverage": { - "status": "not-covered", - "message": "Dev releases are not covered by Drupal security advisories." - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0+" - ], - "authors": [ - { - "name": "Centarro", - "homepage": "https://www.drupal.org/user/3661446" - }, - { - "name": "bojanz", - "homepage": "https://www.drupal.org/user/86106" - }, - { - "name": "jsacksick", - "homepage": "https://www.drupal.org/user/972218" - }, - { - "name": "mglaman", - "homepage": "https://www.drupal.org/user/2416470" - }, - { - "name": "rszrama", - "homepage": "https://www.drupal.org/user/49344" - } - ], - "description": "Drupal Commerce is a flexible eCommerce solution.", - "homepage": "http://drupal.org/project/commerce", - "support": { - "source": "https://git.drupalcode.org/project/commerce" - } - }, - { - "name": "drupal/commerce_cart", - "version": "2.29.0", - "require": { - "drupal/commerce": "*", - "drupal/commerce_order": "*", - "drupal/commerce_product": "*", - "drupal/core": "^9.2 || ^10" - }, - "type": "metapackage", - "extra": { - "drupal": { - "version": "8.x-2.29", - "datestamp": "1643900314", + "version": "8.x-2.36", + "datestamp": "1685624434", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3978,17 +3970,53 @@ "name": "Centarro", "homepage": "https://www.drupal.org/user/3661446" }, - { - "name": "bojanz", - "homepage": "https://www.drupal.org/user/86106" - }, { "name": "jsacksick", "homepage": "https://www.drupal.org/user/972218" }, { - "name": "mglaman", - "homepage": "https://www.drupal.org/user/2416470" + "name": "rszrama", + "homepage": "https://www.drupal.org/user/49344" + } + ], + "description": "Drupal Commerce is a flexible eCommerce solution.", + "homepage": "https://drupal.org/project/commerce", + "support": { + "source": "https://git.drupalcode.org/project/commerce" + } + }, + { + "name": "drupal/commerce_cart", + "version": "2.39.0", + "require": { + "drupal/commerce": "*", + "drupal/commerce_order": "*", + "drupal/commerce_product": "*", + "drupal/core": "^9.3 || ^10" + }, + "type": "metapackage", + "extra": { + "drupal": { + "version": "8.x-2.39", + "datestamp": "1715862323", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Centarro", + "homepage": "https://www.drupal.org/user/3661446" + }, + { + "name": "jsacksick", + "homepage": "https://www.drupal.org/user/972218" }, { "name": "rszrama", @@ -4113,18 +4141,18 @@ }, { "name": "drupal/commerce_checkout", - "version": "2.29.0", + "version": "2.39.0", "require": { "drupal/commerce": "*", "drupal/commerce_cart": "*", "drupal/commerce_order": "*", - "drupal/core": "^9.2 || ^10" + "drupal/core": "^9.3 || ^10" }, "type": "metapackage", "extra": { "drupal": { - "version": "8.x-2.29", - "datestamp": "1643900314", + "version": "8.x-2.39", + "datestamp": "1715862323", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4140,18 +4168,10 @@ "name": "Centarro", "homepage": "https://www.drupal.org/user/3661446" }, - { - "name": "bojanz", - "homepage": "https://www.drupal.org/user/86106" - }, { "name": "jsacksick", "homepage": "https://www.drupal.org/user/972218" }, - { - "name": "mglaman", - "homepage": "https://www.drupal.org/user/2416470" - }, { "name": "rszrama", "homepage": "https://www.drupal.org/user/49344" @@ -4165,28 +4185,35 @@ }, { "name": "drupal/commerce_email", - "version": "dev-1.x", + "version": "1.5.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/commerce_email.git", - "reference": "cf7aff75be4a7cf8d6f548e365efd1090b9c2af3" + "reference": "8.x-1.5" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/commerce_email-8.x-1.5.zip", + "reference": "8.x-1.5", + "shasum": "a371d42ccf54eeceb0d762e5291544622ade0034" }, "require": { "drupal/commerce": "^2.0", - "drupal/core": "^8.9 || ^9", + "drupal/core": "^9.3 || ^10 || ^11", "drupal/token": "*" }, + "require-dev": { + "drupal/advancedqueue": "^1.0", + "drupal/commerce_recurring": "^1.0@rc" + }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, "drupal": { - "version": "8.x-1.0-beta1+8-dev", - "datestamp": "1647058281", + "version": "8.x-1.5", + "datestamp": "1719400405", "security-coverage": { - "status": "not-covered", - "message": "Dev releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } } }, @@ -4199,10 +4226,6 @@ "name": "jsacksick", "homepage": "https://www.drupal.org/user/972218" }, - { - "name": "mglaman", - "homepage": "https://www.drupal.org/user/2416470" - }, { "name": "paul.linney", "homepage": "https://www.drupal.org/user/928636" @@ -4214,6 +4237,10 @@ { "name": "rszrama", "homepage": "https://www.drupal.org/user/49344" + }, + { + "name": "vmarchuk", + "homepage": "https://www.drupal.org/user/306425" } ], "description": "Provides a UI for defining emails to send in response to various Drupal Commerce events.", @@ -4224,37 +4251,41 @@ }, { "name": "drupal/commerce_license", - "version": "dev-2.x", + "version": "2.0.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/commerce_license.git", - "reference": "70f179ba73689dfec29a83ea7c6657639c252665" + "reference": "8.x-2.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/commerce_license-8.x-2.0.zip", + "reference": "8.x-2.0", + "shasum": "8f5ef9d4c0bca8e011706d2aff3a428172cfae27" }, "require": { "drupal/advancedqueue": "^1.0", "drupal/commerce": "^2.19 || ^3", "drupal/commerce_checkout": "*", "drupal/commerce_product": "*", - "drupal/core": "^8.9 || ^9 || ^10", + "drupal/core": "^8.9 || ^9", "drupal/entity": "*", - "drupal/recurring_period": "*", + "drupal/interval": "^1.11", + "drupal/recurring_period": "^1.0", "drupal/state_machine": "*" }, "require-dev": { - "drupal/commerce_recurring": "^1.0@beta", - "drupal/recurring_period": "^1.0" + "dms/phpunit-arraysubset-asserts": "^0.3", + "drupal/commerce_recurring": "^1.0@beta" }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-2.x": "2.x-dev" - }, "drupal": { - "version": "8.x-2.0-beta1+2-dev", - "datestamp": "1644830450", + "version": "8.x-2.0", + "datestamp": "1687180773", "security-coverage": { - "status": "not-covered", - "message": "Dev releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } } }, @@ -4267,14 +4298,6 @@ "name": "Centarro", "homepage": "https://www.drupal.org/user/3661446" }, - { - "name": "Kazanir", - "homepage": "https://www.drupal.org/user/2279698" - }, - { - "name": "bojanz", - "homepage": "https://www.drupal.org/user/86106" - }, { "name": "joachim", "homepage": "https://www.drupal.org/user/107701" @@ -4284,16 +4307,12 @@ "homepage": "https://www.drupal.org/user/972218" }, { - "name": "mglaman", - "homepage": "https://www.drupal.org/user/2416470" + "name": "rszrama", + "homepage": "https://www.drupal.org/user/49344" }, { - "name": "pjcdawkins", - "homepage": "https://www.drupal.org/user/1025236" - }, - { - "name": "wizonesolutions", - "homepage": "https://www.drupal.org/user/739994" + "name": "TomTech", + "homepage": "https://www.drupal.org/user/254986" } ], "description": "License entities and product behavior", @@ -4302,7 +4321,7 @@ "Drupal" ], "support": { - "source": "http://cgit.drupalcode.org/commerce_license", + "source": "https://cgit.drupalcode.org/commerce_license", "issues": "https://www.drupal.org/project/issues/commerce_license" } }, @@ -4443,17 +4462,17 @@ }, { "name": "drupal/commerce_number_pattern", - "version": "2.29.0", + "version": "2.39.0", "require": { "drupal/commerce": "*", "drupal/commerce_store": "*", - "drupal/core": "^9.2 || ^10" + "drupal/core": "^9.3 || ^10" }, "type": "metapackage", "extra": { "drupal": { - "version": "8.x-2.29", - "datestamp": "1643900314", + "version": "8.x-2.39", + "datestamp": "1715862323", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4469,18 +4488,10 @@ "name": "Centarro", "homepage": "https://www.drupal.org/user/3661446" }, - { - "name": "bojanz", - "homepage": "https://www.drupal.org/user/86106" - }, { "name": "jsacksick", "homepage": "https://www.drupal.org/user/972218" }, - { - "name": "mglaman", - "homepage": "https://www.drupal.org/user/2416470" - }, { "name": "rszrama", "homepage": "https://www.drupal.org/user/49344" @@ -4494,13 +4505,13 @@ }, { "name": "drupal/commerce_order", - "version": "2.29.0", + "version": "2.39.0", "require": { "drupal/commerce": "*", "drupal/commerce_number_pattern": "*", "drupal/commerce_price": "*", "drupal/commerce_store": "*", - "drupal/core": "^9.2 || ^10", + "drupal/core": "^9.3 || ^10", "drupal/entity_reference_revisions": "*", "drupal/profile": "*", "drupal/state_machine": "*" @@ -4508,8 +4519,8 @@ "type": "metapackage", "extra": { "drupal": { - "version": "8.x-2.29", - "datestamp": "1643900314", + "version": "8.x-2.39", + "datestamp": "1715862323", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4525,18 +4536,10 @@ "name": "Centarro", "homepage": "https://www.drupal.org/user/3661446" }, - { - "name": "bojanz", - "homepage": "https://www.drupal.org/user/86106" - }, { "name": "jsacksick", "homepage": "https://www.drupal.org/user/972218" }, - { - "name": "mglaman", - "homepage": "https://www.drupal.org/user/2416470" - }, { "name": "rszrama", "homepage": "https://www.drupal.org/user/49344" @@ -4602,16 +4605,16 @@ }, { "name": "drupal/commerce_price", - "version": "2.29.0", + "version": "2.39.0", "require": { "drupal/commerce": "*", - "drupal/core": "^9.2 || ^10" + "drupal/core": "^9.3 || ^10" }, "type": "metapackage", "extra": { "drupal": { - "version": "8.x-2.29", - "datestamp": "1643900314", + "version": "8.x-2.39", + "datestamp": "1715862323", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4627,18 +4630,10 @@ "name": "Centarro", "homepage": "https://www.drupal.org/user/3661446" }, - { - "name": "bojanz", - "homepage": "https://www.drupal.org/user/86106" - }, { "name": "jsacksick", "homepage": "https://www.drupal.org/user/972218" }, - { - "name": "mglaman", - "homepage": "https://www.drupal.org/user/2416470" - }, { "name": "rszrama", "homepage": "https://www.drupal.org/user/49344" @@ -4712,18 +4707,18 @@ }, { "name": "drupal/commerce_product", - "version": "2.29.0", + "version": "2.39.0", "require": { "drupal/commerce": "*", "drupal/commerce_price": "*", "drupal/commerce_store": "*", - "drupal/core": "^9.2 || ^10" + "drupal/core": "^9.3 || ^10" }, "type": "metapackage", "extra": { "drupal": { - "version": "8.x-2.29", - "datestamp": "1643900314", + "version": "8.x-2.39", + "datestamp": "1715862323", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4739,18 +4734,10 @@ "name": "Centarro", "homepage": "https://www.drupal.org/user/3661446" }, - { - "name": "bojanz", - "homepage": "https://www.drupal.org/user/86106" - }, { "name": "jsacksick", "homepage": "https://www.drupal.org/user/972218" }, - { - "name": "mglaman", - "homepage": "https://www.drupal.org/user/2416470" - }, { "name": "rszrama", "homepage": "https://www.drupal.org/user/49344" @@ -4852,17 +4839,17 @@ }, { "name": "drupal/commerce_store", - "version": "2.29.0", + "version": "2.39.0", "require": { "drupal/commerce": "*", "drupal/commerce_price": "*", - "drupal/core": "^9.2 || ^10" + "drupal/core": "^9.3 || ^10" }, "type": "metapackage", "extra": { "drupal": { - "version": "8.x-2.29", - "datestamp": "1643900314", + "version": "8.x-2.39", + "datestamp": "1715862323", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4878,18 +4865,10 @@ "name": "Centarro", "homepage": "https://www.drupal.org/user/3661446" }, - { - "name": "bojanz", - "homepage": "https://www.drupal.org/user/86106" - }, { "name": "jsacksick", "homepage": "https://www.drupal.org/user/972218" }, - { - "name": "mglaman", - "homepage": "https://www.drupal.org/user/2416470" - }, { "name": "rszrama", "homepage": "https://www.drupal.org/user/49344" @@ -5026,6 +5005,63 @@ "source": "https://git.drupalcode.org/project/commerce_variation_cart_form" } }, + { + "name": "drupal/composer_deploy", + "version": "1.7.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/composer_deploy.git", + "reference": "8.x-1.7" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/composer_deploy-8.x-1.7.zip", + "reference": "8.x-1.7", + "shasum": "545cb7d83c701fb68f4d95522f24d7270332ce8a" + }, + "require": { + "drupal/core": "^8.8 || ^9 || ^10", + "webflo/drupal-finder": "^1.2" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-1.7", + "datestamp": "1660818349", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "jhedstrom", + "homepage": "https://www.drupal.org/user/208732" + }, + { + "name": "joelpittet", + "homepage": "https://www.drupal.org/user/160302" + }, + { + "name": "nerdstein", + "homepage": "https://www.drupal.org/user/1557710" + }, + { + "name": "webflo", + "homepage": "https://www.drupal.org/user/254778" + } + ], + "description": "Provide version number from composers lockfile.", + "homepage": "https://www.drupal.org/project/composer_deploy", + "support": { + "source": "https://git.drupalcode.org/project/composer_deploy" + } + }, { "name": "drupal/computed_field", "version": "3.0.0", @@ -6182,27 +6218,30 @@ }, { "name": "drupal/cshs", - "version": "dev-1.x", + "version": "4.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/cshs.git", - "reference": "fb5b1b8eff6391819b28bf9bf1cce5d1c5b7423f" + "reference": "4.0.2" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/cshs-4.0.2.zip", + "reference": "4.0.2", + "shasum": "dc936684e50770d1c4ca541eccffba7d348a4a1c" }, "require": { - "drupal/core": "^8 || ^9", - "php": ">=7.1.0" + "drupal/core": "^9.2 || ^10", + "php": ">=8.0" }, "type": "drupal-module", "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - }, "drupal": { - "version": "8.x-1.7+0-dev", - "datestamp": "1612535860", + "version": "4.0.2", + "datestamp": "1710037257", "security-coverage": { - "status": "not-covered", - "message": "Dev releases are not covered by Drupal security advisories." + "status": "covered", + "message": "Covered by Drupal's security advisory policy" } } }, @@ -11671,13 +11710,15 @@ "source": { "type": "git", "url": "https://git.drupalcode.org/project/profile.git", - "reference": "b919838987bfc461ece7206931a997bc53797ecd" + "reference": "b8193457f4d6ffc87ad30929742cff408c707f23" }, "require": { - "drupal/core": "^9 || ^10", - "drupal/entity": "^1.0" + "drupal/core": "^9 || ^10 || ^11", + "drupal/entity": "^1.0", + "php": "^7.4 || ^8.0" }, "require-dev": { + "drupal/search_api": "~1.30", "drupal/token": "^1.7" }, "type": "drupal-module", @@ -11686,8 +11727,8 @@ "dev-1.x": "1.x-dev" }, "drupal": { - "version": "8.x-1.6+1-dev", - "datestamp": "1665131660", + "version": "8.x-1.10+1-dev", + "datestamp": "1721735467", "security-coverage": { "status": "not-covered", "message": "Dev releases are not covered by Drupal security advisories." @@ -13657,29 +13698,25 @@ "role": "contributor" }, { - "name": "Dave Reid", - "homepage": "https://www.drupal.org/user/53892" - }, - { - "name": "MoustafaEid", - "homepage": "https://www.drupal.org/user/1126928" - }, - { - "name": "VladimirAus", - "homepage": "https://www.drupal.org/user/673120" - }, - { - "name": "alex_optim", - "homepage": "https://www.drupal.org/user/3317601" + "name": "BartK", + "homepage": "https://www.drupal.org/user/401025" }, { "name": "carpenter.490", "homepage": "https://www.drupal.org/user/804142" }, + { + "name": "Dave Reid", + "homepage": "https://www.drupal.org/user/53892" + }, { "name": "dgtlmoon", "homepage": "https://www.drupal.org/user/25027" }, + { + "name": "MoustafaEid", + "homepage": "https://www.drupal.org/user/1126928" + }, { "name": "sdrycroft", "homepage": "https://www.drupal.org/user/151544" @@ -13687,6 +13724,10 @@ { "name": "sumitmadan", "homepage": "https://www.drupal.org/user/1538790" + }, + { + "name": "VladimirAus", + "homepage": "https://www.drupal.org/user/673120" } ], "description": "An expanding/collapsing tree widget for selecting terms in a taxonomy term reference field.", @@ -20288,22 +20329,25 @@ }, { "name": "symfony/filesystem", - "version": "v4.4.42", + "version": "v6.4.9", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "815412ee8971209bd4c1eecd5f4f481eacd44bf5" + "reference": "b51ef8059159330b74a4d52f68e671033c0fe463" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/815412ee8971209bd4c1eecd5f4f481eacd44bf5", - "reference": "815412ee8971209bd4c1eecd5f4f481eacd44bf5", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/b51ef8059159330b74a4d52f68e671033c0fe463", + "reference": "b51ef8059159330b74a4d52f68e671033c0fe463", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-php80": "^1.16" + "symfony/polyfill-mbstring": "~1.8" + }, + "require-dev": { + "symfony/process": "^5.4|^6.4|^7.0" }, "type": "library", "autoload": { @@ -20331,7 +20375,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v4.4.42" + "source": "https://github.com/symfony/filesystem/tree/v6.4.9" }, "funding": [ { @@ -20347,25 +20391,27 @@ "type": "tidelift" } ], - "time": "2022-05-20T08:49:14+00:00" + "time": "2024-06-28T09:49:33+00:00" }, { "name": "symfony/finder", - "version": "v4.4.44", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "66bd787edb5e42ff59d3523f623895af05043e4f" + "reference": "af29198d87112bebdd397bd7735fbd115997824c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/66bd787edb5e42ff59d3523f623895af05043e4f", - "reference": "66bd787edb5e42ff59d3523f623895af05043e4f", + "url": "https://api.github.com/repos/symfony/finder/zipball/af29198d87112bebdd397bd7735fbd115997824c", + "reference": "af29198d87112bebdd397bd7735fbd115997824c", "shasum": "" }, "require": { - "php": ">=7.1.3", - "symfony/polyfill-php80": "^1.16" + "php": ">=8.1" + }, + "require-dev": { + "symfony/filesystem": "^6.0|^7.0" }, "type": "library", "autoload": { @@ -20393,7 +20439,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v4.4.44" + "source": "https://github.com/symfony/finder/tree/v6.4.10" }, "funding": [ { @@ -20409,7 +20455,7 @@ "type": "tidelift" } ], - "time": "2022-07-29T07:35:46+00:00" + "time": "2024-07-24T07:06:38+00:00" }, { "name": "symfony/http-client-contracts", @@ -25353,14 +25399,9 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "drupal/admin_theme": 20, - "drupal/advagg": 20, + "drupal/advagg": 15, "drupal/advanced_text_formatter": 5, - "drupal/auto_entitylabel": 20, "drupal/better_messages": 15, - "drupal/commerce": 20, - "drupal/commerce_email": 20, - "drupal/commerce_license": 20, "drupal/commerce_pricelist": 20, "drupal/commerce_recurring": 20, "drupal/commerce_stripe": 20, @@ -25401,7 +25442,6 @@ "drupal/views_field_view": 20, "weitzman/drupal-test-traits": 20, "drupal/bulkdelete": 20, - "drupal/cshs": 20, "drupal/config_devel": 20, "drupal/config_update": 15, "drupal/context": 5, diff --git a/config/devel/composer_deploy.settings.yml b/config/devel/composer_deploy.settings.yml new file mode 100644 index 00000000..c9b8ca3d --- /dev/null +++ b/config/devel/composer_deploy.settings.yml @@ -0,0 +1,4 @@ +_core: + default_config_hash: FDmXqAGlITLYpZe80ONLw6Y1KEMSvqcMJX1pj2dk6nw +prefixes: + - drupal diff --git a/config/sync/config_split.config_split.devel.yml b/config/sync/config_split.config_split.devel.yml index de6320ca..5c018c86 100644 --- 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 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 389e3b00..a5ac25b4 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 @@ -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 diff --git 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 index dd05666e..ae31a7c4 100644 --- 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 diff --git a/config/sync/core.entity_form_display.commerce_order.recurring.default.yml b/config/sync/core.entity_form_display.commerce_order.recurring.default.yml index 789cfda3..e9eada0d 100644 --- 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 diff --git a/config/sync/field.field.commerce_product_variation.default.license_expiration.yml b/config/sync/field.field.commerce_product_variation.default.license_expiration.yml index 44d3f9b1..35fd954d 100644 --- 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' diff --git 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 index 0a589d0f..7f8ccc00 100644 --- 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' diff --git 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 index 3fcf5349..99534830 100644 --- 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' diff --git a/config/sync/field.storage.commerce_product_variation.license_expiration.yml b/config/sync/field.storage.commerce_product_variation.license_expiration.yml index b3b63423..659a9c1d 100644 --- 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 diff --git a/config/sync/system.action.commerce_license_delete_action.yml b/config/sync/system.action.commerce_license_delete_action.yml new file mode 100644 index 00000000..d7602c7e --- /dev/null +++ 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: { } diff --git a/config/sync/views.view.commerce_order_item_table.yml b/config/sync/views.view.commerce_order_item_table.yml index a3d18dc2..7510ee52 100644 --- 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: diff --git a/web/profiles/d8-starterkit-profile b/web/profiles/d8-starterkit-profile index dfd0a7c3..c7e91555 160000 --- a/web/profiles/d8-starterkit-profile +++ b/web/profiles/d8-starterkit-profile @@ -1 +1 @@ -Subproject commit dfd0a7c389755ddb0ffe74297114756f160fbe0b +Subproject commit c7e9155544663e3e498a9be0849fbb67f5049bb7