@social-mail/social-mail-client 1.2.641 → 1.2.642

package/src/common/controls/phone-editor/PhoneEditor.tsx

@@ -1,12 +1,35 @@
 import XNode from "@web-atoms/core/dist/core/XNode";
 import { AtomControl } from "@web-atoms/core/dist/web/controls/AtomControl";
-import { CountrySelect } from "../countries/CountrySelect";
+import { CountrySelect, formatForCountry, isdForCountry } from "../countries/CountrySelect";
+import Bind from "@web-atoms/core/dist/core/Bind";
+import MaskedInput from "@web-atoms/web-controls/dist/basic/MaskedInput";
 
 export default class PhoneEditor extends AtomControl {
+
+    country: any;
+
+    phoneNumberText: any;
+
+    value: any;
+
     protected preCreate(): void {
+        this.country = "IN";
+        this.phoneNumberText = "";
+        this.value = null;
         this.render(<div data-layout="row">
             <CountrySelect
+                value={Bind.twoWaysImmediate(() => this.country)}
+                />
+            <MaskedInput
+                data-mask={Bind.oneWayAsync(() => formatForCountry(this.country))}
+                value={Bind.twoWaysImmediate(() => this.phoneNumberText)}
                 />
         </div>);
+
+        this.bindEvent(this.element, "input", async () => {
+            const isdCode = await isdForCountry(this.country);
+            const phoneNumber = this.phoneNumberText.replace(/[^0-9]/g,"");
+            this.value = isdCode.startsWith("+") ? isdCode + phoneNumber: `+${isdCode}${phoneNumber}`;
+        });
     }
 }

package/src/common/pages/stores/StoreDetailPage.tsx

