@social-mail/social-mail-client 1.2.704 → 1.2.705

package/package.json

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

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

@@ -199,7 +199,7 @@ export default class ProductEditor extends AtomControl {
             <CollectionEditorEx
                 label="Taxes"
                 model={this.model}
-                field={(x) => x.taxes}
+                field={(x) => x.applicableTaxes}
                 addItemDefaults={({ taxItem: null, storeItem: null })}
                 saveAfterAdd={false}
                 inlineAddRenderer={(item: IStoreItemTax) => <div>

package/src/model/model.ts

@@ -1095,6 +1095,8 @@ export interface IStoreItem extends IClrEntity {
 	internalNotes?: string | null;
 	description?: string | null;
 	itemType?: "product" | "e-product" | "shipping" | "service" | "tax" | "fee" | "commission" | "variant" | "size";
+	itemUnitType?: "product" | "e-product" | "shipping" | "service" | "tax" | "fee" | "commission" | "variant" | "size" | null;
+	itemUnit?: number;
 	folderID?: number | null;
 	sizeForID?: number | null;
 	variantForID?: number | null;
@@ -1113,25 +1115,77 @@ export interface IStoreItem extends IClrEntity {
 	variantFor?: IStoreItem;
 	variants?: ICollection<IStoreItem>;
 	vendor?: IStoreAccount;
+	itemCoupons?: ICollection<IStoreCoupon>;
+	lineItems?: ICollection<IStoreJournalLineItem>;
 	storeItemPrices?: ICollection<IStoreItemPrice>;
 	mediaFiles?: ICollection<IStoreMediaFile>;
 	insights?: ICollection<IStoreInsight>;
-	lineItems?: ICollection<IStoreJournalLineItem>;
-	taxes?: ICollection<IStoreItemTax>;
+	applicableTaxes?: ICollection<IStoreItemTax>;
 	taxItems?: ICollection<IStoreItemTax>;
 	storeItemTags?: ICollection<IStoreItemTag>;
 }
 
 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 StoreItemItemUnitTypeArray = [{"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,{"storeQuery":"external"},any> = 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","dataType":"BigInt"}],"properties":[{"name":"storeID","type":"number","dataType":"BigInt"},{"name":"itemFolderID","type":"number","dataType":"BigInt"},{"name":"name","type":"string","dataType":"Char","length":200,"default":["name","\"\""]},{"name":"active","type":"boolean","dataType":"Boolean","default":["active","false"]},{"name":"internalNotes","type":"string","dataType":"Char","default":["internalNotes","\"\""]},{"name":"description","type":"string","dataType":"Char","default":["description","\"\""]},{"name":"itemType","type":"string","dataType":"Char","length":20,"default":["itemType","\"product\""]},{"name":"folderID","type":"number","dataType":"BigInt"},{"name":"sizeForID","type":"number","dataType":"BigInt"},{"name":"variantForID","type":"number","dataType":"BigInt"},{"name":"dateCreated","type":"DateTime","dataType":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","dataType":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"vendorID","type":"number","dataType":"BigInt"},{"name":"price","type":"number","dataType":"Decimal","default":["price","0"]},{"name":"maxPrice","type":"number","dataType":"Decimal","default":["maxPrice","0"]}],"relations":[{"name":"store","fkMap":[{"fk":"storeID","relatedKey":"folderID"}],"relatedName":"WebSiteFolder"},{"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":"accountID"}],"relatedName":"StoreAccount"},{"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":"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"}],"queries":{"storeQuery":"external"}}
+{ name: "",active: false,itemType: "product",itemUnit: 0,dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()),price: 0,maxPrice: 0 },
+{"name":"store_items","keys":[{"name":"storeItemID","type":"number","generated":"identity","dataType":"BigInt"}],"properties":[{"name":"storeID","type":"number","dataType":"BigInt"},{"name":"itemFolderID","type":"number","dataType":"BigInt"},{"name":"name","type":"string","dataType":"Char","length":200,"default":["name","\"\""]},{"name":"active","type":"boolean","dataType":"Boolean","default":["active","false"]},{"name":"internalNotes","type":"string","dataType":"Char","default":["internalNotes","\"\""]},{"name":"description","type":"string","dataType":"Char","default":["description","\"\""]},{"name":"itemType","type":"string","dataType":"Char","length":20,"default":["itemType","\"product\""]},{"name":"itemUnitType","type":"string","dataType":"Char","length":50,"default":["itemUnitType","\"product\""]},{"name":"itemUnit","type":"number","dataType":"Decimal","default":["itemUnit","0"]},{"name":"folderID","type":"number","dataType":"BigInt"},{"name":"sizeForID","type":"number","dataType":"BigInt"},{"name":"variantForID","type":"number","dataType":"BigInt"},{"name":"dateCreated","type":"DateTime","dataType":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","dataType":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"vendorID","type":"number","dataType":"BigInt"},{"name":"price","type":"number","dataType":"Decimal","default":["price","0"]},{"name":"maxPrice","type":"number","dataType":"Decimal","default":["maxPrice","0"]}],"relations":[{"name":"store","fkMap":[{"fk":"storeID","relatedKey":"folderID"}],"relatedName":"WebSiteFolder"},{"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":"accountID"}],"relatedName":"StoreAccount"},{"name":"itemCoupons","isCollection":true,"isInverse":true,"relatedName":"StoreCoupon"},{"name":"lineItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"},{"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":"applicableTaxes","isCollection":true,"isInverse":true,"relatedName":"StoreItemTax"},{"name":"taxItems","isCollection":true,"isInverse":true,"relatedName":"StoreItemTax"},{"name":"storeItemTags","isCollection":true,"isInverse":true,"relatedName":"StoreItemTag"}],"queries":{"storeQuery":"external"}}
 );
 modelEntitySchemas["StoreItem"] = StoreItem;
 
+export interface IStoreCoupon extends IClrEntity {
+	readonly couponID?: number;
+	storeID?: number;
+	code?: string;
+	active?: boolean;
+	hidden?: boolean;
+	itemID?: number | null;
+	startDate?: DateTime;
+	endDate?: DateTime | null;
+	exclusive?: boolean;
+	minOrderAmount?: number;
+	maxOrderAmount?: number;
+	minQuantity?: number;
+	maxQuantity?: number;
+	amount?: number;
+	type?: "discount" | "subtract";
+	store?: IWebSiteFolder;
+	item?: IStoreItem;
+	orders?: ICollection<IStoreJournalCoupon>;
+}
+
+export const StoreCouponTypeArray = [{"label":"discount","value":"discount"},{"label":"subtract","value":"subtract"}];
+
+export const StoreCoupon: IModel<IStoreCoupon,any,any> = new Model<IStoreCoupon>(
+"StoreCoupon",
+["couponID"],
+{ code: "",active: false,hidden: false,startDate: new DefaultFactory(() => new DateTime()),exclusive: false,minOrderAmount: 0,maxOrderAmount: 0,minQuantity: 0,maxQuantity: 0,amount: 0,type: "discount" },
+{"name":"store_coupons","keys":[{"name":"couponID","type":"number","generated":"identity","dataType":"BigInt"}],"properties":[{"name":"storeID","type":"number","dataType":"BigInt"},{"name":"code","type":"string","dataType":"Char","length":100,"default":["code","\"\""]},{"name":"active","type":"boolean","dataType":"Boolean","default":["active","false"]},{"name":"hidden","type":"boolean","dataType":"Boolean","default":["hidden","false"]},{"name":"itemID","type":"number","dataType":"BigInt"},{"name":"startDate","type":"DateTime","dataType":"DateTime","default":["startDate","new DefaultFactory(() => new DateTime())"]},{"name":"endDate","type":"DateTime","dataType":"DateTime","default":["endDate","new DefaultFactory(() => new DateTime())"]},{"name":"exclusive","type":"boolean","dataType":"Boolean","default":["exclusive","false"]},{"name":"minOrderAmount","type":"number","dataType":"Decimal","default":["minOrderAmount","0"]},{"name":"maxOrderAmount","type":"number","dataType":"Decimal","default":["maxOrderAmount","0"]},{"name":"minQuantity","type":"number","dataType":"Int","default":["minQuantity","0"]},{"name":"maxQuantity","type":"number","dataType":"Int","default":["maxQuantity","0"]},{"name":"amount","type":"number","dataType":"Int","default":["amount","0"]},{"name":"type","type":"string","dataType":"Char","length":50,"default":["type","\"discount\""]}],"relations":[{"name":"store","fkMap":[{"fk":"storeID","relatedKey":"folderID"}],"relatedName":"WebSiteFolder"},{"name":"item","fkMap":[{"fk":"itemID","relatedKey":"storeItemID"}],"relatedName":"StoreItem"},{"name":"orders","isCollection":true,"isInverse":true,"relatedName":"StoreJournalCoupon"}]}
+);
+modelEntitySchemas["StoreCoupon"] = StoreCoupon;
+
+export interface IStoreJournalCoupon extends IClrEntity {
+	readonly appliedCouponID?: number;
+	couponID?: number;
+	orderID?: number;
+	lineItemID?: number | null;
+	couponCode?: string;
+	coupon?: IStoreCoupon;
+	order?: IStoreJournal;
+	lineItem?: IStoreJournalLineItem;
+}
+
+export const StoreJournalCoupon: IModel<IStoreJournalCoupon,any,any> = new Model<IStoreJournalCoupon>(
+"StoreJournalCoupon",
+["appliedCouponID"],
+{ couponCode: "" },
+{"name":"store_journal_coupons","keys":[{"name":"appliedCouponID","type":"number","generated":"identity","dataType":"BigInt"}],"properties":[{"name":"couponID","type":"number","dataType":"BigInt"},{"name":"orderID","type":"number","dataType":"BigInt"},{"name":"lineItemID","type":"number","dataType":"BigInt"},{"name":"couponCode","type":"string","dataType":"Char","length":200,"default":["couponCode","\"\""]}],"relations":[{"name":"coupon","fkMap":[{"fk":"couponID","relatedKey":"couponID"}],"relatedName":"StoreCoupon"},{"name":"order","fkMap":[{"fk":"orderID","relatedKey":"journalID"}],"relatedName":"StoreJournal"},{"name":"lineItem","fkMap":[{"fk":"lineItemID","relatedKey":"lineItemID"}],"relatedName":"StoreJournalLineItem"}]}
+);
+modelEntitySchemas["StoreJournalCoupon"] = StoreJournalCoupon;
+
 export interface IStoreItemFolder extends IClrEntity {
 	readonly itemFolderID?: number;
 	storeID?: number;
@@ -1276,18 +1330,18 @@ export interface IStoreAccount extends IClrEntity {
 	soldInvoices?: ICollection<IStoreJournal>;
 	boughtInvoices?: ICollection<IStoreJournal>;
 	addresses?: ICollection<IStoreAccountAddress>;
+	soldItems?: ICollection<IStoreJournalLineItem>;
 	storePaymentGateway?: IStorePaymentGateway;
 	emails?: ICollection<IStoreAccountEmail>;
 	phones?: ICollection<IStoreAccountPhone>;
 	entries?: ICollection<IStoreJournalEntry>;
-	soldItems?: ICollection<IStoreJournalLineItem>;
 }
 
 export const StoreAccount: IModel<IStoreAccount,any,any> = new Model<IStoreAccount>(
 "StoreAccount",
 ["accountID"],
 { dateCreated: new DefaultFactory(() => new DateTime()),ledgerType: "",name: "",balance: 0 },
-{"name":"store_accounts","keys":[{"name":"accountID","type":"number","dataType":"BigInt"}],"properties":[{"name":"path","type":"string","dataType":"Char","length":400,"default":["path","\"\""]},{"name":"storeID","type":"number","dataType":"BigInt"},{"name":"parentID","type":"number","dataType":"BigInt"},{"name":"head","type":"string","dataType":"Char","length":50,"default":["head","\"\""]},{"name":"dateCreated","type":"DateTime","dataType":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"ledgerType","type":"string","dataType":"Char","length":50,"default":["ledgerType","\"\""]},{"name":"name","type":"string","dataType":"Char","length":400,"default":["name","\"\""]},{"name":"description","type":"string","dataType":"Char","default":["description","\"\""]},{"name":"balance","type":"number","dataType":"Decimal","default":["balance","0"]},{"name":"billingAddressID","type":"number","dataType":"BigInt","default":["billingAddressID","0"]},{"name":"shippingAddressID","type":"number","dataType":"BigInt","default":["shippingAddressID","0"]}],"relations":[{"name":"user","fkMap":[{"fk":"accountID","relatedKey":"userID"}],"relatedName":"User"},{"name":"store","fkMap":[{"fk":"storeID","relatedKey":"folderID"}],"relatedName":"WebSiteFolder"},{"name":"parent","fkMap":[{"fk":"parentID","relatedKey":"accountID"}],"relatedName":"StoreAccount"},{"name":"children","isCollection":true,"isInverse":true,"relatedName":"StoreAccount"},{"name":"vendorItems","isCollection":true,"isInverse":true,"relatedName":"StoreItem"},{"name":"soldInvoices","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"boughtInvoices","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"addresses","isCollection":true,"isInverse":true,"relatedName":"StoreAccountAddress"},{"name":"storePaymentGateway","isCollection":false,"isInverse":true,"relatedName":"StorePaymentGateway"},{"name":"emails","isCollection":true,"isInverse":true,"relatedName":"StoreAccountEmail"},{"name":"phones","isCollection":true,"isInverse":true,"relatedName":"StoreAccountPhone"},{"name":"entries","isCollection":true,"isInverse":true,"relatedName":"StoreJournalEntry"},{"name":"soldItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"}]}
+{"name":"store_accounts","keys":[{"name":"accountID","type":"number","dataType":"BigInt"}],"properties":[{"name":"path","type":"string","dataType":"Char","length":400,"default":["path","\"\""]},{"name":"storeID","type":"number","dataType":"BigInt"},{"name":"parentID","type":"number","dataType":"BigInt"},{"name":"head","type":"string","dataType":"Char","length":50,"default":["head","\"\""]},{"name":"dateCreated","type":"DateTime","dataType":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"ledgerType","type":"string","dataType":"Char","length":50,"default":["ledgerType","\"\""]},{"name":"name","type":"string","dataType":"Char","length":400,"default":["name","\"\""]},{"name":"description","type":"string","dataType":"Char","default":["description","\"\""]},{"name":"balance","type":"number","dataType":"Decimal","default":["balance","0"]},{"name":"billingAddressID","type":"number","dataType":"BigInt","default":["billingAddressID","0"]},{"name":"shippingAddressID","type":"number","dataType":"BigInt","default":["shippingAddressID","0"]}],"relations":[{"name":"user","fkMap":[{"fk":"accountID","relatedKey":"userID"}],"relatedName":"User"},{"name":"store","fkMap":[{"fk":"storeID","relatedKey":"folderID"}],"relatedName":"WebSiteFolder"},{"name":"parent","fkMap":[{"fk":"parentID","relatedKey":"accountID"}],"relatedName":"StoreAccount"},{"name":"children","isCollection":true,"isInverse":true,"relatedName":"StoreAccount"},{"name":"vendorItems","isCollection":true,"isInverse":true,"relatedName":"StoreItem"},{"name":"soldInvoices","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"boughtInvoices","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"addresses","isCollection":true,"isInverse":true,"relatedName":"StoreAccountAddress"},{"name":"soldItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"},{"name":"storePaymentGateway","isCollection":false,"isInverse":true,"relatedName":"StorePaymentGateway"},{"name":"emails","isCollection":true,"isInverse":true,"relatedName":"StoreAccountEmail"},{"name":"phones","isCollection":true,"isInverse":true,"relatedName":"StoreAccountPhone"},{"name":"entries","isCollection":true,"isInverse":true,"relatedName":"StoreJournalEntry"}]}
 );
 modelEntitySchemas["StoreAccount"] = StoreAccount;
 
@@ -1413,9 +1467,10 @@ export interface IStoreJournal extends IClrEntity {
 	reference?: IStoreJournal;
 	references?: ICollection<IStoreJournal>;
 	folder?: IAppFile;
+	orderCoupons?: ICollection<IStoreJournalCoupon>;
+	lineItems?: ICollection<IStoreJournalLineItem>;
 	paymentAttempts?: ICollection<IStorePaymentAttempt>;
 	entries?: ICollection<IStoreJournalEntry>;
-	lineItems?: ICollection<IStoreJournalLineItem>;
 }
 
 export const StoreJournalJournalTypeArray = [{"label":"order","value":"order"},{"label":"purchase-order","value":"purchase-order"},{"label":"sales-invoice","value":"sales-invoice"},{"label":"journal","value":"journal"},{"label":"purchase-bill","value":"purchase-bill"},{"label":"payment","value":"payment"}];
@@ -1424,7 +1479,7 @@ export const StoreJournal: IModel<IStoreJournal,any,any> = new Model<IStoreJourn
 "StoreJournal",
 ["journalID"],
 { 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","dataType":"BigInt"}],"properties":[{"name":"storeID","type":"number","dataType":"BigInt"},{"name":"dateCreated","type":"DateTime","dataType":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","dataType":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"journalType","type":"string","dataType":"AsciiChar","length":50,"default":["journalType","\"order\""]},{"name":"description","type":"string","dataType":"Char","default":["description","\"\""]},{"name":"posted","type":"boolean","dataType":"Boolean","default":["posted","false"]},{"name":"status","type":"string","dataType":"Char","length":50,"default":["status","\"\""]},{"name":"sellerID","type":"number","dataType":"BigInt"},{"name":"buyerID","type":"number","dataType":"BigInt"},{"name":"buyerBillingAddressID","type":"number","dataType":"BigInt"},{"name":"buyerShippingAddressID","type":"number","dataType":"BigInt"},{"name":"total","type":"number","dataType":"Decimal","default":["total","0"]},{"name":"balance","type":"number","dataType":"Decimal","default":["balance","0"]},{"name":"referenceID","type":"number","dataType":"BigInt"},{"name":"folderID","type":"number","dataType":"BigInt"},{"name":"taxExempt","type":"boolean","dataType":"Boolean","default":["taxExempt","false"]},{"name":"taxExemptNotes","type":"string","dataType":"Char","default":["taxExemptNotes","\"\""]},{"name":"taxExemptTaxID","type":"string","dataType":"Char","default":["taxExemptTaxID","\"\""]}],"relations":[{"name":"store","fkMap":[{"fk":"storeID","relatedKey":"folderID"}],"relatedName":"WebSiteFolder"},{"name":"seller","fkMap":[{"fk":"sellerID","relatedKey":"accountID"}],"relatedName":"StoreAccount"},{"name":"buyer","fkMap":[{"fk":"buyerID","relatedKey":"accountID"}],"relatedName":"StoreAccount"},{"name":"buyerBillingAddress","fkMap":[{"fk":"buyerBillingAddressID","relatedKey":"addressID"}],"relatedName":"StoreAccountAddress"},{"name":"buyerShippingAddress","fkMap":[{"fk":"buyerShippingAddressID","relatedKey":"addressID"}],"relatedName":"StoreAccountAddress"},{"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":"paymentAttempts","isCollection":true,"isInverse":true,"relatedName":"StorePaymentAttempt"},{"name":"entries","isCollection":true,"isInverse":true,"relatedName":"StoreJournalEntry"},{"name":"lineItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"}]}
+{"name":"store_journals","keys":[{"name":"journalID","type":"number","generated":"identity","dataType":"BigInt"}],"properties":[{"name":"storeID","type":"number","dataType":"BigInt"},{"name":"dateCreated","type":"DateTime","dataType":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","dataType":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"journalType","type":"string","dataType":"AsciiChar","length":50,"default":["journalType","\"order\""]},{"name":"description","type":"string","dataType":"Char","default":["description","\"\""]},{"name":"posted","type":"boolean","dataType":"Boolean","default":["posted","false"]},{"name":"status","type":"string","dataType":"Char","length":50,"default":["status","\"\""]},{"name":"sellerID","type":"number","dataType":"BigInt"},{"name":"buyerID","type":"number","dataType":"BigInt"},{"name":"buyerBillingAddressID","type":"number","dataType":"BigInt"},{"name":"buyerShippingAddressID","type":"number","dataType":"BigInt"},{"name":"total","type":"number","dataType":"Decimal","default":["total","0"]},{"name":"balance","type":"number","dataType":"Decimal","default":["balance","0"]},{"name":"referenceID","type":"number","dataType":"BigInt"},{"name":"folderID","type":"number","dataType":"BigInt"},{"name":"taxExempt","type":"boolean","dataType":"Boolean","default":["taxExempt","false"]},{"name":"taxExemptNotes","type":"string","dataType":"Char","default":["taxExemptNotes","\"\""]},{"name":"taxExemptTaxID","type":"string","dataType":"Char","default":["taxExemptTaxID","\"\""]}],"relations":[{"name":"store","fkMap":[{"fk":"storeID","relatedKey":"folderID"}],"relatedName":"WebSiteFolder"},{"name":"seller","fkMap":[{"fk":"sellerID","relatedKey":"accountID"}],"relatedName":"StoreAccount"},{"name":"buyer","fkMap":[{"fk":"buyerID","relatedKey":"accountID"}],"relatedName":"StoreAccount"},{"name":"buyerBillingAddress","fkMap":[{"fk":"buyerBillingAddressID","relatedKey":"addressID"}],"relatedName":"StoreAccountAddress"},{"name":"buyerShippingAddress","fkMap":[{"fk":"buyerShippingAddressID","relatedKey":"addressID"}],"relatedName":"StoreAccountAddress"},{"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":"orderCoupons","isCollection":true,"isInverse":true,"relatedName":"StoreJournalCoupon"},{"name":"lineItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"},{"name":"paymentAttempts","isCollection":true,"isInverse":true,"relatedName":"StorePaymentAttempt"},{"name":"entries","isCollection":true,"isInverse":true,"relatedName":"StoreJournalEntry"}]}
 );
 modelEntitySchemas["StoreJournal"] = StoreJournal;
 
@@ -1455,20 +1510,30 @@ export interface IStoreJournalLineItem extends IClrEntity {
 	journalID?: number;
 	itemID?: number;
 	itemPriceID?: number | null;
+	price?: number;
+	discountPercentage?: number;
+	discount?: number;
+	priceAfterDiscount?: number;
+	couponDiscount?: number;
+	quantity?: number;
 	amount?: number;
+	taxes?: number;
 	total?: number;
-	quantity?: number;
 	inclusive?: boolean;
 	itemType?: "product" | "e-product" | "shipping" | "service" | "tax" | "fee" | "commission" | "variant" | "size" | null;
 	hide?: boolean;
 	vendorID?: number | null;
 	sourceID?: number | null;
+	taxForID?: number | null;
 	journal?: IStoreJournal;
 	item?: IStoreItem;
 	itemPrice?: IStoreItemPrice;
 	vendor?: IStoreAccount;
 	source?: IStoreJournalLineItem;
 	relatedItems?: ICollection<IStoreJournalLineItem>;
+	taxFor?: IStoreJournalLineItem;
+	taxLineItems?: ICollection<IStoreJournalLineItem>;
+	coupons?: ICollection<IStoreJournalCoupon>;
 	entries?: ICollection<IStoreJournalEntry>;
 }
 
@@ -1477,8 +1542,8 @@ export const StoreJournalLineItemItemTypeArray = [{"label":"product","value":"pr
 export const StoreJournalLineItem: IModel<IStoreJournalLineItem,any,any> = 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","dataType":"BigInt"}],"properties":[{"name":"journalID","type":"number","dataType":"BigInt"},{"name":"itemID","type":"number","dataType":"BigInt"},{"name":"itemPriceID","type":"number","dataType":"BigInt"},{"name":"amount","type":"number","dataType":"Decimal","default":["amount","0"]},{"name":"total","type":"number","dataType":"Decimal","default":["total","0"]},{"name":"quantity","type":"number","dataType":"Decimal","default":["quantity","0"]},{"name":"inclusive","type":"boolean","dataType":"Boolean","default":["inclusive","false"]},{"name":"itemType","type":"string","dataType":"Char","length":50,"default":["itemType","\"product\""]},{"name":"hide","type":"boolean","dataType":"Boolean","default":["hide","false"]},{"name":"vendorID","type":"number","dataType":"BigInt"},{"name":"sourceID","type":"number","dataType":"BigInt"}],"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":"accountID"}],"relatedName":"StoreAccount"},{"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"}]}
