{{
setmeta({
- title: t('pages.totaliordini'),
+ title: t('mypages.totaliordini'),
description: '',
keywords: '',
})
@@ -11,8 +11,8 @@
-
-
+
diff --git a/src/router/routesECommerce.ts b/src/router/routesECommerce.ts
index f3b8ceb5..1ebf80f8 100644
--- a/src/router/routesECommerce.ts
+++ b/src/router/routesECommerce.ts
@@ -75,7 +75,7 @@ function getRoutesEcomm(site: ISites) {
order: 30,
path: '/admin/ecommerce/gasordini',
materialIcon: 'fas fa-file-alt',
- name: 'pages.gestoreordinigas',
+ name: 'mypages.gestoreordinigas',
component: () => import('@src/rootgen/admin/gasordini/gasordini.vue'),
inmenu: true,
submenu: true,
@@ -102,7 +102,7 @@ function getRoutesEcomm(site: ISites) {
order: 30,
path: '/admin/ecommerce/gestoreordini',
materialIcon: 'fas fa-chart-pie',
- name: 'pages.totaliordini',
+ name: 'mypages.totaliordini',
component: () => import('@src/views/admin/gestoreordini/gestoreordini.vue'),
inmenu: true,
submenu: true,
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index e2efb96b..bf6e3e40 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -1270,6 +1270,8 @@ const msg_it = {
date_updated: 'Ult. Aggiornamento',
},
mypages: {
+ gestoreordinigas: 'Gestore Ordini GAS',
+ totaliordini: 'Totali Ordini GAS',
listadeigas: 'Lista dei GAS',
catalogo_new: 'Vuoi andare al Catalogo "{title}" appena creato?',
confirm_nav: 'Conferma Navigazione',
@@ -1361,6 +1363,11 @@ const msg_it = {
reject_ask_friend: 'Rifiuta Amicizia',
report_user: 'Segnala Utente',
},
+ common: {
+ clear: 'Disattiva',
+ cleared: 'Data rimossa',
+ set:'Imposta',
+ },
handshake: {
strettadimano: 'Stretta di mano',
strettedimano: 'Strette di mano',
@@ -2180,6 +2187,9 @@ const msg_it = {
date_extraction: 'Data Estrazione',
descrizione_lunga: 'Descrizione Lunga',
},
+ date: {
+ rangeFixed: 'La data di fine è stata allineata alla data di inizio',
+ },
},
};
diff --git a/src/store/Modules/costanti.ts b/src/store/Modules/costanti.ts
index 8c45ad75..e9c6fa97 100755
--- a/src/store/Modules/costanti.ts
+++ b/src/store/Modules/costanti.ts
@@ -493,6 +493,7 @@ export const costanti = {
verifica: 21000,
pickcolor: 22000,
username_telegram: 23000,
+ date2startend: 23050,
},
TypeMov: {
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index 46992257..dde1042f 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -63,7 +63,9 @@ function AddCol(params: IColGridTable) {
visulabel: params.visulabel === undefined ? true : params.visulabel,
align: params.align === undefined ? 'left' : params.align,
field: params.field === undefined ? params.name : params.field,
+ field2: params.name2 || '',
subfield: params.subfield === undefined ? '' : params.subfield,
+ subfield2: params.subfield2 === undefined ? '' : params.subfield2,
sortable: params.sortable === undefined ? true : params.sortable,
disable: params.disable === undefined ? false : params.disable,
titlepopupedit: params.titlepopupedit === undefined ? '' : params.titlepopupedit,
@@ -3312,16 +3314,17 @@ export const colmyBachecas = [
}),
AddCol({
name: 'dateTimeStart',
+ name2: 'dateTimeEnd',
label_trans: 'event.dateTimeStart',
// jointable: toolsext.TABCALALLDATE,
- fieldtype: costanti.FieldType.date,
+ fieldtype: costanti.FieldType.date2startend,
// fieldtype: costanti.FieldType.select,
// fieldtype_real: costanti.FieldType.onlydate,
// fieldtype: costanti.FieldType.onlydate,
icon: 'fas fa-calendar-day',
required: true,
}),
- AddCol({
+ /*AddCol({
name: 'dateTimeEnd',
label_trans: 'event.dateTimeEnd',
fieldtype: costanti.FieldType.date,
@@ -3331,7 +3334,7 @@ export const colmyBachecas = [
icon: 'fas fa-calendar-day',
sortable: false,
required: true,
- }),
+ }),*/
AddCol({
name: 'idCity',
label_trans: 'skill.cityorprovince',
@@ -4482,6 +4485,7 @@ export const colTableProdShort = [
label_trans: 'products.name',
field: 'productInfo',
subfield: 'name',
+ required: true,
}),
AddCol({
name: 'price',
@@ -4964,13 +4968,9 @@ const colTableEvents = [
}),
AddCol({
name: 'dateTimeStart',
+ name2: 'dateTimeEnd',
label_trans: 'event.dateTimeStart',
- fieldtype: costanti.FieldType.date,
- }),
- AddCol({
- name: 'dateTimeEnd',
- label_trans: 'event.dateTimeEnd',
- fieldtype: costanti.FieldType.date,
+ fieldtype: costanti.FieldType.date2startend,
}),
AddCol({ name: 'bgcolor', label_trans: 'event.bgcolor' }),
AddCol({ name: 'icon', label_trans: 'event.icon' }),
@@ -7117,7 +7117,7 @@ export const fieldsTable = {
{
value: 'products',
label: 'Prodotti',
- columns: colTableProducts,
+ columns: colTableProdShort,
colkey: '_id',
collabel: (rec: any) => `${rec.productInfo.name}`,
},