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

package/node_modules/@web-atoms/entity/src/services/BaseEntityService.ts

@@ -71,44 +71,9 @@ export interface ICollection<T> extends Array<T> {
 }
 
 const ArrayPrototype = Array.prototype as any;
-ArrayPrototype.where = ArrayPrototype.filter;
-ArrayPrototype.any = ArrayPrototype.some;
-ArrayPrototype.select = ArrayPrototype.map;
-ArrayPrototype.selectMany = function(x) {
-    const r = [];
-    for (const iterator of this) {
-        const items = x(iterator);
-        if (Array.isArray(items)) {
-            r.push(... items);
-        }
-    }
-    return r;
-};
-ArrayPrototype.firstOrDefault = function(f) {
-    if (f) {
-        return ArrayPrototype.find.apply(this, arguments);
-    }
-    return this[0];
-};
-ArrayPrototype.sum = function(f) {
-    let n = 0;
-    for (const iterator of this) {
-        n += f(iterator) ?? 0;
-    }
-    return n;
-};
-ArrayPrototype.average = function(f) {
-    if (this.length === 0) {
-        return 0;
-    }
-    let n = 0;
-    for (const iterator of this) {
-        n += f(iterator) ?? 0;
-    }
-    return n / this.length;
-};
-ArrayPrototype.orderBy = function(f) {
-    return this.sort((a, b) => {
+
+const orderBy = function (f) {
+    return [].concat(this).sort((a, b) => {
         const ak = f(a);
         const bk = f(b);
         if (typeof ak === "string") {
@@ -117,9 +82,9 @@ ArrayPrototype.orderBy = function(f) {
         return ak - bk;
     });
 };
-ArrayPrototype.thenBy = ArrayPrototype.orderBy;
-ArrayPrototype.orderByDescending = function(f) {
-    return this.sort((a, b) => {
+
+const orderByDescending = function (f) {
+    return [].concat(this).sort((a, b) => {
         const ak = f(a);
         const bk = f(b);
         if (typeof ak === "string") {
@@ -128,19 +93,109 @@ ArrayPrototype.orderByDescending = function(f) {
         return bk - ak;
     });
 };
-ArrayPrototype.thenByDescending = ArrayPrototype.orderByDescending;
-ArrayPrototype.count = function(f) {
-    if (!f) {
-        return this.length;
-    }
-    let length = 0;
-    for (const iterator of this) {
-        if (f(iterator)) {
-            length++;
-        }
+
+Object.defineProperties(ArrayPrototype, {
+    where: {
+        enumerable: false,
+        value: ArrayPrototype.filter,
+        configurable: true
+    },
+    any: {
+        enumerable: false,
+        value: ArrayPrototype.some,
+        configurable: true
+    },
+    select: {
+        enumerable: false,
+        value: ArrayPrototype.map,
+        configurable: true
+    },
+    selectMany: {
+        enumerable: false,
+        value(x) {
+            const r = [];
+            for (const iterator of this) {
+                const items = x(iterator);
+                if (Array.isArray(items)) {
+                    r.push(... items);
+                }
+            }
+            return r;        
+        },
+        configurable: true
+    },
+    firstOrDefault: {
+        enumerable: false,
+        value(f) {
+            if (f) {
+                return ArrayPrototype.find.apply(this, arguments);
+            }
+            return this[0];        
+        },
+        configurable: true
+    },
+    sum: {
+        enumerable: false,
+        value(f) {
+            let n = 0;
+            for (const iterator of this) {
+                n += f(iterator) ?? 0;
+            }
+            return n;        
+        },
+        configurable: true
+    },
+    average: {
+        enumerable: false,
+        value(f) {
+            if (this.length === 0) {
+                return 0;
+            }
+            let n = 0;
+            for (const iterator of this) {
+                n += f(iterator) ?? 0;
+            }
+            return n / this.length;        
+        },
+        configurable: true
+    },
+    orderBy: {
+        enumerable: false,
+        value: orderBy,
+        configurable: true
+    },
+    thenBy: {
+        enumerable: false,
+        value: orderBy,        configurable: false
+    },
+    orderByDescending: {
+        enumerable: false,
+        value: orderByDescending,
+        configurable: true
+    },
+    thenByDescending: {
+        enumerable: false,
+        value: orderByDescending,
+        configurable: false
+    },
+    count: {
+        enumerable: false,
+        value(f) {
+            if (!f) {
+                return this.length;
+            }
+            let length = 0;
+            for (const iterator of this) {
+                if (f(iterator)) {
+                    length++;
+                }
+            }
+            return length;        
+        },
+        configurable: false
     }
-    return length;
-};
+
+});
 
 export interface IMethod {
     select?: [string, ... any[]];
@@ -380,7 +435,7 @@ export default abstract class BaseEntityService extends HttpSession {
                 entity,
                 args
             }
-        });
+        }) as Promise<T>;
     }
 
     public save<T extends IClrEntity>(body: T, cloner?: (c: Cloner<T>) => Cloner<T>, trace?: boolean): Promise<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-client",
-  "version": "1.2.641",
+  "version": "1.2.643",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,7 @@
     "@web-atoms/data-styles": "^1.0.123",
     "@web-atoms/date-time": "^1.1.0",
     "@web-atoms/email-dom": "^1.0.32",
-    "@web-atoms/entity": "^2.4.58",
+    "@web-atoms/entity": "^2.4.60",
     "@web-atoms/module-loader": "^2.1.43",
     "@web-atoms/web-controls": "^2.4.56",
     "reflect-metadata": "^0.1.13",

package/src/admin/commands/AdminCommands.ts

@@ -47,11 +47,6 @@ export default class AdminCommands extends CommonCommands {
         openPage: () => import("../pages/repair/RepairPage")
     });
 
-    static editStores = Command.create({
-        route: "/admin/stores",
-        openPage: () => import("../pages/stores/AdminStoreList")
-    });
-
     static editSmsSources = Command.create({
         route: "/admin/sms-sources",
         openPage: () => import("../pages/incoming-sms-sources/EditIncomingSmsSourcePage")

package/src/admin/drawer/AdminDrawer.tsx

@@ -81,11 +81,6 @@ export default class AdminDrawer extends Drawer {
                     label="Sms Sources"
                     commandLink={AdminCommands.editSmsSources.displayRoute({})}
                     />
-                <MenuItem
-                    icon="fas fa-dollar"
-                    label="Stores"
-                    commandLink={AdminCommands.editStores.displayRoute({})}
-                    />
                 <MenuItem
                     icon="fas fa-gear"
                     label="Config"

package/src/common/commands/CommonCommands.ts

@@ -75,12 +75,11 @@ export default class CommonCommands extends Commands {
         openPage: () => import("../pages/stores/settings/EditSettingsPage")
     });
 
-    static editStoreTemplates = Command.create({
-        route: "/stores/templates/{storeID}",
-        openPage: () => import("../pages/stores/templates/EditStoreTemplatesPage")
+    static paymentConfig = Command.create({
+        route: "/stores/payment-gateways/{storeID}",
+        openPage: () => import("../pages/stores/payment-gateway/PaymentGatewayListPage")
     });
 
-
     static editProduct = Command.create({
         route: "/stores/product/{storeItemID}",
         routeOrder: 200,

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

@@ -4,7 +4,7 @@ import AtomRepeater from "@web-atoms/web-controls/dist/basic/AtomRepeater";
 import { ContentPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
 import StoreService from "../../../services/store/StoreService";
 import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
-import { IStore, IStoreInsight, IStoreJournal } from "../../../model/model";
+import { IStoreJournal, IWebSiteFolder } from "../../../model/model";
 import Bind from "@web-atoms/core/dist/core/Bind";
 import AppCommands from "../../../web/commands/AppCommands";
 import CommonCommands from "../../commands/CommonCommands";
@@ -23,7 +23,7 @@ export default class StoreDetailPage extends ContentPage<{ id: any }> {
     @InjectProperty
     storeOrderService: StoreOrderService;
 
-    model: IStore;
+    model: IWebSiteFolder;
 
     items: IStoreJournal[] = [];
     selectedItem: IStoreJournal = null;
@@ -34,7 +34,7 @@ export default class StoreDetailPage extends ContentPage<{ id: any }> {
 
         this.model = await this.storeService.get(this.parameters.id);
 
-        this.title = `${this.model.name} Orders`;
+        this.title = `${this.model.folder.name} Orders`;
 
         this.headerRenderer = () => <div data-layout="flex-wrap-padding">
                 <input type="search" value={Bind.twoWaysImmediate(() => this.search)}/>
@@ -44,13 +44,9 @@ 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"
-                    href={CommonCommands.editStoreTemplates.displayRoute({ storeID: this.parameters.id})}
-                    text="Templates"
-                    ></a>
             </div>;
 
         this.renderer = <div>

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/common/pages/stores/products/EditProductListPage.tsx

@@ -1,5 +1,5 @@
 import { ContentPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
-import { IStore, IStoreItem, StoreItem } from "../../../../model/model";
+import { IStoreItem, IWebSiteFolder, StoreItem } from "../../../../model/model";
 import XNode from "@web-atoms/core/dist/core/XNode";
 import AtomRepeater, { SelectorCheckBox } from "@web-atoms/web-controls/dist/basic/AtomRepeater";
 import InfiniteRepeater from "../../../controls/repeater/InfiniteRepeater";
@@ -21,7 +21,7 @@ export default class EditProductListPage extends ContentPage<{ storeID }> {
 
     items: IStoreItem[] = [];
 
-    store: IStore = null;
+    store: IWebSiteFolder = null;
 
     selectedItem = null;
 

package/src/common/pages/stores/settings/EditSettingsPage.tsx

@@ -3,7 +3,7 @@ import XNode from "@web-atoms/core/dist/core/XNode";
 import AtomRepeater from "@web-atoms/web-controls/dist/basic/AtomRepeater";
 import { ContentPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
 import EntityService from "../../../../services/EntityService";
-import { IStore, IStoreConfig, Store, StoreConfig } from "../../../../model/model";
+import { IStoreConfig, IWebSiteFolder, StoreConfig, WebSiteFolder } from "../../../../model/model";
 import CollectionEditorEx from "../../../controls/collection-editor/CollectionEditorEx";
 import Bind from "@web-atoms/core/dist/core/Bind";
 
@@ -12,13 +12,13 @@ export default class EditSettingsPage extends ContentPage<{storeID}> {
     @InjectProperty
     entityService: EntityService;
 
-    model: IStore = null;
+    model: IWebSiteFolder = null;
 
     async init() {
 
         const { storeID } = this.parameters;
 
-        this.model = await this.entityService.query(Store).where({ storeID}, (p) => (x) => x.storeID === p.storeID)
+        this.model = await this.entityService.query(WebSiteFolder).where({ storeID}, (p) => (x) => x.folderID === p.storeID)
             .include((x) => [x.configs])
             .firstOrDefault();