diff --git a/.env.prod.pcb b/.env.prod.pcb
index 15d522f5..587891a6 100644
--- a/.env.prod.pcb
+++ b/.env.prod.pcb
@@ -10,7 +10,7 @@ PROVA_PAOLO=""
LANG_DEFAULT="it"
PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T"
-MONGODB_HOST="https://srv.piuchebuono.app:3000"
+MONGODB_HOST="https://piuchebuono.app:3000"
LOGO_REG='piuchebuono-logo-full.png'
TEST_NAME=""
TEST_SURNAME=""
diff --git a/.env.test.pcb b/.env.test.pcb
index 13f3f910..7f1794e5 100755
--- a/.env.test.pcb
+++ b/.env.test.pcb
@@ -10,7 +10,7 @@ PROVA_PAOLO=""
LANG_DEFAULT="it"
PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
MASTER_KEY="KKPPSS5KJK435J3KSS9F9D8S9F8SD3CR3T"
-MONGODB_HOST="https://srv.piuchebuono.app:3001"
+MONGODB_HOST="https://piuchebuono.app:3001"
LOGO_REG='piuchebuono-logo-full.png'
TEST_NAME=""
TEST_SURNAME=""
diff --git a/src/components/CProductCard/CProductCard.scss b/src/components/CProductCard/CProductCard.scss
index 6e98e3af..45a9c435 100755
--- a/src/components/CProductCard/CProductCard.scss
+++ b/src/components/CProductCard/CProductCard.scss
@@ -28,3 +28,8 @@
font-weight: bold;
font-size: 1.2rem;
}
+
+.prod_sconti {
+ font-size: 1.1rem;
+ color: blue;
+}
\ No newline at end of file
diff --git a/src/components/CProductCard/CProductCard.vue b/src/components/CProductCard/CProductCard.vue
index 4f5a7e14..8c36e5e9 100755
--- a/src/components/CProductCard/CProductCard.vue
+++ b/src/components/CProductCard/CProductCard.vue
@@ -51,6 +51,15 @@
myproduct.after_price
}}
+
+
+ {{ sconti.description }}
+
+
@@ -129,8 +138,11 @@
tools.isManager() && myproduct.QuantitaOrdinateInAttesa > 0
"
>
- {{ $t('ecomm.qta_in_attesa', {qty: myproduct.QuantitaOrdinateInAttesa }) }}
-
+ {{
+ $t('ecomm.qta_in_attesa', {
+ qty: myproduct.QuantitaOrdinateInAttesa,
+ })
+ }}
diff --git a/src/model/Products.ts b/src/model/Products.ts
index 0cdc61a0..0817bdb3 100755
--- a/src/model/Products.ts
+++ b/src/model/Products.ts
@@ -7,6 +7,8 @@ export interface IProduct {
idProducer?: string,
idProvider?: string,
idStorehouses?: string[],
+ idScontisticas?: string[],
+ scontisticas: IScontistica[],
producer?: IProducer,
storehouses: IStorehouse[],
provider?: IProvider,
@@ -45,6 +47,7 @@ export interface IOrder {
idProducer?: string
idProvider?: string
idStorehouse?: string
+ idScontisticas?: string[]
price?: number
after_price?: string
color?: string
@@ -55,6 +58,7 @@ export interface IOrder {
product?: IProduct
producer?: IProducer
storehouse?: IStorehouse
+ scontisticas?: IScontistica[]
provider?: IProvider
date_created?: Date
date_checkout?: Date
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index 1d140c10..869df05c 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -3566,7 +3566,7 @@ export const fieldsTable = {
label: 'Scontistica',
columns: colTableScontistica,
colkey: '_id',
- collabel: 'code',
+ collabel: 'description',
},
{
value: 'sharewithus',
diff --git a/src/store/Products.ts b/src/store/Products.ts
index e3491dc0..2001caca 100755
--- a/src/store/Products.ts
+++ b/src/store/Products.ts
@@ -44,7 +44,7 @@ export const useProducts = defineStore('Products', {
getProduct: (state: IProductsState) => (code: string): IProduct => {
const prod = state.products.find((prod: IProduct) => prod.code === code)
- return prod ? prod : { storehouses: [] }
+ return prod ? prod : { storehouses: [], scontisticas: [] }
},
getCart: (state: IProductsState) => (): ICart => {
@@ -151,6 +151,8 @@ export const useProducts = defineStore('Products', {
active: false,
idProducer: '',
idStorehouses: [],
+ idScontisticas: [],
+ scontisticas: [],
idProvider: '',
producer: {},
storehouses: [],
@@ -191,7 +193,6 @@ export const useProducts = defineStore('Products', {
idapp: process.env.APP_ID,
idProduct: product._id,
idProducer: product.idProducer,
- idProvider: product.idProvider,
status: shared_consts.OrderStatus.IN_CART,
price: product.price,
after_price: product.after_price,
@@ -201,7 +202,7 @@ export const useProducts = defineStore('Products', {
quantity: order.quantity,
idStorehouse: order.idStorehouse,
-
+ idScontisticas: product.idScontisticas,
}
if (product.storehouses.length === 1) {
diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts
index 93fdeddb..d8bd8614 100644
--- a/src/store/globalStore.ts
+++ b/src/store/globalStore.ts
@@ -120,8 +120,8 @@ export const useGlobalStore = defineStore('GlobalStore', {
resps: [],
workers: [],
storehouses: [],
- providers: [],
scontisticas: [],
+ providers: [],
departments: [],
categories: [],
sharewithus: [],
diff --git a/src/views/ecommerce/productsList/productsList.ts b/src/views/ecommerce/productsList/productsList.ts
index b84eb5a9..fea241de 100755
--- a/src/views/ecommerce/productsList/productsList.ts
+++ b/src/views/ecommerce/productsList/productsList.ts
@@ -10,6 +10,7 @@ import { useQuasar } from 'quasar'
import { costanti } from '@costanti'
import { CProductCard } from '@src/components/CProductCard'
+import { IProduct } from '@src/model'
export default defineComponent({
@@ -24,12 +25,24 @@ export default defineComponent({
const $q = useQuasar()
const { t } = useI18n()
+ const search = ref('')
+
function mounted() {
// Inizializza
productStore.loadProducts()
}
function getProducts() {
- return productStore.getProducts()
+ let arrprod = productStore.getProducts()
+ if (!search.value) {
+ return arrprod
+ }
+
+ let lowerSearchText = search.value.toLowerCase();
+
+ return arrprod.filter((product: IProduct) => {
+ let lowerName = product.name!.toLowerCase();
+ return product.code!.includes(search.value) || lowerName.includes(lowerSearchText);
+ });
}
onMounted(mounted)
@@ -40,6 +53,7 @@ export default defineComponent({
tools,
toolsext,
getProducts,
+ search,
}
}
})
diff --git a/src/views/ecommerce/productsList/productsList.vue b/src/views/ecommerce/productsList/productsList.vue
index 63ba00f2..9720420f 100755
--- a/src/views/ecommerce/productsList/productsList.vue
+++ b/src/views/ecommerce/productsList/productsList.vue
@@ -2,9 +2,29 @@
+
+
+
+
+
+
+
@@ -13,7 +33,6 @@