- fix quantità corretta sulla email e dimensione dell'immagine

This commit is contained in:
Surya Paolo
2024-04-11 17:12:29 +02:00
parent bff31b5fd4
commit c2b6e6edfa
65 changed files with 184 additions and 3592563 deletions

View File

@@ -8,6 +8,8 @@ const msg_website_enUs = {
products: {
quantity: 'Quantità',
quantityAvailable: 'Disponibili',
stockQty: 'In Magazzino',
stockBloccatiQty: 'Bloccati In Magazzino',
weight: 'Peso',
stars: 'Voto',
color: 'Colore',
@@ -36,6 +38,7 @@ const msg_website_enUs = {
productslist: 'Lista Prodotti',
collabora: 'Collabora',
storehouses: 'Magazzino',
providers: 'Fornitori',
departments: 'Uffici',
orders: 'Ordini Ricevuti',
orders2: 'Ordini Ricevuti',

View File

@@ -8,6 +8,7 @@ const msg_website_es = {
products: {
quantity: 'Quantità',
quantityAvailable: 'Disponibili',
stockQty: 'In Magazzino',
weight: 'Peso',
stars: 'Voto',
color: 'Colore',

View File

@@ -1,9 +1,9 @@
const msg_website_it = {
ws: {
sitename: 'Riso',
siteshortname: 'RISO',
description: 'Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.',
keywords: 'riso, piattaforma di scambio, rete italiana scambio orizzontale, riso app, riso piattaforma, scambio e baratto, momenta RIS',
sitename: 'Più che Buono',
siteshortname: 'Più che Buono',
description: '',
keywords: '',
},
hours: {
descr: 'Descrizione',
@@ -16,23 +16,35 @@ const msg_website_it = {
pages: {
home: 'Home',
profile: 'Profilo',
install_site: 'Installa Sito',
profile2: 'ProfiloU',
mypage2: 'mypage2',
myservice2: 'myservice2',
myhosps2: 'myhosps2',
mygood2: 'mygood2',
catalogo: 'Catalogo',
fundraising: 'Sostieni il Progetto',
notifs: 'Configura le Notifiche',
unsubscribe: 'Disiscriviti',
unsubscribe_user: 'Disiscriviti User',
test: 'Test',
projects: 'Progetti',
report: 'Report Ore',
producer: 'Produttore',
orderinfo: 'Ordini Effettuati',
products: 'Prodotti',
cash: 'Cassa',
productInfos: 'Info Prodotti',
listinoprodotti: 'Listino Prodotti',
productslist: 'Lista Prodotti',
collabora: 'Collabora',
categories: 'Categorie',
storehouses: 'Magazzino',
providers: 'Fornitori',
catprods: 'Categorie',
subcatprods: 'Sotto-Categorie',
gasordine: 'Gas Ordine',
scontisticas: 'Scontistica',
departments: 'Uffici',
orders: 'Ordini Ricevuti',
orders2: 'Ordini Ricevuti',
@@ -121,9 +133,11 @@ const msg_website_it = {
only_residenti: 'Solo Residenti',
only_consiglio: 'Solo Consiglieri',
color: 'Colore',
gasordini: 'Gas Ordini',
gestoreordini: 'Gestore Ordini',
},
msg: {
myAppName: 'Riso',
myAppName: 'Più che Buono',
myAppDescription: 'Il primo Vero Social Libero, Equo e Solidale, dove Vive Consapevolezza e Aiuto Comunitario. Gratuito',
underconstruction: 'App in costruzione...',
myDescriz: '',

View File

@@ -7,30 +7,6 @@ import {
import { func } from '@store/Modules/fieldsTable'
// const SHOW_PROJINTHEMENU = false
//
// let arrlistafavourite = []
// let arrlistaprojtutti = []
// let arrlistaprojmiei = []
// if (SHOW_PROJINTHEMENU) {
// arrlistaprojtutti = Projects.getters.listaprojects(RouteNames.projectsall)
// arrlistaprojmiei = Projects.getters.listaprojects(RouteNames.myprojects)
// arrlistafavourite = Projects.getters.listaprojects(RouteNames.favouriteprojects)
// }
// PROGETTI -> FAVORITI :
// if (arrlistafavourite.length > 0) {
// arrMenu.push({
// icon: 'favorite_border',
// nametranslate: 'pages.' + RouteNames.favouriteprojects,
// urlroute: RouteNames.favouriteprojects,
// level_parent: 0.0,
// level_child: 0.5,
// routes2: arrlistafavourite,
// idelem: ''
// })
// }
const firstPage = {
active: true,
order: 5,
@@ -57,72 +33,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
inmenu: true,
infooter: true,
},
{
active: true,
order: 400,
path: '/test',
materialIcon: 'fas fa-test',
name: 'mypages.test',
component: () => import('@/views/testServer/testServer.vue'),
inmenu: false,
infooter: false,
},
{
active: true,
order: 12,
path: '/goods',
materialIcon: 'fas fa-tshirt',
name: 'mypages.goods',
component: () => import('@/root/goods/goods.vue'),
meta: { requiresAuth: true },
inmenu: true,
infooter: true,
},
{
active: true,
order: 15,
path: '/services',
materialIcon: 'fas fa-house-user',
name: 'mypages.services',
component: () => import('@/root/services/services.vue'),
meta: { requiresAuth: true },
inmenu: true,
infooter: true,
},
{
active: true,
order: 15,
path: '/provapao',
materialIcon: 'fas fa-house-user',
name: 'mypages.provapao',
component: () => import('@/root/provapao/provapao.vue'),
meta: { requiresAuth: true },
inmenu: false,
infooter: false,
},
{
active: true,
order: 15,
path: '/hosps',
materialIcon: 'fas fa-bed',
name: 'mypages.hosp',
component: () => import('@/root/hosp/hosp.vue'),
meta: { requiresAuth: true },
inmenu: true,
infooter: true,
},
{
active: site.confpages && site.confpages.enableCircuits,
order: 16,
path: '/circuits',
materialIcon: 'fas fa-coins',
name: 'mypages.circuits',
component: () => import('@/views/user/mycircuits/mycircuits.vue'),
meta: { requiresAuth: true },
inmenu: true,
infooter: true,
},
{
/*{
active: true,
order: 20,
path: '/events',
@@ -132,6 +43,17 @@ function getDynamicPages(site: ISites): IListRoutes[] {
meta: { requiresAuth: true },
inmenu: true,
infooter: true,
},*/
{
active: site.confpages && site.confpages.showProfile,
order: 120,
path: '/myprofile',
materialIcon: 'fas fa-user',
name: 'pages.profile',
component: () => import('@/views/user/myprofile/myprofile.vue'),
meta: { requiresAuth: true },
inmenu: true,
infooter: true,
},
{
active: true,
@@ -145,18 +67,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
infooter: false,
},
{
active: true,
order: 120,
path: '/myprofile',
materialIcon: 'fas fa-user',
name: 'pages.profile',
component: () => import('@/views/user/myprofile/myprofile.vue'),
meta: { requiresAuth: true },
inmenu: true,
infooter: true,
},
{
active: true,
active: site.confpages && site.confpages.showProfile,
order: 120,
path: '/editprofile',
materialIcon: 'fas fa-user',
@@ -167,7 +78,7 @@ function getDynamicPages(site: ISites): IListRoutes[] {
infooter: false,
},
{
active: true,
active: site.confpages && site.confpages.showiscrittiMenu,
order: 130,
path: '/friends',
materialIcon: 'fas fa-user-friends',
@@ -177,6 +88,19 @@ function getDynamicPages(site: ISites): IListRoutes[] {
inmenu: true,
infooter: true,
},
{
active: site.confpages && site.confpages.enableCircuits,
order: 16,
path: '/circuits',
materialIcon: 'fas fa-coins',
name: 'mypages.circuits',
component: () => import('@/views/user/mycircuits/mycircuits.vue'),
meta: { requiresAuth: true },
inmenu: true,
infooter: true,
onlyAdmin: true,
onlyManager: true,
},
{
active: site.confpages && site.confpages.enableGroups,
order: 132,
@@ -187,6 +111,8 @@ function getDynamicPages(site: ISites): IListRoutes[] {
meta: { requiresAuth: true },
inmenu: true,
infooter: false,
onlyAdmin: true,
onlyManager: true,
},
{
active: true,

View File

@@ -1763,7 +1763,7 @@ const msg_it = {
update_TotalPrice: 'Aggiorna Totale',
TotalPriceProduct: 'Prezzo Totale',
order_confirm: 'Conferma Ordini (aggiorna Qta magazzino)',
check_invia_email: 'Invia le email',
check_invia_email: 'Abilita l\'Invio delle email (📩)',
},
cash: {
creatorUserId: 'Creatore',

View File

@@ -94,7 +94,7 @@ export const Api = {
try {
const userStore = useUserStore()
console.log('refreshToken')
// console.log('refreshToken')
const refrTok = localStorage.getItem(toolsext.localStorage.refreshToken)
let response = null
if (refrTok && refrTok !== 'undefined') {
@@ -108,7 +108,7 @@ export const Api = {
// Reset the refresh token if it was reset by the server
if (response.data.refreshToken) {
console.log('salva refreshtoken', response.data.refreshToken)
// console.log('salva refreshtoken', response.data.refreshToken)
userStore.setRefreshToken(response.data.refreshToken)
}
@@ -187,7 +187,7 @@ export const Api = {
}, 1000)
if (error.status === serv_constants.RIS_CODE__HTTP_FORBIDDEN_TOKEN_EXPIRED) {
console.log('Token Expired')
// console.log('Token Expired')
// Prova ad ottenere un nuovo token di accesso
try {
// Se il token è scaduto, allora faccio la richiesta di un NUOVO TOKEN, passandogli refreshToken

View File

@@ -1252,7 +1252,7 @@ export const useUserStore = defineStore('UserStore', {
setRefreshToken(refreshToken: string) {
this.refreshToken = refreshToken
localStorage.setItem(toolsext.localStorage.refreshToken, refreshToken)
console.log('setRefreshToken', refreshToken)
// console.log('setRefreshToken', refreshToken)
},
setAuth(x_auth_token: string, refreshToken: string) {

View File

@@ -1801,7 +1801,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
return Api.SendReq('/site/load', 'POST', paramquery)
.then((res) => {
console.log('datastat', res)
// console.log('datastat', res)
this.datastat = res.data.datastat
return this.datastat
}).catch((error) => {

View File

@@ -674,6 +674,14 @@
></q-btn>
<br />
</div>
<div class="row">
<q-btn
label="Svuota Tutti Gli Accessi Online Con Token"
color="negative"
@click="EseguiFunz('SvuotaTuttiGliAccessiOnlineConToken')"
></q-btn>
<br />
</div>
<div class="row">
<q-btn
label="Aggiorna Coordinate Provincia"

View File

@@ -18,26 +18,20 @@
>
<template v-slot:tutti>
<div class="row items-center no-wrap">
<div class="text-center">
{{ t('gas.tutti') }}
</div>
<div class="text-center">{{ t('gas.tutti') }}</div>
<q-icon right name="fas fa-user-friends" />
</div>
</template>
<template v-slot:gas>
<div class="row items-center no-wrap">
<div class="text-center">
{{ t('gas.ordina_sul_gas') }}
</div>
<div class="text-center">{{ t('gas.ordina_sul_gas') }}</div>
<q-icon right name="fas fa-user-friends" />
</div>
</template>
<template v-slot:bottega>
<div class="row items-center no-wrap">
<div class="text-center">
{{ t('gas.bottega') }}
</div>
<div class="text-center">{{ t('gas.bottega') }}</div>
<q-icon right name="fas fa-store" />
</div>
</template>
@@ -45,6 +39,17 @@
</div>
<div v-if="endload" class="panel">
<div>
<q-toggle
v-if="tools.isManager()"
v-model="check_send_email"
color="blue"
class="row q-mx-md"
icon="fas fa-envelope"
:label="$t('orderscart.check_invia_email')"
></q-toggle>
</div>
<q-tabs v-model="taborders" inline-label class="text-blue">
<span v-for="(stat, index) of shared_consts.OrderStat" :key="index">
<q-tab
@@ -65,8 +70,7 @@
:label="t('products.gasordine') + `:`"
emit-value
map-options
>
</q-select>
></q-select>
<div class="q-pa-sm">
<q-table
@@ -87,27 +91,21 @@
<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>
<q-item-label
v-else-if="col.name === 'nameSurname'"
v-if="col.name === 'created_at'"
caption
>
>{{ tools.getstrDateTime(col.value) }}</q-item-label>
<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
>
>{{ tools.getNomeUtenteByRecUser(props.row.user) }}</span>
</span>
</q-item-label>
<q-item-label v-else-if="col.name === 'items'" caption>
<div
v-for="(item, index) of props.row.items"
:key="index"
>
<div v-for="(item, index) of props.row.items" :key="index">
<div
v-if="
!!item &&
@@ -119,25 +117,23 @@
{{ productStore.getStrInfoOrder(t, item.order) }}
{{ item.order.product.productInfo.name }} ({{
productStore.getQuantityByOrder(t, item.order)
}})<br />
}})
<br />
</div>
</div>
</q-item-label>
<q-item-label
v-else-if="col.name === 'totalPrice'"
caption
>
{{ props.row.totalPrice }} €
</q-item-label>
>{{ props.row.totalPrice }} €</q-item-label>
<q-item-label
v-else-if="col.name === 'totalPriceCalc'"
caption
>
{{ props.row.totalPriceCalc }} €
</q-item-label>
<q-item-label v-else-if="col.name === 'status'" caption>
{{ shared_consts.getStatusStr(props.row.status) }}
</q-item-label>
>{{ props.row.totalPriceCalc }} €</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="
@@ -171,11 +167,7 @@
@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>
@@ -186,10 +178,7 @@
</div>
</q-item-label>
<q-item-label
v-else-if="col.name === 'apri' && props.row._id"
caption
>
<q-item-label v-else-if="col.name === 'apri' && props.row._id" caption>
<div class="q-pa-sm">
<q-btn
size="sm"
@@ -200,9 +189,11 @@
></q-btn>
</div>
</q-item-label>
<q-item-label v-else caption>{{
col.value
}}</q-item-label>
<q-item-label v-else caption>
{{
col.value
}}
</q-item-label>
</q-item-section>
</q-item>
</q-list>
@@ -212,9 +203,7 @@
<template v-else v-slot:body="props">
<q-tr :props="props">
<q-td key="ind" :props="props">
<div class="q-pa-sm">
{{ index }}
</div>
<div class="q-pa-sm">{{ index }}</div>
</q-td>
<q-td key="apri" :props="props">
<div class="q-pa-sm">
@@ -230,10 +219,7 @@
</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
v-if="
taborders === shared_consts.OrderStat.CONFERMATI.value
@@ -257,11 +243,7 @@
@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>
@@ -272,23 +254,24 @@
</div>
</q-td>
<q-td key="numorder" :props="props">
<span v-if="props.row.numorder">
&nbsp; n. {{ props.row.numorder }}</span
>
<span v-if="props.row.numorder">&nbsp; 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
>
>{{ 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)
<span
v-if="taborders === shared_consts.OrderStat.COMPLETATI"
>
<br />Consegnato il:
<br />
{{
tools.getstrDateTime(props.row.date_consegnato)
}}
</span>
</q-td>
@@ -302,55 +285,72 @@
"
>
{{ item.order.product.productInfo.name }} ({{
productStore.getQuantityByOrder($t, item.order)
}})<br />
productStore.getQuantityByOrder($t, item.order)
}})
<br />
</div>
</div>
<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>
<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
>
<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">{{
<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) }}:
<span class="ordstat confermato">{{
<span
class="ordstat confermato"
>
{{
$t('ecomm.confermato')
}}</span>
}}
</span>
</div>
<div v-if="props.row.pagato" class="ordstat">
{{ tools.getstrDateTime(props.row.date_pagato) }}:
<span class="ordstat">{{ $t('ecomm.pagato') }}</span>
<span
class="ordstat"
>{{ $t('ecomm.pagato') }}</span>
</div>
<div v-if="props.row.consegnato" class="ordstat">
{{ tools.getstrDateTime(props.row.date_consegnato) }}:
<span class="ordstat">{{ $t('ecomm.consegnato') }}</span>
<span
class="ordstat"
>{{ $t('ecomm.consegnato') }}</span>
</div>
<div v-if="props.row.preparato" class="ordstat">
{{ tools.getstrDateTime(props.row.date_preparato) }}:
<span class="ordstat">{{ $t('ecomm.preparato') }}</span>
<span
class="ordstat"
>{{ $t('ecomm.preparato') }}</span>
</div>
<div v-if="props.row.spedito">
{{ tools.getstrDateTime(props.row.date_spedito) }}:
<span class="ordstat">{{ $t('ecomm.spedito') }}</span>
<span
class="ordstat"
>{{ $t('ecomm.spedito') }}</span>
</div>
<div v-if="props.row.ricevuto">
{{ tools.getstrDateTime(props.row.date_ricevuto) }}:
<span class="ordstat">{{ $t('ecomm.ricevuto') }}</span>
<span
class="ordstat"
>{{ $t('ecomm.ricevuto') }}</span>
</div>
</q-td>
</q-tr>
@@ -366,18 +366,6 @@
"
class="q-ma-sm q-pa-sm row justify-center"
>
<div>
<q-toggle
v-if="tools.isManager()"
v-model="check_send_email"
color="blue"
class="row q-mx-md"
icon="fas fa-envelope"
:label="$t('orderscart.check_invia_email')"
>
</q-toggle>
</div>
<q-btn
color="positive"
icon="mail"
@@ -401,15 +389,13 @@
label="Scegli il tipo di Email:"
emit-value
map-options
>
</q-select>
></q-select>
<CMyFieldDb
title="Email di Test"
mykey="EMAIL_TEST"
:serv="true"
:type="costanti.FieldType.string"
>
</CMyFieldDb>
></CMyFieldDb>
<q-btn
color="primary"
icon="fas fa-check"
@@ -462,5 +448,5 @@
</script>
<style lang="scss" scoped>
@import './orderInfo';
@import "./orderInfo";
</style>