@social-mail/social-mail-client 1.2.321 → 1.2.323

package/package.json

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

package/src/common/pages/stores/products/ProductEditor.tsx

@@ -64,6 +64,8 @@ export default class ProductEditor extends AtomControl {
 
         this.model.storeItemTags ??= [];
 
+        const storeID = this.model.storeID;
+
         this.renderer = <div>
             <div data-border="frame" data-layout="vertical-flex">
                 <FormField label="Type">
@@ -81,7 +83,7 @@ export default class ProductEditor extends AtomControl {
                     addNewDefaults={({ storeID: this.model.storeID })}
                     editModelPage={EditItemFolderPage}
                     searchQuery={(q: Query<IStoreItemFolder>, search) => (search ? q.where({ search }, (p) => (x) => Sql.text.startsWith(x.name, p.search)): q)
-                        .where({ storeID: this.model.storeID }, (p) => (x) => x.storeID === p.storeID)
+                        .where({ storeID }, (p) => (x) => x.storeID === p.storeID)
                         .orderBy((x) => x.name)
                     }
                     itemRenderer={(x) => <div text={x.name}/>}
@@ -181,7 +183,7 @@ export default class ProductEditor extends AtomControl {
                             (search
                                 ? q.where({ search: search + "%"}, (p) => (x) => Sql.text.iLike(x.name, p.search))
                                 : q
-                            ).where(void 0, (p) => (x) => x.itemType === "tax").include((x) => x.storeItemPrices)
+                            ).where({ storeID }, (p) => (x) => x.storeID === p.storeID && x.itemType === "tax").include((x) => x.storeItemPrices)
                         }
                         itemRenderer={(ti) => <div> <label text={ti.name}/> </div>}
                         suggestionRenderer={(ti) => <div> <label text={ti.name}/> </div>}

package/src/common/pages/user/forgot/ForgotPassword.tsx

@@ -11,6 +11,8 @@ import Action from "@web-atoms/core/dist/view-model/Action";
 import PopupService from "@web-atoms/core/dist/web/services/PopupService";
 import PasswordBox from "@web-atoms/web-controls/dist/basic/PasswordBox";
 import { apiPath } from "../../../apiPath";
+import QRCodeControl from "../../../controls/qrcode/QRCode";
+import sleep from "@web-atoms/core/dist/core/sleep";
 
 const css = styled.css `
     & [data-border=frame] {
@@ -36,6 +38,7 @@ interface IVerification {
     id?: string;
     code?: string;
     verified?: string;
+    smsConfig?: any;
 }
 
 export default class ForgotPassword extends ContentPage {
@@ -173,30 +176,23 @@ export default class ForgotPassword extends ContentPage {
 
         if (phone.id) {
             this.model.phone.id = phone.id;
+            this.model.phone.smsConfig = phone.smsConfig;
         }
 
-        this.askCode();
+        await this.askCode();
     }
 
-    askCode() {
+    async askCode() {
         this.renderer = <div  class={css}>
             <div data-layout="center-all">
-                <Form data-border="frame">
-                    <h3>
-                        Enter verification code.
-                    </h3>
-                    <FormField label="Code">
-                        <input type="tel" value={Bind.twoWaysImmediate(() => this.model.phone.code)}/>
-                    </FormField>
-                    <div data-layout="row">
-                        <button
-                            data-layout="go-button"
-                            data-submit-event="ask-code">Next</button>
-                    </div>
-
-                </Form>
+                <QRCodeControl
+                    smsConfig={this.model.phone.smsConfig}
+                    />
             </div>
         </div>;
+
+        await sleep(3000);
+        await this.resetPassword();
     }
 
     askPasswords() {