@social-mail/social-mail-client 1.9.34 → 1.9.36

package/package.json

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

package/src/admin/pages/domains/DomainListPage.tsx

@@ -9,8 +9,14 @@ import EditDomainPage from "./edit/EditDomainPage";
 import { HostedDomain, IHostedDomain } from "../../../model/model";
 import AdminCommands from "../../commands/AdminCommands";
 import EntityService from "../../../services/EntityService";
+import InfiniteRepeater from "../../../common/controls/repeater/InfiniteRepeater";
+import Bind from "@web-atoms/core/dist/core/Bind";
+import { Sql } from "../../../common/Sql";
+import MasterDetailPage from "@web-atoms/web-controls/dist/mobile-app/MasterDetailPage";
 
-export default class DomainListPage extends ContentPage {
+export default class DomainListPage extends MasterDetailPage {
+
+    search = "";
 
     @InjectProperty
     private adminDomainService: AdminDomainService;
@@ -23,17 +29,24 @@ export default class DomainListPage extends ContentPage {
     async init() {
 
         this.title = "Domains";
-        this.domains = await this.adminDomainService.list();
 
         this.actionRenderer = () => <i data-click-event="add-domain" class="fas fa-plus"/>;
 
+        this.headerRenderer = () => <div>
+            <input type="search" value={Bind.twoWaysImmediate(() => this.search)}/>
+        </div>;
+
         this.renderer = <div>
             <AtomRepeater
+                data-layout="data-grid"
                 items={this.domains}
+                selectOnClick={true}
+                data-selection-updated-event="item-selected"
+                { ... InfiniteRepeater.pagedItems((start) => (c, e, cancelToken) =>
+                    this.loadItems({ search: this.search, start, cancelToken })
+                )}
                 itemRenderer={(domain) => <div>
-                    <a
-                        data-click-event="route"
-                        href={AdminCommands.openDomain.displayRoute(domain)}>{domain.domain.name}</a>
+                    <label>{domain.domain.name}</label>
 
                     <i
                         data-click-event="delete-item"
@@ -44,10 +57,35 @@ export default class DomainListPage extends ContentPage {
         </div>;
     }
 
+    async loadItems({ search, start, cancelToken }) {
+        let q = this.entityService.query(HostedDomain);
+        if (search) {
+            search = `${search}%`.toLowerCase();
+            q = q.where({ search }, (p) => (x) => Sql.text.like(x.domain.name, p.search));
+        }
+        return q
+            .include((x) => x.domain)
+            .orderBy((x) => x.domain.name)
+            .toPagedList({
+            start,
+            size: 10,
+            cancelToken
+        });
+    }
+
     @Action({ onEvent: "add-domain"})
     async addDomain() {
-        const domain = await PageNavigator.pushPageForResult(EditDomainPage, {});
+        const domain = HostedDomain.create({});
         this.domains.add(domain);
+        this.openDetail(EditDomainPage, { model: domain });
+    }
+
+    @Action({ onEvent: "item-selected" , defer: 10 })
+    itemSelected([domain]) {
+        if (!domain) {
+            return;
+        }
+        this.openDetail(EditDomainPage, { model: domain });
     }
 
     @Action({

package/src/site-editor-app/pages/store/order/EditOrderPage.tsx

@@ -1,5 +1,5 @@
 import { ContentPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
-import { IContact, IStoreAccount, IStoreItem, IStoreItemFolder, IStoreItemPrice, IStoreJournal, IStoreJournalEntry, IStoreJournalLineItem, StoreJournal, StoreJournalLineItem } from "../../../../model/model";
+import { IContact, IStoreAccount, IStoreItem, IStoreItemFolder, IStoreItemPrice, IStoreJournal, IStoreJournalEntry, IStoreJournalLineItem, StoreItemPrice, StoreJournal, StoreJournalLineItem } from "../../../../model/model";
 import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
 import StoreOrderService from "../../../../services/store/StoreOrderService";
 import XNode from "@web-atoms/core/dist/core/XNode";
@@ -18,6 +18,7 @@ import Action from "@web-atoms/core/dist/view-model/Action";
 import FormField from "@web-atoms/web-controls/dist/basic/FormField";
 import DateField from "@web-atoms/web-controls/dist/basic/DateField";
 import DateTime from "@web-atoms/date-time/dist/DateTime";
+import EntityService from "../../../../services/EntityService";
 
 export default class EditOrderPage extends ContentPage<Partial<IStoreJournal>> {
 
@@ -29,6 +30,9 @@ export default class EditOrderPage extends ContentPage<Partial<IStoreJournal>> {
     @InjectProperty
     storeItemService: StoreItemService;
 
+    @InjectProperty
+    entityService: EntityService;
+
     async init() {
 
         const storeID = this.parameters.storeID;
@@ -105,9 +109,12 @@ export default class EditOrderPage extends ContentPage<Partial<IStoreJournal>> {
                                 (search
                                     ? q.where({ search, likeSearch: search + "%" }, (p) => (x) => Sql.text.iLike(x.name, p.likeSearch))
                                     : q)
-                                .where({ storeID }, (p) => (x) => x.storeID === p.storeID)
+                                .where({ storeID }, (p) => (x) => x.storeID === p.storeID
+                                    && x.itemType !== "tax"
+                                    && x.itemType !== "commission")
                             }
                             itemRenderer={(x) => <div text={x.name}></div>}
+                            event-reference-updated={(ce) => this.onItemUpdated(line, ce.detail)}
                             />
                         <ReferenceEditor
                             label=""
@@ -123,7 +130,9 @@ export default class EditOrderPage extends ContentPage<Partial<IStoreJournal>> {
                             itemRenderer={(x) => <div text={`${x.currency} ${x.amount}`}></div>}
                             />
 
-                        <input value={Bind.sourceTwoWays(line, (x) => x.source.quantity)}/>
+                        <input
+                            event-input={() => line.total = (Number(line.amount) * Number(line.quantity)).toFixed() as any }
+                            value={Bind.sourceTwoWays(line, (x) => x.source.quantity)}/>
                         <input
                             readOnly={true}
                             value={Bind.source(line, (x) => x.source.amount)}/>
@@ -202,8 +211,25 @@ export default class EditOrderPage extends ContentPage<Partial<IStoreJournal>> {
         await this.init();
     }
 
+    async onItemUpdated(line: IStoreJournalLineItem, detail: IStoreItem) {
+        // get first active price
+        const { storeItemID } = detail;
+        const firstPrice = await this.entityService.query(StoreItemPrice)
+            .where({ storeItemID }, (p) => (x) => x.storeItemID === p.storeItemID
+                && x.active === true
+            )
+            .firstOrDefault();
+        line.itemPrice = firstPrice;
+        line.itemPriceID = firstPrice.priceID;
+        line.quantity = 1;
+        line.amount = Number(firstPrice.amount);
+        line.total = (Number(line.amount) * Number(line.quantity)).toFixed(2) as any;
+    }
+
+
     onItemPriceUpdated(line: IStoreJournalLineItem, detail: IStoreItemPrice): any {
         line.amount = Number(detail.amount);
+        line.total = (Number(line.amount) * Number(line.quantity)).toFixed(2) as any;
     }
 
     async onLineItemDeleted(line: IStoreJournalLineItem) {