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

product

Browse Source
This commit is contained in:
Surya Paolo
2024-01-13 16:21:19 +01:00
parent 3ffa2893e5
commit 8979cd807a
10 changed files with 230 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/CDateTime/CDateTime.vue
View File

@@ -5,7 +5,7 @@
v-show="false"
color="blue-6"
hide-bottom-space
outlined
standout
borderless
:label="label"
:bg-color="bgcolor"
@@ -22,13 +22,14 @@
:label="label"
stack-label
:value="myvalue"
outlined
standout
:dense="dense"
color="blue-6"
label-color="blue-6"
:bg-color="bgcolor"
debounce="500"
:input-class="getclass()"
>
<template v-slot:control>
<div style="">
<div

12
src/components/CMyPopupEdit/CMyPopupEdit.ts
View File

@@ -54,6 +54,16 @@ export default defineComponent({
required: false,
default: false,
},
dense: {
type: Boolean,
required: false,
default: false,
},
justifycenter: {
type: Boolean,
required: false,
default: true,
},
isrec: {
type: Boolean,
required: false,
@@ -704,7 +714,7 @@ export default defineComponent({
function getclassCol(mycol: any) {
if (mycol) {
let myclstr = (mycol.disable || isviewfield()) ? '' : 'colmodif'
let myclstr = (mycol.disable || isviewfield()) ? '' : (props.canEdit ? 'colmodif' : '')
myclstr += ((mycol.fieldtype === costanti.FieldType.date) || (mycol.fieldtype === costanti.FieldType.onlydate)) ? ' coldate flex flex-container' : ''
return myclstr

26
src/components/CMyPopupEdit/CMyPopupEdit.vue
View File

@@ -15,7 +15,7 @@
"
style="flex-grow: 1"
>
<div :class="{ flex: !isInModif, 'justify-center': true }">
<div :class="{ flex: !isInModif, 'justify-center': justifycenter }">
<div>
<!-- Edit Value -->
<div v-if="col.fieldtype === costanti.FieldType.boolean">
@@ -572,11 +572,11 @@
? $t(col.label_trans)
: ''
"
class="cursor-pointer"
:class="{'cursor-pointer': canEdit}"
v-model:value="myvalue"
:readonly="false"
:minuteinterval="minuteinterval"
:dense="true"
:dense="dense"
:canEdit="canEdit"
@savetoclose="SaveValueInt"
@show="OpenEdit"
@@ -585,7 +585,7 @@
</div>
<div v-else-if="canEdit">
<q-btn
dense
:dense="dense"
color="primary"
@click="OpenEditDateToday"
icon="fas fa-calendar-day"
@@ -595,12 +595,12 @@
<div v-else-if="col.fieldtype === costanti.FieldType.onlydate">
<CDateTime
:label="col.label ? col.label : $t(col.label_trans)"
class="cursor-pointer"
:class="{'cursor-pointer': canEdit}"
:valueDate="myvalue"
v-model:value="myvalue"
:readonly="false"
:minuteinterval="minuteinterval"
:dense="true"
:dense="dense"
:canEdit="canEdit"
@savetoclose="SaveValueInt"
@show="OpenEdit"
@@ -925,7 +925,7 @@
</div>
<div v-else-if="col.fieldtype === costanti.FieldType.html">
<div v-if="isInModif">
<q-bar v-if="isInModif" dense class="bg-primary text-white">
<q-bar v-if="isInModif" :dense="dense" class="bg-primary text-white">
<span v-if="col.label_trans">{{ $t(col.label_trans) }}</span
><span v-else> {{ $t('event.testo_di_spiegazione') }}: </span>
<q-space />
@@ -975,7 +975,7 @@
<div v-if="!isFieldDb()">
<q-dialog v-model="visuhtml" full-height full-width>
<q-card>
<q-bar dense class="bg-primary text-white">
<q-bar :dense="dense" class="bg-primary text-white">
<span> {{ getTitleEditor(col, row) }} </span>
<q-space />
<q-btn
@@ -1359,11 +1359,11 @@
? $t(col.label_trans)
: ''
"
class="cursor-pointer"
:class="{'cursor-pointer': canEdit}"
v-model:value="myvalue"
:readonly="false"
:minuteinterval="minuteinterval"
:dense="true"
:dense="dense"
:canEdit="canEdit"
@savetoclose="SaveValueInt"
@show="OpenEdit"
@@ -1373,12 +1373,12 @@
<div v-else-if="col.fieldtype === costanti.FieldType.onlydate">
<CDateTime
:label="col.label ? col.label : $t(col.label_trans)"
class="cursor-pointer"
:class="{'cursor-pointer': canEdit}"
:valueDate="myvalue"
v-model:value="myvalue"
:readonly="false"
:minuteinterval="minuteinterval"
:dense="true"
:dense="dense"
:canEdit="canEdit"
@savetoclose="SaveValueInt"
@show="OpenEdit"
@@ -1480,7 +1480,7 @@
v-model="scope.value"
:options="shared_consts.LISTBESTCOLORS"
@update:model-value="changevalRec"
dense
:dense="dense"
label="Colore:"
emit-value
map-options

5
src/components/CMyValueDb/CMyValueDb.ts
View File

@@ -71,6 +71,11 @@ export default defineComponent({
required: false,
default: false,
},
editOn: {
type: Boolean,
required: false,
default: false,
},
canModify: {
type: Boolean,
required: false,

9
src/components/CMyValueDb/CMyValueDb.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="text-center">
<div class="row items-center justify-center q-gutter-xs q-ma-xs">
<div>
<div class="row">
<div :class="` `" :style="withBorder() ? `` : ``">
<div v-if="title && type === costanti.FieldType.string" class="q-ma-xs">
<q-field
@@ -33,6 +33,7 @@
</div>
<CMyPopupEdit
:dense="false"
debounce="1000"
:fielddb="true"
v-bind="$attrs"
@@ -52,8 +53,8 @@
:disable="disable"
:jointable="jointable"
:myimg="myimg"
:canModify="canModify"
:canEdit="true"
:canModify="canModify && editOn"
:canEdit="editOn"
:id="id"
:idmain="idmain"
:mycol="col ? col : {}"

336
src/components/CProductCard/CProductCard.vue
View File

@@ -12,6 +12,20 @@
v-if="!!myproduct && endload && !!myproduct.productInfo"
bordered
>
<q-toggle
v-if="tools.isManager()"
v-model="editOn"
class="absolute-top-right"
color="green"
icon="fas fa-pencil-alt"
dense
>
</q-toggle>
<div v-if="!myproduct.active">
<span class="text-bold text-white bg-red text-h6">{{
t('ecomm.not_active')
}}</span>
</div>
<q-card-section horizontal class="image-section">
<div class="image-container">
<q-img
@@ -34,7 +48,7 @@
style="bottom: -10px; right: 0px; transform: translateY(-50%)"
/>
</div>
<q-btn
<!--<q-btn
v-if="!complete"
fab
color="primary"
@@ -43,6 +57,7 @@
style="top: 0; right: -15px; transform: translateY(-66%)"
:to="`/product/` + myproduct._id + '/' + cosa"
/>
-->
<q-list>
<q-item>
<q-item-section avatar>
@@ -129,9 +144,22 @@
{{ t('ecomm.available') }}
</q-item-label>
<q-item-label>
<span class="prod_disp">
<span v-if="!editOn" class="prod_disp">
{{ products.getQtyAvailable(myproduct) }}
</span>
<CMyValueDb
v-if="editOn"
:editOn="editOn"
:title="t('products.stockQty')"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="stockQty"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.number"
>
</CMyValueDb>
<div class="prod_qtywarn">
<div
v-if="
@@ -167,10 +195,23 @@
>
<q-item-label> {{ t('ecomm.bloccati') }}: </q-item-label>
<q-item-label>
<span class="text-black q-ml-xs text-h8">
{{ products.getQtyBloccataAvailable(myproduct) }}</span
<span v-if="!editOn" class="text-black q-ml-xs text-h8">
{{ myproduct.stockBloccatiQty }}</span
>
</q-item-label>
<CMyValueDb
v-if="editOn"
:editOn="editOn"
:title="t('products.stockBloccatiQty')"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="stockBloccatiQty"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.number"
>
</CMyValueDb>
</q-item-section>
</q-item-section>
</q-item>
@@ -288,7 +329,17 @@
<q-item-section>
<q-item-label class="">
<span v-html="myproduct.note"></span>
<CMyValueDb
:editOn="editOn"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="note"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.string"
>
</CMyValueDb>
</q-item-label>
</q-item-section>
</q-item>
@@ -296,7 +347,7 @@
<q-card-section v-if="isOrdGas()">
<q-item
v-if="
products.getQtyBookableAvailable(myproduct) > 0 ||
myproduct.bookableAvailableQty > 0 ||
myproduct.maxbookableGASQty > 0
"
:clickable="tools.isManager()"
@@ -317,9 +368,22 @@
{{ t('ecomm.preorders') }}
</q-item-label>
<q-item-label>
<span class="prod_preorder">
{{ products.getQtyBookableAvailable(myproduct) }}
<span v-if="!editOn" class="prod_preorder">
{{ myproduct.bookableAvailableQty }}
</span>
<CMyValueDb
v-if="editOn"
:editOn="editOn"
:title="t('products.maxbookableGASQty')"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="maxbookableGASQty"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.number"
>
</CMyValueDb>
<div class="prod_qtywarn">
<div
v-if="
@@ -352,11 +416,34 @@
{{ t('ecomm.bloccati') }}:
</q-item-label>
<q-item-label>
<span class="text-black q-ml-xs text-h8">
{{
products.getQtyBloccataBookableAvailable(myproduct)
}}</span
<span v-if="!editOn" class="text-black q-ml-xs text-h8">
{{ myproduct.bookableGASBloccatiQty }}</span
>
<CMyValueDb
v-if="editOn"
:editOn="editOn"
:title="t('products.bookableGASBloccatiQty')"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="bookableGASBloccatiQty"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.number"
>
</CMyValueDb>
<CMyValueDb
:editOn="editOn"
:title="t('products.bookedGASQtyConfirmed')"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="bookedGASQtyConfirmed"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.number"
>
</CMyValueDb>
</q-item-label>
</q-item-section>
</q-item-section>
@@ -457,6 +544,34 @@
})
}}</span>
</q-item-label>
<div class="row">
<CMyValueDb
v-if="editOn"
:editOn="editOn"
:title="t('ecomm.bookedGASQtyOrdered')"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="bookedGASQtyOrdered"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.number"
>
</CMyValueDb>
<CMyValueDb
v-if="editOn"
:editOn="editOn"
:title="t('ecomm.qtyToReachForGas')"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="qtyToReachForGas"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.number"
>
</CMyValueDb>
</div>
<q-item-label>
<span class="prod_disp">
{{
@@ -515,20 +630,13 @@
</q-item-section>
<q-item-section v-if="!!recgasordineSelected.dataora_chiusura_ordini">
<q-item-label class="subtit_prod">
{{ t('gas.dataora_chiusura_ordini') }}
</q-item-label>
<q-item-label class="countdown_scadenza">
<span v-if="timerLabelScadenza">{{ timerLabelScadenza }}</span>
<span v-else-if="isOrdineChiuso()">{{
t('ecomm.ordine_scaduto', {
date: tools.getstrshortDateTime(
recgasordineSelected.dataora_chiusura_ordini
),
})
t('ecomm.ordine_scaduto')
}}</span>
<CMyValueDb
v-if="editOn"
:editOn="editOn"
:title="t('gas.dataora_chiusura_ordini')"
table="gasordines"
:id="recgasordineSelected._id"
@@ -537,6 +645,7 @@
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.date"
:justifycenter="false"
>
</CMyValueDb>
</q-item-label>
@@ -548,12 +657,9 @@
</q-item-section>
<q-item-section class="subtit_prod">
<q-item-label>
{{ t('gas.data_arrivo_merce') }}
</q-item-label>
<q-item-label class="countdown_scadenza">
<CMyValueDb
v-if="editOn"
:editOn="editOn"
:title="t('gas.data_arrivo_merce')"
table="gasordines"
:id="recgasordineSelected._id"
@@ -562,11 +668,9 @@
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.date"
:justifycenter="false"
>
</CMyValueDb>
<div v-else>
{{ labelDataArrivoMerce }}
</div>
</q-item-label>
</q-item-section>
</q-item>
@@ -576,25 +680,20 @@
</q-item-section>
<q-item-section>
<q-item-label class="subtit_prod">
{{ t('gas.dataora_ritiro') }}
</q-item-label>
<q-item-label class="countdown_scadenza">
<CMyValueDb
v-if="editOn"
:editOn="editOn"
:title="t('gas.dataora_ritiro')"
table="gasordines"
:id="recgasordineSelected._id"
:rec="recgasordineSelected"
mykey="dataora_ritiro"
:justifycenter="false"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.date"
:type="costanti.FieldType.onlydate"
>
</CMyValueDb>
<div v-else>
{{ labelDataRitiro }}
</div>
</q-item-label>
</q-item-section>
</q-item>
@@ -628,122 +727,6 @@
<div class="no-outline label-qta text-center" tabindex="0">
{{ myorder.quantity + myorder.quantitypreordered }}
</div>
<div v-if="editOn">
<CMyValueDb
:title="t('products.note')"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="note"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.string"
>
</CMyValueDb>
<div v-if="!isOrdGas()">
<CMyValueDb
:title="t('products.stockQty')"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="stockQty"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.number"
>
</CMyValueDb>
<CMyValueDb
:title="t('products.stockBloccatiQty')"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="stockBloccatiQty"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.number"
>
</CMyValueDb>
<CMyValueDb
:title="t('products.bookedQtyOrdered')"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="bookedQtyOrdered"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.number"
>
</CMyValueDb>
<CMyValueDb
:title="t('products.bookedQtyConfirmed')"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="bookedQtyConfirmed"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.number"
>
</CMyValueDb>
</div>
<q-separator> </q-separator>
<div v-if="isOrdGas()">
<CMyValueDb
:title="t('products.maxbookableGASQty')"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="maxbookableGASQty"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.number"
>
</CMyValueDb>
<CMyValueDb
:title="t('products.bookableGASBloccatiQty')"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="bookableGASBloccatiQty"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.number"
>
</CMyValueDb>
<CMyValueDb
:title="t('ecomm.bookedGASQtyOrdered')"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="bookedGASQtyOrdered"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.number"
>
</CMyValueDb>
<CMyValueDb
:title="t('products.bookedGASQtyConfirmed')"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="bookedGASQtyConfirmed"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.number"
>
</CMyValueDb>
</div>
<div class="text-center">
<q-btn
rounded
icon="fas fa-sync-alt"
color="primary"
:label="t('ecomm.ricarica')"
@click="ricarica()"
></q-btn>
</div>
</div>
</template>
</q-field>
@@ -778,17 +761,48 @@
></q-btn>
</div>
</q-card-section>
<q-toggle
v-if="tools.isManager()"
v-model="editOn"
color="green"
icon="fas fa-pencil-alt"
dense
>
</q-toggle>
<div v-if="editOn">
<div v-if="!isOrdGas()" class="row">
<CMyValueDb
:editOn="editOn"
:title="t('products.bookedQtyOrdered')"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="bookedQtyOrdered"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.number"
>
</CMyValueDb>
<CMyValueDb
:editOn="editOn"
:title="t('products.bookedQtyConfirmed')"
table="products"
:id="myproduct._id"
:rec="myproduct"
mykey="bookedQtyConfirmed"
debounce="1000"
:save="updateproductmodif()"
:type="costanti.FieldType.number"
>
</CMyValueDb>
</div>
<q-separator> </q-separator>
<div class="text-center">
<q-btn
rounded
icon="fas fa-sync-alt"
color="primary"
:label="t('ecomm.ricarica')"
@click="ricarica()"
></q-btn>
</div>
</div>
<div v-if="editOn">{{ t('ecomm.active') }}:</div>
<CMyValueDb
v-if="editOn"
:title="t('ecomm.active')"
:editOn="editOn"
table="products"
:id="myproduct._id"
:rec="myproduct"

2
src/model/Products.ts
View File

@@ -244,6 +244,8 @@ export interface IOrderCart {
date_ricevuto?: Date
created_at?: Date
note: string
note_per_gestore: string
note_per_admin: string
}
export interface IShareWithUs {

12
src/statics/lang/it.js
View File

@@ -66,7 +66,7 @@ const msg_it = {
minBuyQty: 'Qta minima acquistabile',
minStepQty: 'Step Minimo',
maxBookableSinglePersQty: 'Qtà massima prenotabile singolarm.',
bookedQtyOrdered: 'Quantità Ordered',
bookedQtyOrdered: 'Quantità Ordinate',
bookedQtyConfirmed: 'Quantità Confermate',
bookableAvailableQty: 'Disponib. Prenotabili',
maxbookableGASQty: 'Prenotabili',
@@ -1714,14 +1714,16 @@ const msg_it = {
offerta_gas_raggiunta: 'Complimenti! Gli ordini hanno superato il minimo quantitativo di {qta} {unit}',
note: 'Note',
apriordine: 'Vedi Ordine',
ordine_scaduto: 'l\'Ordine è stato chiuso il {date}!',
ordine_scaduto: 'l\'Ordine è Chiuso !',
ricarica: 'Ricarica',
active: 'Prodotto Acquistabile',
not_active: 'Prodotto Non Acquistabile',
},
gas: {
name: 'Ordine Gas',
dataora_chiusura_ordini: 'Data Chiusura Ordini',
data_arrivo_merce: 'Data Arrivo Merce',
dataora_ritiro: 'Data Ritiro',
dataora_chiusura_ordini: 'Chiusura Ordini',
data_arrivo_merce: 'Arrivo Merce',
dataora_ritiro: 'Ritiro dal',
ordina_sul_gas: 'Gruppo di Acquisto',
bottega: 'Bottega',
x_prodotti_gas: '{qta} prodotti',

2
src/store/Products.ts
View File

@@ -29,6 +29,8 @@ function getRecordOrdersCartEmpty(): IOrderCart {
spedito: false,
ricevuto: false,
note: '',
note_per_gestore: '',
note_per_admin: '',
}
}

6
src/views/ecommerce/orderInfo/orderInfo.vue
View File

@@ -206,6 +206,12 @@
<div v-if="props.row.note" class="note">
Note: {{ props.row.note }}
</div>
<div v-if="props.row.note_per_gestore" class="note">
Note per Gestore: {{ props.row.note_per_gestore }}
</div>
<div v-if="props.row.note_per_admin" class="note">
Note per Admin: {{ props.row.note_per_admin }}
</div>
</q-td>
<q-td key="totalPrice" :props="props">
<span :class="props.row.user.name !== 'TOTALI' ? '' : 'totali'">{{ props.row.totalPrice }} €</span>