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

- modifiche al catalogo

Browse Source 
- tolta la richiesta di accettazione dei RIS, che ora vengono accettati automaticamente.
This commit is contained in:
Surya Paolo
2024-07-03 13:22:57 +02:00
parent 2ffcf56625
commit 8e711d0f63
50 changed files with 1882 additions and 1390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"

2
.env.example.production
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

2
.env.prod.gruppomacro
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="18"
DIRECTORY_LOCAL=newfreeplanet

2
.env.prod.pcb
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="17"
DIRECTORY_LOCAL=newfreeplanet

2
.env.test.gruppomacro
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="18"
DIRECTORY_LOCAL=newfreeplanet

2
.env.test.pcb
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="17"
DIRECTORY_LOCAL=newfreeplanet

2
.env.test.risosrv
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker_1.0.39.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

2
.env.test2
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

2
.env.test_riso.pcb
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

2
_ALL_SITES/fioredellavita.riso.app/.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="15"
DIRECTORY_LOCAL="newfreeplanet"

2
_ALL_SITES/fioredellavita.riso.app/.env.test
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="15"
DIRECTORY_LOCAL=newfreeplanet

2
_ALL_SITES/fioredellavita.riso.app/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "fioredellavita",
"version": "1.0.49",
"version": "1.0.51",
"description": "Fiore Della Vita",
"productName": "Fiore Della Vita",
"author": "Paolo Arena",

2
_ALL_SITES/gruppomacro.app/.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="18"
DIRECTORY_LOCAL="newfreeplanet"

2
_ALL_SITES/gruppomacro.app/.env.test
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="16"
DIRECTORY_LOCAL=newfreeplanet

83
_ALL_SITES/gruppomacro.app/package.json
View File