@@ -44,7 +44,7 @@ export default class StoreDetailPage extends ContentPage<{ id: any }> {
                     text="Products"
                     />
                 <a data-click-event="route"
-                    href={CommonCommands.editConfig.displayRoute({ storeID: this.parameters.id})}
+                    href={CommonCommands.paymentConfig.displayRoute({ storeID: this.parameters.id})}
                     text="Settings"
                     ></a>
                 <a data-click-event="route"

package/src/common/pages/stores/payment-gateway/PaymentGatewayEditorPage.tsx

@@ -0,0 +1,62 @@
+import { ContentPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
+import { IStoreLedger, StoreLedgerPaymentGatewayArray } from "../../../../model/model";
+import XNode from "@web-atoms/core/dist/core/XNode";
+import Form from "@web-atoms/web-controls/dist/basic/Form";
+import FormField from "@web-atoms/web-controls/dist/basic/FormField";
+import Bind from "@web-atoms/core/dist/core/Bind";
+import Select from "@web-atoms/web-controls/dist/basic/Select";
+import { SaveIconTextButton } from "../../../controls/buttons/IconButton";
+import Action from "@web-atoms/core/dist/view-model/Action";
+import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
+import EntityService from "../../../../services/EntityService";
+
+export default class PaymentGatewayEditorPage extends ContentPage<IStoreLedger> {
+
+    model: IStoreLedger;
+
+    @InjectProperty
+    entityService: EntityService;
+
+    async init() {
+
+        this.title = "Payment Gateway";
+
+        this.model = this.parameters;
+
+        this.renderer = <div>
+            <Form>
+                <FormField label="Type">
+                    <Select
+                        items={StoreLedgerPaymentGatewayArray}
+                        value={Bind.twoWaysImmediate(() => this.model.paymentGateway)}
+                        />
+                </FormField>
+                <FormField label="Name">
+                    <input value={Bind.twoWaysImmediate(() => this.model.name)}/>
+                </FormField>
+                <FormField label="Description">
+                    <input value={Bind.twoWaysImmediate(() => this.model.description)}/>
+                </FormField>
+                <FormField label="MerchantID">
+                    <input value={Bind.twoWaysImmediate(() => this.model.merchantID)}/>
+                </FormField>
+                <FormField label="Username/Access ID/Key Index">
+                    <input value={Bind.twoWaysImmediate(() => this.model.username)}/>
+                </FormField>
+                <FormField label="Password/Secret/Key">
+                    <input value={Bind.twoWaysImmediate(() => this.model.password)}/>
+                </FormField>
+                <div data-layout="sticky-command-row">
+                    <SaveIconTextButton data-submit-event="submitForm" />
+                </div>
+            </Form>
+        </div>;
+    }
+
+    @Action({ onEvent: "submitForm", close: true })
+    async submitForm() {
+        await this.entityService.save(this.model, (c) => c);
+        return this.model;
+    }
+
+}

package/src/common/pages/stores/payment-gateway/PaymentGatewayListPage.tsx

@@ -0,0 +1,94 @@
+import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
+import XNode from "@web-atoms/core/dist/core/XNode";
+import { Inject } from "@web-atoms/core/dist/di/Inject";
+import AtomRepeater from "@web-atoms/web-controls/dist/basic/AtomRepeater";
+import MasterDetailPage from "@web-atoms/web-controls/dist/mobile-app/MasterDetailPage";
+import EntityService from "../../../../services/EntityService";
+import InfiniteRepeater from "../../../controls/repeater/InfiniteRepeater";
+import { IStoreLedger, StoreLedger } from "../../../../model/model";
+import Bind from "@web-atoms/core/dist/core/Bind";
+import { Sql } from "../../../Sql";
+import Action from "@web-atoms/core/dist/view-model/Action";
+import PageNavigator from "@web-atoms/web-controls/dist/PageNavigator";
+import PaymentGatewayEditorPage from "./PaymentGatewayEditorPage";
+import { AddIconButton, AddIconTextButton } from "../../../controls/buttons/IconButton";
+
+export default class PaymentGatewayListPage extends MasterDetailPage {
+
+    parameters: { storeID };
+
+    @InjectProperty
+    entityService: EntityService;
+
+    search: string = "";
+
+    items: IStoreLedger[] = [];
+
+    repeater: AtomRepeater;
+
+    async init() {
+
+        this.headerRenderer = () => <div>
+            <input type="search" value={Bind.twoWaysImmediate(() => this.search)}/>
+        </div>;
+
+        this.renderer = <div>
+            <AtomRepeater
+                data-layout="data-grid"
+                data-selection-updated-event="itemSelected"
+                data-items-updated-event="itemsLoaded"
+                presenter={Bind.presenter((c) => this.repeater = c)}
+                items={this.items}
+                { ... InfiniteRepeater.pagedItems((start) => (c, e, cancelToken) => this.load({ start, search: this.search, cancelToken }))}
+                itemRenderer={(x: IStoreLedger) => <div>
+                    <label text={x.ledgerID}/>
+                    <label text={x.paymentGateway}/>
+                    <label text={x.name}/>
+                </div>}
+                />
+        </div>;
+
+        this.footerRenderer = () => <div>
+            <AddIconTextButton data-click-event="addItem" />
+        </div>;
+    }
+
+    load( { start, cancelToken, search } ) {
+        const { storeID } = this.parameters;
+        let q = this.entityService.query(StoreLedger)
+            .where({ storeID }, (p) => (x) => x.storeID === p.storeID && x.paymentGateway !== null);
+        if (search) {
+            q = q.where({ search }, (p) => (x) => Sql.text.iLike(x.description, p.search));
+        }
+        return q.toPagedList({
+            start,
+            cancelToken
+        });
+    }
+
+    @Action({ onEvent: "itemSelected"})
+    itemSelected() {
+        const data = this.repeater.selectedItem;
+        if (!data) {
+            return;
+        }
+        this.openDetail(PaymentGatewayEditorPage, data);
+    }
+
+    @Action({ onEvent: "itemsLoaded"})
+    itemsLoaded() {
+        this.repeater.selectedItem = this.items[0];
+    }
+
+    @Action({ onEvent: "addItem"})
+    addItem() {
+        const { storeID } = this.parameters;
+        const item = StoreLedger.create({
+            storeID,
+            head: "Income"
+        });
+        this.items.add(item);
+        this.repeater.selectedItem = item;
+    }
+
+}

package/src/model/model.ts

@@ -57,8 +57,8 @@ export interface IAppFile extends IClrEntity {
 	currentVersionWebSites?: ICollection<IWebSiteFolder>;
 	stores?: ICollection<IStore>;
 	storeItems?: ICollection<IStoreItem>;
-	storeMediaFiles?: ICollection<IStoreMediaFile>;
 	storeJournals?: ICollection<IStoreJournal>;
+	storeMediaFiles?: ICollection<IStoreMediaFile>;
 	userPins?: ICollection<IUserPin>;
 	websiteVersions?: ICollection<IWebSiteFolderVersion>;
 }
@@ -69,7 +69,7 @@ export const AppFile: IModel<IAppFile,{"storeItemFiles":"external","channelEmail
 "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","dataType":"BigInt"}],"properties":[{"name":"path","type":"string","dataType":"AsciiChar","length":400,"default":["path","\"\""]},{"name":"isFolder","type":"boolean","dataType":"Boolean","default":["isFolder","false"]},{"name":"name","type":"string","dataType":"Char","length":400,"default":["name","\"\""]},{"name":"fileSize","type":"number","dataType":"BigInt","default":["fileSize","0"]},{"name":"contentType","type":"string","dataType":"Char","length":200,"default":["contentType","\"\""]},{"name":"contentDisposition","type":"string","dataType":"AsciiChar","length":10,"default":["contentDisposition","\"attachment\""]},{"name":"contentID","type":"string","dataType":"Char","default":["contentID","\"\""]},{"name":"fileContentID","type":"number","dataType":"BigInt"},{"name":"creatorID","type":"number","dataType":"BigInt"},{"name":"parentID","type":"number","dataType":"BigInt"},{"name":"emailID","type":"number","dataType":"BigInt"},{"name":"isDeleted","type":"boolean","dataType":"Boolean","default":["isDeleted","false"]},{"name":"isShared","type":"boolean","dataType":"Boolean","default":["isShared","false"]},{"name":"dateCreated","type":"DateTime","dataType":"DateTimeOffset","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","dataType":"DateTimeOffset","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"versions","type":"number","dataType":"Int","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"}],"queries":{"storeItemFiles":"external","channelEmailFiles":"external","children":"external","templateSnapshot":"external"}}
+{"name":"app_files","keys":[{"name":"appFileID","type":"number","generated":"identity","dataType":"BigInt"}],"properties":[{"name":"path","type":"string","dataType":"AsciiChar","length":400,"default":["path","\"\""]},{"name":"isFolder","type":"boolean","dataType":"Boolean","default":["isFolder","false"]},{"name":"name","type":"string","dataType":"Char","length":400,"default":["name","\"\""]},{"name":"fileSize","type":"number","dataType":"BigInt","default":["fileSize","0"]},{"name":"contentType","type":"string","dataType":"Char","length":200,"default":["contentType","\"\""]},{"name":"contentDisposition","type":"string","dataType":"AsciiChar","length":10,"default":["contentDisposition","\"attachment\""]},{"name":"contentID","type":"string","dataType":"Char","default":["contentID","\"\""]},{"name":"fileContentID","type":"number","dataType":"BigInt"},{"name":"creatorID","type":"number","dataType":"BigInt"},{"name":"parentID","type":"number","dataType":"BigInt"},{"name":"emailID","type":"number","dataType":"BigInt"},{"name":"isDeleted","type":"boolean","dataType":"Boolean","default":["isDeleted","false"]},{"name":"isShared","type":"boolean","dataType":"Boolean","default":["isShared","false"]},{"name":"dateCreated","type":"DateTime","dataType":"DateTimeOffset","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","dataType":"DateTimeOffset","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"versions","type":"number","dataType":"Int","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":"storeJournals","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"storeMediaFiles","isCollection":true,"isInverse":true,"relatedName":"StoreMediaFile"},{"name":"userPins","isCollection":true,"isInverse":true,"relatedName":"UserPin"},{"name":"websiteVersions","isCollection":true,"isInverse":true,"relatedName":"WebSiteFolderVersion"}],"queries":{"storeItemFiles":"external","channelEmailFiles":"external","children":"external","templateSnapshot":"external"}}
 );
 modelEntitySchemas["AppFile"] = AppFile;
 
@@ -223,9 +223,9 @@ export interface IContact extends IClrEntity {
 	domains?: ICollection<IContactDomain>;
 	sellerStores?: ICollection<IStore>;
 	vendorItems?: ICollection<IStoreItem>;
-	ledgers?: ICollection<IStoreLedger>;
 	soldInvoices?: ICollection<IStoreJournal>;
 	boughtInvoices?: ICollection<IStoreJournal>;
+	ledgers?: ICollection<IStoreLedger>;
 	soldItems?: ICollection<IStoreJournalLineItem>;
 }
 
@@ -233,7 +233,7 @@ export const Contact: IModel<IContact,any,any> = new Model<IContact>(
 "Contact",
 ["contactID"],
 { name: "",type: "",dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()) },
-{"name":"contacts","keys":[{"name":"contactID","type":"number","generated":"identity","dataType":"BigInt"}],"properties":[{"name":"externalID","type":"string","dataType":"Char","length":400,"default":["externalID","\"\""]},{"name":"userID","type":"number","dataType":"BigInt"},{"name":"mailboxID","type":"number","dataType":"BigInt"},{"name":"domainID","type":"number","dataType":"BigInt"},{"name":"name","type":"string","dataType":"Char","length":200,"default":["name","\"\""]},{"name":"description","type":"string","dataType":"Char","length":200,"default":["description","\"\""]},{"name":"companyID","type":"string","dataType":"Char","length":200,"default":["companyID","\"\""]},{"name":"salesTaxID","type":"string","dataType":"Char","length":200,"default":["salesTaxID","\"\""]},{"name":"gstTaxID","type":"string","dataType":"Char","length":200,"default":["gstTaxID","\"\""]},{"name":"vatTaxID","type":"string","dataType":"Char","length":200,"default":["vatTaxID","\"\""]},{"name":"incomeTaxID","type":"string","dataType":"Char","length":200,"default":["incomeTaxID","\"\""]},{"name":"type","type":"string","dataType":"Char","length":50,"default":["type","\"\""]},{"name":"synchronization","type":"string","dataType":"Char","default":["synchronization","\"\""]},{"name":"dateCreated","type":"DateTime","dataType":"DateTimeOffset","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","dataType":"DateTimeOffset","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"previewID","type":"number","dataType":"BigInt"},{"name":"billingAddressID","type":"number","dataType":"BigInt"},{"name":"shippingAddressID","type":"number","dataType":"BigInt"}],"relations":[{"name":"user","fkMap":[{"fk":"userID","relatedKey":"userID"}],"relatedName":"User"},{"name":"mailbox","fkMap":[{"fk":"mailboxID","relatedKey":"mailboxID"}],"relatedName":"Mailbox"},{"name":"hostedDomain","fkMap":[{"fk":"domainID","relatedKey":"domainID"}],"relatedName":"HostedDomain"},{"name":"preview","fkMap":[{"fk":"previewID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"billingAddress","fkMap":[{"fk":"billingAddressID","relatedKey":"addressID"}],"relatedName":"ContactAddress"},{"name":"addresses","isCollection":true,"isInverse":true,"relatedName":"ContactAddress"},{"name":"shippingAddress","fkMap":[{"fk":"shippingAddressID","relatedKey":"addressID"}],"relatedName":"ContactAddress"},{"name":"emails","isCollection":true,"isInverse":true,"relatedName":"ContactEmail"},{"name":"phones","isCollection":true,"isInverse":true,"relatedName":"ContactPhone"},{"name":"items","isCollection":true,"isInverse":true,"relatedName":"ContactItem"},{"name":"domains","isCollection":true,"isInverse":true,"relatedName":"ContactDomain"},{"name":"sellerStores","isCollection":true,"isInverse":true,"relatedName":"Store"},{"name":"vendorItems","isCollection":true,"isInverse":true,"relatedName":"StoreItem"},{"name":"ledgers","isCollection":true,"isInverse":true,"relatedName":"StoreLedger"},{"name":"soldInvoices","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"boughtInvoices","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"soldItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"}]}
+{"name":"contacts","keys":[{"name":"contactID","type":"number","generated":"identity","dataType":"BigInt"}],"properties":[{"name":"externalID","type":"string","dataType":"Char","length":400,"default":["externalID","\"\""]},{"name":"userID","type":"number","dataType":"BigInt"},{"name":"mailboxID","type":"number","dataType":"BigInt"},{"name":"domainID","type":"number","dataType":"BigInt"},{"name":"name","type":"string","dataType":"Char","length":200,"default":["name","\"\""]},{"name":"description","type":"string","dataType":"Char","length":200,"default":["description","\"\""]},{"name":"companyID","type":"string","dataType":"Char","length":200,"default":["companyID","\"\""]},{"name":"salesTaxID","type":"string","dataType":"Char","length":200,"default":["salesTaxID","\"\""]},{"name":"gstTaxID","type":"string","dataType":"Char","length":200,"default":["gstTaxID","\"\""]},{"name":"vatTaxID","type":"string","dataType":"Char","length":200,"default":["vatTaxID","\"\""]},{"name":"incomeTaxID","type":"string","dataType":"Char","length":200,"default":["incomeTaxID","\"\""]},{"name":"type","type":"string","dataType":"Char","length":50,"default":["type","\"\""]},{"name":"synchronization","type":"string","dataType":"Char","default":["synchronization","\"\""]},{"name":"dateCreated","type":"DateTime","dataType":"DateTimeOffset","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","dataType":"DateTimeOffset","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"previewID","type":"number","dataType":"BigInt"},{"name":"billingAddressID","type":"number","dataType":"BigInt"},{"name":"shippingAddressID","type":"number","dataType":"BigInt"}],"relations":[{"name":"user","fkMap":[{"fk":"userID","relatedKey":"userID"}],"relatedName":"User"},{"name":"mailbox","fkMap":[{"fk":"mailboxID","relatedKey":"mailboxID"}],"relatedName":"Mailbox"},{"name":"hostedDomain","fkMap":[{"fk":"domainID","relatedKey":"domainID"}],"relatedName":"HostedDomain"},{"name":"preview","fkMap":[{"fk":"previewID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"billingAddress","fkMap":[{"fk":"billingAddressID","relatedKey":"addressID"}],"relatedName":"ContactAddress"},{"name":"addresses","isCollection":true,"isInverse":true,"relatedName":"ContactAddress"},{"name":"shippingAddress","fkMap":[{"fk":"shippingAddressID","relatedKey":"addressID"}],"relatedName":"ContactAddress"},{"name":"emails","isCollection":true,"isInverse":true,"relatedName":"ContactEmail"},{"name":"phones","isCollection":true,"isInverse":true,"relatedName":"ContactPhone"},{"name":"items","isCollection":true,"isInverse":true,"relatedName":"ContactItem"},{"name":"domains","isCollection":true,"isInverse":true,"relatedName":"ContactDomain"},{"name":"sellerStores","isCollection":true,"isInverse":true,"relatedName":"Store"},{"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":"ledgers","isCollection":true,"isInverse":true,"relatedName":"StoreLedger"},{"name":"soldItems","isCollection":true,"isInverse":true,"relatedName":"StoreJournalLineItem"}]}
 );
 modelEntitySchemas["Contact"] = Contact;
 
@@ -554,7 +554,7 @@ export interface IEmail extends IClrEntity {
 	lastReplyID?: number | null;
 	engagement?: string | null;
 	tags?: string | null;
-	postID?: string | null;
+	postID?: string;
 	senderEmail?: IEmailAddress;
 	senderUser?: IUser;
 	mimeFile?: IEmailLog;
@@ -770,8 +770,8 @@ export interface IMailboxEmail extends IClrEntity {
 	engagementCount?: number;
 	dateUpdated?: DateTime | null;
 	datePublished?: DateTime | null;
-	postID?: string | null;
 	isThread?: boolean;
+	postID?: string;
 	mailbox?: IMailbox;
 	email?: IEmail;
 }
@@ -1089,9 +1089,9 @@ export interface IStore extends IClrEntity {
 	configs?: ICollection<IStoreConfig>;
 	storeItems?: ICollection<IStoreItem>;
 	itemFolders?: ICollection<IStoreItemFolder>;
-	insights?: ICollection<IStoreInsight>;
-	ledgers?: ICollection<IStoreLedger>;
 	journals?: ICollection<IStoreJournal>;
+	ledgers?: ICollection<IStoreLedger>;
+	insights?: ICollection<IStoreInsight>;
 	tags?: ICollection<IStoreTag>;
 	storeWebsites?: ICollection<IWebSiteStore>;
 }
@@ -1100,7 +1100,7 @@ export const Store: IModel<IStore,{"storeQuery":"external"},any> = new Model<ISt
 "Store",
 ["storeID"],
 { name: "",currency: "" },
-{"name":"stores","keys":[{"name":"storeID","type":"number","generated":"identity","dataType":"BigInt"}],"properties":[{"name":"name","type":"string","dataType":"Char","length":200,"default":["name","\"\""]},{"name":"currency","type":"string","dataType":"Char","length":5,"default":["currency","\"\""]},{"name":"sellerID","type":"number","dataType":"BigInt"},{"name":"folderID","type":"number","dataType":"BigInt"}],"relations":[{"name":"seller","fkMap":[{"fk":"sellerID","relatedKey":"contactID"}],"relatedName":"Contact"},{"name":"folder","fkMap":[{"fk":"folderID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"storeUsers","isCollection":true,"isInverse":true,"relatedName":"StoreUser"},{"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":"insights","isCollection":true,"isInverse":true,"relatedName":"StoreInsight"},{"name":"ledgers","isCollection":true,"isInverse":true,"relatedName":"StoreLedger"},{"name":"journals","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"tags","isCollection":true,"isInverse":true,"relatedName":"StoreTag"},{"name":"storeWebsites","isCollection":true,"isInverse":true,"relatedName":"WebSiteStore"}],"queries":{"storeQuery":"external"}}
+{"name":"stores","keys":[{"name":"storeID","type":"number","generated":"identity","dataType":"BigInt"}],"properties":[{"name":"name","type":"string","dataType":"Char","length":200,"default":["name","\"\""]},{"name":"currency","type":"string","dataType":"Char","length":5,"default":["currency","\"\""]},{"name":"sellerID","type":"number","dataType":"BigInt"},{"name":"folderID","type":"number","dataType":"BigInt"}],"relations":[{"name":"seller","fkMap":[{"fk":"sellerID","relatedKey":"contactID"}],"relatedName":"Contact"},{"name":"folder","fkMap":[{"fk":"folderID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"storeUsers","isCollection":true,"isInverse":true,"relatedName":"StoreUser"},{"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":"journals","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"ledgers","isCollection":true,"isInverse":true,"relatedName":"StoreLedger"},{"name":"insights","isCollection":true,"isInverse":true,"relatedName":"StoreInsight"},{"name":"tags","isCollection":true,"isInverse":true,"relatedName":"StoreTag"},{"name":"storeWebsites","isCollection":true,"isInverse":true,"relatedName":"WebSiteStore"}],"queries":{"storeQuery":"external"}}
 );
 modelEntitySchemas["Store"] = Store;
 
@@ -1163,9 +1163,9 @@ export interface IStoreItem extends IClrEntity {
 	variants?: ICollection<IStoreItem>;
 	vendor?: IContact;
 	storeItemPrices?: ICollection<IStoreItemPrice>;
+	ledgers?: ICollection<IStoreLedger>;
 	mediaFiles?: ICollection<IStoreMediaFile>;
 	insights?: ICollection<IStoreInsight>;
-	ledgers?: ICollection<IStoreLedger>;
 	lineItems?: ICollection<IStoreJournalLineItem>;
 	taxes?: ICollection<IStoreItemTax>;
 	taxItems?: ICollection<IStoreItemTax>;
@@ -1178,7 +1178,7 @@ export const StoreItem: IModel<IStoreItem,{"storeQuery":"external"},any> = new M
 "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":"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"}],"queries":{"storeQuery":"external"}}
+{"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":"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":"ledgers","isCollection":true,"isInverse":true,"relatedName":"StoreLedger"},{"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"}}
 );
 modelEntitySchemas["StoreItem"] = StoreItem;
 
@@ -1242,6 +1242,25 @@ export const StoreItemPrice: IModel<IStoreItemPrice,{"storeQuery":"external"},an
 );
 modelEntitySchemas["StoreItemPrice"] = StoreItemPrice;
 
