@social-mail/social-mail-client 1.2.652 → 1.2.653

package/package.json

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

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

@@ -1,5 +1,5 @@
 import { ContentPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
-import { IStoreAccount, StoreAccountPaymentGatewayArray } from "../../../../model/model";
+import { IStorePaymentGateway, StorePaymentGatewayPaymentGatewayArray } 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";
@@ -10,9 +10,9 @@ 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<IStoreAccount> {
+export default class PaymentGatewayEditorPage extends ContentPage<IStorePaymentGateway> {
 
-    model: IStoreAccount;
+    model: IStorePaymentGateway;
 
     @InjectProperty
     entityService: EntityService;
@@ -27,24 +27,30 @@ export default class PaymentGatewayEditorPage extends ContentPage<IStoreAccount>
             <Form>
                 <FormField label="Type">
                     <Select
-                        items={StoreAccountPaymentGatewayArray}
+                        items={StorePaymentGatewayPaymentGatewayArray}
                         value={Bind.twoWaysImmediate(() => this.model.paymentGateway)}
                         />
                 </FormField>
                 <FormField label="Name">
-                    <input value={Bind.twoWaysImmediate(() => this.model.name)}/>
+                    <input value={Bind.twoWaysImmediate(() => this.model.storeAccount.name)}/>
                 </FormField>
                 <FormField label="Description">
-                    <input value={Bind.twoWaysImmediate(() => this.model.description)}/>
+                    <input value={Bind.twoWaysImmediate(() => this.model.storeAccount.description)}/>
+                </FormField>
+                <FormField label="Client ID">
+                    <input value={Bind.twoWaysImmediate(() => this.model.clientID)}/>
                 </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 label="Salt Index">
+                    <input value={Bind.twoWaysImmediate(() => this.model.saltIndex)}/>
+                </FormField>
+                <FormField label="Salt">
+                    <input value={Bind.twoWaysImmediate(() => this.model.salt)}/>
                 </FormField>
-                <FormField label="Password/Secret/Key">
-                    <input value={Bind.twoWaysImmediate(() => this.model.password)}/>
+                <FormField label="Secret">
+                    <input value={Bind.twoWaysImmediate(() => this.model.secret)}/>
                 </FormField>
                 <FormField label="Url">
                     <input value={Bind.twoWaysImmediate(() => this.model.url)}/>
@@ -58,7 +64,7 @@ export default class PaymentGatewayEditorPage extends ContentPage<IStoreAccount>
 
     @Action({ onEvent: "submitForm", close: true })
     async submitForm() {
-        await this.entityService.save(this.model, (c) => c);
+        await this.entityService.save(this.model, (c) => c.include((x) => x.storeAccount));
         return this.model;
     }
 

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

@@ -5,7 +5,7 @@ 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 { IStoreAccount, StoreAccount } from "../../../../model/model";
+import { IStoreAccount, IStorePaymentGateway, StoreAccount, StorePaymentGateway } 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";
@@ -41,10 +41,9 @@ export default class PaymentGatewayListPage extends MasterDetailPage {
                 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: IStoreAccount) => <div>
-                    <label text={x.accessID}/>
+                itemRenderer={(x: IStorePaymentGateway) => <div>
                     <label text={x.paymentGateway}/>
-                    <label text={x.name}/>
+                    <label text={x.storeAccount.name}/>
                 </div>}
                 />
         </div>;
@@ -56,15 +55,17 @@ export default class PaymentGatewayListPage extends MasterDetailPage {
 
     load( { start, cancelToken, search } ) {
         const { storeID } = this.parameters;
-        let q = this.entityService.query(StoreAccount)
-            .where({ storeID }, (p) => (x) => x.storeID === p.storeID && x.paymentGateway !== null);
+        let q = this.entityService.query(StorePaymentGateway)
+            .where({ storeID }, (p) => (x) => x.storeAccount.storeID === p.storeID);
         if (search) {
-            q = q.where({ search }, (p) => (x) => Sql.text.iLike(x.description, p.search));
+            q = q.where({ search }, (p) => (x) => Sql.text.iLike(x.storeAccount.description, p.search));
         }
-        return q.toPagedList({
-            start,
-            cancelToken
-        });
+        return q
+            .include((x) => x.storeAccount)
+            .toPagedList({
+                start,
+                cancelToken
+            });
     }
 
     @Action({ onEvent: "itemSelected"})
@@ -84,9 +85,11 @@ export default class PaymentGatewayListPage extends MasterDetailPage {
     @Action({ onEvent: "addItem"})
     addItem() {
         const { storeID } = this.parameters;
-        const item = StoreAccount.create({
-            storeID,
-            head: "Income"
+        const item = StorePaymentGateway.create({
+            storeAccount: StoreAccount.create({
+                storeID,
+                head: "Income"
+            })
         });
         this.items.add(item);
         this.repeater.selectedItem = item;

package/src/model/model.ts

@@ -1200,14 +1200,14 @@ export interface IStorePaymentAttempt extends IClrEntity {
 	dateUpdated?: DateTime;
 	success?: boolean;
 	order?: IStoreJournal;
-	gateway?: IStoreAccount;
+	gateway?: IStorePaymentGateway;
 }
 
 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":"accountID"}],"relatedName":"StoreAccount"}]}
+{"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":"accountID"}],"relatedName":"StorePaymentGateway"}]}
 );
 modelEntitySchemas["StorePaymentAttempt"] = StorePaymentAttempt;
 
@@ -1267,20 +1267,8 @@ export interface IStoreAccount 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;
 	billingAddressID?: number | null;
 	shippingAddressID?: number | null;
-	isDefault?: boolean;
-	password?: string;
-	secret?: string;
 	store?: IWebSiteFolder;
 	parent?: IStoreAccount;
 	children?: ICollection<IStoreAccount>;
@@ -1290,20 +1278,18 @@ export interface IStoreAccount extends IClrEntity {
 	soldInvoices?: ICollection<IStoreJournal>;
 	boughtInvoices?: ICollection<IStoreJournal>;
 	addresses?: ICollection<IStoreAccountAddress>;
-	paymentAttempts?: ICollection<IStorePaymentAttempt>;
+	storePaymentGateway?: IStorePaymentGateway;
 	emails?: ICollection<IStoreAccountEmail>;
 	phones?: ICollection<IStoreAccountPhone>;
 	entries?: ICollection<IStoreJournalEntry>;
 	soldItems?: ICollection<IStoreJournalLineItem>;
 }
 
-export const StoreAccountPaymentGatewayArray = [{"label":"paypal","value":"paypal"},{"label":"phone-pe","value":"phone-pe"}];
-
 export const StoreAccount: IModel<IStoreAccount,any,any> = new Model<IStoreAccount>(
 "StoreAccount",
 ["accountID"],
-{ dateCreated: new DefaultFactory(() => new DateTime()),ledgerType: "",name: "",balance: 0,isGatewayActive: false,isDefault: false },
-{"name":"store_accounts","keys":[{"name":"accountID","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":"customerID","type":"number","dataType":"BigInt"},{"name":"itemID","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":"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":"billingAddressID","type":"number","dataType":"BigInt","default":["billingAddressID","0"]},{"name":"shippingAddressID","type":"number","dataType":"BigInt","default":["shippingAddressID","0"]},{"name":"isDefault","type":"boolean","dataType":"Boolean","default":["isDefault","false"]}],"relations":[{"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":"customer","fkMap":[{"fk":"customerID","relatedKey":"userID"}],"relatedName":"User"},{"name":"item","fkMap":[{"fk":"itemID","relatedKey":"storeItemID"}],"relatedName":"StoreItem"},{"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":"paymentAttempts","isCollection":true,"isInverse":true,"relatedName":"StorePaymentAttempt"},{"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"}]}
+{ dateCreated: new DefaultFactory(() => new DateTime()),ledgerType: "",name: "",balance: 0 },
+{"name":"store_accounts","keys":[{"name":"accountID","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":"customerID","type":"number","dataType":"BigInt"},{"name":"itemID","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":"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":"customer","fkMap":[{"fk":"customerID","relatedKey":"userID"}],"relatedName":"User"},{"name":"item","fkMap":[{"fk":"itemID","relatedKey":"storeItemID"}],"relatedName":"StoreItem"},{"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"}]}
 );
 modelEntitySchemas["StoreAccount"] = StoreAccount;
 
@@ -1364,10 +1350,40 @@ export const StoreAccountPhone: IModel<IStoreAccountPhone,any,any> = new Model<I
 "StoreAccountPhone",
 ["accountID","phoneNumberE64"],
 {  },
-{"name":"store_account_phone","keys":[{"name":"accountID","type":"number","dataType":"BigInt"},{"name":"phoneNumberE64","type":"string","dataType":"Char","length":200}],"properties":[{"name":"type","type":"string","dataType":"Char","length":50,"default":["type","\"\""]},{"name":"notes","type":"string","dataType":"Char","default":["notes","\"\""]}],"relations":[{"name":"storeAccount","fkMap":[{"fk":"accountID","relatedKey":"accountID"}],"relatedName":"StoreAccount"}]}
+{"name":"store_account_phones","keys":[{"name":"accountID","type":"number","dataType":"BigInt"},{"name":"phoneNumberE64","type":"string","dataType":"Char","length":200}],"properties":[{"name":"type","type":"string","dataType":"Char","length":50,"default":["type","\"\""]},{"name":"notes","type":"string","dataType":"Char","default":["notes","\"\""]}],"relations":[{"name":"storeAccount","fkMap":[{"fk":"accountID","relatedKey":"accountID"}],"relatedName":"StoreAccount"}]}
 );
 modelEntitySchemas["StoreAccountPhone"] = StoreAccountPhone;
 
+export interface IStorePaymentGateway extends IClrEntity {
+	accountID?: number;
+	paymentGateway?: "paypal" | "phone-pe" | null;
+	isGatewayActive?: boolean;
+	isDefault?: boolean;
+	merchantID?: string | null;
+	url?: string | null;
+	accessID?: string | null;
+	clientID?: string | null;
+	saltIndex?: string | null;
+	encryptedSalt?: string | null;
+	encryptedSecret?: string | null;
+	country?: string | null;
+	currency?: string | null;
+	salt?: string;
+	secret?: string;
+	storeAccount?: IStoreAccount;
+	paymentAttempts?: ICollection<IStorePaymentAttempt>;
+}
+
+export const StorePaymentGatewayPaymentGatewayArray = [{"label":"paypal","value":"paypal"},{"label":"phone-pe","value":"phone-pe"}];
+
+export const StorePaymentGateway: IModel<IStorePaymentGateway,any,any> = new Model<IStorePaymentGateway>(
+"StorePaymentGateway",
+["accountID"],
+{ isGatewayActive: false,isDefault: false },
+{"name":"store_payment_gateways","keys":[{"name":"accountID","type":"number","dataType":"BigInt"}],"properties":[{"name":"paymentGateway","type":"string","dataType":"Char","length":50,"default":["paymentGateway","\"paypal\""]},{"name":"isGatewayActive","type":"boolean","dataType":"Boolean","default":["isGatewayActive","false"]},{"name":"isDefault","type":"boolean","dataType":"Boolean","default":["isDefault","false"]},{"name":"merchantID","type":"string","dataType":"Char","length":400,"default":["merchantID","\"\""]},{"name":"url","type":"string","dataType":"Char","default":["url","\"\""]},{"name":"accessID","type":"string","dataType":"Char","default":["accessID","\"\""]},{"name":"clientID","type":"string","dataType":"Char","default":["clientID","\"\""]},{"name":"saltIndex","type":"string","dataType":"Char","length":50,"default":["saltIndex","\"\""]},{"name":"encryptedSalt","type":"string","dataType":"Char","length":400,"default":["encryptedSalt","\"\""]},{"name":"encryptedSecret","type":"string","dataType":"Char","default":["encryptedSecret","\"\""]},{"name":"country","type":"string","dataType":"Char","length":20,"default":["country","\"\""]},{"name":"currency","type":"string","dataType":"Char","length":20,"default":["currency","\"\""]}],"relations":[{"name":"storeAccount","fkMap":[{"fk":"accountID","relatedKey":"accountID"}],"relatedName":"StoreAccount"},{"name":"paymentAttempts","isCollection":true,"isInverse":true,"relatedName":"StorePaymentAttempt"}]}
+);
+modelEntitySchemas["StorePaymentGateway"] = StorePaymentGateway;
+
 export interface IStoreJournal extends IClrEntity {
 	readonly journalID?: number;
 	storeID?: number;