@@ -1,8 +1,8 @@
{
"name": "gruppomacro",
"version": "1.0.49",
"description": "Gruppo Macro Editori",
"productName": "Gruppo Macro",
"version": "1.0.51",
"description": "Gruppo Macro Cataloghi",
"productName": "GruppoMacro",
"author": "Paolo Arena",
"private": true,
"keywords": [],
@@ -27,57 +27,58 @@
"@babel/plugin-proposal-export-namespace-from": "^7.18.9",
"@babel/plugin-proposal-json-strings": "^7.18.6",
"@babel/plugin-proposal-numeric-separator": "^7.18.6",
"@cubejs-client/core": "^0.35.0",
"@quasar/extras": "^1.16.9",
"@cubejs-client/core": "^0.35.23",
"@quasar/extras": "^1.16.11",
"@quasar/quasar-ui-qcalendar": "^4.0.0-beta.19",
"@types/leaflet": "^1.9.8",
"@vue/compat": "^3.4.21",
"@vue/compiler-sfc": "^3.4.21",
"@vue/eslint-config-standard": "^7.0.0",
"@types/leaflet": "^1.9.12",
"@vue/compat": "^3.4.30",
"@vue/compiler-sfc": "^3.4.30",
"@vue/eslint-config-standard": "^8.0.1",
"@vuelidate/core": "^2.0.3",
"@vuelidate/validators": "^2.0.4",
"acorn": "^8.11.3",
"acorn": "^8.12.0",
"animate.css": "^4.1.1",
"autoprefixer": "^10.4.19",
"axios": "^1.6.8",
"axios": "^1.7.2",
"bcryptjs": "^2.4.3",
"chart.js": "^4.4.2",
"core-js": "^3.36.1",
"chart.js": "^4.4.3",
"core-js": "^3.37.1",
"crypto-browserify": "^3.12.0",
"date-fns": "^3.6.0",
"dotenv": "^16.4.5",
"echarts": "5.5.0",
"eslint-plugin-n": "^15.0.0",
"eslint-plugin-n": "^17.9.0",
"eslint-plugin-quasar": "^1.1.0",
"graphql": "^16.8.1",
"graphql": "^16.9.0",
"graphql-tag": "^2.12.6",
"gsap": "^3.12.5",
"jquery": "^3.7.1",
"js-cookie": "^3.0.5",
"jspdf": "^2.5.1",
"leaflet": "^1.9.4",
"leaflet.markercluster": "^1.5.3",
"localforage": "^1.10.0",
"lodash": "^4.17.21",
"normalize.css": "^8.0.1",
"npm": "^10.5.0",
"npm": "^10.8.1",
"nprogress": "^0.2.0",
"pinia": "^2.1.7",
"prerender-spa-plugin": "^3.4.0",
"quasar": "^2.15.1",
"quasar": "^2.16.4",
"quasar-extras": "^2.0.9",
"register-service-worker": "^1.7.2",
"typescript-eslint": "^7.3.1",
"vee-validate": "^4.12.6",
"vue": "^3.4.21",
"typescript-eslint": "^7.14.1",
"vee-validate": "^4.13.1",
"vue": "^3.4.30",
"vue-class-component": "^8.0.0-rc.1",
"vue-country-code": "^1.1.3",
"vue-echarts": "^6.6.9",
"vue-i18n": "^9.10.2",
"vue-echarts": "^6.7.3",
"vue-i18n": "^9.13.1",
"vue-idb": "^0.2.0",
"vue-image-zoomer": "^2.2.3",
"vue-image-zoomer": "^2.4.0",
"vue-loader": "^17.4.2",
"vue-property-decorator": "^10.0.0-rc.3",
"vue-router": "^4.3.0",
"vue-router": "^4.4.0",
"vue-scroll-reveal": "^2.1.0",
"vue-social-sharing": "^4.0.0-alpha4",
"vue-svgicon": "^4.0.0-alpha.3",
@@ -88,45 +89,49 @@
"vuex-router-sync": "^6.0.0-rc.1"
},
"devDependencies": {
"@babel/core": "^7.24.3",
"@quasar/app-webpack": "^3.12.4",
"@babel/core": "^7.24.7",
"@quasar/app-webpack": "^3.13.2",
"@types/bcryptjs": "^2.4.6",
"@types/dotenv": "^8.2.0",
"@types/googlemaps": "^3.43.3",
"@types/jest": "^29.5.12",
"@types/js-cookie": "^3.0.6",
"@types/node": "20.11.30",
"@types/node": "20.14.9",
"@types/nprogress": "^0.2.3",
"@types/vue-tel-input": "^2.1.6",
"@types/vuelidate": "^0.7.21",
"@typescript-eslint/eslint-plugin": "^7.3.1",
"@typescript-eslint/parser": "^7.3.1",
"eslint": "^8.37.0",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"copy-webpack-plugin": "^12.0.2",
"eslint": "^9.5.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-vue": "^8.7.1",
"eslint-plugin-promise": "^6.2.0",
"eslint-plugin-vue": "^9.26.0",
"file-loader": "^6.2.0",
"fork-ts-checker-webpack-plugin": "^9.0.2",
"friendly-errors-webpack-plugin": "^1.7.0",
"html-webpack-plugin": "^5.6.0",
"http-proxy-middleware": "^2.0.6",
"http-proxy-middleware": "^3.0.0",
"jest": "^29.7.0",
"json-loader": "^0.5.7",
"node-sass": "^9.0.0",
"npm-check-updates": "^16.14.17",
"npm-check-updates": "^16.14.20",
"optimize-css-assets-webpack-plugin": "^6.0.1",
"parcel": "^2.12.0",
"postcss": "^8.4.38",
"postcss-loader": "^8.1.1",
"sass-loader": "^14.1.1",
"sass-loader": "^14.2.1",
"strip-ansi": "=7.1.0",
"ts-jest": "^29.1.2",
"ts-jest": "^29.1.5",
"ts-loader": "^9.5.1",
"typescript": "5.3.2",
"typescript": "5.5.2",
"vue-cli-plugin-element-ui": "^1.1.4",
"vueify": "^9.4.1",
"webpack": "^5.91.0",
"workbox-webpack-plugin": "^6.5.4"
"webpack": "^5.92.1",
"webpack-dashboard": "^3.3.8",
"workbox-webpack-plugin": "^7.1.0"
},
"browser": {
"crypto": false

2
_ALL_SITES/piuchebuono.app/.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="17"
DIRECTORY_LOCAL="newfreeplanet"

2
_ALL_SITES/piuchebuono.app/.env.test
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

2
_ALL_SITES/riso.app/.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL="newfreeplanet"

2
_ALL_SITES/riso.app/.env.production
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="13"
DIRECTORY_LOCAL=newfreeplanet

2
_ALL_SITES/riso.app/.env.test
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="16"
DIRECTORY_LOCAL=newfreeplanet

2
_ALL_SITES/riso.app/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "riso",
"version": "1.0.49",
"version": "1.0.51",
"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.",
"productName": "Riso",
"author": "Paolo Arena",

2
_ALL_SITES/terradellavisione.app/.env.development
View File

@@ -1,4 +1,4 @@
APP_VERSION="1.0.49"
APP_VERSION="1.0.51"
SERVICE_WORKER_FILE="service-worker.js"
APP_ID="14"
DIRECTORY_LOCAL="newfreeplanet"

1
deploy_on_prod_gruppomacro.app.sh
View File

@@ -20,6 +20,7 @@ if [[ $risposta == "Y" || $risposta == "y" ]]; then
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
rsync -e 'ssh -p 8822' -a dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE
rsync -e 'ssh -p 8822' -av --delete dist/pwa/js/ pcbuser@pcb:$SERVERDIR_WEBSITE/js
echo "Finito $SERVERDIR_WEBSITE "

200
docs/aaa.json Normal file
View File

@@ -0,0 +1,200 @@
Iniziato: 2024-07-01 14: 48: 48
<br>updatecreate: ARRIVATO ORDINE
<br>{
"id": 67843,
"parent_id": 0,
"status": "processing",
"currency": "EUR",
"version": "9.0.2",
"prices_include_tax": true,
"date_created": "2024-07-01T14:47:00",
"date_modified": "2024-07-01T14:48:28",
"discount_total": "0.00",
"discount_tax": "0.00",
"shipping_total": "0.00",
"shipping_tax": "0.00",
"cart_tax": "0.00",
"total": "26.41",
"total_tax": "0.00",
"customer_id": 0,
"order_key": "wc_order_2AWFH9zg349Tg",
"billing": {
"first_name": "marica",
"last_name": "medici",
"company": null,
"address_1": "stazione 34 c\/o ca' de' medici srl-orari uffici",
"address_2": null,
"city": "reggio emilia",
"state": "RE",
"postcode": "42124",
"country": "IT",
"email": "marica@cademedici.it",
"phone": null
},
"shipping": {
"first_name": "marica",
"last_name": "medici",
"company": null,
"address_1": "stazione 34 c\/o ca' de' medici srl-orari uffici",
"address_2": null,
"city": "reggio emilia",
"state": "RE",
"postcode": "42124",
"country": "IT",
"phone": null
},
"payment_method": "wc_gateway_gestpay",
"payment_method_title": "Paga con carta di credito",
"transaction_id": "35\/H81309",
"customer_ip_address": "162.158.129.30",
"customer_user_agent": "Mozilla\/5.0 (Windows NT 10.0; Win64; x64; rv:127.0) Gecko\/20100101 Firefox\/127.0",
"created_via": "checkout",
"customer_note": "consegnare a Ca' De' Medici srl\nvia stazione 34-42124 reggio emilia",
"date_completed": null,
"date_paid": "2024-07-01T14:48:28",
"cart_hash": "fe3d382269c03953dab9da7034317045",
"number": "67843",
"meta_data": [
{
"id": 1379287,
"key": "is_vat_exempt",
"value": "no"
},
{
"id": 1379288,
"key": "yaydp_product_pricing_rules",
"value": []
},
{
"id": 1379289,
"key": "yaydp_cart_discount_rules",
"value": []
},
{
"id": 1379290,
"key": "yaydp_checkout_fee_rules",
"value": []
},
{
"id": 1379291,
"key": "_wc_gestpay_banktid",
"value": "35"
},
{
"id": 1379292,
"key": "_wc_gestpay_authcode",
"value": "H81309"
}
],
"line_items": [
{
"id": 158,
"name": "Le vie della libert\u00e0 - Nuovo",
"product_id": 64301,
"variation_id": 64302,
"quantity": 2,
"tax_class": null,
"subtotal": "26.41",
"subtotal_tax": "0.00",
"total": "26.41",
"total_tax": "0.00",
"taxes": [],
"meta_data": [
{
"id": 1346,
"key": "pa_versione",
"value": "nuovo",
"display_key": "Versione",
"display_value": "Nuovo"
},
{
"id": 1353,
"key": "_reduced_stock",
"value": "2",
"display_key": "_reduced_stock",
"display_value": "2"
}
],
"sku": "21845",
"price": 13.205,
"image": {
"id": 65711,
"src": "https:\/\/www.fioredellavita.it\/wp-content\/uploads\/2024\/04\/le-vie-della-liberta.jpg"
},
"parent_name": "Le vie della libert\u00e0"
}
],
"tax_lines": [],
"shipping_lines": [
{
"id": 159,
"method_title": "Spedizione gratuita",
"method_id": "free_shipping",
"instance_id": "2",
"total": "0.00",
"total_tax": "0.00",
"taxes": [],
"meta_data": [
{
"id": 1352,
"key": "Prodotti",
"value": "Le vie della libert\u00e0 - Nuovo &times; 2",
"display_key": "Prodotti",
"display_value": "Le vie della libert\u00e0 - Nuovo &times; 2"
}
]
}
],
"fee_lines": [],
"coupon_lines": [],
"refunds": [],
"payment_url": "https:\/\/www.fioredellavita.it\/pagamento\/order-pay\/67843\/?pay_for_order=true&key=wc_order_2AWFH9zg349Tg",
"is_editable": false,
"needs_payment": false,
"needs_processing": true,
"date_created_gmt": "2024-07-01T12:47:00",
"date_modified_gmt": "2024-07-01T12:48:28",
"date_completed_gmt": null,
"date_paid_gmt": "2024-07-01T12:48:28",
"currency_symbol": "\u20ac",
"_links": {
"self": [
{
"href": "https:\/\/www.fioredellavita.it\/wp-json\/wc\/v3\/orders\/67843"
}
],
"collection": [
{
"href": "https:\/\/www.fioredellavita.it\/wp-json\/wc\/v3\/orders"
}
]
}
}
<br>Creazione Ordine... codice=67843
<br>Order: {
"IdInternet": 67843,
"CodClienteInternet": 0,
"Enabled": 1,
"DataOra": "2024-07-01T14:47:00",
"Note": "consegnare a Ca' De' Medici srl\nvia stazione 34-42124 reggio emilia",
"Totale": "26.41",
"CodPagamentoGM": "CARTASELLA",
"Spedizioniere": "GLS",
"ImportoSpedizione": "0.00",
"id": 0
}
<br>$orderdetail->CodArticoloGM= 21845
<br>sku=21845
<br>Dettaglio Ordine: {
"IdInternet": 67843,
"CodArticoloGM": 21845,
"Qta": 2,
"PrezzoLordo": "26.41",
"Enabled": 1,
"DataOra": "2024-07-01T14:47:00",
"id": 35
}
<br>Cerco il customer_id: 0
<br>Errore Nuovo Ordine: Error: Id risorsa non valida [woocommerce_rest_invalid_id
]
<br>

175
docs/bbb.json Normal file
View File

@@ -0,0 +1,175 @@
{
"id": 67843,
"parent_id": 0,
"status": "processing",
"currency": "EUR",
"version": "9.0.2",
"prices_include_tax": true,
"date_created": "2024-07-01T14:47:00",
"date_modified": "2024-07-01T14:48:28",
"discount_total": "0.00",
"discount_tax": "0.00",
"shipping_total": "0.00",
"shipping_tax": "0.00",
"cart_tax": "0.00",
"total": "26.41",
"total_tax": "0.00",
"customer_id": 0,
"order_key": "wc_order_2AWFH9zg349Tg",
"billing": {
"first_name": "marica",
"last_name": "medici",
"company": null,
"address_1": "stazione 34 c\/o ca' de' medici srl-orari uffici",
"address_2": null,
"city": "reggio emilia",
"state": "RE",
"postcode": "42124",
"country": "IT",
"email": "marica@cademedici.it",
"phone": null
},
"shipping": {
"first_name": "marica",
"last_name": "medici",
"company": null,
"address_1": "stazione 34 c\/o ca' de' medici srl-orari uffici",
"address_2": null,
"city": "reggio emilia",
"state": "RE",
"postcode": "42124",
"country": "IT",
"phone": null
},
"payment_method": "wc_gateway_gestpay",
"payment_method_title": "Paga con carta di credito",
"transaction_id": "35\/H81309",
"customer_ip_address": "162.158.129.30",
"customer_user_agent": "Mozilla\/5.0 (Windows NT 10.0; Win64; x64; rv:127.0) Gecko\/20100101 Firefox\/127.0",
"created_via": "checkout",
"customer_note": "consegnare a Ca' De' Medici srl\nvia stazione 34-42124 reggio emilia",
"date_completed": null,
"date_paid": "2024-07-01T14:48:28",
"cart_hash": "fe3d382269c03953dab9da7034317045",
"number": "67843",
"meta_data": [
{
"id": 1379287,
"key": "is_vat_exempt",
"value": "no"
},
{
"id": 1379288,
"key": "yaydp_product_pricing_rules",
"value": []
},
{
"id": 1379289,
"key": "yaydp_cart_discount_rules",
"value": []
},
{
"id": 1379290,
"key": "yaydp_checkout_fee_rules",
"value": []
},
{
"id": 1379291,
"key": "_wc_gestpay_banktid",
"value": "35"
},
{
"id": 1379292,
"key": "_wc_gestpay_authcode",
"value": "H81309"
},
{
"id": 1379297,
"key": "_ga_tracked",
"value": "1"
}
],
"line_items": [
{
"id": 158,
"name": "Le vie della libert\u00e0 - Nuovo",
"product_id": 64301,
"variation_id": 64302,
"quantity": 2,
"tax_class": null,
"subtotal": "26.41",
"subtotal_tax": "0.00",
"total": "26.41",
"total_tax": "0.00",
"taxes": [],
"meta_data": [
{
"id": 1346,
"key": "pa_versione",
"value": "nuovo",
"display_key": "Versione",
"display_value": "Nuovo"
},
{
"id": 1353,
"key": "_reduced_stock",
"value": "2",
"display_key": "_reduced_stock",
"display_value": "2"
}
],
"sku": "21845",
"price": 13.205,
"image": {
"id": 65711,
"src": "https:\/\/i0.wp.com\/www.fioredellavita.it\/wp-content\/uploads\/2024\/04\/le-vie-della-liberta.jpg?fit=450%2C623&ssl=1"
},
"parent_name": "Le vie della libert\u00e0"
}
],
"tax_lines": [],
"shipping_lines": [
{
"id": 159,
"method_title": "Spedizione gratuita",
"method_id": "free_shipping",
"instance_id": "2",
"total": "0.00",
"total_tax": "0.00",
"taxes": [],
"meta_data": [
{
"id": 1352,
"key": "Prodotti",
"value": "Le vie della libert\u00e0 - Nuovo &times; 2",
"display_key": "Prodotti",
"display_value": "Le vie della libert\u00e0 - Nuovo &times; 2"
}
]
}
],
"fee_lines": [],
"coupon_lines": [],
"refunds": [],
"payment_url": "https:\/\/www.fioredellavita.it\/pagamento\/order-pay\/67843\/?pay_for_order=true&key=wc_order_2AWFH9zg349Tg",
"is_editable": false,
"needs_payment": false,
"needs_processing": true,
"date_created_gmt": "2024-07-01T12:47:00",
"date_modified_gmt": "2024-07-01T12:48:28",
"date_completed_gmt": null,
"date_paid_gmt": "2024-07-01T12:48:28",
"currency_symbol": "\u20ac",
"_links": {
"self": [
{
"href": "https:\/\/www.fioredellavita.it\/wp-json\/wc\/v3\/orders\/67843"
}
],
"collection": [
{
"href": "https:\/\/www.fioredellavita.it\/wp-json\/wc\/v3\/orders"
}
]
}
}

2
now.txt
View File

@@ -1 +1 @@
TERMINA DI LAVORARE SU riso.app: (Sovrascrivo !)
TERMINA DI LAVORARE SU gruppomacro.app: (Sovrascrivo !)

2
p_old_package copy.json
View File

@@ -1,6 +1,6 @@
{
"name": "riso",
"version": "1.0.49",
"version": "1.0.51",
"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.",
"productName": "Riso",
"author": "Paolo Arena",

2
package copy_nuovo.json
View File

@@ -1,6 +1,6 @@
{
"name": "riso",
"version": "1.0.49",
"version": "1.0.51",
"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.",
"productName": "Riso",
"author": "Paolo Arena",

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "riso",
"version": "1.0.49",
"version": "1.0.51",
"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.",
"productName": "Riso",
"author": "Paolo Arena",

12
send_pwa_to_gruppomacro.sh Executable file
View File

@@ -0,0 +1,12 @@
#!/bin/bash
source .env.test.gruppomacro
cp .env.test.gruppomacro .env.production
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
rsync -e 'ssh -p 8822' -a --exclude 'upload' dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE
rsync -e 'ssh -p 8822' -av --delete dist/pwa/js/ pcbuser@pcb:$SERVERDIR_WEBSITE/js
echo "Finito $SERVERDIR_WEBSITE"
cp .env.prod.bak .env.production

12
send_pwa_to_test_gruppomacro.sh Executable file
View File

@@ -0,0 +1,12 @@
#!/bin/bash
source .env.test.gruppomacro
cp .env.test.gruppomacro .env.production
echo "Sincronizzazione in remoto $SERVERDIR_WEBSITE ..."
rsync -e 'ssh -p 8822' -a --exclude 'upload' dist/pwa/ pcbuser@pcb:$SERVERDIR_WEBSITE
rsync -e 'ssh -p 8822' -av --delete dist/pwa/js/ pcbuser@pcb:$SERVERDIR_WEBSITE/js
echo "Finito $SERVERDIR_WEBSITE"
cp .env.prod.bak .env.production

30
src/common/shared_vuejs.ts
View File

@@ -1,6 +1,5 @@
export const shared_consts = {
Accepted: {
CHECK_READ_GUIDELINES: {
value: 1,
@@ -2173,18 +2172,7 @@ export const shared_consts = {
PDF: 107,
STREAMING: 108,
},
VERSIONE: {
NUOVO: 1,
USATO: 2,
DOWNLOAD: 3,
DVD: 4,
EPUB: 5,
MOBI: 6,
PDF: 7,
STREAMING: 8,
},
VERSIONI_PRODOTTO: [
{
label: '[Nessuno]',
@@ -2193,42 +2181,42 @@ export const shared_consts = {
},
{
label: 'Nuovo',
value: 1,
value: 101,
color: 'primary',
},
{
label: 'Usato',
value: 2,
value: 102,
color: 'orange-9',
},
{
label: 'Download',
value: 3,
value: 103,
color: 'success',
},
{
label: 'DVD',
value: 4,
value: 104,
color: 'secondary',
},
{
label: 'EPUB',
value: 5,
value: 105,
color: 'orange',
},
{
label: 'MOBI',
value: 6,
value: 106,
color: 'indigo',
},
{
label: 'PDF',
value: 7,
value: 107,
color: 'purple',
},
{
label: 'Streaming',
value: 8,
value: 108,
color: 'red',
},

2
src/components/CCatalogo/CCatalogo.ts
View File

@@ -8,7 +8,7 @@ export default defineComponent({
components: { Catalogo },
props: {
// add options ICatalogo
options: {
optcatalogo: {
type: Object as PropType<ICatalogo>,
required: false,
default: () => ({

2
src/components/CCatalogoCard/CCatalogoCard.ts
View File

@@ -493,7 +493,7 @@ export default defineComponent({
emit('opendetail')
}
function escludiArticolo(variazione: IVariazione) {
let hasExcludeProductTypes = !props.optcatalogo.excludeproductTypes || (props.optcatalogo.excludeproductTypes && (variazione.arrversioni || []).every((item: any) => props.optcatalogo.excludeproductTypes.includes(item)))
let hasExcludeProductTypes = !props.optcatalogo.excludeproductTypes || (props.optcatalogo.excludeproductTypes && (props.optcatalogo.excludeproductTypes.includes(variazione.versione!)))
return hasExcludeProductTypes
}

75
src/components/CCatalogoCard/CCatalogoCard.vue
View File

@@ -23,8 +23,19 @@
dense
>
</q-toggle>
<q-page-sticky v-if="complete" position="bottom-right" :offset="[18, 0]">
<q-btn fab icon="fas fa-arrow-up" class="semi-transparent" color="primary" v-close-popup/>
<q-page-sticky
v-if="complete"
position="bottom-right"
:offset="[18, 0]"
style="z-index: 1000;"
>
<q-btn
fab
icon="fas fa-arrow-up"
class="semi-transparent"
color="primary"
v-close-popup
/>
</q-page-sticky>
<q-card-section>
@@ -133,7 +144,7 @@
Pagine: {{ myproduct.productInfo.numpages }}
</div>
<div v-if="myproduct.productInfo.publisher" class="book-pages">
Casa Editrice: {{ myproduct.productInfo.publisher }}
{{ myproduct.productInfo.publisher.name }}
</div>
<div
v-if="myproduct.productInfo.date_publishing && complete"
@@ -155,22 +166,23 @@
:key="index"
@click="setvariazioneSelected(index)"
>
<div v-if="checkIfVariazioneDaVisu(variazione)" class="flex justify-between items-center q-mx-sm">
<div
v-if="checkIfVariazioneDaVisu(variazione)"
class="flex justify-between items-center q-mx-sm"
>
<q-badge
class="q-badge--large"
:color="
shared_consts.VERSIONI_PRODOTTO[variazione.arrversioni[0]].color
tools.getRecByVersioneProd(variazione.versione).color
"
>
<q-icon
v-if="variazione.arrversioni[0] > 0"
:name="tools.getIconByVersione(variazione.arrversioni[0])"
v-if="variazione.versione > 0"
:name="tools.getIconByVersione(variazione.versione)"
color="white"
></q-icon
>&nbsp;
{{
shared_consts.VERSIONI_PRODOTTO[variazione.arrversioni[0]].label
}}
{{ tools.getRecByVersioneProd(variazione.versione).label }}
</q-badge>
<div v-if="variazione.formato && false">
formato: {{ variazione.formato }}
@@ -178,9 +190,6 @@
<div v-if="variazione.tipologia && false">
tipologia: {{ variazione.tipologia }}
</div>
<div v-if="variazione.edizione && false">
edizione: {{ variazione.edizione }}
</div>
<div v-if="variazione.status && false">
status: {{ variazione.status }}
</div>
@@ -244,7 +253,11 @@
v-for="(variazione, index) of myproduct.arrvariazioni"
:key="index"
>
<div v-show="indvariazSel == index && checkIfVariazioneDaVisu(variazione)">
<div
v-show="
indvariazSel == index && checkIfVariazioneDaVisu(variazione)
"
>
<div
v-show="tools.disponibStr(variazione.quantita)"
class="row justify-center q-mt-sm vertical-middle"
@@ -282,14 +295,42 @@
>
<span class="q-mr-sm">{{ $t('products.formato') }}:</span>
<q-badge
v-show="variazione.arrversioni[0] > 0"
v-show="variazione.versione > 0"
:color="
shared_consts.VERSIONI_PRODOTTO[variazione.arrversioni[0]]
.color
tools.getRecByVersioneProd(variazione.versione).color
"
>{{ variazione.formato }}</q-badge
>
</div>
<div
v-show="!!variazione.edizione"
class="row justify-center q-ma-sm vertical-middle"
style="align-items: center"
>
<span class="q-mr-sm">{{ $t('products.edizione') }}:</span>
{{ variazione.edizione }}
</div>
<div
v-show="!!myproduct.isbn"
class="row justify-center q-ma-sm vertical-middle"
style="align-items: center"
>
<span class="q-mr-sm">{{ $t('products.isbn') }}:</span>
{{ myproduct.isbn }}
</div>
<div
v-show="!!myproduct.productInfo.publisher"
class="row justify-center q-ma-sm vertical-middle"
style="align-items: center"
>
<span class="q-mr-sm">{{ $t('products.editore') }}:</span>
<q-badge
:color="
tools.getRecByVersioneProd(variazione.versione).color
"
>{{ myproduct.productInfo.publisher.name }}</q-badge
>
</div>
<div class="row justify-center q-mt-sm">
<q-btn

1
src/components/CCurrencyValue/CCurrencyValue.vue
View File

@@ -1,6 +1,7 @@
<template>
<div v-if="small">
<q-chip
dense
class="cltexth4 chipbooked shadow-5 q-pa-sm2"

4
src/components/CMyEditElem/CMyEditElem.ts
View File

@@ -30,6 +30,7 @@ import { useI18n } from '@/boot/i18n'
import { emitKeypressEvents } from 'readline'
import { costanti } from '@costanti'
import objectId from '@src/js/objectId'
import { useProducts } from '@src/store/Products'
export default defineComponent({
name: 'CMyEditElem',
@@ -82,6 +83,8 @@ export default defineComponent({
const enableAdd = ref(true)
const tabadd = ref('tools')
const Products = useProducts()
const neworder = ref(<number | undefined>0)
const myel = toRef(props, 'myelem')
@@ -314,6 +317,7 @@ export default defineComponent({
tabElemsText,
visuadd,
tabadd,
Products,
}
},

23
src/components/CMyEditElem/CMyEditElem.vue
View File

@@ -998,7 +998,7 @@
rounded
outlined
v-model="myel.catalogo.productTypes"
:options="tools.SelectListVersione"
:options="shared_consts.VERSIONI_PRODOTTO"
@update:model-value="modifElem"
multiple
dense
@@ -1015,7 +1015,7 @@
rounded
outlined
v-model="myel.catalogo.excludeproductTypes"
:options="tools.SelectListVersione"
:options="shared_consts.VERSIONI_PRODOTTO"
@update:model-value="modifElem"
multiple
dense
@@ -1025,6 +1025,25 @@
map-options
>
</q-select>
<q-select
:behavior="$q.platform.is.ios === true ? 'dialog' : 'menu'"
v-if="enableEdit"
rounded
outlined
v-model="myel.catalogo.Editore"
:options="Products.publishers"
@update:model-value="modifElem"
multiple
dense
label="Editori"
style="width: 150px"
emit-value
map-options
option-value="_id"
option-label="name"
>
</q-select>
</div>
</div>
</div>

2
src/index.template.html
View File

@@ -10,7 +10,7 @@
<meta name="description" content="<%= productDescription %>">
<meta name="format-detection" content="telephone=no">
<meta name="msapplication-tap-highlight" content="no">
<meta name="version" content="1.0.49">
<meta name="version" content="1.0.51">
<meta name="viewport"
content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>">

4
src/model/Products.ts
View File

@@ -37,6 +37,7 @@ export interface IProductInfo {
idPublisher?: string
publisher?: IPublisher
date_publishing?: Date
date_publishing_ts: number
numpages?: number
productTypes?: number[]
versioneGM?: string
@@ -44,7 +45,7 @@ export interface IProductInfo {
export interface IVariazione {
active?: boolean
arrversioni?: number[]
versione?: number
status?: string,
price?: number
sale_price?: number
@@ -143,6 +144,7 @@ export interface IOrder {
export interface IProductsState {
products: IProduct[]
authors: IAuthor[]
publishers: IPublisher[]
cart: ICart
orders: IOrderCart[]
catprods: ICatProd[]

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

@@ -96,6 +96,9 @@ const msg_it = {
link_scheda: 'Link Scheda',
addtocart_ext: 'Aggiungi',
formato: 'Formato',
edizione: 'Edizione',
editore: 'Ediitore',
isbn: 'ISBN',
},
storehouses: {
name: 'Magazzino',
@@ -1427,6 +1430,7 @@ const msg_it = {
question_sendcoinsto: 'Inviare {qty} {coin} a {dest}?',
question_sendcoinsto_from: 'Inviare {qty} {coin} da {from} a {dest}?',
coins_sendrequest_sent: 'Richiesta d\'invio RIS avvenuto',
coins_sent: 'Inviati {qty} {symbol} a {dest}',
coins_sendrequest_failed: 'Richiesta d\'invio RIS non avvenuta, riprovare',
coins_accepted: 'RIS accettati',
coins_refused: 'RIS rifiutate',

19
src/store/Modules/costanti.ts
View File

@@ -262,7 +262,7 @@ export const costanti = {
small: true,
table: '',
},
{
/*{
visible: false,
title: ' Attività ',
subtitle: 'Artigiani, Aziende, Società, Negozi',
@@ -275,7 +275,7 @@ export const costanti = {
visuonstat: true,
small: false,
showfavorite: true,
},
},*/
],
GROUPCARDS: [
@@ -461,4 +461,19 @@ export const costanti = {
TESTO_BORDATO: 5,
},
SORT_ALPHA: 0,
SORT_PUBDATE: 1,
ORDINAMENTO_CATALOGHI: [
{
label: 'Data di Uscita',
value: 1,
},
{
label: 'Alfabetico',
value: 0,
},
],
}

30
src/store/Modules/tools.ts
View File

@@ -1392,12 +1392,6 @@ export const tools = {
},
SelectListVersione: [
{ label: '[Tutti]', value: 0 },
{ label: 'Nuovi', value: shared_consts.PRODUCTTYPE.NUOVO },
{ label: 'Usati', value: shared_consts.PRODUCTTYPE.USATO },
{ label: 'DVD', value: shared_consts.PRODUCTTYPE.DVD },
],
INDEX_MENU_DELETE: 4,
@@ -6567,7 +6561,8 @@ export const tools = {
userStore.my.profile.useraccounts = res.useraccounts
}
$router.push('/circuits')
tools.showPositiveNotif($q, t('circuit.coins_sendrequest_sent'))
tools.showPositiveNotif($q, t('circuit.coins_sent', {qty: sendcoinrec.qty, symbol: circuit.symbol, dest}))
//tools.showPositiveNotif($q, t('circuit.coins_sendrequest_sent'))
} else {
tools.showNegativeNotif($q, res.errormsg)
}
@@ -8624,23 +8619,23 @@ export const tools = {
getIconByVersione(versione: number) {
let str = ''
if (versione === shared_consts.VERSIONE.NUOVO)
if (versione === shared_consts.PRODUCTTYPE.NUOVO)
str = 'fas fa-book'
else if (versione === shared_consts.VERSIONE.USATO)
else if (versione === shared_consts.PRODUCTTYPE.USATO)
// Versione Libro usato
str = 'fas fa-book-open'
else if (versione === shared_consts.VERSIONE.DOWNLOAD)
else if (versione === shared_consts.PRODUCTTYPE.DOWNLOAD)
str = 'fas fa-file-download'
else if (versione === shared_consts.VERSIONE.DVD)
else if (versione === shared_consts.PRODUCTTYPE.DVD)
str = 'fas fa-film'
else if (versione === shared_consts.VERSIONE.PDF)
else if (versione === shared_consts.PRODUCTTYPE.PDF)
str = 'fas fa-file-pdf'
else if (versione === shared_consts.VERSIONE.EPUB)
else if (versione === shared_consts.PRODUCTTYPE.EPUB)
// Libro elettronico EPUB
str = 'fas fa-book-open-reader'
else if (versione === shared_consts.VERSIONE.DVD)
else if (versione === shared_consts.PRODUCTTYPE.DVD)
str = 'fas fa-video'
else if (versione === shared_consts.VERSIONE.STREAMING)
else if (versione === shared_consts.PRODUCTTYPE.STREAMING)
str = 'fas fa-stream'
return str
@@ -8691,6 +8686,11 @@ export const tools = {
return record
},
getRecByVersioneProd(versione: number) {
return shared_consts.VERSIONI_PRODOTTO.find((rec: any) => rec.value === versione)
}
// FINE !
// getLocale() {

1
src/store/Products.ts
View File

@@ -109,6 +109,7 @@ export const useProducts = defineStore('Products', {
catprods: [],
catprods_gas: [],
authors: [],
publishers: [],
subcatprods: [],
productInfos: [],
userActive: { username: '', name: '', surname: '', _id: '' },

2
src/store/globalStore.ts
View File

@@ -341,6 +341,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
else if (table === 'subcatprods') ris = Products.subcatprods
else if (table === 'catprods_gas') ris = Products.catprods_gas
else if (table === 'authors') ris = Products.authors
else if (table === 'publishers') ris = Products.publishers
else if (table === 'catais') ris = state.catAI
else if (table === 'queryais') ris = state.queryAIList
else if (table === 'sharewithus') ris = state.sharewithus
@@ -1577,6 +1578,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
Products.subcatprods = (res.data.subcatprods) ? [...res.data.subcatprods] : []
Products.catprods_gas = (res.data.catprods_gas) ? [...res.data.catprods_gas] : []
Products.authors = (res.data.authors) ? [...res.data.authors] : []
Products.publishers = (res.data.publishers) ? [...res.data.publishers] : []
this.gasordines = (res.data.gasordines) ? [...res.data.gasordines] : []
this.scontisticas = (res.data.scontisticas) ? [...res.data.scontisticas] : []

38
src/views/ecommerce/catalogo/catalogo.ts
View File

@@ -21,7 +21,7 @@ import { fieldsTable } from '@store/Modules/fieldsTable'
export default defineComponent({
name: 'Catalogo',
components: { CContainerCatalogoCard, CProductCard, CSelectUserActive, CMySelect },
props: {
props: {
optcatalogo: {
type: Object as PropType<ICatalogo>,
required: false,
@@ -48,6 +48,7 @@ export default defineComponent({
const filter = ref(<any>{
author: '',
sort: 1,
publisher: '',
type: '',
ageGroup: ''
@@ -135,6 +136,14 @@ export default defineComponent({
}
})
watch(() => filter.value.sort, (newval, oldval) => {
calcArrProducts()
if (tools.scrollTop() > 300) {
tools.scrollToTopValue(300)
}
})
watch(() => cosa.value, (newval, oldval) => {
tools.setCookie(tools.COOK_COSA_PRODOTTI, cosa.value.toString())
if (cosa.value !== shared_consts.PROD.TUTTI)
@@ -146,7 +155,7 @@ export default defineComponent({
const mialista = getSearchList()
if (mialista && mialista.value && mialista.value.hasOwnProperty('name')) {
mialista.value = null
}
}
search.value = ''
}
@@ -170,6 +179,7 @@ export default defineComponent({
let arrprod = productStore.getProducts(cosa.value) || [];
let filtroAuthor = filter.value.author || '';
//++AddCATALOGO_FIELDS
let filtroProductTypes = props.optcatalogo.productTypes || [0]
@@ -177,6 +187,9 @@ export default defineComponent({
let boolfiltroVuotoProductTypes = (filtroProductTypes.length === 0 || (filtroProductTypes.length === 1 && (filtroProductTypes[0] === 0)))
let boolfiltroVuotoExcludeProductTypes = filtroExcludeProductTypes.length === 0
let filtroPublishers = props.optcatalogo.Editore || []
let boolfiltroVuotoEditore = (filtroPublishers.length === 0)
//console.log('filtroVersione', filtroProductTypes)
let catstr = cat.value || ''
@@ -187,7 +200,7 @@ export default defineComponent({
}
let lowerSearchText = (searchtext || '').toLowerCase().trim();
lowerSearchText = lowerSearchText.replace(/[-@:=]/g, '');
if ((!lowerSearchText || (lowerSearchText && lowerSearchText.length < 2)) && !catstr && boolfiltroVuotoProductTypes && boolfiltroVuotoExcludeProductTypes && !filtroAuthor && (!gasselstr && (cosa.value !== shared_consts.PROD.GAS))) {
if ((!lowerSearchText || (lowerSearchText && lowerSearchText.length < 2)) && !catstr && boolfiltroVuotoProductTypes && boolfiltroVuotoExcludeProductTypes && boolfiltroVuotoEditore && !filtroAuthor && (!gasselstr && (cosa.value !== shared_consts.PROD.GAS))) {
} else {
@@ -198,6 +211,7 @@ export default defineComponent({
let hasAuthor = !filtroAuthor || (filtroAuthor && (product.productInfo.idAuthors || []).includes(filtroAuthor));
let hasProductTypes = true
let hasPublished = true
let hasExcludeProductTypes = false
//++AddCATALOGO_FIELDS
@@ -206,6 +220,9 @@ export default defineComponent({
// check if productInfo.productTypes array includes some item in props.optcatalogo.ProductTypes array
hasProductTypes = !props.optcatalogo.productTypes || (props.optcatalogo.productTypes && (product.productInfo.productTypes || []).some((item: any) => props.optcatalogo.productTypes.includes(item)))
}
if (props.optcatalogo && !boolfiltroVuotoEditore) {
hasPublished = !props.optcatalogo.Editore || (props.optcatalogo.Editore && props.optcatalogo.Editore.includes(product.productInfo.idPublisher!))
}
if (props.optcatalogo && !boolfiltroVuotoExcludeProductTypes) {
// check if productInfo.productTypes array exclude some item in props.optcatalogo.ProductTypes array
@@ -224,7 +241,7 @@ export default defineComponent({
// Check if all words in lowerSearchText are present in lowerName
let allWordsPresent = lowerSearchText.split(/\s+/).every(word => new RegExp(`\\b${word}\\b`, 'i').test(lowerName));
return (codeMatch.test(product.productInfo.code || '') || allWordsPresent) && hasCategoria && hasAuthor && productgassel && hasProductTypes && !hasExcludeProductTypes;
return (codeMatch.test(product.productInfo.code || '') || allWordsPresent) && hasCategoria && hasAuthor && productgassel && hasProductTypes && hasPublished && !hasExcludeProductTypes;
} else {
console.error('product or product.productInfo is null');
return false;
@@ -232,6 +249,18 @@ export default defineComponent({
});
}
console.log('filter.value.sort', filter.value.sort)
// sort using filter.value.sort :
if (filter.value.sort === costanti.SORT_PUBDATE) {
arrprod = arrprod.sort((a: IProduct, b: IProduct) => {
return b.productInfo.date_publishing_ts - a.productInfo.date_publishing_ts
})
} else if (filter.value.sort === costanti.SORT_ALPHA) {
}
arrProducts.value = arrprod
loaddata()
refreshpage.value = false
@@ -404,6 +433,7 @@ export default defineComponent({
labelcombo,
mycolumns,
tabvisu,
getSearchText,
}
}
})

29
src/views/ecommerce/catalogo/catalogo.vue
View File

@@ -8,9 +8,15 @@
<div class="container">
<q-tabs v-model="tabvisu" dense class="bg-indigo text-white">
<q-tab name="categorie" icon="fas fa-folder-open" label="Categorie" />
<q-tab name="autori" icon="fas fa-user" label="Autori" />
<q-tab name="ricerca" icon="fas fa-search" label="Cerca" />
<q-tab name="categorie" icon="fas fa-folder-open" label="Categorie">
<q-badge v-if="cat" color="red" floating>1</q-badge>
</q-tab>
<q-tab name="autori" icon="fas fa-user" label="Autori">
<q-badge v-if="filter.author" color="red" floating>1</q-badge>
</q-tab>
<q-tab name="ricerca" icon="fas fa-search" label="Cerca">
<q-badge v-if="getSearchText()" color="red" floating>1</q-badge>
</q-tab>
</q-tabs>
<q-tab-panels v-model="tabvisu" animated class="">
<q-tab-panel name="categorie">
@@ -133,6 +139,22 @@
</div>
</q-tab-panel>
</q-tab-panels>
<div class="row justify-center q-mx-auto">
<q-select
v-model="filter.sort"
dense
:options="costanti.ORDINAMENTO_CATALOGHI"
label="Ordinamento"
placeholder=""
emit-value
map-options
filled
rounded
></q-select>
</div>
<div class="text-center q-py-sm prod_trov">
<span v-show="productStore.getNumProdTot() !== arrProducts.length">{{
t('ecomm.prodotti_trovati', {
@@ -175,7 +197,6 @@
productInfo.productTypes.includes(
shared_consts.PRODUCTTYPE.PRODUCT
))
"
:id="product._id"
:complete="false"

2
src/views/user/mypagebacheca/mypagebacheca.ts
View File

@@ -5,6 +5,7 @@ import { useI18n } from '@/boot/i18n'
import { useQuasar } from 'quasar'
import { CMyCardPopup } from '@/components/CMyCardPopup'
import { CMyCardService } from '@/components/CMyCardService'
import { shared_consts } from '@src/common/shared_vuejs'
import { CMyPage } from '@/components/CMyPage'
import { CCheckIfIsLogged } from '@/components/CCheckIfIsLogged'
import { toolsext } from '@store/Modules/toolsext'
@@ -27,6 +28,7 @@ export default defineComponent({
idBacheca,
toolsext,
tools,
shared_consts,
}
}
})

2
src/views/user/mypagehosp/mypagehosp.ts
View File

@@ -8,6 +8,7 @@ import { CMyPage } from '@/components/CMyPage'
import { CCheckIfIsLogged } from '@/components/CCheckIfIsLogged'
import { toolsext } from '@store/Modules/toolsext'
import { tools } from '@store/Modules/tools'
import { shared_consts } from '@src/common/shared_vuejs'
export default defineComponent({
name: 'mypagehosp',
@@ -26,6 +27,7 @@ export default defineComponent({
idHosp,
toolsext,
tools,
shared_consts,
}
}
})

2469
yarn.lock
View File

File diff suppressed because it is too large Load Diff