fix(com-pwa): back to admin-order-list & add the missing this param

Alwatr · May 29, 2023 · 23bb08f · 23bb08f
1 parent 7bb5ade
commit 23bb08f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/uniquely/com-pwa/src/ui/page/admin-order-list.ts b/uniquely/com-pwa/src/ui/page/admin-order-list.ts
@@ -98,7 +98,7 @@ export class AlwatrPageAdminOrderList extends ScheduleUpdateToFrameMixin(
       reloadingFailed: 'complete',
       reloading: 'complete',
       complete: this._renderStateComplete,
-    });
+    }, this);
   }
 
   protected _renderStateLoading(): unknown {

diff --git a/uniquely/com-pwa/src/ui/page/admin-order.ts b/uniquely/com-pwa/src/ui/page/admin-order.ts
@@ -17,7 +17,7 @@ import {message, number, replaceNumber} from '@alwatr/i18n';
 import '@alwatr/icon';
 import {calcDiscount} from '@alwatr/math';
 import {redirect} from '@alwatr/router';
-import {subscribe} from '@alwatr/signal/src/core.js';
+import {eventListener} from '@alwatr/signal';
 import {AlwatrDocumentStorage} from '@alwatr/type';
 import {Order, OrderDraft, OrderItem, OrderShippingInfo, Product} from '@alwatr/type/customer-order-management.js';
 import '@alwatr/ui-kit/card/icon-box.js';
@@ -169,7 +169,9 @@ export class AlwatrPageAdminOrder extends UnresolvedMixin(LocalizeMixin(SignalMi
     super.connectedCallback();
 
     this._addSignalListeners(
-        subscribe(buttons.backToOrderList.clickSignalId, (): void => redirect({sectionList: ['admin-order-list']})),
+        eventListener.subscribe(buttons.backToOrderList.clickSignalId, (): void => {
+          redirect({sectionList: ['admin-order-list']});
+        }),
     );
   }
 
@@ -190,7 +192,7 @@ export class AlwatrPageAdminOrder extends UnresolvedMixin(LocalizeMixin(SignalMi
       reloadingFailed: 'complete',
       reloading: 'complete',
       complete: this._renderStateComplete,
-    });
+    }, this);
   }
 
   protected _renderStateLoading(): unknown {

diff --git a/uniquely/com-pwa/src/ui/stuff/user-inc-order-box.ts b/uniquely/com-pwa/src/ui/stuff/user-inc-order-box.ts
@@ -62,6 +62,12 @@ export class alwatrUserIncOrderBox extends LocalizeMixin(SignalMixin(AlwatrBaseE
     .empty-order {
       padding: calc(2 * var(--sys-spacing-track));
     }
+
+    a {
+      display: block;
+      color: inherit;
+      text-decoration: none;
+    }
   `;
 
   @property()
@@ -79,15 +85,15 @@ export class alwatrUserIncOrderBox extends LocalizeMixin(SignalMixin(AlwatrBaseE
       <alwatr-icon-box .content=${userProfileIconBox}>
         <div class="detail-container">
           <div>
-            <span>${message('page_admin_order_list_phone_number')}:‌</span>
+            <span>${message('page_admin_order_list_phone_number')}: </span>
             <span dir="ltr">+${this.userIncOrder?.phoneNumber}</span>
           </div>
           <div>
-            <span>${message('page_admin_order_list_province')}:‌</span>
+            <span>${message('page_admin_order_list_province')}: </span>
             <span>${this.userIncOrder?.province}</span>
           </div>
           <div>
-            <span>${message('page_admin_order_list_city')}:‌</span>
+            <span>${message('page_admin_order_list_city')}: </span>
             <span>${this.userIncOrder?.city}</span>
           </div>
         </div>