surya/newfreeplanet_OLD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- aggiunta campi Gas data + fix

Browse Source
This commit is contained in:
Surya Paolo
2023-12-28 23:48:09 +01:00
parent ed76b9c1dd
commit 42d37d8209
11 changed files with 61 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/store/Modules/fieldsTable.ts
View File

@@ -461,6 +461,7 @@ export const colTableGasordine = [
AddCol({ name: 'city', label_trans: 'store.city' }),
AddCol({ name: 'img', label_trans: 'store.img' }),
AddCol({ name: 'dataora_chiusura_ordini', label_trans: 'gas.dataora_chiusura_ordini', fieldtype: costanti.FieldType.date }),
AddCol({ name: 'data_arrivo_merce', label_trans: 'gas.data_arrivo_merce', fieldtype: costanti.FieldType.date }),
AddCol({ name: 'dataora_ritiro', label_trans: 'gas.dataora_ritiro', fieldtype: costanti.FieldType.date }),
AddCol(DeleteRec),
AddCol(DuplicateRec),

3
src/store/Products.ts
View File

@@ -179,7 +179,7 @@ export const useProducts = defineStore('Products', {
getOrderProductInCart: (state: IProductsState) => (idproduct: string): IOrder | null => {
// console.log('.cart.items', this.cart.items)
if (state.cart.items) {
const ris = state.cart.items.find((item: IBaseOrder) => item.order.idProduct === idproduct)
const ris = state.cart.items.find((item: IBaseOrder) => item.order ? (item.order.idProduct === idproduct) : false)
return ris ? ris.order : null
}
return null
@@ -803,6 +803,7 @@ export const useProducts = defineStore('Products', {
return mygas.name!
else
return mygas.name + ' (' + mygas.city + ') ' + translate('gas.dataora_chiusura_ordini') + ': ' + tools.getstrDateShort(mygas.dataora_chiusura_ordini)
+ ' ' + translate('gas.data_arrivo_merce') + ': ' + tools.getstrDateShort(mygas.data_arrivo_merce)
+ ' ' + translate('gas.dataora_ritiro') + ': ' + tools.getstrDateShort(mygas.dataora_ritiro)
} else
return ''