@social-mail/social-mail-client 1.2.261 → 1.2.262

package/package.json

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

package/src/common/currency.ts

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

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

@@ -148,6 +148,7 @@ export default class ProductEditor extends AtomControl {
                 itemRenderer={(item: IStoreItemPrice) => <div>
                     <div text={item.currency}/>
                     <div text={item.amount }/>
+                    <div text={item.addonsAmount}/>
                     <div
                         title={DateFormats.withWeekDayAndTime(item.startDate)}
                         text={DateFormats.relative.short(item.startDate)}/>

package/src/model/model.ts

@@ -52,13 +52,13 @@ export interface IAppFile extends IClrEntity {
 	mailboxLogos?: ICollection<IMailbox>;
 	previewContacts?: ICollection<IContact>;
 	templates?: ICollection<IEmailTemplate>;
+	websiteFolder?: IWebSiteFolder;
+	currentVersionWebSites?: ICollection<IWebSiteFolder>;
 	stores?: ICollection<IStore>;
 	storeItems?: ICollection<IStoreItem>;
 	storeMediaFiles?: ICollection<IStoreMediaFile>;
 	storeJournals?: ICollection<IStoreJournal>;
 	userPins?: ICollection<IUserPin>;
-	websiteFolder?: IWebSiteFolder;
-	currentVersionWebSites?: ICollection<IWebSiteFolder>;
 	websiteVersions?: ICollection<IWebSiteFolderVersion>;
 }
 
@@ -68,7 +68,7 @@ export const AppFile: IModel<IAppFile> = new Model<IAppFile>(
 "AppFile",
 ["appFileID"],
 { isFolder: false,name: "",fileSize: 0,contentType: "",isDeleted: false,isShared: false,dateCreated: new DefaultFactory(() => new DateTime()) },
-{"name":"app_files","keys":[{"name":"appFileID","type":"number","generated":"identity"}],"properties":[{"name":"path","type":"string","default":["path","\"\""]},{"name":"isFolder","type":"boolean","default":["isFolder","false"]},{"name":"name","type":"string","default":["name","\"\""]},{"name":"fileSize","type":"number","default":["fileSize","0"]},{"name":"contentType","type":"string","default":["contentType","\"\""]},{"name":"contentDisposition","type":"string","default":["contentDisposition","\"attachment\""]},{"name":"contentID","type":"string","default":["contentID","\"\""]},{"name":"fileContentID","type":"number"},{"name":"creatorID","type":"number"},{"name":"parentID","type":"number"},{"name":"emailID","type":"number"},{"name":"isDeleted","type":"boolean","default":["isDeleted","false"]},{"name":"isShared","type":"boolean","default":["isShared","false"]},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"versions","type":"number","default":["versions","0"]}],"relations":[{"name":"fileContent","fkMap":[{"fk":"fileContentID","relatedKey":"fileContentID"}],"relatedName":"FileContent"},{"name":"creator","fkMap":[{"fk":"creatorID","relatedKey":"userID"}],"relatedName":"User"},{"name":"parent","fkMap":[{"fk":"parentID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"children","isCollection":true,"isInverse":true,"relatedName":"AppFile"},{"name":"email","fkMap":[{"fk":"emailID","relatedKey":"emailID"}],"relatedName":"Email"},{"name":"fileVersions","isCollection":true,"isInverse":true,"relatedName":"AppFileVersion"},{"name":"folderVersions","isCollection":true,"isInverse":true,"relatedName":"AppFileVersion"},{"name":"accessList","isCollection":true,"isInverse":true,"relatedName":"AppFileAccess"},{"name":"tags","isCollection":true,"isInverse":true,"relatedName":"AppFileTag"},{"name":"mailboxLogos","isCollection":true,"isInverse":true,"relatedName":"Mailbox"},{"name":"previewContacts","isCollection":true,"isInverse":true,"relatedName":"Contact"},{"name":"templates","isCollection":true,"isInverse":true,"relatedName":"EmailTemplate"},{"name":"stores","isCollection":true,"isInverse":true,"relatedName":"Store"},{"name":"storeItems","isCollection":true,"isInverse":true,"relatedName":"StoreItem"},{"name":"storeMediaFiles","isCollection":true,"isInverse":true,"relatedName":"StoreMediaFile"},{"name":"storeJournals","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"userPins","isCollection":true,"isInverse":true,"relatedName":"UserPin"},{"name":"websiteFolder","isCollection":false,"isInverse":true,"relatedName":"WebSiteFolder"},{"name":"currentVersionWebSites","isCollection":true,"isInverse":true,"relatedName":"WebSiteFolder"},{"name":"websiteVersions","isCollection":true,"isInverse":true,"relatedName":"WebSiteFolderVersion"}]}
+{"name":"app_files","keys":[{"name":"appFileID","type":"number","generated":"identity"}],"properties":[{"name":"path","type":"string","default":["path","\"\""]},{"name":"isFolder","type":"boolean","default":["isFolder","false"]},{"name":"name","type":"string","default":["name","\"\""]},{"name":"fileSize","type":"number","default":["fileSize","0"]},{"name":"contentType","type":"string","default":["contentType","\"\""]},{"name":"contentDisposition","type":"string","default":["contentDisposition","\"attachment\""]},{"name":"contentID","type":"string","default":["contentID","\"\""]},{"name":"fileContentID","type":"number"},{"name":"creatorID","type":"number"},{"name":"parentID","type":"number"},{"name":"emailID","type":"number"},{"name":"isDeleted","type":"boolean","default":["isDeleted","false"]},{"name":"isShared","type":"boolean","default":["isShared","false"]},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"versions","type":"number","default":["versions","0"]}],"relations":[{"name":"fileContent","fkMap":[{"fk":"fileContentID","relatedKey":"fileContentID"}],"relatedName":"FileContent"},{"name":"creator","fkMap":[{"fk":"creatorID","relatedKey":"userID"}],"relatedName":"User"},{"name":"parent","fkMap":[{"fk":"parentID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"children","isCollection":true,"isInverse":true,"relatedName":"AppFile"},{"name":"email","fkMap":[{"fk":"emailID","relatedKey":"emailID"}],"relatedName":"Email"},{"name":"fileVersions","isCollection":true,"isInverse":true,"relatedName":"AppFileVersion"},{"name":"folderVersions","isCollection":true,"isInverse":true,"relatedName":"AppFileVersion"},{"name":"accessList","isCollection":true,"isInverse":true,"relatedName":"AppFileAccess"},{"name":"tags","isCollection":true,"isInverse":true,"relatedName":"AppFileTag"},{"name":"mailboxLogos","isCollection":true,"isInverse":true,"relatedName":"Mailbox"},{"name":"previewContacts","isCollection":true,"isInverse":true,"relatedName":"Contact"},{"name":"templates","isCollection":true,"isInverse":true,"relatedName":"EmailTemplate"},{"name":"websiteFolder","isCollection":false,"isInverse":true,"relatedName":"WebSiteFolder"},{"name":"currentVersionWebSites","isCollection":true,"isInverse":true,"relatedName":"WebSiteFolder"},{"name":"stores","isCollection":true,"isInverse":true,"relatedName":"Store"},{"name":"storeItems","isCollection":true,"isInverse":true,"relatedName":"StoreItem"},{"name":"storeMediaFiles","isCollection":true,"isInverse":true,"relatedName":"StoreMediaFile"},{"name":"storeJournals","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"userPins","isCollection":true,"isInverse":true,"relatedName":"UserPin"},{"name":"websiteVersions","isCollection":true,"isInverse":true,"relatedName":"WebSiteFolderVersion"}]}
 );
 modelEntitySchemas["AppFile"] = AppFile;
 
@@ -351,16 +351,19 @@ modelEntitySchemas["CachedItem"] = CachedItem;
 export interface IDomain extends IClrEntity {
 	readonly domainID?: number;
 	name?: string;
+	received?: number;
+	failed?: number;
 	emailAddresses?: ICollection<IEmailAddress>;
 	hostedDomain?: IHostedDomain;
 	contactDomains?: ICollection<IContactDomain>;
+	activities?: ICollection<IServerActivity>;
 }
 
 export const Domain: IModel<IDomain> = new Model<IDomain>(
 "Domain",
 ["domainID"],
-{ name: "" },
-{"name":"domains","keys":[{"name":"domainID","type":"number","generated":"identity"}],"properties":[{"name":"name","type":"string","default":["name","\"\""]}],"relations":[{"name":"emailAddresses","isCollection":true,"isInverse":true,"relatedName":"EmailAddress"},{"name":"hostedDomain","isCollection":false,"isInverse":true,"relatedName":"HostedDomain"},{"name":"contactDomains","isCollection":true,"isInverse":true,"relatedName":"ContactDomain"}]}
+{ name: "",received: 0,failed: 0 },
+{"name":"domains","keys":[{"name":"domainID","type":"number","generated":"identity"}],"properties":[{"name":"name","type":"string","default":["name","\"\""]},{"name":"received","type":"number","default":["received","0"]},{"name":"failed","type":"number","default":["failed","0"]}],"relations":[{"name":"emailAddresses","isCollection":true,"isInverse":true,"relatedName":"EmailAddress"},{"name":"hostedDomain","isCollection":false,"isInverse":true,"relatedName":"HostedDomain"},{"name":"contactDomains","isCollection":true,"isInverse":true,"relatedName":"ContactDomain"},{"name":"activities","isCollection":true,"isInverse":true,"relatedName":"ServerActivity"}]}
 );
 modelEntitySchemas["Domain"] = Domain;
 
@@ -631,6 +634,8 @@ export interface IMailbox extends IClrEntity {
 	maxStorage?: number;
 	indexAttachments?: boolean;
 	indexImageAttachments?: boolean;
+	readonly unreplied?: number;
+	readonly unread?: number;
 	logoID?: number | null;
 	description?: string | null;
 	dateCreated?: DateTime;
@@ -663,8 +668,8 @@ export interface IMailbox extends IClrEntity {
 export const Mailbox: IModel<IMailbox> = new Model<IMailbox>(
 "Mailbox",
 ["mailboxID"],
-{ storage: 0,maxStorage: 0,indexAttachments: false,indexImageAttachments: false,dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()),isChannel: false,isPrivateChannel: false,requireApproval: false,subscriberCount: 0 },
-{"name":"mailboxes","keys":[{"name":"mailboxID","type":"number"}],"properties":[{"name":"domainID","type":"number"},{"name":"storage","type":"number","default":["storage","0"]},{"name":"maxStorage","type":"number","default":["maxStorage","0"]},{"name":"indexAttachments","type":"boolean","default":["indexAttachments","false"]},{"name":"indexImageAttachments","type":"boolean","default":["indexImageAttachments","false"]},{"name":"firstID","type":"number","default":["firstID","0"]},{"name":"recentID","type":"number","default":["recentID","0"]},{"name":"logoID","type":"number"},{"name":"description","type":"string","default":["description","\"\""]},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"isChannel","type":"boolean","default":["isChannel","false"]},{"name":"isPrivateChannel","type":"boolean","default":["isPrivateChannel","false"]},{"name":"requireApproval","type":"boolean","default":["requireApproval","false"]},{"name":"subscriberCount","type":"number","default":["subscriberCount","0"]},{"name":"datePublished","type":"DateTime","default":["datePublished","new DefaultFactory(() => new DateTime())"]},{"name":"dateEngaged","type":"DateTime","default":["dateEngaged","new DefaultFactory(() => new DateTime())"]},{"name":"parentID","type":"number","default":["parentID","0"]}],"relations":[{"name":"emailAddress","fkMap":[{"fk":"mailboxID","relatedKey":"emailAddressID"}],"relatedName":"EmailAddress"},{"name":"domain","fkMap":[{"fk":"domainID","relatedKey":"domainID"}],"relatedName":"HostedDomain"},{"name":"logo","fkMap":[{"fk":"logoID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"contacts","isCollection":true,"isInverse":true,"relatedName":"Contact"},{"name":"templates","isCollection":true,"isInverse":true,"relatedName":"EmailTemplate"},{"name":"emails","isCollection":true,"isInverse":true,"relatedName":"MailboxEmail"},{"name":"mailboxContacts","isCollection":true,"isInverse":true,"relatedName":"MailboxContact"},{"name":"threadEmails","isCollection":true,"isInverse":true,"relatedName":"MailboxContactEmail"},{"name":"syncTargets","isCollection":true,"isInverse":true,"relatedName":"MailboxSyncTarget"},{"name":"channelConfig","isCollection":false,"isInverse":true,"relatedName":"ChannelConfig"},{"name":"subscriberActivities","isCollection":true,"isInverse":true,"relatedName":"SubscriberActivity"},{"name":"userPins","isCollection":true,"isInverse":true,"relatedName":"UserPin"},{"name":"userMailboxes","isCollection":true,"isInverse":true,"relatedName":"UserMailbox"},{"name":"websiteChannels","isCollection":true,"isInverse":true,"relatedName":"WebSiteChannel"}]}
+{ storage: 0,maxStorage: 0,indexAttachments: false,indexImageAttachments: false,unreplied: 0,unread: 0,dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()),isChannel: false,isPrivateChannel: false,requireApproval: false,subscriberCount: 0 },
+{"name":"mailboxes","keys":[{"name":"mailboxID","type":"number"}],"properties":[{"name":"domainID","type":"number"},{"name":"storage","type":"number","default":["storage","0"]},{"name":"maxStorage","type":"number","default":["maxStorage","0"]},{"name":"indexAttachments","type":"boolean","default":["indexAttachments","false"]},{"name":"indexImageAttachments","type":"boolean","default":["indexImageAttachments","false"]},{"name":"firstID","type":"number","default":["firstID","0"]},{"name":"recentID","type":"number","default":["recentID","0"]},{"name":"unreplied","type":"number","default":["unreplied","0"]},{"name":"unread","type":"number","default":["unread","0"]},{"name":"logoID","type":"number"},{"name":"description","type":"string","default":["description","\"\""]},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"isChannel","type":"boolean","default":["isChannel","false"]},{"name":"isPrivateChannel","type":"boolean","default":["isPrivateChannel","false"]},{"name":"requireApproval","type":"boolean","default":["requireApproval","false"]},{"name":"subscriberCount","type":"number","default":["subscriberCount","0"]},{"name":"datePublished","type":"DateTime","default":["datePublished","new DefaultFactory(() => new DateTime())"]},{"name":"dateEngaged","type":"DateTime","default":["dateEngaged","new DefaultFactory(() => new DateTime())"]},{"name":"parentID","type":"number","default":["parentID","0"]}],"relations":[{"name":"emailAddress","fkMap":[{"fk":"mailboxID","relatedKey":"emailAddressID"}],"relatedName":"EmailAddress"},{"name":"domain","fkMap":[{"fk":"domainID","relatedKey":"domainID"}],"relatedName":"HostedDomain"},{"name":"logo","fkMap":[{"fk":"logoID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"contacts","isCollection":true,"isInverse":true,"relatedName":"Contact"},{"name":"templates","isCollection":true,"isInverse":true,"relatedName":"EmailTemplate"},{"name":"emails","isCollection":true,"isInverse":true,"relatedName":"MailboxEmail"},{"name":"mailboxContacts","isCollection":true,"isInverse":true,"relatedName":"MailboxContact"},{"name":"threadEmails","isCollection":true,"isInverse":true,"relatedName":"MailboxContactEmail"},{"name":"syncTargets","isCollection":true,"isInverse":true,"relatedName":"MailboxSyncTarget"},{"name":"channelConfig","isCollection":false,"isInverse":true,"relatedName":"ChannelConfig"},{"name":"subscriberActivities","isCollection":true,"isInverse":true,"relatedName":"SubscriberActivity"},{"name":"userPins","isCollection":true,"isInverse":true,"relatedName":"UserPin"},{"name":"userMailboxes","isCollection":true,"isInverse":true,"relatedName":"UserMailbox"},{"name":"websiteChannels","isCollection":true,"isInverse":true,"relatedName":"WebSiteChannel"}]}
 );
 modelEntitySchemas["Mailbox"] = Mailbox;
 
@@ -690,6 +695,7 @@ export interface IMailboxContact extends IClrEntity {
 	dateCreated?: DateTime;
 	dateUpdated?: DateTime;
 	unread?: number;
+	readonly replied?: DateTime | null;
 	total?: number;
 	doNotIndex?: boolean | null;
 	doNotIndexAttachments?: boolean | null;
@@ -714,7 +720,7 @@ export const MailboxContact: IModel<IMailboxContact> = new Model<IMailboxContact
 "MailboxContact",
 ["mailboxID","emailAddressID"],
 { dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()),unread: 0,total: 0,isOwner: false,canContribute: false,priority: 0,blocked: false,mute: false,status: "invited" },
-{"name":"mailbox_contacts","keys":[{"name":"mailboxID","type":"number"},{"name":"emailAddressID","type":"number"}],"properties":[{"name":"lastEmailID","type":"number"},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"unread","type":"number","default":["unread","0"]},{"name":"total","type":"number","default":["total","0"]},{"name":"doNotIndex","type":"boolean","default":["doNotIndex","false"]},{"name":"doNotIndexAttachments","type":"boolean","default":["doNotIndexAttachments","false"]},{"name":"isOwner","type":"boolean","default":["isOwner","false"]},{"name":"canContribute","type":"boolean","default":["canContribute","false"]},{"name":"priority","type":"number","default":["priority","0"]},{"name":"blocked","type":"boolean","default":["blocked","false"]},{"name":"mute","type":"boolean","default":["mute","false"]},{"name":"status","type":"string","default":["status","\"invited\""]}],"relations":[{"name":"mailbox","fkMap":[{"fk":"mailboxID","relatedKey":"mailboxID"}],"relatedName":"Mailbox"},{"name":"emailAddress","fkMap":[{"fk":"emailAddressID","relatedKey":"emailAddressID"}],"relatedName":"EmailAddress"},{"name":"lastEmail","fkMap":[{"fk":"lastEmailID","relatedKey":"emailID"}],"relatedName":"Email"},{"name":"tags","isCollection":true,"isInverse":true,"relatedName":"MailboxContactTag"}]}
+{"name":"mailbox_contacts","keys":[{"name":"mailboxID","type":"number"},{"name":"emailAddressID","type":"number"}],"properties":[{"name":"lastEmailID","type":"number"},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"unread","type":"number","default":["unread","0"]},{"name":"replied","type":"DateTime","default":["replied","new DefaultFactory(() => new DateTime())"]},{"name":"total","type":"number","default":["total","0"]},{"name":"doNotIndex","type":"boolean","default":["doNotIndex","false"]},{"name":"doNotIndexAttachments","type":"boolean","default":["doNotIndexAttachments","false"]},{"name":"isOwner","type":"boolean","default":["isOwner","false"]},{"name":"canContribute","type":"boolean","default":["canContribute","false"]},{"name":"priority","type":"number","default":["priority","0"]},{"name":"blocked","type":"boolean","default":["blocked","false"]},{"name":"mute","type":"boolean","default":["mute","false"]},{"name":"status","type":"string","default":["status","\"invited\""]}],"relations":[{"name":"mailbox","fkMap":[{"fk":"mailboxID","relatedKey":"mailboxID"}],"relatedName":"Mailbox"},{"name":"emailAddress","fkMap":[{"fk":"emailAddressID","relatedKey":"emailAddressID"}],"relatedName":"EmailAddress"},{"name":"lastEmail","fkMap":[{"fk":"lastEmailID","relatedKey":"emailID"}],"relatedName":"Email"},{"name":"tags","isCollection":true,"isInverse":true,"relatedName":"MailboxContactTag"}]}
 );
 modelEntitySchemas["MailboxContact"] = MailboxContact;
 
@@ -870,6 +876,27 @@ export const SearchWordIndex: IModel<ISearchWordIndex> = new Model<ISearchWordIn
 );
 modelEntitySchemas["SearchWordIndex"] = SearchWordIndex;
 
+export interface IServerActivity extends IClrEntity {
+	readonly activityID?: number;
+	domainID?: number | null;
+	webSiteFolderID?: number | null;
+	dateCreated?: DateTime;
+	ipAddress?: string;
+	activity?: "visit" | "rcpt-not-found" | "mail-received";
+	domain?: IDomain;
+	webSite?: IWebSiteFolder;
+}
+
+export const ServerActivityActivityArray = [{"label":"visit","value":"visit"},{"label":"rcpt-not-found","value":"rcpt-not-found"},{"label":"mail-received","value":"mail-received"}];
+
+export const ServerActivity: IModel<IServerActivity> = new Model<IServerActivity>(
+"ServerActivity",
+["activityID"],
+{ dateCreated: new DefaultFactory(() => new DateTime()),ipAddress: "",activity: "visit" },
+{"name":"server_activities","keys":[{"name":"activityID","type":"number","generated":"identity"}],"properties":[{"name":"domainID","type":"number"},{"name":"webSiteFolderID","type":"number"},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"ipAddress","type":"string","default":["ipAddress","\"\""]},{"name":"activity","type":"string","default":["activity","\"visit\""]}],"relations":[{"name":"domain","fkMap":[{"fk":"domainID","relatedKey":"domainID"}],"relatedName":"Domain"},{"name":"webSite","fkMap":[{"fk":"webSiteFolderID","relatedKey":"folderID"}],"relatedName":"WebSiteFolder"}]}
+);
+modelEntitySchemas["ServerActivity"] = ServerActivity;
+
 export interface IStore extends IClrEntity {
 	readonly storeID?: number;
 	name?: string;
@@ -942,6 +969,8 @@ export interface IStoreItem extends IClrEntity {
 	dateCreated?: DateTime;
 	dateUpdated?: DateTime;
 	vendorID?: number | null;
+	readonly price?: number;
+	readonly maxPrice?: number;
 	signed?: string;
 	store?: IStore;
 	itemFolder?: IStoreItemFolder;
@@ -965,8 +994,8 @@ export const StoreItemItemTypeArray = [{"label":"product","value":"product"},{"l
 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()) },
-{"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"}],"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: "",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"}]}
 );
 modelEntitySchemas["StoreItem"] = StoreItem;
 
@@ -1000,6 +1029,7 @@ export interface IStoreItemPrice extends IClrEntity {
 	amount?: number;
 	maxAmount?: number | null;
 	active?: boolean;
+	addonsAmount?: number;
 	storeItem?: IStoreItem;
 	addons?: ICollection<IStorePriceAddOn>;
 	lineItems?: ICollection<IStoreJournalLineItem>;
@@ -1008,8 +1038,8 @@ export interface IStoreItemPrice extends IClrEntity {
 export const StoreItemPrice: IModel<IStoreItemPrice> = new Model<IStoreItemPrice>(
 "StoreItemPrice",
 ["priceID"],
-{ 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":"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,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"}]}
 );
 modelEntitySchemas["StoreItemPrice"] = StoreItemPrice;
 
@@ -1347,6 +1377,7 @@ export interface IWebSiteFolder extends IClrEntity {
 	isModified?: boolean;
 	folder?: IAppFile;
 	currentVersion?: IAppFile;
+	activities?: ICollection<IServerActivity>;
 	hosts?: ICollection<IWebSiteFolderHost>;
 	versions?: ICollection<IWebSiteFolderVersion>;
 	channels?: ICollection<IWebSiteChannel>;
@@ -1357,7 +1388,7 @@ export const WebSiteFolder: IModel<IWebSiteFolder> = new Model<IWebSiteFolder>(
 "WebSiteFolder",
 ["folderID"],
 { isStatic: false,isTemplate: false,isModified: false },
-{"name":"web_site_folders","keys":[{"name":"folderID","type":"number"}],"properties":[{"name":"currentVersionID","type":"number"},{"name":"isStatic","type":"boolean","default":["isStatic","false"]},{"name":"isTemplate","type":"boolean","default":["isTemplate","false"]},{"name":"isModified","type":"boolean","default":["isModified","false"]}],"relations":[{"name":"folder","fkMap":[{"fk":"folderID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"currentVersion","fkMap":[{"fk":"currentVersionID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"hosts","isCollection":true,"isInverse":true,"relatedName":"WebSiteFolderHost"},{"name":"versions","isCollection":true,"isInverse":true,"relatedName":"WebSiteFolderVersion"},{"name":"channels","isCollection":true,"isInverse":true,"relatedName":"WebSiteChannel"},{"name":"websiteStores","isCollection":true,"isInverse":true,"relatedName":"WebSiteStore"}]}
+{"name":"web_site_folders","keys":[{"name":"folderID","type":"number"}],"properties":[{"name":"currentVersionID","type":"number"},{"name":"isStatic","type":"boolean","default":["isStatic","false"]},{"name":"isTemplate","type":"boolean","default":["isTemplate","false"]},{"name":"isModified","type":"boolean","default":["isModified","false"]}],"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":"hosts","isCollection":true,"isInverse":true,"relatedName":"WebSiteFolderHost"},{"name":"versions","isCollection":true,"isInverse":true,"relatedName":"WebSiteFolderVersion"},{"name":"channels","isCollection":true,"isInverse":true,"relatedName":"WebSiteChannel"},{"name":"websiteStores","isCollection":true,"isInverse":true,"relatedName":"WebSiteStore"}]}
 );
 modelEntitySchemas["WebSiteFolder"] = WebSiteFolder;
 

package/src/public/store/StoreItemDetailView.tsx

@@ -11,7 +11,7 @@ import Bind from "@web-atoms/core/dist/core/Bind";
 import Action from "@web-atoms/core/dist/view-model/Action";
 import styled from "@web-atoms/core/dist/style/styled";
 import FetchBuilder from "@web-atoms/core/dist/services/FetchBuilder";
-import { formatCurrency } from "../../common/currency";
+import { formatCurrency, formatPrice } from "../../common/currency";
 
 const url = (window as any).pageUrl as URL;
 
@@ -103,7 +103,6 @@ export default class StoreItemDetailView extends AtomControl {
         const specifications = this.model.mediaFiles.find((x) => x.title === "specs.html");
 
         const price = this.model.storeItemPrices[0];
-        const sellPrice = price.amount;
         const maxPrice = price.maxAmount ? price.maxAmount : ( Math.ceil(price.amount * 1.1));
 
         const [offerHtml, specHtml] = await Promise.all([
@@ -141,7 +140,7 @@ export default class StoreItemDetailView extends AtomControl {
                     {this.model.description}
                 </p>
                 <p>
-                    <label text={ formatCurrency(sellPrice, price.currency) }/>
+                    <label text={ formatPrice(price) }/>
                 </p>
                 <button>Buy</button>
             </section>

package/src/public/store/StoreItemListView.tsx

@@ -181,7 +181,6 @@ export default class StoreItemListView extends AtomControl {
         for (const item of items.items) {
             item.storeItemTags?.sort((a, b) => a.sortOrder - b.sortOrder);
         }
-        
         return items;
     }
 }