@social-mail/social-mail-client 1.2.270 → 1.2.271

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-client",
-  "version": "1.2.270",
+  "version": "1.2.271",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/common/controls/collection-editor/CollectionEditorEx.tsx

@@ -40,6 +40,7 @@ export default class CollectionEditorEx<T = any, TR = any> extends AtomControl {
     pageResultToItem?: (item: TR) => TR = null;
     itemFactory?: () => TR = null;
     itemRenderer: (item: TR) => XNode = null;
+    inlineAddRenderere: (item: TR) => XNode = null;
     inlineAdd: boolean = false;
     addPage?: any = null;
     editPage?: any = null;
@@ -75,6 +76,8 @@ export default class CollectionEditorEx<T = any, TR = any> extends AtomControl {
             this.model[this.fieldName] ??= [];
         }
 
+        this.inlineAdd ||= !!this.inlineAddRenderere;
+
         const fx = () =>
             this.model[this.fieldName] ??= [];
         const exp = `() => this.model`;
@@ -94,15 +97,17 @@ export default class CollectionEditorEx<T = any, TR = any> extends AtomControl {
                     data-layout={this.layout as any}
                     event-delete-collection-item={(ce: CustomEvent) => this.deleteItem(ce.detail)}
                     items={Bind.oneWay(() => this.items)}
-                    footer={Bind.oneWay(() => this.inlineAdd ? this.schema.create({ ... this.addItemDefaults ?? {}}) : void 0)}
+                    footer={Bind.oneWay(() => this.inlineAdd ? this.relation.relatedModel.create({ ... this.addItemDefaults ?? {}}) : void 0)}
                     footerRenderer={(newItem) => {
-                        const node = this.itemRenderer(newItem);
+                        const node = this.inlineAddRenderere
+                            ? this.inlineAddRenderere(newItem)
+                            : this.itemRenderer(newItem);
                         const na = node.attributes ??= {};
                         na["data-margin"] = "default";
                         node.children.push(<span><button
                             event-click={async () => {
                                 await this.addNewItemInList(newItem);
-                                this.repeater.footer = this.schema.create({ ... this.addItemDefaults ?? {}});
+                                this.repeater.footer = this.relation.relatedModel.create({ ... this.addItemDefaults ?? {}});
                             }}
                             text="Add"/></span>);
                         for (const iterator of node.children) {

package/src/common/currency.ts

@@ -31,5 +31,5 @@ export function formatCurrency(n, currency: string) {
 }
 
 export function formatPrice(n: IStoreItemPrice) {
-    return formatCurrency(Number(n.amount) + Number(n.addonsAmount), n.currency || "INR");
+    return formatCurrency(Number(n.amount) + Number(n.taxAmount), n.currency || "INR");
 }

package/src/common/pages/stores/orders/EditOrderPage.tsx

@@ -114,17 +114,6 @@ export default class EditOrderPage extends ContentPage<Partial<IStoreJournal>> {
                             data-layout="vertical-flex"
                             style-padding="0"
                             style-overflow="visible">
-                            <ReferenceEditor
-                                label=""
-                                model={line}
-                                field={(f) => f.taxFolder}
-                                event-reference-updated={(ce) => this.taxFolderUpdated(line, ce.detail)}
-                                searchQuery={(q: Query<IStoreItemFolder>, search) =>
-                                    (search
-                                        ? q.where({ search: search + "%" }, (p) => (x) => Sql.text.iLike(x.name , p.search))
-                                        : q)}
-                                itemRenderer={(x) => <div text={x.name}/>}
-                                />
                             <AtomRepeater
                                 items={Bind.source(line, (x) => x.source.relatedItems)}
                                 itemRenderer={(ri: IStoreJournalLineItem) => <div data-layout="row">

package/src/common/pages/stores/products/ProductEditor.tsx

@@ -1,13 +1,12 @@
 import { AtomControl } from "@web-atoms/core/dist/web/controls/AtomControl";
-import { IStoreItem, IStoreItemFolder, IStoreItemPrice, IStoreMediaFile, IStorePriceAddOn, StoreItem, StoreItemItemTypeArray, StoreMediaFile, StorePriceAddOn } from "../../../../model/model";
+import { IStoreItem, IStoreItemFolder, IStoreItemPrice, IStoreItemTax, IStoreMediaFile, StoreItem, StoreItemItemTypeArray, StoreMediaFile } from "../../../../model/model";
 import Bind from "@web-atoms/core/dist/core/Bind";
 import XNode from "@web-atoms/core/dist/core/XNode";
 import Query from "@web-atoms/entity/dist/services/Query";
-import Form from "@web-atoms/web-controls/dist/basic/Form";
 import FormField from "@web-atoms/web-controls/dist/basic/FormField";
 import Select from "@web-atoms/web-controls/dist/basic/Select";
 import { Sql } from "../../../Sql";
-import { SaveIconTextButton, UploadIconTextButton } from "../../../controls/buttons/IconButton";
+import { UploadIconTextButton } from "../../../controls/buttons/IconButton";
 import CollectionEditorEx from "../../../controls/collection-editor/CollectionEditorEx";
 import ReferenceEditor from "../../../controls/reference-editor/ReferenceEditor";
 import TagChips from "../../../controls/tags/TagChips";
@@ -21,15 +20,11 @@ import UploadEvent from "@web-atoms/web-controls/dist/basic/UploadEvent";
 import Action from "@web-atoms/core/dist/view-model/Action";
 import { signedImageUrl } from "../../../fileUrl";
 import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
-import EntityService from "../../../../services/EntityService";
 import StoreItemService from "../../../../services/store/StoreItemService";
 import { InlinePopupButton } from "@web-atoms/web-controls/dist/basic/InlinePopup";
 import { MenuItem } from "@web-atoms/web-controls/dist/basic/PopupButton";
-import MasterDetailPage from "@web-atoms/web-controls/dist/mobile-app/MasterDetailPage";
-import ProductHtmlEditor from "./html/ProductHtmlEditorPage";
 import { Offers } from "./html/Offsers";
 import { Specifications } from "./html/Specifications";
-import { IUploadedFile } from "../../../../services/files/LocalFileService";
 
 export default class ProductEditor extends AtomControl {
 
@@ -149,7 +144,7 @@ export default class ProductEditor extends AtomControl {
                 itemRenderer={(item: IStoreItemPrice) => <div>
                     <div text={item.currency}/>
                     <div text={item.amount }/>
-                    <div text={item.addonsAmount}/>
+                    <div text={item.taxAmount }/>
                     <div
                         title={DateFormats.withWeekDayAndTime(item.startDate)}
                         text={DateFormats.relative.short(item.startDate)}/>
@@ -159,36 +154,33 @@ export default class ProductEditor extends AtomControl {
                             text={DateFormats.relative.short(item.endDate)}/>
                         : <div/>
                     }
-                    <CollectionEditorEx
-                        label="Add Ons"
+                </div>}
+            />
+            <CollectionEditorEx
+                label="Taxes"
+                model={this.model}
+                field={(x) => x.taxes}
+                addItemDefaults={({ taxItem: null, storeItem: null })}
+                saveAfterAdd={false}
+                inlineAddRenderere={(item: IStoreItemTax) => <div>
+                    <ReferenceEditor
                         model={item}
-                        field={(x) => x.addons}
-                        itemFactory={() => StorePriceAddOn.create({
-                            price: item,
-                            priceID: item.priceID,
-                            addOnItemID: null,
-                            addOnItem: null,
-                            inclusive: false,
-                            print: true
-                        })}
-                        saveAfterAdd={false}
-                        itemRenderer={(x: IStorePriceAddOn) => <div>
-                            <ReferenceEditor
-                                model={x}
-                                field={(a) => a.addOnItem}
-                                searchQuery={(q: Query<IStoreItem>, search) => (search
-                                    ? q.where({ search: search + "%" }, (p) => (i) => Sql.text.iLike(i.name, p.search))
-                                    : q)}
-                                suggestionRenderer={(i: IStoreItem) => <div><label text={i.name}/></div>}
-                                itemRenderer={(a: IStoreItem) => <div>
-                                    <label text={a.name}/>
-                                </div>}
-                                />
-                        </div>}
+                        field={(x) => x.taxItem}
+                        searchQuery={(q: Query<IStoreItem>, search) =>
+                            (search
+                                ? q.where({ search: search + "%"}, (p) => (x) => Sql.text.iLike(x.name, p.search))
+                                : q
+                            ).where(void 0, (p) => (x) => x.itemType === "tax").include((x) => x.storeItemPrices)
+                        }
+                        itemRenderer={(ti) => <div> <label text={ti.name}/> </div>}
+                        suggestionRenderer={(ti) => <div> <label text={ti.name}/> </div>}
                         />
-                    {/* <Switch
-                        checked={item.active}
-                        /> */}
+                </div>}
+                itemRenderer={(item: IStoreItemTax) => <div>
+                    <label text={item.taxItem.name}/>
+                    <div data-layout="flex-wrap-padding">
+                    { ... item.taxItem.storeItemPrices.map((t) => <label text={t.amount}/>)}
+                    </div>
                 </div>}
             />
             <details

package/src/model/model.ts

@@ -962,7 +962,7 @@ export interface IStoreItem extends IClrEntity {
 	active?: boolean;
 	internalNotes?: string | null;
 	description?: string | null;
-	itemType?: "product" | "service" | "tax" | "fee" | "commission" | "variant" | "size";
+	itemType?: "product" | "e-product" | "shipping" | "service" | "tax" | "fee" | "commission" | "variant" | "size";
 	folderID?: number | null;
 	sizeForID?: number | null;
 	variantForID?: number | null;
@@ -981,21 +981,22 @@ export interface IStoreItem extends IClrEntity {
 	variants?: ICollection<IStoreItem>;
 	vendor?: IContact;
 	storeItemPrices?: ICollection<IStoreItemPrice>;
-	priceAddOns?: ICollection<IStorePriceAddOn>;
 	mediaFiles?: ICollection<IStoreMediaFile>;
 	insights?: ICollection<IStoreInsight>;
 	ledgers?: ICollection<IStoreLedger>;
 	lineItems?: ICollection<IStoreJournalLineItem>;
+	taxes?: ICollection<IStoreItemTax>;
+	taxItems?: ICollection<IStoreItemTax>;
 	storeItemTags?: ICollection<IStoreItemTag>;
 }
 
-export const StoreItemItemTypeArray = [{"label":"product","value":"product"},{"label":"service","value":"service"},{"label":"tax","value":"tax"},{"label":"fee","value":"fee"},{"label":"commission","value":"commission"},{"label":"variant","value":"variant"},{"label":"size","value":"size"}];
+export const StoreItemItemTypeArray = [{"label":"product","value":"product"},{"label":"e-product","value":"e-product"},{"label":"shipping","value":"shipping"},{"label":"service","value":"service"},{"label":"tax","value":"tax"},{"label":"fee","value":"fee"},{"label":"commission","value":"commission"},{"label":"variant","value":"variant"},{"label":"size","value":"size"}];
 
 export const StoreItem: IModel<IStoreItem> = new Model<IStoreItem>(
 "StoreItem",
 ["storeItemID"],
 { name: "",active: false,itemType: "product",dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()),price: 0,maxPrice: 0 },
-{"name":"store_items","keys":[{"name":"storeItemID","type":"number","generated":"identity"}],"properties":[{"name":"storeID","type":"number"},{"name":"itemFolderID","type":"number"},{"name":"name","type":"string","default":["name","\"\""]},{"name":"active","type":"boolean","default":["active","false"]},{"name":"internalNotes","type":"string","default":["internalNotes","\"\""]},{"name":"description","type":"string","default":["description","\"\""]},{"name":"itemType","type":"string","default":["itemType","\"product\""]},{"name":"folderID","type":"number"},{"name":"sizeForID","type":"number"},{"name":"variantForID","type":"number"},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"vendorID","type":"number"},{"name":"price","type":"number","default":["price","0"]},{"name":"maxPrice","type":"number","default":["maxPrice","0"]}],"relations":[{"name":"store","fkMap":[{"fk":"storeID","relatedKey":"storeID"}],"relatedName":"Store"},{"name":"itemFolder","fkMap":[{"fk":"itemFolderID","relatedKey":"itemFolderID"}],"relatedName":"StoreItemFolder"},{"name":"fileFolder","fkMap":[{"fk":"folderID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"sizeFor","fkMap":[{"fk":"sizeForID","relatedKey":"storeItemID"}],"relatedName":"StoreItem"},{"name":"sizes","isCollection":true,"isInverse":true,"relatedName":"StoreItem"},{"name":"variantFor","fkMap":[{"fk":"variantForID","relatedKey":"storeItemID"}],"relatedName":"StoreItem"},{"name":"variants","isCollection":true,"isInverse":true,"relatedName":"StoreItem"},{"name":"vendor","fkMap":[{"fk":"vendorID","relatedKey":"contactID"}],"relatedName":"Contact"},{"name":"storeItemPrices","isCollection":true,"isInverse":true,"relatedName":"StoreItemPrice"},{"name":"priceAddOns","isCollection":true,"isInverse":true,"relatedName":"StorePriceAddOn"},{"name":"mediaFiles","isCollection":true,"isInverse":true,"relatedName":"StoreMediaFile"},{"name":"insights","isCollection":true,"isInverse":true,"relatedName":"StoreInsight"},{"name":"ledgers","isCollection":true,"isInverse":true,"relatedName":"StoreLedger"},{"name":"lineItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"},{"name":"storeItemTags","isCollection":true,"isInverse":true,"relatedName":"StoreItemTag"}]}
+{"name":"store_items","keys":[{"name":"storeItemID","type":"number","generated":"identity"}],"properties":[{"name":"storeID","type":"number"},{"name":"itemFolderID","type":"number"},{"name":"name","type":"string","default":["name","\"\""]},{"name":"active","type":"boolean","default":["active","false"]},{"name":"internalNotes","type":"string","default":["internalNotes","\"\""]},{"name":"description","type":"string","default":["description","\"\""]},{"name":"itemType","type":"string","default":["itemType","\"product\""]},{"name":"folderID","type":"number"},{"name":"sizeForID","type":"number"},{"name":"variantForID","type":"number"},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"vendorID","type":"number"},{"name":"price","type":"number","default":["price","0"]},{"name":"maxPrice","type":"number","default":["maxPrice","0"]}],"relations":[{"name":"store","fkMap":[{"fk":"storeID","relatedKey":"storeID"}],"relatedName":"Store"},{"name":"itemFolder","fkMap":[{"fk":"itemFolderID","relatedKey":"itemFolderID"}],"relatedName":"StoreItemFolder"},{"name":"fileFolder","fkMap":[{"fk":"folderID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"sizeFor","fkMap":[{"fk":"sizeForID","relatedKey":"storeItemID"}],"relatedName":"StoreItem"},{"name":"sizes","isCollection":true,"isInverse":true,"relatedName":"StoreItem"},{"name":"variantFor","fkMap":[{"fk":"variantForID","relatedKey":"storeItemID"}],"relatedName":"StoreItem"},{"name":"variants","isCollection":true,"isInverse":true,"relatedName":"StoreItem"},{"name":"vendor","fkMap":[{"fk":"vendorID","relatedKey":"contactID"}],"relatedName":"Contact"},{"name":"storeItemPrices","isCollection":true,"isInverse":true,"relatedName":"StoreItemPrice"},{"name":"mediaFiles","isCollection":true,"isInverse":true,"relatedName":"StoreMediaFile"},{"name":"insights","isCollection":true,"isInverse":true,"relatedName":"StoreInsight"},{"name":"ledgers","isCollection":true,"isInverse":true,"relatedName":"StoreLedger"},{"name":"lineItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"},{"name":"taxes","isCollection":true,"isInverse":true,"relatedName":"StoreItemTax"},{"name":"taxItems","isCollection":true,"isInverse":true,"relatedName":"StoreItemTax"},{"name":"storeItemTags","isCollection":true,"isInverse":true,"relatedName":"StoreItemTag"}]}
 );
 modelEntitySchemas["StoreItem"] = StoreItem;
 
@@ -1009,14 +1010,13 @@ export interface IStoreItemFolder extends IClrEntity {
 	parent?: IStoreItemFolder;
 	children?: ICollection<IStoreItemFolder>;
 	items?: ICollection<IStoreItem>;
-	taxLineItems?: ICollection<IStoreJournalLineItem>;
 }
 
 export const StoreItemFolder: IModel<IStoreItemFolder> = new Model<IStoreItemFolder>(
 "StoreItemFolder",
 ["itemFolderID"],
 { name: "",path: "" },
-{"name":"store_item_folders","keys":[{"name":"itemFolderID","type":"number","generated":"identity"}],"properties":[{"name":"storeID","type":"number"},{"name":"name","type":"string","default":["name","\"\""]},{"name":"path","type":"string","default":["path","\"\""]},{"name":"parentID","type":"number"}],"relations":[{"name":"store","fkMap":[{"fk":"storeID","relatedKey":"storeID"}],"relatedName":"Store"},{"name":"parent","fkMap":[{"fk":"parentID","relatedKey":"itemFolderID"}],"relatedName":"StoreItemFolder"},{"name":"children","isCollection":true,"isInverse":true,"relatedName":"StoreItemFolder"},{"name":"items","isCollection":true,"isInverse":true,"relatedName":"StoreItem"},{"name":"taxLineItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"}]}
+{"name":"store_item_folders","keys":[{"name":"itemFolderID","type":"number","generated":"identity"}],"properties":[{"name":"storeID","type":"number"},{"name":"name","type":"string","default":["name","\"\""]},{"name":"path","type":"string","default":["path","\"\""]},{"name":"parentID","type":"number"}],"relations":[{"name":"store","fkMap":[{"fk":"storeID","relatedKey":"storeID"}],"relatedName":"Store"},{"name":"parent","fkMap":[{"fk":"parentID","relatedKey":"itemFolderID"}],"relatedName":"StoreItemFolder"},{"name":"children","isCollection":true,"isInverse":true,"relatedName":"StoreItemFolder"},{"name":"items","isCollection":true,"isInverse":true,"relatedName":"StoreItem"}]}
 );
 modelEntitySchemas["StoreItemFolder"] = StoreItemFolder;
 
@@ -1028,38 +1028,20 @@ export interface IStoreItemPrice extends IClrEntity {
 	currency?: string;
 	amount?: number;
 	maxAmount?: number | null;
+	taxAmount?: number;
 	active?: boolean;
-	addonsAmount?: number;
 	storeItem?: IStoreItem;
-	addons?: ICollection<IStorePriceAddOn>;
 	lineItems?: ICollection<IStoreJournalLineItem>;
 }
 
 export const StoreItemPrice: IModel<IStoreItemPrice> = new Model<IStoreItemPrice>(
 "StoreItemPrice",
 ["priceID"],
-{ startDate: new DefaultFactory(() => new DateTime()),currency: "",amount: 0,active: false,addonsAmount: 0 },
-{"name":"store_item_prices","keys":[{"name":"priceID","type":"number","generated":"identity"}],"properties":[{"name":"storeItemID","type":"number"},{"name":"startDate","type":"DateTime","default":["startDate","new DefaultFactory(() => new DateTime())"]},{"name":"endDate","type":"DateTime","default":["endDate","new DefaultFactory(() => new DateTime())"]},{"name":"currency","type":"string","default":["currency","\"\""]},{"name":"amount","type":"number","default":["amount","0"]},{"name":"maxAmount","type":"number","default":["maxAmount","0"]},{"name":"active","type":"boolean","default":["active","false"]},{"name":"addonsAmount","type":"number","default":["addonsAmount","0"]}],"relations":[{"name":"storeItem","fkMap":[{"fk":"storeItemID","relatedKey":"storeItemID"}],"relatedName":"StoreItem"},{"name":"addons","isCollection":true,"isInverse":true,"relatedName":"StorePriceAddOn"},{"name":"lineItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"}]}
+{ startDate: new DefaultFactory(() => new DateTime()),currency: "",amount: 0,active: false },
+{"name":"store_item_prices","keys":[{"name":"priceID","type":"number","generated":"identity"}],"properties":[{"name":"storeItemID","type":"number"},{"name":"startDate","type":"DateTime","default":["startDate","new DefaultFactory(() => new DateTime())"]},{"name":"endDate","type":"DateTime","default":["endDate","new DefaultFactory(() => new DateTime())"]},{"name":"currency","type":"string","default":["currency","\"\""]},{"name":"amount","type":"number","default":["amount","0"]},{"name":"maxAmount","type":"number","default":["maxAmount","0"]},{"name":"active","type":"boolean","default":["active","false"]}],"relations":[{"name":"storeItem","fkMap":[{"fk":"storeItemID","relatedKey":"storeItemID"}],"relatedName":"StoreItem"},{"name":"lineItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"}]}
 );
 modelEntitySchemas["StoreItemPrice"] = StoreItemPrice;
 
-export interface IStorePriceAddOn extends IClrEntity {
-	priceID?: number;
-	addOnItemID?: number;
-	inclusive?: boolean;
-	print?: boolean;
-	price?: IStoreItemPrice;
-	addOnItem?: IStoreItem;
-}
-
-export const StorePriceAddOn: IModel<IStorePriceAddOn> = new Model<IStorePriceAddOn>(
-"StorePriceAddOn",
-["priceID","addOnItemID"],
-{ inclusive: false,print: false },
-{"name":"store_price_add_ons","keys":[{"name":"priceID","type":"number"},{"name":"addOnItemID","type":"number"}],"properties":[{"name":"inclusive","type":"boolean","default":["inclusive","false"]},{"name":"print","type":"boolean","default":["print","false"]}],"relations":[{"name":"price","fkMap":[{"fk":"priceID","relatedKey":"priceID"}],"relatedName":"StoreItemPrice"},{"name":"addOnItem","fkMap":[{"fk":"addOnItemID","relatedKey":"storeItemID"}],"relatedName":"StoreItem"}]}
-);
-modelEntitySchemas["StorePriceAddOn"] = StorePriceAddOn;
-
 export interface IStoreMediaFile extends IClrEntity {
 	storeItemID?: number;
 	appFileID?: number;
@@ -1146,6 +1128,9 @@ export interface IStoreJournal extends IClrEntity {
 	balance?: number;
 	referenceID?: number | null;
 	folderID?: number | null;
+	taxExempt?: boolean;
+	taxExemptNotes?: string | null;
+	taxExemptTaxID?: string | null;
 	store?: IStore;
 	seller?: IContact;
 	buyer?: IContact;
@@ -1161,8 +1146,8 @@ export const StoreJournalJournalTypeArray = [{"label":"order","value":"order"},{
 export const StoreJournal: IModel<IStoreJournal> = new Model<IStoreJournal>(
 "StoreJournal",
 ["journalID"],
-{ dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()),journalType: "order",posted: false,status: "",total: 0,balance: 0 },
-{"name":"store_journals","keys":[{"name":"journalID","type":"number","generated":"identity"}],"properties":[{"name":"storeID","type":"number"},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"journalType","type":"string","default":["journalType","\"order\""]},{"name":"description","type":"string","default":["description","\"\""]},{"name":"posted","type":"boolean","default":["posted","false"]},{"name":"status","type":"string","default":["status","\"\""]},{"name":"sellerID","type":"number"},{"name":"buyerID","type":"number"},{"name":"total","type":"number","default":["total","0"]},{"name":"balance","type":"number","default":["balance","0"]},{"name":"referenceID","type":"number"},{"name":"folderID","type":"number"}],"relations":[{"name":"store","fkMap":[{"fk":"storeID","relatedKey":"storeID"}],"relatedName":"Store"},{"name":"seller","fkMap":[{"fk":"sellerID","relatedKey":"contactID"}],"relatedName":"Contact"},{"name":"buyer","fkMap":[{"fk":"buyerID","relatedKey":"contactID"}],"relatedName":"Contact"},{"name":"reference","fkMap":[{"fk":"referenceID","relatedKey":"journalID"}],"relatedName":"StoreJournal"},{"name":"references","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"folder","fkMap":[{"fk":"folderID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"entries","isCollection":true,"isInverse":true,"relatedName":"StoreJournalEntry"},{"name":"lineItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"}]}
+{ dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()),journalType: "order",posted: false,status: "",total: 0,balance: 0,taxExempt: false },
+{"name":"store_journals","keys":[{"name":"journalID","type":"number","generated":"identity"}],"properties":[{"name":"storeID","type":"number"},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"journalType","type":"string","default":["journalType","\"order\""]},{"name":"description","type":"string","default":["description","\"\""]},{"name":"posted","type":"boolean","default":["posted","false"]},{"name":"status","type":"string","default":["status","\"\""]},{"name":"sellerID","type":"number"},{"name":"buyerID","type":"number"},{"name":"total","type":"number","default":["total","0"]},{"name":"balance","type":"number","default":["balance","0"]},{"name":"referenceID","type":"number"},{"name":"folderID","type":"number"},{"name":"taxExempt","type":"boolean","default":["taxExempt","false"]},{"name":"taxExemptNotes","type":"string","default":["taxExemptNotes","\"\""]},{"name":"taxExemptTaxID","type":"string","default":["taxExemptTaxID","\"\""]}],"relations":[{"name":"store","fkMap":[{"fk":"storeID","relatedKey":"storeID"}],"relatedName":"Store"},{"name":"seller","fkMap":[{"fk":"sellerID","relatedKey":"contactID"}],"relatedName":"Contact"},{"name":"buyer","fkMap":[{"fk":"buyerID","relatedKey":"contactID"}],"relatedName":"Contact"},{"name":"reference","fkMap":[{"fk":"referenceID","relatedKey":"journalID"}],"relatedName":"StoreJournal"},{"name":"references","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"folder","fkMap":[{"fk":"folderID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"entries","isCollection":true,"isInverse":true,"relatedName":"StoreJournalEntry"},{"name":"lineItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"}]}
 );
 modelEntitySchemas["StoreJournal"] = StoreJournal;
 
@@ -1197,31 +1182,46 @@ export interface IStoreJournalLineItem extends IClrEntity {
 	total?: number;
 	quantity?: number;
 	inclusive?: boolean;
-	itemType?: "commission" | "fee" | "tax" | "variant" | "size" | null;
+	itemType?: "product" | "e-product" | "shipping" | "service" | "tax" | "fee" | "commission" | "variant" | "size" | null;
 	hide?: boolean;
 	vendorID?: number | null;
 	sourceID?: number | null;
-	taxFolderID?: number | null;
 	journal?: IStoreJournal;
 	item?: IStoreItem;
 	itemPrice?: IStoreItemPrice;
 	vendor?: IContact;
 	source?: IStoreJournalLineItem;
 	relatedItems?: ICollection<IStoreJournalLineItem>;
-	taxFolder?: IStoreItemFolder;
 	entries?: ICollection<IStoreJournalEntry>;
 }
 
-export const StoreJournalLineItemItemTypeArray = [{"label":"commission","value":"commission"},{"label":"fee","value":"fee"},{"label":"tax","value":"tax"},{"label":"variant","value":"variant"},{"label":"size","value":"size"}];
+export const StoreJournalLineItemItemTypeArray = [{"label":"product","value":"product"},{"label":"e-product","value":"e-product"},{"label":"shipping","value":"shipping"},{"label":"service","value":"service"},{"label":"tax","value":"tax"},{"label":"fee","value":"fee"},{"label":"commission","value":"commission"},{"label":"variant","value":"variant"},{"label":"size","value":"size"}];
 
 export const StoreJournalLineItem: IModel<IStoreJournalLineItem> = new Model<IStoreJournalLineItem>(
 "StoreJournalLineItem",
 ["lineItemID"],
 { amount: 0,total: 0,quantity: 0,inclusive: false,hide: false },
-{"name":"store_journal_line_items","keys":[{"name":"lineItemID","type":"number","generated":"identity"}],"properties":[{"name":"journalID","type":"number"},{"name":"itemID","type":"number"},{"name":"itemPriceID","type":"number"},{"name":"amount","type":"number","default":["amount","0"]},{"name":"total","type":"number","default":["total","0"]},{"name":"quantity","type":"number","default":["quantity","0"]},{"name":"inclusive","type":"boolean","default":["inclusive","false"]},{"name":"itemType","type":"string","default":["itemType","\"commission\""]},{"name":"hide","type":"boolean","default":["hide","false"]},{"name":"vendorID","type":"number"},{"name":"sourceID","type":"number"},{"name":"taxFolderID","type":"number"}],"relations":[{"name":"journal","fkMap":[{"fk":"journalID","relatedKey":"journalID"}],"relatedName":"StoreJournal"},{"name":"item","fkMap":[{"fk":"itemID","relatedKey":"storeItemID"}],"relatedName":"StoreItem"},{"name":"itemPrice","fkMap":[{"fk":"itemPriceID","relatedKey":"priceID"}],"relatedName":"StoreItemPrice"},{"name":"vendor","fkMap":[{"fk":"vendorID","relatedKey":"contactID"}],"relatedName":"Contact"},{"name":"source","fkMap":[{"fk":"sourceID","relatedKey":"lineItemID"}],"relatedName":"StoreJournalLineItem"},{"name":"relatedItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"},{"name":"taxFolder","fkMap":[{"fk":"taxFolderID","relatedKey":"itemFolderID"}],"relatedName":"StoreItemFolder"},{"name":"entries","isCollection":true,"isInverse":true,"relatedName":"StoreJournalEntry"}]}
+{"name":"store_journal_line_items","keys":[{"name":"lineItemID","type":"number","generated":"identity"}],"properties":[{"name":"journalID","type":"number"},{"name":"itemID","type":"number"},{"name":"itemPriceID","type":"number"},{"name":"amount","type":"number","default":["amount","0"]},{"name":"total","type":"number","default":["total","0"]},{"name":"quantity","type":"number","default":["quantity","0"]},{"name":"inclusive","type":"boolean","default":["inclusive","false"]},{"name":"itemType","type":"string","default":["itemType","\"product\""]},{"name":"hide","type":"boolean","default":["hide","false"]},{"name":"vendorID","type":"number"},{"name":"sourceID","type":"number"}],"relations":[{"name":"journal","fkMap":[{"fk":"journalID","relatedKey":"journalID"}],"relatedName":"StoreJournal"},{"name":"item","fkMap":[{"fk":"itemID","relatedKey":"storeItemID"}],"relatedName":"StoreItem"},{"name":"itemPrice","fkMap":[{"fk":"itemPriceID","relatedKey":"priceID"}],"relatedName":"StoreItemPrice"},{"name":"vendor","fkMap":[{"fk":"vendorID","relatedKey":"contactID"}],"relatedName":"Contact"},{"name":"source","fkMap":[{"fk":"sourceID","relatedKey":"lineItemID"}],"relatedName":"StoreJournalLineItem"},{"name":"relatedItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"},{"name":"entries","isCollection":true,"isInverse":true,"relatedName":"StoreJournalEntry"}]}
 );
 modelEntitySchemas["StoreJournalLineItem"] = StoreJournalLineItem;
 
+export interface IStoreItemTax extends IClrEntity {
+	storeItemID?: number;
+	taxItemID?: number;
+	inclusive?: boolean;
+	print?: boolean;
+	storeItem?: IStoreItem;
+	taxItem?: IStoreItem;
+}
+
+export const StoreItemTax: IModel<IStoreItemTax> = new Model<IStoreItemTax>(
+"StoreItemTax",
+["storeItemID","taxItemID"],
+{ inclusive: false,print: false },
+{"name":"store_item_taxes","keys":[{"name":"storeItemID","type":"number"},{"name":"taxItemID","type":"number"}],"properties":[{"name":"inclusive","type":"boolean","default":["inclusive","false"]},{"name":"print","type":"boolean","default":["print","false"]}],"relations":[{"name":"storeItem","fkMap":[{"fk":"storeItemID","relatedKey":"storeItemID"}],"relatedName":"StoreItem"},{"name":"taxItem","fkMap":[{"fk":"taxItemID","relatedKey":"storeItemID"}],"relatedName":"StoreItem"}]}
+);
+modelEntitySchemas["StoreItemTax"] = StoreItemTax;
+
 export interface IStoreItemTag extends IClrEntity {
 	storeItemID?: number;
 	tagID?: number;
@@ -1525,105 +1525,6 @@ export const Tag: IModel<ITag> = new Model<ITag>(
 );
 modelEntitySchemas["Tag"] = Tag;
 
-export interface IVirtualServer extends IClrEntity {
-	readonly serverID?: number;
-	serverName?: string;
-	ownerEmailAddress?: string | null;
-	ownerPhoneNumber?: string | null;
-	active?: boolean;
-	bucketName?: string | null;
-	database?: string | null;
-	host?: string;
-	forwardHost?: string | null;
-	forwardPublicKey?: string | null;
-	environmentVariables?: string | null;
-	maxStorageGB?: number;
-	dnsZones?: ICollection<IDnsZone>;
-}
-
-export const VirtualServer: IModel<IVirtualServer> = new Model<IVirtualServer>(
-"VirtualServer",
-["serverID"],
-{ serverName: "",active: false,host: "",maxStorageGB: 0 },
-{"name":"virtual_servers","keys":[{"name":"serverID","type":"number","generated":"identity"}],"properties":[{"name":"serverName","type":"string","default":["serverName","\"\""]},{"name":"ownerEmailAddress","type":"string","default":["ownerEmailAddress","\"\""]},{"name":"ownerPhoneNumber","type":"string","default":["ownerPhoneNumber","\"\""]},{"name":"active","type":"boolean","default":["active","false"]},{"name":"bucketName","type":"string","default":["bucketName","\"\""]},{"name":"database","type":"string","default":["database","\"\""]},{"name":"host","type":"string","default":["host","\"\""]},{"name":"forwardHost","type":"string","default":["forwardHost","\"\""]},{"name":"forwardPrivateKey","type":"string","default":["forwardPrivateKey","\"\""]},{"name":"forwardPublicKey","type":"string","default":["forwardPublicKey","\"\""]},{"name":"environmentVariables","type":"string","default":["environmentVariables","\"\""]},{"name":"maxStorageGB","type":"number","default":["maxStorageGB","0"]}],"relations":[{"name":"dnsZones","isCollection":true,"isInverse":true,"relatedName":"DnsZone"}]}
-);
-modelEntitySchemas["VirtualServer"] = VirtualServer;
-
-export interface IDnsZone extends IClrEntity {
-	readonly zoneID?: number;
-	serverID?: number;
-	zone?: string;
-	keySigningKeyID?: number;
-	zoneSigningKeyID?: number;
-	dateCreated?: DateTime;
-	dateUpdated?: DateTime;
-	signed?: string | null;
-	unsigned?: string | null;
-	virtualServer?: IVirtualServer;
-	ksk?: IDnsSigningKey;
-	zsk?: IDnsSigningKey;
-	records?: ICollection<IDnsZoneRecord>;
-}
-
-export const DnsZone: IModel<IDnsZone> = new Model<IDnsZone>(
-"DnsZone",
-["zoneID"],
-{ zone: "",dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()) },
-{"name":"dns_zones","keys":[{"name":"zoneID","type":"number","generated":"identity"}],"properties":[{"name":"serverID","type":"number"},{"name":"zone","type":"string","default":["zone","\"\""]},{"name":"zoneLowerCase","type":"string","generated":"computed"},{"name":"keySigningKeyID","type":"number"},{"name":"zoneSigningKeyID","type":"number"},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"signed","type":"string","default":["signed","\"\""]},{"name":"unsigned","type":"string","default":["unsigned","\"\""]}],"relations":[{"name":"virtualServer","fkMap":[{"fk":"serverID","relatedKey":"serverID"}],"relatedName":"VirtualServer"},{"name":"ksk","fkMap":[{"fk":"keySigningKeyID","relatedKey":"keyID"}],"relatedName":"DnsSigningKey"},{"name":"zsk","fkMap":[{"fk":"zoneSigningKeyID","relatedKey":"keyID"}],"relatedName":"DnsSigningKey"},{"name":"records","isCollection":true,"isInverse":true,"relatedName":"DnsZoneRecord"}]}
-);
-modelEntitySchemas["DnsZone"] = DnsZone;
-
-export interface IDnsZoneRecord extends IClrEntity {
-	readonly recordID?: number;
-	zoneID?: number;
-	disabled?: boolean;
-	name?: string;
-	type?: "A" | "AAAA" | "CNAME" | "MX" | "TXT" | "PTR" | "SRV" | "CAA" | "NS" | "SOA";
-	isAlias?: boolean;
-	value?: string;
-	ttl?: number;
-	dateCreated?: DateTime;
-	dateUpdated?: DateTime;
-	notes?: string | null;
-	signature?: string | null;
-	expiryDate?: DateTime | null;
-	readonly fqdn?: string | null;
-	hosted?: boolean;
-	zone?: IDnsZone;
-}
-
-export const DnsZoneRecordTypeArray = [{"label":"A","value":"A"},{"label":"AAAA","value":"AAAA"},{"label":"CNAME","value":"CNAME"},{"label":"MX","value":"MX"},{"label":"TXT","value":"TXT"},{"label":"PTR","value":"PTR"},{"label":"SRV","value":"SRV"},{"label":"CAA","value":"CAA"},{"label":"NS","value":"NS"},{"label":"SOA","value":"SOA"}];
-
-export const DnsZoneRecord: IModel<IDnsZoneRecord> = new Model<IDnsZoneRecord>(
-"DnsZoneRecord",
-["recordID"],
-{ disabled: false,name: "",type: "A",isAlias: false,value: "",ttl: 0,dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()),hosted: false },
-{"name":"dns_zone_records","keys":[{"name":"recordID","type":"number","generated":"identity"}],"properties":[{"name":"zoneID","type":"number"},{"name":"disabled","type":"boolean","default":["disabled","false"]},{"name":"name","type":"string","default":["name","\"\""]},{"name":"type","type":"Object","default":["type","\"A\""]},{"name":"isAlias","type":"boolean","default":["isAlias","false"]},{"name":"value","type":"string","default":["value","\"\""]},{"name":"ttl","type":"number","default":["ttl","0"]},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"notes","type":"string","default":["notes","\"\""]},{"name":"signature","type":"string","default":["signature","\"\""]},{"name":"expiryDate","type":"DateTime","default":["expiryDate","new DefaultFactory(() => new DateTime())"]},{"name":"fqdn","type":"string","default":["fqdn","\"\""]},{"name":"hosted","type":"boolean","default":["hosted","false"]}],"relations":[{"name":"zone","fkMap":[{"fk":"zoneID","relatedKey":"zoneID"}],"relatedName":"DnsZone"}]}
-);
-modelEntitySchemas["DnsZoneRecord"] = DnsZoneRecord;
-
-export interface IDnsSigningKey extends IClrEntity {
-	readonly keyID?: number;
-	publicKey?: string;
-	digestAlgorithm?: number;
-	signingAlgorithm?: number;
-	digest?: string;
-	flags?: number;
-	dateCreated?: DateTime;
-	expiryDate?: DateTime;
-	fileName?: string;
-	kskZones?: ICollection<IDnsZone>;
-	zskZones?: ICollection<IDnsZone>;
-}
-
-export const DnsSigningKey: IModel<IDnsSigningKey> = new Model<IDnsSigningKey>(
-"DnsSigningKey",
-["keyID"],
-{ publicKey: "",digestAlgorithm: 0,signingAlgorithm: 0,digest: "",flags: 0,dateCreated: new DefaultFactory(() => new DateTime()),expiryDate: new DefaultFactory(() => new DateTime()),fileName: "" },
-{"name":"dns_signing_keys","keys":[{"name":"keyID","type":"number","generated":"identity"}],"properties":[{"name":"publicKey","type":"string","default":["publicKey","\"\""]},{"name":"privateKey","type":"string","default":["privateKey","\"\""]},{"name":"digestAlgorithm","type":"number","default":["digestAlgorithm","0"]},{"name":"signingAlgorithm","type":"number","default":["signingAlgorithm","0"]},{"name":"digest","type":"string","default":["digest","\"\""]},{"name":"flags","type":"number","default":["flags","0"]},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"expiryDate","type":"DateTime","default":["expiryDate","new DefaultFactory(() => new DateTime())"]},{"name":"fileName","type":"string","default":["fileName","\"\""]}],"relations":[{"name":"kskZones","isCollection":true,"isInverse":true,"relatedName":"DnsZone"},{"name":"zskZones","isCollection":true,"isInverse":true,"relatedName":"DnsZone"}]}
-);
-modelEntitySchemas["DnsSigningKey"] = DnsSigningKey;
-
 const fixRelatedSchemas = (schema) => {
 for (const key in schema) {
 if (Object.prototype.hasOwnProperty.call(schema, key)) {

package/src/services/store/StoreItemService.ts

@@ -26,7 +26,8 @@ export default class StoreItemService {
                 x.store.folder,
                 x.itemFolder,
                 x.fileFolder,
-                x.storeItemPrices.forEach((i) => i.addons.forEach((a) => a.addOnItem.storeItemPrices)),
+                x.storeItemPrices,
+                x.taxes.forEach((t) => t.taxItem.storeItemPrices),
                 x.mediaFiles.forEach((m) => m.appFile),
                 x.storeItemTags.forEach((t) => t.tag)
             ])
@@ -84,11 +85,11 @@ export default class StoreItemService {
     async save(storeItem: IStoreItem) {
         await this.entityService.save(storeItem, (c) =>
             c.include((x) => x.storeItemPrices)
-                .thenInclude((x) => x.addons)
+            .include((x) => x.taxes)
             .include((x) => x.storeItemTags)
                 .thenInclude((x) => x.tag)
             .include((x) => x.mediaFiles)
-        );
+        , true);
         return storeItem;
     }