+export interface IStorePaymentAttempt extends IClrEntity {
+	readonly attemptID?: number;
+	orderID?: number;
+	gatewayID?: number;
+	dateCreated?: DateTime;
+	dateUpdated?: DateTime;
+	success?: boolean;
+	order?: IStoreJournal;
+	gateway?: IStoreLedger;
+}
+
+export const StorePaymentAttempt: IModel<IStorePaymentAttempt,any,any> = new Model<IStorePaymentAttempt>(
+"StorePaymentAttempt",
+["attemptID"],
+{ dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()),success: false },
+{"name":"store_payment_attempt","keys":[{"name":"attemptID","type":"number","generated":"identity","dataType":"BigInt"}],"properties":[{"name":"orderID","type":"number","dataType":"BigInt"},{"name":"gatewayID","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":"success","type":"boolean","dataType":"Boolean","default":["success","false"]}],"relations":[{"name":"order","fkMap":[{"fk":"orderID","relatedKey":"journalID"}],"relatedName":"StoreJournal"},{"name":"gateway","fkMap":[{"fk":"gatewayID","relatedKey":"ledgerID"}],"relatedName":"StoreLedger"}]}
+);
+modelEntitySchemas["StorePaymentAttempt"] = StorePaymentAttempt;
+
 export interface IStoreMediaFile extends IClrEntity {
 	storeItemID?: number;
 	appFileID?: number;
@@ -1297,19 +1316,34 @@ export interface IStoreLedger extends IClrEntity {
 	name?: string;
 	description?: string | null;
 	balance?: number;
+	paymentGateway?: "paypal" | "phone-pe" | null;
+	isGatewayActive?: boolean;
+	merchantID?: string | null;
+	url?: string | null;
+	username?: string | null;
+	encryptedPassword?: string | null;
+	accessID?: string | null;
+	encryptedSecret?: string | null;
+	country?: string | null;
+	isDefault?: boolean;
+	password?: string;
+	secret?: string;
 	store?: IStore;
 	parent?: IStoreLedger;
 	children?: ICollection<IStoreLedger>;
 	contact?: IContact;
 	item?: IStoreItem;
+	paymentAttempts?: ICollection<IStorePaymentAttempt>;
 	entries?: ICollection<IStoreJournalEntry>;
 }
 
+export const StoreLedgerPaymentGatewayArray = [{"label":"paypal","value":"paypal"},{"label":"phone-pe","value":"phone-pe"}];
+
 export const StoreLedger: IModel<IStoreLedger,any,any> = new Model<IStoreLedger>(
 "StoreLedger",
 ["ledgerID"],
-{ ledgerType: "",name: "",balance: 0 },
-{"name":"store_ledger","keys":[{"name":"ledgerID","type":"number","generated":"identity","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":"contactID","type":"number","dataType":"BigInt"},{"name":"itemID","type":"number","dataType":"BigInt"},{"name":"head","type":"string","dataType":"Char","length":50,"default":["head","\"\""]},{"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"]}],"relations":[{"name":"store","fkMap":[{"fk":"storeID","relatedKey":"storeID"}],"relatedName":"Store"},{"name":"parent","fkMap":[{"fk":"parentID","relatedKey":"ledgerID"}],"relatedName":"StoreLedger"},{"name":"children","isCollection":true,"isInverse":true,"relatedName":"StoreLedger"},{"name":"contact","fkMap":[{"fk":"contactID","relatedKey":"contactID"}],"relatedName":"Contact"},{"name":"item","fkMap":[{"fk":"itemID","relatedKey":"storeItemID"}],"relatedName":"StoreItem"},{"name":"entries","isCollection":true,"isInverse":true,"relatedName":"StoreJournalEntry"}]}
+{ ledgerType: "",name: "",balance: 0,isGatewayActive: false,isDefault: false },
+{"name":"store_ledger","keys":[{"name":"ledgerID","type":"number","generated":"identity","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":"contactID","type":"number","dataType":"BigInt"},{"name":"itemID","type":"number","dataType":"BigInt"},{"name":"head","type":"string","dataType":"Char","length":50,"default":["head","\"\""]},{"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":"paymentGateway","type":"string","dataType":"Char","length":50,"default":["paymentGateway","\"paypal\""]},{"name":"isGatewayActive","type":"boolean","dataType":"Boolean","default":["isGatewayActive","false"]},{"name":"merchantID","type":"string","dataType":"Char","length":400,"default":["merchantID","\"\""]},{"name":"url","type":"string","dataType":"Char","default":["url","\"\""]},{"name":"username","type":"string","dataType":"Char","default":["username","\"\""]},{"name":"encryptedPassword","type":"string","dataType":"Char","default":["encryptedPassword","\"\""]},{"name":"accessID","type":"string","dataType":"Char","default":["accessID","\"\""]},{"name":"encryptedSecret","type":"string","dataType":"Char","default":["encryptedSecret","\"\""]},{"name":"country","type":"string","dataType":"Char","length":20,"default":["country","\"\""]},{"name":"isDefault","type":"boolean","dataType":"Boolean","default":["isDefault","false"]}],"relations":[{"name":"store","fkMap":[{"fk":"storeID","relatedKey":"storeID"}],"relatedName":"Store"},{"name":"parent","fkMap":[{"fk":"parentID","relatedKey":"ledgerID"}],"relatedName":"StoreLedger"},{"name":"children","isCollection":true,"isInverse":true,"relatedName":"StoreLedger"},{"name":"contact","fkMap":[{"fk":"contactID","relatedKey":"contactID"}],"relatedName":"Contact"},{"name":"item","fkMap":[{"fk":"itemID","relatedKey":"storeItemID"}],"relatedName":"StoreItem"},{"name":"paymentAttempts","isCollection":true,"isInverse":true,"relatedName":"StorePaymentAttempt"},{"name":"entries","isCollection":true,"isInverse":true,"relatedName":"StoreJournalEntry"}]}
 );
 modelEntitySchemas["StoreLedger"] = StoreLedger;
 