+{ price: 0,discountPercentage: 0,discount: 0,priceAfterDiscount: 0,couponDiscount: 0,quantity: 0,amount: 0,taxes: 0,total: 0,inclusive: false,hide: false },
+{"name":"store_journal_line_items","keys":[{"name":"lineItemID","type":"number","generated":"identity","dataType":"BigInt"}],"properties":[{"name":"journalID","type":"number","dataType":"BigInt"},{"name":"itemID","type":"number","dataType":"BigInt"},{"name":"itemPriceID","type":"number","dataType":"BigInt"},{"name":"price","type":"number","dataType":"Decimal","default":["price","0"]},{"name":"discountPercentage","type":"number","dataType":"Decimal","default":["discountPercentage","0"]},{"name":"discount","type":"number","dataType":"Decimal","default":["discount","0"]},{"name":"priceAfterDiscount","type":"number","dataType":"Decimal","default":["priceAfterDiscount","0"]},{"name":"couponDiscount","type":"number","dataType":"Decimal","default":["couponDiscount","0"]},{"name":"quantity","type":"number","dataType":"Decimal","default":["quantity","0"]},{"name":"amount","type":"number","dataType":"Decimal","default":["amount","0"]},{"name":"taxes","type":"number","dataType":"Decimal","default":["taxes","0"]},{"name":"total","type":"number","dataType":"Decimal","default":["total","0"]},{"name":"inclusive","type":"boolean","dataType":"Boolean","default":["inclusive","false"]},{"name":"itemType","type":"string","dataType":"Char","length":50,"default":["itemType","\"product\""]},{"name":"hide","type":"boolean","dataType":"Boolean","default":["hide","false"]},{"name":"vendorID","type":"number","dataType":"BigInt"},{"name":"sourceID","type":"number","dataType":"BigInt"},{"name":"taxForID","type":"number","dataType":"BigInt"}],"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":"accountID"}],"relatedName":"StoreAccount"},{"name":"source","fkMap":[{"fk":"sourceID","relatedKey":"lineItemID"}],"relatedName":"StoreJournalLineItem"},{"name":"relatedItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"},{"name":"taxFor","fkMap":[{"fk":"taxForID","relatedKey":"lineItemID"}],"relatedName":"StoreJournalLineItem"},{"name":"taxLineItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"},{"name":"coupons","isCollection":true,"isInverse":true,"relatedName":"StoreJournalCoupon"},{"name":"entries","isCollection":true,"isInverse":true,"relatedName":"StoreJournalEntry"}]}
 );
 modelEntitySchemas["StoreJournalLineItem"] = StoreJournalLineItem;
 
