@social-mail/social-mail-client 1.9.77 → 1.9.79

package/package.json

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

package/src/common/events/StoreEvents.ts

@@ -0,0 +1,7 @@
+import EventScope from "@web-atoms/core/dist/core/EventScope";
+import { IStoreJournal } from "../../model/model";
+
+export const StoreEvents = {
+    onJournalSaved: EventScope.create<IStoreJournal>(),
+    onJournalPosted: EventScope.create<IStoreJournal>(),
+};

package/src/services/store/StoreOrderService.ts

@@ -28,7 +28,8 @@ export default class StoreOrderService {
         start = 0,
         size = 100,
         search = "",
-        cancelToken = void 0
+        cancelToken = void 0,
+        v = void 0
     }) {
         let q = this.entityService.query(StoreJournal)
             .where({ storeID }, (p) => (x) => x.storeID === p.storeID);

package/src/site-editor-app/pages/store/ledger/EditLedgerPage.tsx

@@ -0,0 +1,49 @@
+import { ContentPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
+import { IStoreAccount, StoreAccount } from "../../../../model/model";
+import XNode from "@web-atoms/core/dist/core/XNode";
+import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
+import EntityService from "../../../../services/EntityService";
+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 { SaveIconTextButton } from "../../../../common/controls/buttons/IconButton";
+import Action from "@web-atoms/core/dist/view-model/Action";
+
+export default class EditLedgerPage extends ContentPage<IStoreAccount> {
+
+    @InjectProperty
+    entityService: EntityService;
+
+    model: IStoreAccount;
+
+    async init() {
+
+        this.model = this.parameters.accountID
+            ? this.parameters
+            : StoreAccount.create({ storeID: this.parameters.storeID });
+
+        this.renderer = <div>
+            <Form>
+                <FormField label="Name">
+                    <input value={Bind.twoWaysImmediate(() => this.model.name)}/>
+                </FormField>
+                <FormField label="Head">
+                    <input value={Bind.twoWaysImmediate(() => this.model.head)}/>
+                </FormField>
+                <FormField label="Description">
+                    <textarea value={Bind.twoWaysImmediate(() => this.model.description)}/>
+                </FormField>
+                <div>
+                    <SaveIconTextButton data-submit-event="saveForm"/>
+                </div>
+            </Form>
+        </div>;
+
+    }
+
+    @Action({ onEvent: "saveForm"})
+    async saveForm() {
+        await this.entityService.save(this.model);
+        return this.model;
+    }
+}

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

@@ -19,6 +19,7 @@ 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";
+import EditLedgerPage from "../ledger/EditLedgerPage";
 
 export default class EditOrderPage extends ContentPage<Partial<IStoreJournal>> {
 
@@ -68,10 +69,11 @@ export default class EditOrderPage extends ContentPage<Partial<IStoreJournal>> {
                     label="Buyer"
                     model={this.model}
                     field={(x) => x.buyer}
-                    editModelPage={ContactEditorPage}
+                    editModelPage={EditLedgerPage}
                     searchQuery={(q, search) => (search
                             ? q.where({ search, likeSearch: search + "%" }, (p) => (x) =>
                                 Sql.text.iLike(x.name, p.likeSearch)
+                                || Sql.text.iLike(x.description, p.likeSearch)
                                 || x.emails.some((e) => Sql.text.iLike(e.emailAddress.emailAddress, p.likeSearch))
                                 || x.phones.some((e) => e.phoneNumberE64 === p.search)
                             )

package/src/site-editor-app/pages/store/orders/StoreOrderListPage.tsx

@@ -12,6 +12,7 @@ import InfiniteRepeater from "../../../../common/controls/repeater/InfiniteRepea
 import { AddIconTextButton } from "../../../../common/controls/buttons/IconButton";
 import MasterDetailPage from "@web-atoms/web-controls/dist/mobile-app/MasterDetailPage";
 import EntityService from "../../../../services/EntityService";
+import { StoreEvents } from "../../../../common/events/StoreEvents";
 
 export default class StoreDetailPage extends MasterDetailPage<{ id: any }> {
 
@@ -31,6 +32,8 @@ export default class StoreDetailPage extends MasterDetailPage<{ id: any }> {
 
     search = "";
 
+    version = 1;
+
     async init() {
 
         this.model = await this.storeService.get(this.parameters.id);
@@ -52,7 +55,8 @@ export default class StoreDetailPage extends MasterDetailPage<{ id: any }> {
                                 storeID: this.parameters.id,
                                 start,
                                 search: this.search,
-                                cancelToken
+                                cancelToken,
+                                v: this.version
                             })
                         )}
                     itemRenderer={(item: IStoreJournal) => <div data-click-event="open-order">
@@ -108,4 +112,9 @@ export default class StoreDetailPage extends MasterDetailPage<{ id: any }> {
         });
     }
 
+    @Action({ onEvent: StoreEvents.onJournalPosted })
+    onJournalPosted() {
+        this.version ++;
+    }
+
 }