@@ -1341,6 +1375,7 @@ export interface IStoreJournal extends IClrEntity {
 	reference?: IStoreJournal;
 	references?: ICollection<IStoreJournal>;
 	folder?: IAppFile;
+	paymentAttempts?: ICollection<IStorePaymentAttempt>;
 	entries?: ICollection<IStoreJournalEntry>;
 	lineItems?: ICollection<IStoreJournalLineItem>;
 }
@@ -1351,7 +1386,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":"storeID"}],"relatedName":"Store"},{"name":"seller","fkMap":[{"fk":"sellerID","relatedKey":"contactID"}],"relatedName":"Contact"},{"name":"buyer","fkMap":[{"fk":"buyerID","relatedKey":"contactID"}],"relatedName":"Contact"},{"name":"buyerBillingAddress","fkMap":[{"fk":"buyerBillingAddressID","relatedKey":"addressID"}],"relatedName":"ContactAddress"},{"name":"buyerShippingAddress","fkMap":[{"fk":"buyerShippingAddressID","relatedKey":"addressID"}],"relatedName":"ContactAddress"},{"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"}]}
+{"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":"storeID"}],"relatedName":"Store"},{"name":"seller","fkMap":[{"fk":"sellerID","relatedKey":"contactID"}],"relatedName":"Contact"},{"name":"buyer","fkMap":[{"fk":"buyerID","relatedKey":"contactID"}],"relatedName":"Contact"},{"name":"buyerBillingAddress","fkMap":[{"fk":"buyerBillingAddressID","relatedKey":"addressID"}],"relatedName":"ContactAddress"},{"name":"buyerShippingAddress","fkMap":[{"fk":"buyerShippingAddressID","relatedKey":"addressID"}],"relatedName":"ContactAddress"},{"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"}]}
 );
 modelEntitySchemas["StoreJournal"] = StoreJournal;
 

