diff --git a/src/components/CSingleCart/CSingleCart.ts b/src/components/CSingleCart/CSingleCart.ts
index 6552e29d..47d4ca50 100755
--- a/src/components/CSingleCart/CSingleCart.ts
+++ b/src/components/CSingleCart/CSingleCart.ts
@@ -110,6 +110,10 @@ export default defineComponent({
}
+ function updateOrder(val: any) {
+
+ }
+
function getRisparmio(): string {
return ((order.value.product!.price * order.value.quantity) - order.value.TotalPriceProduct).toFixed(2)
}
@@ -123,6 +127,7 @@ export default defineComponent({
tools,
products,
t,
+ updateOrder,
}
},
})
diff --git a/src/db/lang/ws_it.js b/src/db/lang/ws_it.js
index aeab2813..ec305d77 100755
--- a/src/db/lang/ws_it.js
+++ b/src/db/lang/ws_it.js
@@ -40,6 +40,7 @@ const msg_website_it = {
storehouses: 'Magazzino',
providers: 'Fornitori',
catprods: 'Categorie',
+ subcatprods: 'Sotto-Categorie',
gasordine: 'Gas Ordine',
scontisticas: 'Scontistica',
departments: 'Uffici',
diff --git a/src/model/GlobalStore.ts b/src/model/GlobalStore.ts
index 656bcccd..a67dba90 100755
--- a/src/model/GlobalStore.ts
+++ b/src/model/GlobalStore.ts
@@ -1,7 +1,7 @@
import { IAction } from '@src/model/Projects'
import { IFriends, IGroupShort, IMyGroup, IPaymentType } from '@src/model/UserStore'
import {
- IDepartment, IProducer, IShareWithUs, IStorehouse, IProductInfo, IProvider, IScontistica, ICategory, IGasordine, ICatProd
+ IDepartment, IProducer, IShareWithUs, IStorehouse, IProductInfo, IProvider, IScontistica, ICategory, IGasordine, ICatProd, ISubCatProd
} from '@src/model/Products'
import { IUserFields, IUserProfile } from '@src/model/UserStore'
@@ -447,6 +447,7 @@ export interface IGlobalState {
producers: IProducer[],
providers: IProvider[],
catprods: ICatProd[],
+ subcatprods: ISubCatProd[],
gasordines: IGasordine[],
scontisticas: IScontistica[],
storehouses: IStorehouse[],
diff --git a/src/model/Products.ts b/src/model/Products.ts
index 996824fc..105d0c7c 100755
--- a/src/model/Products.ts
+++ b/src/model/Products.ts
@@ -8,7 +8,9 @@ export interface IProductInfo {
description?: string,
department?: string,
idCatProds?: string[],
+ idSubCatProds?: string[],
catprods?: ICatProd[],
+ subcatprods?: ISubCatProd[],
color?: string,
size?: string,
weight?: number,
@@ -96,6 +98,7 @@ export interface IProductsState {
cart: ICart
orders: IOrderCart[]
catprods: ICatProd[]
+ subcatprods: ISubCatProd[]
productInfos: IProductInfo[]
}
@@ -133,6 +136,15 @@ export interface ICatProd {
color?: string,
}
+export interface ISubCatProd {
+ _id?: any
+ idCatProd: string
+ name: string
+ img?: string
+ icon?: string
+ color?: string
+}
+
export interface IStorehouse {
_id?: any
idapp?: string
diff --git a/src/rootgen/admin/importdata/importdata.ts b/src/rootgen/admin/importdata/importdata.ts
index f0509c11..6093cbdb 100755
--- a/src/rootgen/admin/importdata/importdata.ts
+++ b/src/rootgen/admin/importdata/importdata.ts
@@ -419,6 +419,7 @@ export default defineComponent({
strris += addfield(col, 'minBuyQty', rec, { isnumero: true }); col++;
strris += addfield(col, 'minStepQty', rec, { isnumero: true }); col++;
strris += addfield(col, 'cat_name', rec,{}); col++;
+ strris += addfield(col, 'subcat_name', rec,{}); col++;
strris += addfield(col, 'producer_name', rec, {}); col++;
strris += addfield(col, 'provider_name', rec, {}); col++;
strris += addfield(col, 'magazzino_name', rec, {}); col++;
diff --git a/src/rootgen/admin/subcatprods/subcatprods.scss b/src/rootgen/admin/subcatprods/subcatprods.scss
new file mode 100755
index 00000000..e69de29b
diff --git a/src/rootgen/admin/subcatprods/subcatprods.ts b/src/rootgen/admin/subcatprods/subcatprods.ts
new file mode 100755
index 00000000..a68e35ec
--- /dev/null
+++ b/src/rootgen/admin/subcatprods/subcatprods.ts
@@ -0,0 +1,23 @@
+import { defineComponent } from 'vue'
+
+import { CImgText } from '../../../components/CImgText/index'
+import { CMyPage } from '@/components/CMyPage'
+import { CTitleBanner } from '@/components/CTitleBanner'
+import { CGridTableRec } from '@/components/CGridTableRec'
+
+import { colTableSubCatProd } from '@src/store/Modules/fieldsTable'
+import MixinMetaTags from '@/mixins/mixin-metatags'
+
+export default defineComponent({
+ name: 'SubCatProdPage',
+ components: { CImgText, CMyPage, CTitleBanner, CGridTableRec },
+ setup() {
+
+ const { setmeta } = MixinMetaTags()
+
+ return {
+ colTableSubCatProd,
+ setmeta,
+ }
+ }
+})
diff --git a/src/rootgen/admin/subcatprods/subcatprods.vue b/src/rootgen/admin/subcatprods/subcatprods.vue
new file mode 100755
index 00000000..0d8c28b9
--- /dev/null
+++ b/src/rootgen/admin/subcatprods/subcatprods.vue
@@ -0,0 +1,31 @@
+
+
+ {{
+ setmeta({
+ title: 'Sotto Categorie',
+ description: '',
+ keywords: '',
+ })
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index f887c980..c4df241d 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -426,6 +426,20 @@ export const colTableCatProd = [
AddCol(DeleteRec),
AddCol(DuplicateRec),
]
+export const colTableSubCatProd = [
+ AddCol({ name: 'name', label_trans: 'categories.name' }),
+ AddCol({
+ name: 'idCatProd',
+ label_trans: 'products.category',
+ fieldtype: costanti.FieldType.select,
+ jointable: 'catprods',
+ }),
+ AddCol({ name: 'img', label_trans: 'categories.img' }),
+ AddCol({ name: 'icon', label_trans: 'categories.icon' }),
+ AddCol({ name: 'color', label_trans: 'categories.color' }),
+ AddCol(DeleteRec),
+ AddCol(DuplicateRec),
+]
export const colTableStorehouse = [
AddCol({ name: 'name', label_trans: 'store.name' }),
diff --git a/src/store/Products.ts b/src/store/Products.ts
index 1346ac70..03d9fbed 100755
--- a/src/store/Products.ts
+++ b/src/store/Products.ts
@@ -39,6 +39,7 @@ function getRecordProductInfoEmpty(): IProductInfo {
description: '',
department: '',
catprods: [],
+ subcatprods: [],
color: '',
size: '',
weight: 0,
@@ -101,6 +102,7 @@ export const useProducts = defineStore('Products', {
cart: { items: [], totalPrice: 0, totalQty: 0, userId: '' },
orders: [],
catprods: [],
+ subcatprods: [],
productInfos: [],
}),
diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts
index 1c3e6137..771decff 100644
--- a/src/store/globalStore.ts
+++ b/src/store/globalStore.ts
@@ -123,6 +123,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
scontisticas: [],
providers: [],
catprods: [],
+ subcatprods: [],
gasordines: [],
departments: [],
categories: [],
diff --git a/src/views/admin/dbop/dbop.vue b/src/views/admin/dbop/dbop.vue
index c569f2a5..31d3f838 100755
--- a/src/views/admin/dbop/dbop.vue
+++ b/src/views/admin/dbop/dbop.vue
@@ -267,6 +267,11 @@
color="negative"
@click="EseguiFunz('dropCatProd')"
>
+