diff --git a/src/components/CProductCard/CProductCard.vue b/src/components/CProductCard/CProductCard.vue index 8c36e5e9..b1cb43f6 100755 --- a/src/components/CProductCard/CProductCard.vue +++ b/src/components/CProductCard/CProductCard.vue @@ -91,7 +91,8 @@ > {{ t('products.weight') }}: - + {{ myproduct.weight }} {{ tools.getUnitsMeasure(myproduct.unit, true) }} @@ -135,7 +136,7 @@
{{ diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts index 1cba688a..3e2b2568 100755 --- a/src/model/GlobalStore.ts +++ b/src/model/GlobalStore.ts @@ -305,6 +305,8 @@ export interface ISites { telegram_key?: string telegram_bot_name?: string telegram_key_test?: string + load_process_telegram_test?: string + load_process_telegram?: string telegram_bot_name_test?: string telegram_support_chat?: string pathreg_add?: string diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts index 869df05c..a31ea586 100755 --- a/src/store/Modules/fieldsTable.ts +++ b/src/store/Modules/fieldsTable.ts @@ -1654,6 +1654,8 @@ export const colTableSites = [ AddCol({ name: 'telegram_bot_name', label_trans: 'sites.telegram_bot_name', fieldtype: costanti.FieldType.string }), AddCol({ name: 'telegram_support_chat', label_trans: 'sites.telegram_support_chat', fieldtype: costanti.FieldType.string }), AddCol({ name: 'telegram_key_test', label_trans: 'sites.telegram_key_test', fieldtype: costanti.FieldType.string }), + AddCol({ name: 'load_process_telegram_test', label_trans: 'sites.load_process_telegram_test', fieldtype: costanti.FieldType.boolean }), + AddCol({ name: 'load_process_telegramt', label_trans: 'sites.load_process_telegram', fieldtype: costanti.FieldType.boolean}), AddCol({ name: 'telegram_bot_name_test', label_trans: 'sites.telegram_bot_name_test', diff --git a/src/store/Products.ts b/src/store/Products.ts index 2001caca..c2b36563 100755 --- a/src/store/Products.ts +++ b/src/store/Products.ts @@ -238,8 +238,10 @@ export const useProducts = defineStore('Products', { let ris = null + console.log('Ottieni Prodotti') ris = await Api.SendReq('/products', 'POST', { userId: userStore.my._id }) .then((res) => { + console.log('Prodotti scaricati') if (res.data.products) { this.products = res.data.products } else { diff --git a/src/views/admin/dbop/dbop.vue b/src/views/admin/dbop/dbop.vue index 6cfc02e0..374f1131 100755 --- a/src/views/admin/dbop/dbop.vue +++ b/src/views/admin/dbop/dbop.vue @@ -570,6 +570,14 @@ >
+
+ +
+
diff --git a/src/views/ecommerce/orderInfo/orderInfo.vue b/src/views/ecommerce/orderInfo/orderInfo.vue index 01433185..4543361e 100755 --- a/src/views/ecommerce/orderInfo/orderInfo.vue +++ b/src/views/ecommerce/orderInfo/orderInfo.vue @@ -35,6 +35,19 @@ {{ tools.getstrDateTime(col.value) }} + + + {{ tools.getNomeUtenteByRecUser(props.row.user) }} + +
{{ shared_consts.getStatusStr(props.row.status) }} + +
+ + + + + + + + {{ cmd.label }} + + + + +
+
{{ col.value }} @@ -79,8 +126,7 @@ {{ tools.getNomeUtenteByRecUser(props.row.user) }} -