surya/salvato.newfreeplanet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://risosrv:5522/~/repository/newfreeplanet into develop

Browse Source
This commit is contained in:
Surya Paolo
2024-01-10 00:03:22 +01:00
parent 6dc74b5826 6ab83e7ed5
commit c283645d0b
2 changed files with 32 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/store/UserStore.ts
View File

@@ -1133,10 +1133,12 @@ export const useUserStore = defineStore('UserStore', {
this.usersList = [...usersList] this.usersList = [...usersList]
}, },
setlang($q: any, router: Router, newstr: string) {
setlang($q: any, router: Router, newstr: string) { setlang($q: any, router: Router, newstr: string) {
console.log('SETLANG', newstr) console.log('SETLANG', newstr)
this.lang = newstr this.lang = newstr
toolsext.setLangAtt($q, router, newstr) toolsext.setLangAtt($q, router, newstr)
toolsext.setLangAtt($q, router, newstr)
tools.localStSetItem(toolsext.localStorage.lang, this.lang) tools.localStSetItem(toolsext.localStorage.lang, this.lang)
}, },

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

@@ -65,25 +65,14 @@
<div v-if="endload" class="panel"> <div v-if="endload" class="panel">
<q-tabs v-model="taborders" inline-label class="text-blue"> <q-tabs v-model="taborders" inline-label class="text-blue">
<span v-for="(stat, index) of shared_consts.OrderStat" :key="index"> <span v-for="(stat, index) of shared_consts.OrderStat" :key="index">
<q-tab <q-tab v-if="arrnumstatus[stat.value] > 0" :class="stat.color" :name="stat.value" :icon="stat.icon"
v-if="arrnumstatus[stat.value] > 0" :label="`(` + arrnumstatus[stat.value] + `) ` + stat.label" />
:class="stat.color"
:name="stat.value"
:icon="stat.icon"
:label="`(` + arrnumstatus[stat.value] + `) ` + stat.label"
/>
</span> </span>
</q-tabs> </q-tabs>
<div class="q-pa-sm"> <div class="q-pa-sm">
<q-table <q-table :grid="$q.screen.lt.sm" :hide-header="$q.screen.lt.sm" :columns="columns" row-key="numorder"
:grid="$q.screen.lt.sm" :pagination="initialPagination" :rows="getOrdersCartWithTotals()">
:hide-header="$q.screen.lt.sm"
:columns="columns"
row-key="numorder"
:pagination="initialPagination"
:rows="getOrdersCartWithTotals()"
>
<template v-if="$q.screen.lt.sm" v-slot:item="props"> <template v-if="$q.screen.lt.sm" v-slot:item="props">
<div class="q-pa-xs col-xs-12 col-sm-6 col-md-4"> <div class="q-pa-xs col-xs-12 col-sm-6 col-md-4">
<q-card class="my-card-shadow yes_shadow"> <q-card class="my-card-shadow yes_shadow">
@@ -93,21 +82,13 @@
<q-item-label>{{ col.label }}</q-item-label> <q-item-label>{{ col.label }}</q-item-label>
</q-item-section> </q-item-section>
<q-item-section side> <q-item-section side>
<q-item-label v-if="col.name === 'created_at'" caption <q-item-label v-if="col.name === 'created_at'" caption>{{ tools.getstrDateTime(col.value) }}
>{{ tools.getstrDateTime(col.value) }}
</q-item-label> </q-item-label>
<q-item-label <q-item-label v-else-if="col.name === 'nameSurname'" caption>
v-else-if="col.name === 'nameSurname'"
caption
>
<span v-if="props.row.user"> <span v-if="props.row.user">
<span <span :class="props.row.user.name !== 'TOTALI' ? '' : 'totali'
:class=" ">{{ tools.getNomeUtenteByRecUser(props.row.user) }}
props.row.user.name !== 'TOTALI' ? '' : 'totali' </span></span>
"
>{{ tools.getNomeUtenteByRecUser(props.row.user) }}
</span></span
>
</q-item-label> </q-item-label>
<q-item-label v-else-if="col.name === 'items'" caption> <q-item-label v-else-if="col.name === 'items'" caption>
<div <div
@@ -128,40 +109,24 @@
</div> </div>
</div> </div>
</q-item-label> </q-item-label>
<q-item-label <q-item-label v-else-if="col.name === 'totalPrice'" caption>
v-else-if="col.name === 'totalPrice'"
caption
>
{{ props.row.totalPrice }} € {{ props.row.totalPrice }} €
</q-item-label> </q-item-label>
<q-item-label v-else-if="col.name === 'status'" caption> <q-item-label v-else-if="col.name === 'status'" caption>
{{ shared_consts.getStatusStr(props.row.status) }} {{ shared_consts.getStatusStr(props.row.status) }}
</q-item-label> </q-item-label>
<q-item-label v-else-if="col.name === 'comandi'" caption> <q-item-label v-else-if="col.name === 'comandi'" caption>
<div <div v-if="tools.isManager() &&
v-if=" props.row.user.name !== 'TOTALI'
tools.isManager() && " class="q-pa-sm">
props.row.user.name !== 'TOTALI'
"
class="q-pa-sm"
>
<q-btn-dropdown rounded dense label="Azioni"> <q-btn-dropdown rounded dense label="Azioni">
<q-list class="text-primary"> <q-list class="text-primary">
<q-item <q-item v-for="(
v-for="(
cmd, index cmd, index
) of shared_consts.OrderCmdStr" ) of shared_consts.OrderCmdStr" :key="index" clickable v-close-popup
:key="index" @click="clickFunz(props.row, cmd.value)">
clickable
v-close-popup
@click="clickFunz(props.row, cmd.value)"
>
<q-item-section avatar> <q-item-section avatar>
<q-avatar <q-avatar :icon="cmd.icon" :color="cmd.color" text-color="white" />
:icon="cmd.icon"
:color="cmd.color"
text-color="white"
/>
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label>{{ cmd.label }}</q-item-label> <q-item-label>{{ cmd.label }}</q-item-label>
@@ -171,6 +136,7 @@
</q-btn-dropdown> </q-btn-dropdown>
</div> </div>
</q-item-label> </q-item-label>
<q-item-label v-else-if="col.name === 'apri'" caption> <q-item-label v-else-if="col.name === 'apri'" caption>
<div class="q-pa-sm"> <div class="q-pa-sm">
<q-btn <q-btn
@@ -207,22 +173,19 @@
</q-td> </q-td>
<q-td key="numorder" :props="props"> <q-td key="numorder" :props="props">
<span v-if="props.row.numorder"> <span v-if="props.row.numorder">
&nbsp; n. {{ props.row.numorder }}</span &nbsp; n. {{ props.row.numorder }}</span>
>
</q-td> </q-td>
<q-td key="nameSurname" :props="props"> <q-td key="nameSurname" :props="props">
<span v-if="props.row.user"> <span v-if="props.row.user">
<span <span :class="props.row.user.name !== 'TOTALI' ? '' : 'totali'">{{
:class="props.row.user.name !== 'TOTALI' ? '' : 'totali'" tools.getNomeUtenteByRecUser(props.row.user) }}
>{{ tools.getNomeUtenteByRecUser(props.row.user) }} </span></span>
</span></span
>
</q-td> </q-td>
<q-td key="created_at" :props="props"> <q-td key="created_at" :props="props">
{{ tools.getstrDateTime(props.row.created_at) }} {{ tools.getstrDateTime(props.row.created_at) }}
<span v-if="taborders === shared_consts.OrderStat.COMPLETATI"> <span v-if="taborders === shared_consts.OrderStat.COMPLETATI">
<br />Consegnato il:<br />{{ <br />Consegnato il:<br />{{
tools.getstrDateTime(props.row.date_consegnato) tools.getstrDateTime(props.row.date_consegnato)
}} }}
</span> </span>
</q-td> </q-td>
@@ -236,7 +199,7 @@
" "
> >
{{ item.order.product.productInfo.name }} ({{ {{ item.order.product.productInfo.name }} ({{
productStore.getQuantityByOrder($t, item.order) productStore.getQuantityByOrder($t, item.order)
}})<br /> }})<br />
</div> </div>
</div> </div>
@@ -245,14 +208,12 @@
</div> </div>
</q-td> </q-td>
<q-td key="totalPrice" :props="props"> <q-td key="totalPrice" :props="props">
<span :class="props.row.user.name !== 'TOTALI' ? '' : 'totali'" <span :class="props.row.user.name !== 'TOTALI' ? '' : 'totali'">{{ props.row.totalPrice }} €</span>
>{{ props.row.totalPrice }} €</span
>
</q-td> </q-td>
<q-td key="status" :props="props"> <q-td key="status" :props="props">
<span :class="props.row.status">{{ <span :class="props.row.status">{{
shared_consts.getStatusStr(props.row.status) shared_consts.getStatusStr(props.row.status)
}}</span> }}</span>
<br /> <br />
<div v-if="props.row.confermato" class="ordstat"> <div v-if="props.row.confermato" class="ordstat">
{{ tools.getstrDateTime(props.row.date_confermato) }}: {{ tools.getstrDateTime(props.row.date_confermato) }}:
@@ -278,25 +239,13 @@
</div> </div>
</q-td> </q-td>
<q-td key="comandi" :props="props"> <q-td key="comandi" :props="props">
<div <div v-if="tools.isManager() && props.row.user.name !== 'TOTALI'" class="q-pa-sm">
v-if="tools.isManager() && props.row.user.name !== 'TOTALI'"
class="q-pa-sm"
>
<q-btn-dropdown rounded dense label="Azioni"> <q-btn-dropdown rounded dense label="Azioni">
<q-list class="text-primary"> <q-list class="text-primary">
<q-item <q-item v-for="(cmd, index) of shared_consts.OrderCmdStr" :key="index" clickable v-close-popup
v-for="(cmd, index) of shared_consts.OrderCmdStr" @click="clickFunz(props.row, cmd.value)">
:key="index"
clickable
v-close-popup
@click="clickFunz(props.row, cmd.value)"
>
<q-item-section avatar> <q-item-section avatar>
<q-avatar <q-avatar :icon="cmd.icon" :color="cmd.color" text-color="white" />
:icon="cmd.icon"
:color="cmd.color"
text-color="white"
/>
</q-item-section> </q-item-section>
<q-item-section> <q-item-section>
<q-item-label>{{ cmd.label }}</q-item-label> <q-item-label>{{ cmd.label }}</q-item-label>