diff --git a/config/sync/config_split.config_split.devel.yml b/config/sync/config_split.config_split.devel.yml index 74464130..84375241 100644 --- a/config/sync/config_split.config_split.devel.yml +++ b/config/sync/config_split.config_split.devel.yml @@ -18,8 +18,8 @@ module: entity_clone: 0 update: 0 views_ui: 0 - webform_ui: 0 workflow_ui: 0 + webprofiler: 0 theme: { } complete_list: - maillog.settings diff --git a/config/sync/config_split.config_split.prod.yml b/config/sync/config_split.config_split.prod.yml index 013f2e24..4acfd5b8 100644 --- a/config/sync/config_split.config_split.prod.yml +++ b/config/sync/config_split.config_split.prod.yml @@ -13,7 +13,6 @@ module: dblog: 0 google_analytics: 0 mailgun: 0 - matomo: 0 pwa: 0 pwa_extras: 0 theme: { } diff --git a/config/sync/core.entity_form_display.commerce_pricelist_item.commerce_product_variation.default.yml b/config/sync/core.entity_form_display.commerce_pricelist_item.commerce_product_variation.default.yml new file mode 100644 index 00000000..39e447f2 --- /dev/null +++ b/config/sync/core.entity_form_display.commerce_pricelist_item.commerce_product_variation.default.yml @@ -0,0 +1,51 @@ +uuid: 98917ebc-f12a-4239-b116-6b762d783223 +langcode: fr +status: true +dependencies: + module: + - commerce_order + - commerce_price + - commerce_pricelist +id: commerce_pricelist_item.commerce_product_variation.default +targetEntityType: commerce_pricelist_item +bundle: commerce_product_variation +mode: default +content: + list_price: + type: commerce_list_price + weight: 1 + region: content + settings: { } + third_party_settings: { } + price: + type: commerce_price_default + weight: 2 + region: content + settings: { } + third_party_settings: { } + purchasable_entity: + type: entity_reference_autocomplete + weight: -1 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } + quantity: + type: commerce_quantity + weight: 0 + region: content + settings: + placeholder: '' + step: '1' + third_party_settings: { } + status: + type: options_buttons + weight: 3 + region: content + settings: { } + third_party_settings: { } +hidden: + price_list_id: true diff --git a/config/sync/core.entity_view_display.commerce_pricelist_item.commerce_product_variation.default.yml b/config/sync/core.entity_view_display.commerce_pricelist_item.commerce_product_variation.default.yml new file mode 100644 index 00000000..658a6f14 --- /dev/null +++ b/config/sync/core.entity_view_display.commerce_pricelist_item.commerce_product_variation.default.yml @@ -0,0 +1,15 @@ +uuid: f9285e9c-7bd0-46a9-a58a-7acaf23f61d4 +langcode: fr +status: true +dependencies: + module: + - commerce_price + - commerce_pricelist +id: commerce_pricelist_item.commerce_product_variation.default +targetEntityType: commerce_pricelist_item +bundle: commerce_product_variation +mode: default +content: { } +hidden: + search_api_excerpt: true + synonyms: true diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 63551c78..18252e70 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -141,7 +141,6 @@ module: materio_sapi: 0 materio_simplenews: 0 materio_user: 0 - matomo: 0 maxlength: 0 menu_block: 0 menu_ui: 0 @@ -230,6 +229,7 @@ module: views_ef_fieldset: 0 vue_link_formatter: 0 webform: 0 + webform_ui: 0 workflow: 0 workflow_access: 0 workflow_operations: 0 diff --git a/config/sync/eu_cookie_compliance.settings.yml b/config/sync/eu_cookie_compliance.settings.yml index 55d4c58d..7374858f 100644 --- a/config/sync/eu_cookie_compliance.settings.yml +++ b/config/sync/eu_cookie_compliance.settings.yml @@ -14,7 +14,7 @@ popup_info: format: wysiwyg mobile_popup_info: value: '' - format: full_html + format: wysiwyg popup_info_template: new popup_agree_button_message: Accept popup_more_info_button_message: 'Privacy Policy' diff --git a/config/sync/matomo.settings.yml b/config/sync/matomo.settings.yml deleted file mode 100644 index a25d7d76..00000000 --- a/config/sync/matomo.settings.yml +++ /dev/null @@ -1,40 +0,0 @@ -_core: - default_config_hash: YGueb7ImKHSG1RRmIB1iqPHVGXTmI2yvCcB-RX7FPeY -site_id: '' -url_http: '' -url_https: '' -domain_mode: 0 -visibility: - request_path_mode: 0 - request_path_pages: |- - /admin - /admin/* - /batch - /node/add* - /node/*/* - /user/*/* - user_role_mode: 0 - user_role_roles: { } - user_account_mode: 1 -track: - mailto: true - files: true - files_extensions: '7z|aac|arc|arj|asf|asx|avi|bin|csv|doc(x|m)?|dot(x|m)?|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mp(2|3|4|e?g)|mov(ie)?|msi|msp|pdf|phps|png|ppt(x|m)?|pot(x|m)?|pps(x|m)?|ppam|sld(x|m)?|thmx|qtm?|ra(m|r)?|sea|sit|tar|tgz|torrent|txt|wav|wma|wmv|wpd|xls(x|m|b)?|xlt(x|m)|xlam|xml|z|zip' - colorbox: true - userid: false - messages: { } - site_search: false -privacy: - donottrack: true - disablecookies: false -custom: - variable: { } -codesnippet: - before: '' - after: '' -translation_set: false -disable_tracking: false -cache: false -page_title_hierarchy: false -page_title_hierarchy_exclude_home: true -status_codes_disabled: { } diff --git a/config/sync/pwa.config.yml b/config/sync/pwa.config.yml index 9afee06d..c07e6913 100644 --- a/config/sync/pwa.config.yml +++ b/config/sync/pwa.config.yml @@ -12,7 +12,7 @@ default_image: '0' urls_to_cache: "/en/pricing\r\n/en/blabla\r\n/en/base\r\n/en/showrooms" urls_to_exclude: "admin/.*\r\nuser/.*" offline_page: /offline -cache_version: '2' +cache_version: '3' cross_origin: false skip_waiting: false image: /sites/default/files/pwa/materiopwaicon.png diff --git a/config/sync/search_api_solr.solr_field_type.text_fr_6_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_fr_6_0_0.yml index a88cc5d4..7dbc9c11 100644 --- a/config/sync/search_api_solr.solr_field_type.text_fr_6_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_fr_6_0_0.yml @@ -569,5 +569,4 @@ text_files: "\uFB06" => "st" synonyms: | drupal, durpal - nouns: | - + nouns: '' diff --git a/config/sync/search_api_solr.solr_field_type.text_fr_7_0_0.yml b/config/sync/search_api_solr.solr_field_type.text_fr_7_0_0.yml index 69bde097..9913643a 100644 --- a/config/sync/search_api_solr.solr_field_type.text_fr_7_0_0.yml +++ b/config/sync/search_api_solr.solr_field_type.text_fr_7_0_0.yml @@ -569,5 +569,4 @@ text_files: "\uFB06" => "st" synonyms: | drupal, durpal - nouns: | - + nouns: '' diff --git a/config/sync/ultimate_cron.job.matomo_cron.yml b/config/sync/ultimate_cron.job.matomo_cron.yml deleted file mode 100644 index 69d765a5..00000000 --- a/config/sync/ultimate_cron.job.matomo_cron.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 893534dd-cd4d-458b-8aec-629ce95fddf1 -langcode: en -status: true -dependencies: - module: - - matomo -title: 'Default cron handler' -id: matomo_cron -weight: 0 -module: matomo -callback: matomo_cron -scheduler: - id: simple -launcher: - id: serial -logger: - id: database diff --git a/config/sync/user.role.authenticated.yml b/config/sync/user.role.authenticated.yml index 2e1e2412..f7a5ed12 100644 --- a/config/sync/user.role.authenticated.yml +++ b/config/sync/user.role.authenticated.yml @@ -17,7 +17,6 @@ dependencies: - google_analytics - graphql - materio_flag - - matomo - profile - rest - simplenews @@ -41,7 +40,6 @@ permissions: - 'manage own commerce_payment_method' - 'materio_jsonapi ownroles' - 'opt-in or out of google analytics tracking' - - 'opt-in or out of matomo tracking' - 'restful post user_registration' - 'subscribe to newsletters' - 'update own customer profile' diff --git a/web/profiles/d8-starterkit-profile b/web/profiles/d8-starterkit-profile index 179aa994..7bf07a20 160000 --- a/web/profiles/d8-starterkit-profile +++ b/web/profiles/d8-starterkit-profile @@ -1 +1 @@ -Subproject commit 179aa994156fa9c986cf9eb9262872abb9c651a2 +Subproject commit 7bf07a20b7ac7383f72c9df88449ad299924ec99