@@ -1693,6 +1758,7 @@ export interface IWebSiteFolder extends IClrEntity {
 	storeItems?: ICollection<IStoreItem>;
 	itemFolders?: ICollection<IStoreItemFolder>;
 	storeAccounts?: ICollection<IStoreAccount>;
+	coupons?: ICollection<IStoreCoupon>;
 	journals?: ICollection<IStoreJournal>;
 	insights?: ICollection<IStoreInsight>;
 	tags?: ICollection<IStoreTag>;
@@ -1705,7 +1771,7 @@ export const WebSiteFolder: IModel<IWebSiteFolder,{"templates":"external"},any>
 "WebSiteFolder",
 ["folderID"],
 { isStatic: false,isTemplate: false,storeEnabled: false,isModified: false,snapshotStorage: 0,currency: "" },
-{"name":"web_site_folders","keys":[{"name":"folderID","type":"number","dataType":"BigInt"}],"properties":[{"name":"currentVersionID","type":"number","dataType":"BigInt"},{"name":"isStatic","type":"boolean","dataType":"Boolean","default":["isStatic","false"]},{"name":"isTemplate","type":"boolean","dataType":"Boolean","default":["isTemplate","false"]},{"name":"storeEnabled","type":"boolean","dataType":"Boolean","default":["storeEnabled","false"]},{"name":"isModified","type":"boolean","dataType":"Boolean","default":["isModified","false"]},{"name":"snapshotStorage","type":"number","dataType":"BigInt","default":["snapshotStorage","0"]},{"name":"supportEmail","type":"string","dataType":"Char","length":200,"default":["supportEmail","\"\""]},{"name":"fromEmail","type":"string","dataType":"Char","length":200,"default":["fromEmail","\"\""]},{"name":"currency","type":"string","dataType":"Char","length":10,"default":["currency","\"\""]}],"relations":[{"name":"folder","fkMap":[{"fk":"folderID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"currentVersion","fkMap":[{"fk":"currentVersionID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"activities","isCollection":true,"isInverse":true,"relatedName":"ServerActivity"},{"name":"configs","isCollection":true,"isInverse":true,"relatedName":"StoreConfig"},{"name":"storeItems","isCollection":true,"isInverse":true,"relatedName":"StoreItem"},{"name":"itemFolders","isCollection":true,"isInverse":true,"relatedName":"StoreItemFolder"},{"name":"storeAccounts","isCollection":true,"isInverse":true,"relatedName":"StoreAccount"},{"name":"journals","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"insights","isCollection":true,"isInverse":true,"relatedName":"StoreInsight"},{"name":"tags","isCollection":true,"isInverse":true,"relatedName":"StoreTag"},{"name":"hosts","isCollection":true,"isInverse":true,"relatedName":"WebSiteFolderHost"},{"name":"versions","isCollection":true,"isInverse":true,"relatedName":"WebSiteFolderVersion"},{"name":"channels","isCollection":true,"isInverse":true,"relatedName":"WebSiteChannel"}],"queries":{"templates":"external"}}
+{"name":"web_site_folders","keys":[{"name":"folderID","type":"number","dataType":"BigInt"}],"properties":[{"name":"currentVersionID","type":"number","dataType":"BigInt"},{"name":"isStatic","type":"boolean","dataType":"Boolean","default":["isStatic","false"]},{"name":"isTemplate","type":"boolean","dataType":"Boolean","default":["isTemplate","false"]},{"name":"storeEnabled","type":"boolean","dataType":"Boolean","default":["storeEnabled","false"]},{"name":"isModified","type":"boolean","dataType":"Boolean","default":["isModified","false"]},{"name":"snapshotStorage","type":"number","dataType":"BigInt","default":["snapshotStorage","0"]},{"name":"supportEmail","type":"string","dataType":"Char","length":200,"default":["supportEmail","\"\""]},{"name":"fromEmail","type":"string","dataType":"Char","length":200,"default":["fromEmail","\"\""]},{"name":"currency","type":"string","dataType":"Char","length":10,"default":["currency","\"\""]}],"relations":[{"name":"folder","fkMap":[{"fk":"folderID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"currentVersion","fkMap":[{"fk":"currentVersionID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"activities","isCollection":true,"isInverse":true,"relatedName":"ServerActivity"},{"name":"configs","isCollection":true,"isInverse":true,"relatedName":"StoreConfig"},{"name":"storeItems","isCollection":true,"isInverse":true,"relatedName":"StoreItem"},{"name":"itemFolders","isCollection":true,"isInverse":true,"relatedName":"StoreItemFolder"},{"name":"storeAccounts","isCollection":true,"isInverse":true,"relatedName":"StoreAccount"},{"name":"coupons","isCollection":true,"isInverse":true,"relatedName":"StoreCoupon"},{"name":"journals","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"insights","isCollection":true,"isInverse":true,"relatedName":"StoreInsight"},{"name":"tags","isCollection":true,"isInverse":true,"relatedName":"StoreTag"},{"name":"hosts","isCollection":true,"isInverse":true,"relatedName":"WebSiteFolderHost"},{"name":"versions","isCollection":true,"isInverse":true,"relatedName":"WebSiteFolderVersion"},{"name":"channels","isCollection":true,"isInverse":true,"relatedName":"WebSiteChannel"}],"queries":{"templates":"external"}}
 );
 modelEntitySchemas["WebSiteFolder"] = WebSiteFolder;
 

package/src/services/store/StoreItemService.ts

@@ -36,7 +36,7 @@ export default class StoreItemService {
                 x.storeItemPrices,
                 x.variantFor,
                 x.sizeFor,
-                x.taxes.forEach((t) => t.taxItem.storeItemPrices),
+                x.applicableTaxes.forEach((t) => t.taxItem.storeItemPrices),
                 x.mediaFiles.forEach((m) => m.appFile),
                 x.storeItemTags.forEach((t) => t.tag)
             ])
@@ -75,7 +75,7 @@ export default class StoreItemService {
     async save(storeItem: IStoreItem) {
         await this.entityService.save(storeItem, (c) =>
             c.include((x) => x.storeItemPrices)
-            .include((x) => x.taxes)
+            .include((x) => x.applicableTaxes)
             .include((x) => x.storeItemTags)
                 .thenInclude((x) => x.tag)
             .include((x) => x.mediaFiles)