Merge branch 'prod'

This commit is contained in:
Bachir Soussi Chiadmi 2022-03-07 14:34:21 +01:00
commit 407c430b94
9 changed files with 19 additions and 59 deletions

View File

@ -256,6 +256,12 @@
"drupal/stripe": { "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" "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"
},
"drupal/commerce_pricelist": {
"expected argument of type array or Traversable and ArrayAccess, string given":"https://www.drupal.org/files/issues/2022-02-24/price_list-routing-parameters.patch"
},
"drupal/commerce_stripe" : { "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" "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"
}, },

View File

@ -1,32 +0,0 @@
site_id: ''
url_http: ''
url_https: ''
domain_mode: 0
visibility:
request_path_mode: 0
request_path_pages: "/admin\n/admin/*\n/batch\n/node/add*\n/node/*/*\n/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
cache: false
page_title_hierarchy: false
page_title_hierarchy_exclude_home: true
_core:
default_config_hash: YGueb7ImKHSG1RRmIB1iqPHVGXTmI2yvCcB-RX7FPeY

View File

@ -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

View File

@ -9,7 +9,8 @@
"lint": "eslint --ext .js,.vue src", "lint": "eslint --ext .js,.vue src",
"lint:fix": "eslint --ext .js,.vue src --fix", "lint:fix": "eslint --ext .js,.vue src --fix",
"test": "jest --config test/jest.config.js", "test": "jest --config test/jest.config.js",
"test:debug": "node --inspect node_modules/.bin/jest --runInBand --config test/jest.config.js" "test:debug": "node --inspect node_modules/.bin/jest --runInBand --config test/jest.config.js",
"postinstall": "patch --forward node_modules/slim-select/package.json < patches/slimselect-export-css.patch"
}, },
"keywords": [ "keywords": [
"Vue", "Vue",

File diff suppressed because one or more lines are too long

View File

@ -143,7 +143,7 @@
</section> </section>
<section class="industriels"> <section class="industriels">
<!-- <h4 class="label">{{ $t("default.Contact") }}</h4> --> <!-- <h4 class="label">{{ $t("default.Contact") }}</h4> -->
<section v-if="material.manufacturer"> <section v-if="material.manufacturer && material.manufacturer.length">
<span class="label">{{ $t("materio.Manufacturer") }}</span> <span class="label">{{ $t("materio.Manufacturer") }}</span>
<ul> <ul>
<li v-for="manu in material.manufacturer" v-bind:key="manu.id"> <li v-for="manu in material.manufacturer" v-bind:key="manu.id">
@ -157,7 +157,7 @@
</li> </li>
</ul> </ul>
</section> </section>
<section v-if="material.distributor"> <section v-if="material.distributor && material.distributor.length">
<span class="label">{{ $t("materio.Distributor") }}</span> <span class="label">{{ $t("materio.Distributor") }}</span>
<ul> <ul>
<li v-for="distrib in material.distributor" v-bind:key="distrib.id"> <li v-for="distrib in material.distributor" v-bind:key="distrib.id">

View File

@ -34,12 +34,12 @@ export default createStore(Vuex.Store, {
// https://github.com/huybuidac/vuex-extensions // https://github.com/huybuidac/vuex-extensions
mixins: { mixins: {
actions: { actions: {
loadMaterialsGQL ({ dispatch }, { ids, gqlfragment, callBack, callBackArgs }) { loadMaterialsGQL ({ dispatch }, { ids, gqlfragment, gqlFragmentfields, callBack, callBackArgs }) {
console.log('loadMaterialsGQL ids', ids) console.log('loadMaterialsGQL ids', ids)
const ast = gql`{ const ast = gql`{
materiaux(ids: [${ids}]) { materiaux(ids: [${ids}]) {
...MateriauFields ...${gqlFragmentfields}
} }
} }
${gqlfragment} ${gqlfragment}

View File

@ -332,6 +332,7 @@ export default {
dispatch('loadMaterialsGQL', { dispatch('loadMaterialsGQL', {
ids: state.flagcolls[collid].items, ids: state.flagcolls[collid].items,
gqlfragment: materiauFlaglistGQL, gqlfragment: materiauFlaglistGQL,
gqlFragmentfields: 'MateriauFlagListFields',
callBack: 'loadMaterialsCallBack', callBack: 'loadMaterialsCallBack',
callBackArgs: { collid: collid } callBackArgs: { collid: collid }
}).then(() => { }).then(() => {
@ -370,6 +371,7 @@ export default {
dispatch('loadMaterialsGQL', { dispatch('loadMaterialsGQL', {
ids: state.flagcolls[collid].items, ids: state.flagcolls[collid].items,
gqlfragment: materiauFlaglistGQL, gqlfragment: materiauFlaglistGQL,
gqlFragmentfields: 'MateriauFlagListFields',
callBack: 'loadMaterialsCallBack', callBack: 'loadMaterialsCallBack',
callBackArgs: { collid: collid } callBackArgs: { collid: collid }
}) })