Merge branch 'develop' of ssh://risosrv:5522/~/repository/newfreeplanet into develop
This commit is contained in:
Surya Paolo
@@ -1133,10 +1133,12 @@ export const useUserStore = defineStore('UserStore', {
|
||||
this.usersList = [...usersList]
|
||||
},
|
||||
|
||||
setlang($q: any, router: Router, newstr: string) {
|
||||
setlang($q: any, router: Router, newstr: string) {
|
||||
console.log('SETLANG', newstr)
|
||||
this.lang = newstr
|
||||
toolsext.setLangAtt($q, router, newstr)
|
||||
toolsext.setLangAtt($q, router, newstr)
|
||||
tools.localStSetItem(toolsext.localStorage.lang, this.lang)
|
||||
},
|
||||
|
||||
|
||||
@@ -65,25 +65,14 @@
|
||||
<div v-if="endload" class="panel">
|
||||
<q-tabs v-model="taborders" inline-label class="text-blue">
|
||||
<span v-for="(stat, index) of shared_consts.OrderStat" :key="index">
|
||||
<q-tab
|
||||
v-if="arrnumstatus[stat.value] > 0"
|
||||
:class="stat.color"
|
||||
:name="stat.value"
|
||||
:icon="stat.icon"
|
||||
:label="`(` + arrnumstatus[stat.value] + `) ` + stat.label"
|
||||
/>
|
||||
<q-tab v-if="arrnumstatus[stat.value] > 0" :class="stat.color" :name="stat.value" :icon="stat.icon"
|
||||
:label="`(` + arrnumstatus[stat.value] + `) ` + stat.label" />
|
||||
</span>
|
||||
</q-tabs>
|
||||
|
||||
<div class="q-pa-sm">
|
||||
<q-table
|
||||
:grid="$q.screen.lt.sm"
|
||||
:hide-header="$q.screen.lt.sm"
|
||||
:columns="columns"
|
||||
row-key="numorder"
|
||||
:pagination="initialPagination"
|
||||
:rows="getOrdersCartWithTotals()"
|
||||
>
|
||||
<q-table :grid="$q.screen.lt.sm" :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">
|
||||
<div class="q-pa-xs col-xs-12 col-sm-6 col-md-4">
|
||||
<q-card class="my-card-shadow yes_shadow">
|
||||
@@ -93,21 +82,13 @@
|
||||
<q-item-label>{{ col.label }}</q-item-label>
|
||||
</q-item-section>
|
||||
<q-item-section side>
|
||||
<q-item-label v-if="col.name === 'created_at'" caption
|
||||
>{{ tools.getstrDateTime(col.value) }}
|
||||
<q-item-label v-if="col.name === 'created_at'" caption>{{ tools.getstrDateTime(col.value) }}
|
||||
</q-item-label>
|
||||
<q-item-label
|
||||
v-else-if="col.name === 'nameSurname'"
|
||||
caption
|
||||
>
|
||||
<q-item-label v-else-if="col.name === 'nameSurname'" caption>
|
||||
<span v-if="props.row.user">
|
||||
<span
|
||||
:class="
|
||||
props.row.user.name !== 'TOTALI' ? '' : 'totali'
|
||||
"
|
||||
>{{ tools.getNomeUtenteByRecUser(props.row.user) }}
|
||||
</span></span
|
||||
>
|
||||
<span :class="props.row.user.name !== 'TOTALI' ? '' : 'totali'
|
||||
">{{ tools.getNomeUtenteByRecUser(props.row.user) }}
|
||||
</span></span>
|
||||
</q-item-label>
|
||||
<q-item-label v-else-if="col.name === 'items'" caption>
|
||||
<div
|
||||
@@ -128,40 +109,24 @@
|
||||
</div>
|
||||
</div>
|
||||
</q-item-label>
|
||||
<q-item-label
|
||||
v-else-if="col.name === 'totalPrice'"
|
||||
caption
|
||||
>
|
||||
<q-item-label v-else-if="col.name === 'totalPrice'" caption>
|
||||
{{ props.row.totalPrice }} €
|
||||
</q-item-label>
|
||||
<q-item-label v-else-if="col.name === 'status'" caption>
|
||||
{{ shared_consts.getStatusStr(props.row.status) }}
|
||||
</q-item-label>
|
||||
<q-item-label v-else-if="col.name === 'comandi'" caption>
|
||||
<div
|
||||
v-if="
|
||||
tools.isManager() &&
|
||||
props.row.user.name !== 'TOTALI'
|
||||
"
|
||||
class="q-pa-sm"
|
||||
>
|
||||
<div v-if="tools.isManager() &&
|
||||
props.row.user.name !== 'TOTALI'
|
||||
" class="q-pa-sm">
|
||||
<q-btn-dropdown rounded dense label="Azioni">
|
||||
<q-list class="text-primary">
|
||||
<q-item
|
||||
v-for="(
|
||||
<q-item v-for="(
|
||||
cmd, index
|
||||
) of shared_consts.OrderCmdStr"
|
||||
:key="index"
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="clickFunz(props.row, cmd.value)"
|
||||
>
|
||||
) of shared_consts.OrderCmdStr" :key="index" clickable v-close-popup
|
||||
@click="clickFunz(props.row, cmd.value)">
|
||||
<q-item-section avatar>
|
||||
<q-avatar
|
||||
:icon="cmd.icon"
|
||||
:color="cmd.color"
|
||||
text-color="white"
|
||||
/>
|
||||
<q-avatar :icon="cmd.icon" :color="cmd.color" text-color="white" />
|
||||
</q-item-section>
|
||||
<q-item-section>
|
||||
<q-item-label>{{ cmd.label }}</q-item-label>
|
||||
@@ -171,6 +136,7 @@
|
||||
</q-btn-dropdown>
|
||||
</div>
|
||||
</q-item-label>
|
||||
|
||||
<q-item-label v-else-if="col.name === 'apri'" caption>
|
||||
<div class="q-pa-sm">
|
||||
<q-btn
|
||||
@@ -207,22 +173,19 @@
|
||||
</q-td>
|
||||
<q-td key="numorder" :props="props">
|
||||
<span v-if="props.row.numorder">
|
||||
n. {{ props.row.numorder }}</span
|
||||
>
|
||||
n. {{ props.row.numorder }}</span>
|
||||
</q-td>
|
||||
<q-td key="nameSurname" :props="props">
|
||||
<span v-if="props.row.user">
|
||||
<span
|
||||
:class="props.row.user.name !== 'TOTALI' ? '' : 'totali'"
|
||||
>{{ tools.getNomeUtenteByRecUser(props.row.user) }}
|
||||
</span></span
|
||||
>
|
||||
<span :class="props.row.user.name !== 'TOTALI' ? '' : 'totali'">{{
|
||||
tools.getNomeUtenteByRecUser(props.row.user) }}
|
||||
</span></span>
|
||||
</q-td>
|
||||
<q-td key="created_at" :props="props">
|
||||
{{ tools.getstrDateTime(props.row.created_at) }}
|
||||
<span v-if="taborders === shared_consts.OrderStat.COMPLETATI">
|
||||
<br />Consegnato il:<br />{{
|
||||
tools.getstrDateTime(props.row.date_consegnato)
|
||||
tools.getstrDateTime(props.row.date_consegnato)
|
||||
}}
|
||||
</span>
|
||||
</q-td>
|
||||
@@ -236,7 +199,7 @@
|
||||
"
|
||||
>
|
||||
{{ item.order.product.productInfo.name }} ({{
|
||||
productStore.getQuantityByOrder($t, item.order)
|
||||
productStore.getQuantityByOrder($t, item.order)
|
||||
}})<br />
|
||||
</div>
|
||||
</div>
|
||||
@@ -245,14 +208,12 @@
|
||||
</div>
|
||||
</q-td>
|
||||
<q-td key="totalPrice" :props="props">
|
||||
<span :class="props.row.user.name !== 'TOTALI' ? '' : 'totali'"
|
||||
>{{ props.row.totalPrice }} €</span
|
||||
>
|
||||
<span :class="props.row.user.name !== 'TOTALI' ? '' : 'totali'">{{ props.row.totalPrice }} €</span>
|
||||
</q-td>
|
||||
<q-td key="status" :props="props">
|
||||
<span :class="props.row.status">{{
|
||||
shared_consts.getStatusStr(props.row.status)
|
||||
}}</span>
|
||||
}}</span>
|
||||
<br />
|
||||
<div v-if="props.row.confermato" class="ordstat">
|
||||
{{ tools.getstrDateTime(props.row.date_confermato) }}:
|
||||
@@ -278,25 +239,13 @@
|
||||
</div>
|
||||
</q-td>
|
||||
<q-td key="comandi" :props="props">
|
||||
<div
|
||||
v-if="tools.isManager() && props.row.user.name !== 'TOTALI'"
|
||||
class="q-pa-sm"
|
||||
>
|
||||
<div v-if="tools.isManager() && props.row.user.name !== 'TOTALI'" class="q-pa-sm">
|
||||
<q-btn-dropdown rounded dense label="Azioni">
|
||||
<q-list class="text-primary">
|
||||
<q-item
|
||||
v-for="(cmd, index) of shared_consts.OrderCmdStr"
|
||||
:key="index"
|
||||
clickable
|
||||
v-close-popup
|
||||
@click="clickFunz(props.row, cmd.value)"
|
||||
>
|
||||
<q-item v-for="(cmd, index) of shared_consts.OrderCmdStr" :key="index" clickable v-close-popup
|
||||
@click="clickFunz(props.row, cmd.value)">
|
||||
<q-item-section avatar>
|
||||
<q-avatar
|
||||
:icon="cmd.icon"
|
||||
:color="cmd.color"
|
||||
text-color="white"
|
||||
/>
|
||||
<q-avatar :icon="cmd.icon" :color="cmd.color" text-color="white" />
|
||||
</q-item-section>
|
||||
<q-item-section>
|
||||
<q-item-label>{{ cmd.label }}</q-item-label>
|
||||
|
||||
Reference in New Issue
Block a user