package/src/public/store/Store.tsx

@@ -1,6 +1,11 @@
 import WebApp from "@web-atoms/core/dist/web/WebApp";
 import "../../style/GlobalStyle";
 import Pack from "@web-atoms/core/dist/Pack";
+import { StoreUrlService } from "./StoreUrlService";
+
+import StoreItemDetailView from "./StoreItemDetailView";
+import StoreItemListView from "./StoreItemListView";
+import SiteLogin from "../user/SiteLogin";
 
 if(/\d+\.\d+\.\d+\.\d+/i.test(location.hostname)) {
 
@@ -8,15 +13,24 @@ if(/\d+\.\d+\.\d+\.\d+/i.test(location.hostname)) {
     WebApp.installStyleSheet("/styles/vars.css");
 }
 
+const { buy, order, orders, login, checkout, detail } = StoreUrlService.getParameters();
 
 const url = new URL(location.href);
 (window as any).pageUrl = url;
-const { default: view } = await (/\/store\/\d+/.test(url.pathname) || url.searchParams.has("detail")
-    ? import("./StoreItemDetailView")
-    : import("./StoreItemListView")) as any;
+
+let View: any;
+if (login) {
+    View = SiteLogin;
+}
+if (detail) {
+    View = StoreItemDetailView;
+}
+if (!View) {
+    View = StoreItemListView;
+}
 
 @Pack
-export default class Empty extends view {
+export default class Empty extends View {
 
 }
 

package/src/public/store/StoreItemDetailView.tsx

@@ -13,11 +13,18 @@ import styled from "@web-atoms/core/dist/style/styled";
 import FetchBuilder from "@web-atoms/core/dist/services/FetchBuilder";
 import { formatCurrency, formatPrice } from "../../common/currency";
 import ToggleButtonBar from "@web-atoms/web-controls/dist/basic/ToggleButtonBar";
+import { StoreUrlService } from "./StoreUrlService";
+import WebSiteUserService from "../user/WebSiteUserService";
 
-const url = (window as any).pageUrl as URL;
+let storeID;
+let itemID;
 
+const { detail } = StoreUrlService.getParameters();
 
-let {1: storeID = "2", 2: itemID = "4w" } = /^\/store\/([^\/]+)\/([^\/]+)\//.exec(url?.pathname) ?? {} as any;
+if (detail) {
+    storeID = detail.storeID;
+    itemID = detail.productID;
+}
 
 storeID = parseInt(storeID, 36);
 itemID = parseInt(itemID, 36);
@@ -236,7 +243,7 @@ export default class StoreItemDetailView extends AtomControl {
 
     getFiles(item: IStoreItem, variant: IStoreItem, size: IStoreItem) {
         const variantFiles = variant?.mediaFiles?.filter((x) => x.isPreview);
-        const files = variantFiles ?? item.mediaFiles.filter((x) => x.isPreview);
+        const files = variantFiles ?? item.mediaFiles?.filter((x) => x.isPreview) ?? [];
         if (size?.mediaFiles) {
             files.push(... size.mediaFiles.filter((x) => x.isPreview));
         }
@@ -303,7 +310,7 @@ export default class StoreItemDetailView extends AtomControl {
                     <p class="price">
                         <label text={ formatPrice(price) }/>
                     </p>
-                    <button class="buy">Buy</button>
+                    <button data-click-event="buy-now" class="buy">Buy</button>
 
                     { this.model.sizes?.length && <ToggleButtonBar
                         items={this.model.sizes}
@@ -335,6 +342,12 @@ export default class StoreItemDetailView extends AtomControl {
         this.selectedFile = this.model.mediaFiles.find((x) => x.appFileID === id);
     }
 
+    @Action({ onEvent: "buy-now"})
+    async buyNow() {
+        const userService = this.resolve(WebSiteUserService);
+        const user = await userService.getUser();
+    }
+
     async getItem() {
         return this.entityService
             .query(StoreItem, "storeQuery")

package/src/public/store/StoreItemListView.tsx

@@ -231,9 +231,11 @@ export default class StoreItemListView extends AtomControl {
                     <img
                         src={Bind.oneTimeAsync(() => this.downloadImage(item))}
                         />
-                    <button
+                    <a
+                        title={item.name || item.variantFor?.name || item.name}
+                        href={StoreUrlService.productUrl(item)}><button
                         class="buy"
-                        text="Buy"/>
+                        text="Buy"/></a>
                     <div class="price">
                         <label text={ formatPrice(item.storeItemPrices?.[0] ?? item.variantFor?.storeItemPrices?.[0] )}/>
                     </div>