Просмотр исходного кода

Merge branch 'ui-refactor-phase-2' of guanli/ngfrontend into develop

bill001 2 недель назад
Родитель
Сommit
cec4bb3e18

+ 6 - 7
src/ui-refactor/views/guest-shop/GuestOrderDetails.vue

@@ -11,11 +11,12 @@ const numeric = value =>
 export default {
 export default {
   name: 'GuestOrderDetails',
   name: 'GuestOrderDetails',
   components: { UiSectionCard },
   components: { UiSectionCard },
-  props: { order: { type: Object, required: true }, items: { type: Array, default: () => [] }},
+  props: {
+    order: { type: Object, required: true },
+    items: { type: Array, default: () => [] },
+    showBv: Boolean
+  },
   computed: {
   computed: {
-    showBv() {
-      return this.order.SHOW_BV === true
-    },
     totalBv() {
     totalBv() {
       return this.order.PAY_PV != null ? this.order.PAY_PV : this.order.PV
       return this.order.PAY_PV != null ? this.order.PAY_PV : this.order.PV
     },
     },
@@ -84,9 +85,7 @@ export default {
       return this.order.PAY_TYPE === 'pay_stack' ? 'Paystack' : this.order.PAY_TYPE || '—'
       return this.order.PAY_TYPE === 'pay_stack' ? 'Paystack' : this.order.PAY_TYPE || '—'
     },
     },
     address() {
     address() {
-      return (
-        this.order.FULL_ADDRESS === 'Self Pick-up' ? 'Self Pick-up' : 'Delivery'
-      )
+      return String(this.order.EXPRESS_TYPE) === '1' ? 'Self Pick-up' : 'Delivery'
     }
     }
   },
   },
   methods: {
   methods: {

+ 6 - 2
src/ui-refactor/views/guest-shop/GuestOrderPage.vue

@@ -37,7 +37,11 @@ export default {
         const { data } = await fetchGuestOrderDetail({ orderSn: this.order })
         const { data } = await fetchGuestOrderDetail({ orderSn: this.order })
         if (version !== this.requestVersion) return
         if (version !== this.requestVersion) return
         if (!data || !data.order || data.order.SN !== this.order) { throw new Error('Unexpected order reference') }
         if (!data || !data.order || data.order.SN !== this.order) { throw new Error('Unexpected order reference') }
-        this.detail = { order: data.order, goods: Array.isArray(data.goods) ? data.goods : [] }
+        this.detail = {
+          order: data.order,
+          goods: Array.isArray(data.goods) ? data.goods : [],
+          showBv: Boolean(usersInfo.accessToken())
+        }
       } catch (error) {
       } catch (error) {
         if (version === this.requestVersion) this.failed = true
         if (version === this.requestVersion) this.failed = true
       } finally {
       } finally {
@@ -111,7 +115,7 @@ export default {
         @click="loadOrder"
         @click="loadOrder"
       >Retry</el-button>
       >Retry</el-button>
     </ui-section-card>
     </ui-section-card>
-    <guest-order-details v-else :order="detail.order" :items="detail.goods">
+    <guest-order-details v-else :order="detail.order" :items="detail.goods" :show-bv="detail.showBv">
       <template slot="sidebar">
       <template slot="sidebar">
         <ui-section-card title="Receipt">
         <ui-section-card title="Receipt">
           <p>Download a copy of your order receipt for your records.</p>
           <p>Download a copy of your order receipt for your records.</p>

+ 1 - 1
src/ui-refactor/views/guest-shop/GuestPurchaseFlow.vue

@@ -152,7 +152,7 @@
     <paystack-payment-dialog
     <paystack-payment-dialog
       :visible="emailVisible"
       :visible="emailVisible"
       :amount="pending ? pending.amount : totals.total"
       :amount="pending ? pending.amount : totals.total"
-      :currency="pending ? pending.currency : currency"
+      :currency="paymentCurrency"
       :loading="submitting || sdkActive"
       :loading="submitting || sdkActive"
       :title="payType === 'pay_stack' ? 'Paystack Payment' : 'Confirm your order'"
       :title="payType === 'pay_stack' ? 'Paystack Payment' : 'Confirm your order'"
       :note="
       :note="

+ 2 - 2
src/ui-refactor/views/guest-shop/README.md

@@ -29,7 +29,7 @@
 
 
 匿名下单实际可返回订单记录 `SN / PAY_AMOUNT / ORDER_AMOUNT / COUNTRY_ID / CURRENCY_ID`:金额优先取 `PAY_AMOUNT`,缺失时取 `ORDER_AMOUNT`,不使用 `_STANDARD` 字段或 `EXCHANGE_RATE` 换算。订单未返回 ISO 币种代码时,必须先核对 `COUNTRY_ID` 和当前国家,再用 `CURRENCY_ID` 匹配所选商品的 `LOCAL_CURRENCY_ID`,使用该商品的 `COIN`;无法匹配时保留订单并阻止支付。继续兼容原 `SN / amount / currency`,显式返回的 `amount / currency` 优先。Paystack 使用本次结账填写的邮箱,响应 `EMAIL` 不覆盖填写值,避免后端返回空邮箱使支付失败;取消后继续支付仍使用同一订单与邮箱,不生成替代邮箱。SDK 返回的错误沿原错误处理上报。
 匿名下单实际可返回订单记录 `SN / PAY_AMOUNT / ORDER_AMOUNT / COUNTRY_ID / CURRENCY_ID`:金额优先取 `PAY_AMOUNT`,缺失时取 `ORDER_AMOUNT`,不使用 `_STANDARD` 字段或 `EXCHANGE_RATE` 换算。订单未返回 ISO 币种代码时,必须先核对 `COUNTRY_ID` 和当前国家,再用 `CURRENCY_ID` 匹配所选商品的 `LOCAL_CURRENCY_ID`,使用该商品的 `COIN`;无法匹配时保留订单并阻止支付。继续兼容原 `SN / amount / currency`,显式返回的 `amount / currency` 优先。Paystack 使用本次结账填写的邮箱,响应 `EMAIL` 不覆盖填写值,避免后端返回空邮箱使支付失败;取消后继续支付仍使用同一订单与邮箱,不生成替代邮箱。SDK 返回的错误沿原错误处理上报。
 
 
-支付金额为主币单位,只在支付适配时转为最小单位一次。下单成功、支付数据有效后直接按返回的最终金额调用 SDK,金额或展示币种变化不再中断流程要求二次确认,不自行换汇。页面移除未付订单已保存的提示;内部仍保留本次 SN,取消支付后继续支付不重复下单。按 2026-10-27 用户要求,`OrderPaystack` 调用 V1 SDK `setup` 时的 `currency` 固定传 `NGN`,不区分国家;金额数值及商品、订单页面的币种展示保持原逻辑。继续复消 V1 的 SN / metadata 协议,并处理脚本失败、超时及 SDK 异常;不使用注册的 accessCode / draft 协议。响应中的 `STATUS / PAY_AT` 不作为前端确认已付款的依据。
+支付金额为主币单位,只在支付适配时转为最小单位一次。支付确认弹窗的币种单独取 `/no-login-show-cart` 返回的 `coin`,首次打开、订单返回后和继续支付均使用该值,不跟随商品或订单的展示币种;金额数值保持原逻辑,不自行换汇。下单成功、支付数据有效后直接按返回的最终金额调用 SDK,不再中断流程要求二次确认。页面移除未付订单已保存的提示;内部仍保留本次 SN,取消支付后继续支付不重复下单。按 2026-10-27 用户要求,`OrderPaystack` 调用 V1 SDK `setup` 时的 `currency` 固定传 `NGN`,不区分国家;商品、订单页面的币种展示保持原逻辑。继续复消 V1 的 SN / metadata 协议,并处理脚本失败、超时及 SDK 异常;不使用注册的 accessCode / draft 协议。响应中的 `STATUS / PAY_AT` 不作为前端确认已付款的依据。
 
 
 请求期间防止重复提交。关闭支付保留 SN,重开只恢复支付,不重复 POST,也不调用会员取消接口;未付单存在时锁定商品、地址和支付方式。异步响应和 SDK 回调受组件生命周期与本次支付序号约束。
 请求期间防止重复提交。关闭支付保留 SN,重开只恢复支付,不重复 POST,也不调用会员取消接口;未付单存在时锁定商品、地址和支付方式。异步响应和 SDK 回调受组件生命周期与本次支付序号约束。
 
 
@@ -37,7 +37,7 @@
 
 
 详情以 `order.CURRENCY / PAY_AMOUNT / ORDER_AMOUNT / PAY_FREIGHT / FREIGHT / STATUS / CREATED_AT / PAY_TYPE / CONSIGNEE / MOBILE / FULL_ADDRESS / COUNTRY` 展示,配送地址缺失时使用已有 `ADDRESS / LGA_NAME / CITY_NAME`,不把 `PROVINCE` 地区 ID 当名称。`goods` 沿用会员订单商品的 `GOODS_TITLE / SKU_CODE / COVER / REAL_PRICE / BUY_NUMS / TAX_RATE`。商品为空显示暂无明细;缺失金额和地址显示 `—`,不会补成零。税额按原含税算法展示,不再次加到接口金额;总额直接取 `PAY_AMOUNT`,缺失时取 `ORDER_AMOUNT`,两者均为已含税金额。支付状态只取详情接口,数字状态不推断为 Paid,前端支付回调和 URL 参数均不能改变状态。
 详情以 `order.CURRENCY / PAY_AMOUNT / ORDER_AMOUNT / PAY_FREIGHT / FREIGHT / STATUS / CREATED_AT / PAY_TYPE / CONSIGNEE / MOBILE / FULL_ADDRESS / COUNTRY` 展示,配送地址缺失时使用已有 `ADDRESS / LGA_NAME / CITY_NAME`,不把 `PROVINCE` 地区 ID 当名称。`goods` 沿用会员订单商品的 `GOODS_TITLE / SKU_CODE / COVER / REAL_PRICE / BUY_NUMS / TAX_RATE`。商品为空显示暂无明细;缺失金额和地址显示 `—`,不会补成零。税额按原含税算法展示,不再次加到接口金额;总额直接取 `PAY_AMOUNT`,缺失时取 `ORDER_AMOUNT`,两者均为已含税金额。支付状态只取详情接口,数字状态不推断为 Paid,前端支付回调和 URL 参数均不能改变状态。
 
 
-2026-10-27 按用户确认统一八类订单的展示:注册、复消、会员报单、会员复消、AMP、会员升级由接口 `SHOW_BV: true` 显示商品 `REAL_PV` 和订单 BV(优先 `PAY_PV`,缺失时 `PV`);尼日利亚与 UAE 无账号订单隐藏 BV。Payment 下方始终显示 Member 卡片,包含 Member ID、Name、Placed、Paid、Currency;`SHOW_BV` 为 true 时读取 `USER_NAME / REAL_NAME`,否则两个身份字段固定显示 `-`,不把推荐人信息当成游客的会员身份。时间读取 `CREATED_AT / PAY_AT`,未付款且无有效付款时间显示 `Not yet paid`;缺失 BV 显示 `—`,真实零值保留为 `0`。
+2026-10-27 按用户最新确认,订单详情读取现有 `usersInfo.accessToken()`:没有 token 时隐藏全部 BV,有 token 时显示商品 `REAL_PV` 和订单 BV(优先 `PAY_PV`,缺失时 `PV`),不再依赖接口 `SHOW_BV`。展示标识在详情请求完成时读取,重试或切换订单时重新判断;不改认证或 token 存储。Payment 下方始终显示 Member 卡片,包含 Member ID、Name、Placed、Paid、Currency;有 token 时读取 `USER_NAME / REAL_NAME`,否则两个身份字段固定显示 `-`,不把推荐人信息当成游客的会员身份。时间读取 `CREATED_AT / PAY_AT`,未付款且无有效付款时间显示 `Not yet paid`;缺失 BV 显示 `—`,真实零值保留为 `0`。配送卡片标题按 `EXPRESS_TYPE` 判断,数值/字符串 `0` 显示 `Delivery`,`1` 显示 `Self Pick-up`,不再按地址文字推测。
 
 
 复制链接使用当前访问地址和 Vue Router 解析后的路径,自动适配测试/生产域名、部署目录与 Hash 路由;复用既有 clipboard 工具。下载根据现有登录状态选择接口:游客使用 `GET /v1/shop/no-login-order-export/{orderSn}`,已登录使用原 `downloadOrder` 与 `/v1/shop/order-export/{orderSn}`;两者沿用 `fileUrl / targetName` 返回字段。游客调用中的 HTTP 401 留给页面处理,避免会员请求拦截器清缓存并跳回登录;不修改全局拦截器或会员导出方法。下载支持失败重试、阻止重复请求并忽略离开后的响应。不缓存本地订单,不提供邮件发送、物流查询或前端生成收据。
 复制链接使用当前访问地址和 Vue Router 解析后的路径,自动适配测试/生产域名、部署目录与 Hash 路由;复用既有 clipboard 工具。下载根据现有登录状态选择接口:游客使用 `GET /v1/shop/no-login-order-export/{orderSn}`,已登录使用原 `downloadOrder` 与 `/v1/shop/order-export/{orderSn}`;两者沿用 `fileUrl / targetName` 返回字段。游客调用中的 HTTP 401 留给页面处理,避免会员请求拦截器清缓存并跳回登录;不修改全局拦截器或会员导出方法。下载支持失败重试、阻止重复请求并忽略离开后的响应。不缓存本地订单,不提供邮件发送、物流查询或前端生成收据。
 
 

+ 19 - 10
src/ui-refactor/views/guest-shop/__tests__/verifyBrowser.cjs

@@ -45,8 +45,8 @@ async function main() {
           assert(Object.values(ids).includes(country), 'Expected a country string ID')
           assert(Object.values(ids).includes(country), 'Expected a country string ID')
           const currency = country === ids.ae ? 'AED' : 'NGN'
           const currency = country === ids.ae ? 'AED' : 'NGN'
           if (api.endsWith('no-login-reconsume')) data = { list: ['Calmag', 'Elken Spirulina', 'C-Joie Flex'].map((name, i) => ({ ID: 'P' + i, GOODS_NAME: name, GOODS_NO: 'SKU' + i, COVER: 'guest-fixture.png', CONTENT: 'Sample product for isolated verification.', SELL_PRICE: 100, MARKET_PRICE: 120, PRICE_PV: 20, DISCOUNT: 80, STORE_NUMS: 5, TAX_RATE: 7.5, COIN: currency, LOCAL_CURRENCY_ID: country === ids.ae ? '148' : '104' })), totalCount: 60 }
           if (api.endsWith('no-login-reconsume')) data = { list: ['Calmag', 'Elken Spirulina', 'C-Joie Flex'].map((name, i) => ({ ID: 'P' + i, GOODS_NAME: name, GOODS_NO: 'SKU' + i, COVER: 'guest-fixture.png', CONTENT: 'Sample product for isolated verification.', SELL_PRICE: 100, MARKET_PRICE: 120, PRICE_PV: 20, DISCOUNT: 80, STORE_NUMS: 5, TAX_RATE: 7.5, COIN: currency, LOCAL_CURRENCY_ID: country === ids.ae ? '148' : '104' })), totalCount: 60 }
-          // 故意返回相反币种,验证商品 COIN 不被结算配置覆盖。
-          else if (api.endsWith('no-login-show-cart')) data = { sellType: [{ id: 1, sell_type: [{ label: 'pay_stack', name: 'Paystack' }] }], freight: 10, freeShipping: 500, coin: currency === 'NGN' ? 'AED' : 'NGN' }
+          // UAE 商品为 AED,结算返回 NGN,弹窗单独使用结算币种。
+          else if (api.endsWith('no-login-show-cart')) data = { sellType: [{ id: 1, sell_type: [{ label: 'pay_stack', name: 'Paystack' }] }], freight: 10, freeShipping: 500, coin: 'NGN' }
           else data = [{ value: 'R1', label: country === ids.ae ? 'Dubai' : 'Lagos' }]
           else data = [{ value: 'R1', label: country === ids.ae ? 'Dubai' : 'Lagos' }]
         } else if (api === '/v1/user/guest-dec' && request.method() === 'GET') {
         } else if (api === '/v1/user/guest-dec' && request.method() === 'GET') {
           data = {
           data = {
@@ -61,7 +61,7 @@ async function main() {
           detailRequests.push(sn)
           detailRequests.push(sn)
           if (detailMode === 'error') return route.fulfill({ contentType: 'application/json', body: JSON.stringify({ success: false, message: 'Sample query failure' }) })
           if (detailMode === 'error') return route.fulfill({ contentType: 'application/json', body: JSON.stringify({ success: false, message: 'Sample query failure' }) })
           data = {
           data = {
-            order: { SN: sn, STATUS: 'Unpaid', CURRENCY: 'NGN', CREATED_AT: 1792000000, PAY_AT: 0, ORDER_AMOUNT: '120.00', PAY_AMOUNT: '130.00', PAY_FREIGHT: '10.00', PAY_PV: '20.00', CONSIGNEE: 'Sample recipient', MOBILE: '+234123456789', FULL_ADDRESS: 'Sample street, Lagos', COUNTRY: 'Nigeria', PAY_TYPE: 'Paystack', USER_NAME: 'PRIVATE-MEMBER', REAL_NAME: 'Sample member', SHOW_BV: detailMode === 'member' },
+            order: { SN: sn, STATUS: 'Unpaid', CURRENCY: 'NGN', CREATED_AT: 1792000000, PAY_AT: 0, ORDER_AMOUNT: '120.00', PAY_AMOUNT: '130.00', PAY_FREIGHT: '10.00', PAY_PV: '20.00', CONSIGNEE: 'Sample recipient', MOBILE: '+234123456789', FULL_ADDRESS: 'Sample street, Lagos', EXPRESS_TYPE: detailMode === 'member' ? '1' : 0, COUNTRY: 'Nigeria', PAY_TYPE: 'Paystack', USER_NAME: 'PRIVATE-MEMBER', REAL_NAME: 'Sample member', SHOW_BV: detailMode === 'member' },
             goods: [{ GOODS_TITLE: 'Sample ordered product', SKU_CODE: 'SAMPLE-SKU', COVER: 'guest-fixture.png', REAL_PRICE: '120.00', REAL_PV: '20.00', BUY_NUMS: 1, TAX_RATE: 7.5 }]
             goods: [{ GOODS_TITLE: 'Sample ordered product', SKU_CODE: 'SAMPLE-SKU', COVER: 'guest-fixture.png', REAL_PRICE: '120.00', REAL_PV: '20.00', BUY_NUMS: 1, TAX_RATE: 7.5 }]
           }
           }
           if (detailMode === 'empty') {
           if (detailMode === 'empty') {
@@ -174,7 +174,7 @@ async function main() {
       await layouts(market + '-checkout')
       await layouts(market + '-checkout')
       await page.getByRole('button', { name: 'Place order', exact: true }).click()
       await page.getByRole('button', { name: 'Place order', exact: true }).click()
       assert.equal(await page.locator('.ng-paystack-payment-dialog input').count(), 0)
       assert.equal(await page.locator('.ng-paystack-payment-dialog input').count(), 0)
-      assert((await page.locator('.ng-paystack-payment-amount strong').textContent()).includes(currency + ' 130'))
+      assert.equal(await page.locator('.ng-paystack-payment-amount strong').textContent(), 'NGN 130')
       await layouts(market + '-payment', true)
       await layouts(market + '-payment', true)
       await page.getByRole('button', { name: 'Continue to Paystack', exact: true }).focus()
       await page.getByRole('button', { name: 'Continue to Paystack', exact: true }).focus()
       await page.keyboard.press('Enter')
       await page.keyboard.press('Enter')
@@ -188,6 +188,7 @@ async function main() {
       assert.equal(payment.currency, 'NGN')
       assert.equal(payment.currency, 'NGN')
       assert.equal(payment.cart, 'SAMPLE-ORDER-' + orders.length)
       assert.equal(payment.cart, 'SAMPLE-ORDER-' + orders.length)
       assert.equal(payment.email, 'buyer-' + market + '@example.test')
       assert.equal(payment.email, 'buyer-' + market + '@example.test')
+      assert.equal(await page.locator('.ng-paystack-payment-amount strong').textContent(), market === 'ae' ? 'NGN 10' : 'NGN 130')
       assert.equal(await page.locator('.ng-guest-pending').count(), 0)
       assert.equal(await page.locator('.ng-guest-pending').count(), 0)
       assert(!(await page.locator('.ng-guest-shop').textContent()).includes('Your unpaid order is saved for this visit.'))
       assert(!(await page.locator('.ng-guest-shop').textContent()).includes('Your unpaid order is saved for this visit.'))
       const before = orders.length
       const before = orders.length
@@ -202,6 +203,7 @@ async function main() {
       const orderText = await page.locator('.ng-guest-order').textContent()
       const orderText = await page.locator('.ng-guest-order').textContent()
       assert(orderText.includes('NGN 130.00') && orderText.includes('Unpaid'), 'SDK success must not replace server payment status')
       assert(orderText.includes('NGN 130.00') && orderText.includes('Unpaid'), 'SDK success must not replace server payment status')
       assert(!orderText.includes('PRIVATE-MEMBER') && !orderText.includes('BV'))
       assert(!orderText.includes('PRIVATE-MEMBER') && !orderText.includes('BV'))
+      assert(await page.getByRole('heading', { name: 'Delivery', exact: true }).isVisible())
       assert.equal(await page.locator('.ng-public-header').count(), 0)
       assert.equal(await page.locator('.ng-public-header').count(), 0)
       await layouts(market + '-order')
       await layouts(market + '-order')
       const detailCount = detailRequests.length
       const detailCount = detailRequests.length
@@ -224,13 +226,13 @@ async function main() {
     detailMode = 'member'
     detailMode = 'member'
     await page.goto(origin + '/#/guest-order?order=SAMPLE-ORDER-MEMBER')
     await page.goto(origin + '/#/guest-order?order=SAMPLE-ORDER-MEMBER')
     await page.locator('.ng-guest-order-member').waitFor()
     await page.locator('.ng-guest-order-member').waitFor()
-    assert((await page.locator('.ng-guest-order-member').textContent()).includes('PRIVATE-MEMBER'))
-    assert((await page.locator('.ng-guest-order-member').textContent()).includes('Sample member'))
-    assert((await page.locator('.ng-guest-order-item-bv').textContent()).includes('20 BV each'))
-    assert.equal((await page.locator('.ng-guest-order-bv-total dd').textContent()).trim(), '+20 BV')
+    assert(!(await page.locator('.ng-guest-order-member').textContent()).includes('PRIVATE-MEMBER'))
+    assert(!(await page.locator('.ng-guest-order-member').textContent()).includes('Sample member'))
+    assert.equal(await page.locator('.ng-guest-order-item-bv').count(), 0)
+    assert.equal(await page.locator('.ng-guest-order-bv-total').count(), 0)
+    assert(await page.getByRole('heading', { name: 'Self Pick-up', exact: true }).isVisible())
     assert.equal((await page.locator('.ng-guest-order-grand-total strong').textContent()).trim(), 'NGN 130.00')
     assert.equal((await page.locator('.ng-guest-order-grand-total strong').textContent()).trim(), 'NGN 130.00')
-    await layouts('member-order')
-    await page.locator('.ng-guest-order-member').screenshot({ path: path.join(output, 'member-card.png'), animations: 'disabled' })
+    await layouts('anonymous-order-with-bv-flag')
     detailMode = 'empty'
     detailMode = 'empty'
     await page.goto(origin + '/#/guest-order?order=SAMPLE-ORDER-EMPTY')
     await page.goto(origin + '/#/guest-order?order=SAMPLE-ORDER-EMPTY')
     await page.getByText('Item details are unavailable.', { exact: true }).waitFor()
     await page.getByText('Item details are unavailable.', { exact: true }).waitFor()
@@ -282,7 +284,12 @@ async function main() {
     await page.goto(origin + '/#/guest-order?order=SAMPLE-ORDER-SIGNED-IN')
     await page.goto(origin + '/#/guest-order?order=SAMPLE-ORDER-SIGNED-IN')
     await page.getByText('Sample ordered product', { exact: true }).waitFor()
     await page.getByText('Sample ordered product', { exact: true }).waitFor()
     assert.equal(await page.locator('.ng-public-header').count(), 1, 'Signed-in order details must retain the header')
     assert.equal(await page.locator('.ng-public-header').count(), 1, 'Signed-in order details must retain the header')
+    assert((await page.locator('.ng-guest-order-member').textContent()).includes('PRIVATE-MEMBER'))
+    assert((await page.locator('.ng-guest-order-item-bv').textContent()).includes('20 BV each'))
+    assert.equal((await page.locator('.ng-guest-order-bv-total dd').textContent()).trim(), '+20 BV')
+    assert(await page.getByRole('heading', { name: 'Delivery', exact: true }).isVisible())
     await layouts('signed-in-order')
     await layouts('signed-in-order')
+    await page.locator('.ng-guest-order-member').screenshot({ path: path.join(output, 'member-card.png'), animations: 'disabled' })
     receiptUnauthorized = false
     receiptUnauthorized = false
     const memberReceipt = page.waitForEvent('download')
     const memberReceipt = page.waitForEvent('download')
     await page.getByRole('button', { name: 'Download receipt', exact: true }).click()
     await page.getByRole('button', { name: 'Download receipt', exact: true }).click()
@@ -294,6 +301,8 @@ async function main() {
     await page.reload()
     await page.reload()
     await page.getByText('Sample ordered product', { exact: true }).waitFor()
     await page.getByText('Sample ordered product', { exact: true }).waitFor()
     assert.equal(await page.locator('.ng-public-header').count(), 0, 'Anonymous order details must keep the header hidden')
     assert.equal(await page.locator('.ng-public-header').count(), 0, 'Anonymous order details must keep the header hidden')
+    assert.equal(await page.locator('.ng-guest-order-item-bv').count(), 0)
+    assert.equal(await page.locator('.ng-guest-order-bv-total').count(), 0)
     assert.deepEqual(unknown, [])
     assert.deepEqual(unknown, [])
     assert.deepEqual(errors, [])
     assert.deepEqual(errors, [])
     fs.writeFileSync(path.join(output, 'results.json'), JSON.stringify({ checks, orders: orders.length, errors, unknown }, null, 2))
     fs.writeFileSync(path.join(output, 'results.json'), JSON.stringify({ checks, orders: orders.length, errors, unknown }, null, 2))

+ 2 - 0
src/ui-refactor/views/guest-shop/guestPurchase.js

@@ -58,6 +58,7 @@ export default {
       page: 1,
       page: 1,
       limit: 50,
       limit: 50,
       currency: '',
       currency: '',
+      paymentCurrency: '',
       freeShipping: 0,
       freeShipping: 0,
       freight: 0,
       freight: 0,
       payList: [],
       payList: [],
@@ -240,6 +241,7 @@ export default {
         this.payType = this.payList[0]?.label || ''
         this.payType = this.payList[0]?.label || ''
         this.freeShipping = data.freeShipping
         this.freeShipping = data.freeShipping
         this.freight = data.freight
         this.freight = data.freight
+        this.paymentCurrency = data.coin || ''
         // 商品币种优先,结算配置只在商品尚未提供币种时兜底。
         // 商品币种优先,结算配置只在商品尚未提供币种时兜底。
         if (!this.currency) this.currency = data.coin || ''
         if (!this.currency) this.currency = data.coin || ''
         this.settingsReady =
         this.settingsReady =

+ 1 - 1
src/ui-refactor/views/purchase/__tests__/OrderNavigation.spec.js

@@ -15,7 +15,7 @@ import { load } from './loadComponent'
 jest.mock('@/api/shop', () => Object.fromEntries(['fetchProductList', 'fetchReconsumeProductList', 'fetchAutoMaintenanceProductList', 'fetchShoppingCart', 'createOrder', 'createApproachOrder', 'createReconsumeOrder', 'createApproachReconsumeOrder', 'createAutoMaintenanceOrder', 'createApproachAutoMaintenanceOrder', 'deleteApproachOrder', 'fetchOrderList', 'downloadOrder', 'fetchGuestOrderDetail'].map(key => [key, jest.fn()])))
 jest.mock('@/api/shop', () => Object.fromEntries(['fetchProductList', 'fetchReconsumeProductList', 'fetchAutoMaintenanceProductList', 'fetchShoppingCart', 'createOrder', 'createApproachOrder', 'createReconsumeOrder', 'createApproachReconsumeOrder', 'createAutoMaintenanceOrder', 'createApproachAutoMaintenanceOrder', 'deleteApproachOrder', 'fetchOrderList', 'downloadOrder', 'fetchGuestOrderDetail'].map(key => [key, jest.fn()])))
 jest.mock('@/api/user', () => Object.fromEntries(['fetchFullInfo', 'fetchUpgrade', 'fetchUpgradeInfo', 'fetchSendUpgrade', 'getUserInfo', 'fetchOrderList', 'downloadOrder'].map(key => [key, jest.fn()])))
 jest.mock('@/api/user', () => Object.fromEntries(['fetchFullInfo', 'fetchUpgrade', 'fetchUpgradeInfo', 'fetchSendUpgrade', 'getUserInfo', 'fetchOrderList', 'downloadOrder'].map(key => [key, jest.fn()])))
 jest.mock('@/api/config', () => ({ getRegionList: jest.fn().mockResolvedValue({ data: [] }) }))
 jest.mock('@/api/config', () => ({ getRegionList: jest.fn().mockResolvedValue({ data: [] }) }))
-jest.mock('@/utils/usersInfo', () => ({ userId: () => 'OP1', loginTimestamp: jest.fn(), userName: () => 'OP1', userEmail: () => 'operator@example.test' }))
+jest.mock('@/utils/usersInfo', () => ({ userId: () => 'OP1', loginTimestamp: jest.fn(), userName: () => 'OP1', userEmail: () => 'operator@example.test', accessToken: () => 'sample-session' }))
 jest.mock('@/router', () => ({ afterEach: jest.fn() }))
 jest.mock('@/router', () => ({ afterEach: jest.fn() }))
 jest.mock('vue-paystack', () => ({ render: h => h('button') }))
 jest.mock('vue-paystack', () => ({ render: h => h('button') }))
 Vue.use(Router)
 Vue.use(Router)

+ 1 - 1
src/ui-refactor/views/welcome-pack/__tests__/WelcomePackNavigation.spec.js

@@ -15,7 +15,7 @@ import { load } from '../../purchase/__tests__/loadComponent'
 jest.mock('@/api/user', () => ({ fetchWelcomePack: jest.fn(), createWelcomePack: jest.fn() }))
 jest.mock('@/api/user', () => ({ fetchWelcomePack: jest.fn(), createWelcomePack: jest.fn() }))
 jest.mock('@/api/shop', () => ({ deleteApproachOrder: jest.fn(), fetchGuestOrderDetail: jest.fn() }))
 jest.mock('@/api/shop', () => ({ deleteApproachOrder: jest.fn(), fetchGuestOrderDetail: jest.fn() }))
 jest.mock('@/api/setting', () => ({ getLanguages: jest.fn() }))
 jest.mock('@/api/setting', () => ({ getLanguages: jest.fn() }))
-jest.mock('@/utils/usersInfo', () => ({ userName: () => 'OPERATOR', userEmail: () => 'operator@example.test', baseData: () => ({ COUNTRY_ID: 'C1' }), loginTimestamp: () => 'session' }))
+jest.mock('@/utils/usersInfo', () => ({ userName: () => 'OPERATOR', userEmail: () => 'operator@example.test', baseData: () => ({ COUNTRY_ID: 'C1' }), loginTimestamp: () => 'session', accessToken: () => 'sample-session' }))
 jest.mock('vue-paystack', () => ({ render: h => h('button') }))
 jest.mock('vue-paystack', () => ({ render: h => h('button') }))
 Vue.use(Router)
 Vue.use(Router)
 Vue.use(ElementUI)
 Vue.use(ElementUI)

+ 1 - 0
tests/unit/ui-refactor/guestShop.spec.js

@@ -66,6 +66,7 @@ it.each([
   resolve[last](responses[last])
   resolve[last](responses[last])
   const vm = await loading
   const vm = await loading
   expect(vm.currency).toBe(coin)
   expect(vm.currency).toBe(coin)
+  expect(vm.paymentCurrency).toBe(settingsCoin)
   expect(vm.displayProducts[0].CODE).toBe(coin)
   expect(vm.displayProducts[0].CODE).toBe(coin)
 })
 })
 it('uses market price without member discount and does not add included tax again', () => {
 it('uses market price without member discount and does not add included tax again', () => {

+ 44 - 1
tests/unit/ui-refactor/guestShopOrder.spec.js

@@ -323,7 +323,8 @@ it.each([
   ['Member Repeat Purchase', true, 'NGN', 'Nigeria'],
   ['Member Repeat Purchase', true, 'NGN', 'Nigeria'],
   ['AMP', true, 'NGN', 'Nigeria'],
   ['AMP', true, 'NGN', 'Nigeria'],
   ['Member Upgrade', true, 'NGN', 'Nigeria']
   ['Member Upgrade', true, 'NGN', 'Nigeria']
-])('%s details follow SHOW_BV, keep the Member card and use the server total', async(type, showBv, currency, country) => {
+])('%s details follow the login token, keep the Member card and use the server total', async(type, showBv, currency, country) => {
+  usersInfo.accessToken.mockReturnValue(showBv ? 'sample-session' : '')
   const record = {
   const record = {
     ...sample, ORDER_TYPE: type, SHOW_BV: showBv, CURRENCY: currency, COUNTRY: country,
     ...sample, ORDER_TYPE: type, SHOW_BV: showBv, CURRENCY: currency, COUNTRY: country,
     USER_NAME: 'SAMPLE-MEMBER', REAL_NAME: 'Sample member',
     USER_NAME: 'SAMPLE-MEMBER', REAL_NAME: 'Sample member',
@@ -364,6 +365,7 @@ it.each([
 })
 })
 
 
 it('handles missing member fields, zero BV and an unpaid timestamp without invented values', async() => {
 it('handles missing member fields, zero BV and an unpaid timestamp without invented values', async() => {
+  usersInfo.accessToken.mockReturnValue('sample-session')
   fetchGuestOrderDetail.mockResolvedValue({ data: { order: { ...sample, SHOW_BV: true, PAY_PV: null, PV: '0.00', PAY_AT: '0' }, goods: [] }})
   fetchGuestOrderDetail.mockResolvedValue({ data: { order: { ...sample, SHOW_BV: true, PAY_PV: null, PV: '0.00', PAY_AT: '0' }, goods: [] }})
   const vm = mount()
   const vm = mount()
   await settle()
   await settle()
@@ -373,8 +375,49 @@ it('handles missing member fields, zero BV and an unpaid timestamp without inven
 })
 })
 
 
 it.each([null, undefined])('keeps unavailable BV %s distinct from zero', async value => {
 it.each([null, undefined])('keeps unavailable BV %s distinct from zero', async value => {
+  usersInfo.accessToken.mockReturnValue('sample-session')
   fetchGuestOrderDetail.mockResolvedValue({ data: { order: { ...sample, SHOW_BV: true, PAY_PV: value, PV: value }, goods: [] }})
   fetchGuestOrderDetail.mockResolvedValue({ data: { order: { ...sample, SHOW_BV: true, PAY_PV: value, PV: value }, goods: [] }})
   const vm = mount()
   const vm = mount()
   await settle()
   await settle()
   expect(vm.$el.querySelector('.ng-guest-order-bv-total dd').textContent).toBe('—')
   expect(vm.$el.querySelector('.ng-guest-order-bv-total dd').textContent).toBe('—')
 })
 })
+
+it.each([
+  ['', true, false], [null, true, false],
+  ['sample-session', false, true], ['sample-session', undefined, true]
+])('uses token %s to control BV independently of SHOW_BV %s', async(token, flag, visible) => {
+  usersInfo.accessToken.mockReturnValue(token)
+  fetchGuestOrderDetail.mockResolvedValue({ data: {
+    order: { ...sample, SHOW_BV: flag, PAY_PV: '70' },
+    goods: [{ ...sample.hasChildren[0], REAL_PV: '35' }]
+  }})
+  const vm = mount()
+  await settle()
+  expect(vm.$el.querySelectorAll('.ng-guest-order-item-bv')).toHaveLength(visible ? 1 : 0)
+  expect(Boolean(vm.$el.querySelector('.ng-guest-order-bv-total'))).toBe(visible)
+  if (!visible) expect(vm.$el.textContent).not.toContain('BV')
+})
+
+it('hides BV after the token is removed and order details are reloaded', async() => {
+  usersInfo.accessToken.mockReturnValue('sample-session')
+  fetchGuestOrderDetail.mockResolvedValue(response({ ...sample, SHOW_BV: true, PAY_PV: '70' }))
+  const vm = mount()
+  await settle()
+  expect(vm.$el.querySelector('.ng-guest-order-bv-total')).not.toBeNull()
+  usersInfo.accessToken.mockReturnValue('')
+  await vm.loadOrder()
+  await settle()
+  expect(vm.$el.textContent).not.toContain('BV')
+})
+
+it.each([
+  [0, 'Self Pick-up', 'Delivery'], ['0', 'Self Pick-up', 'Delivery'],
+  [1, 'Sample street, Lagos', 'Self Pick-up'], ['1', 'Sample street, Lagos', 'Self Pick-up']
+])('uses EXPRESS_TYPE %s for the delivery title instead of address text', async(type, address, title) => {
+  fetchGuestOrderDetail.mockResolvedValue(response({ ...sample, EXPRESS_TYPE: type, FULL_ADDRESS: address }))
+  const vm = mount()
+  await settle()
+  const titles = Array.from(vm.$el.querySelectorAll('h2'), heading => heading.textContent)
+  expect(titles).toContain(title)
+  expect(titles).not.toContain(title === 'Delivery' ? 'Self Pick-up' : 'Delivery')
+})

+ 26 - 2
tests/unit/ui-refactor/guestShopUi.spec.js

@@ -103,7 +103,7 @@ it('connects product, cart and checkout controls without guest BV or member fiel
   expect(dialog.$el.textContent).not.toContain('Confirm your email')
   expect(dialog.$el.textContent).not.toContain('Confirm your email')
   expect(dialog.$el.querySelector('[type=password]')).toBeNull()
   expect(dialog.$el.querySelector('[type=password]')).toBeNull()
 })
 })
-it('keeps Nigeria merchandise, cart, checkout and email amounts in the product currency', async() => {
+it('keeps Nigeria merchandise in the product currency and uses the cart coin for payment', async() => {
   shop.fetchGuestProducts.mockResolvedValue({ data: { list: [{ ID: 'P1', GOODS_NAME: 'Nigeria product', SELL_PRICE: 100, MARKET_PRICE: 120, DISCOUNT: 80, TAX_RATE: 7.5, STORE_NUMS: 5, COIN: 'NGN' }], totalCount: 1 }})
   shop.fetchGuestProducts.mockResolvedValue({ data: { list: [{ ID: 'P1', GOODS_NAME: 'Nigeria product', SELL_PRICE: 100, MARKET_PRICE: 120, DISCOUNT: 80, TAX_RATE: 7.5, STORE_NUMS: 5, COIN: 'NGN' }], totalCount: 1 }})
   const vm = mount(Flow, { market: 'ng', stage: 'catalog' })
   const vm = mount(Flow, { market: 'ng', stage: 'catalog' })
   await settle()
   await settle()
@@ -121,7 +121,31 @@ it('keeps Nigeria merchandise, cart, checkout and email amounts in the product c
   await settle()
   await settle()
   const dialog = descendants(vm).find(child => child.$options.name === 'PaystackPaymentDialog')
   const dialog = descendants(vm).find(child => child.$options.name === 'PaystackPaymentDialog')
   expect(dialog.visible).toBe(true)
   expect(dialog.visible).toBe(true)
-  expect(dialog.$el.querySelector('.ng-paystack-payment-amount').textContent).toContain('NGN 130')
+  expect(dialog.$el.querySelector('.ng-paystack-payment-amount').textContent).toContain('AED 130')
+})
+it.each(['ng', 'ae'])('uses the show-cart coin in the %s payment dialog before and after an order is created', async market => {
+  shop.fetchGuestCart.mockResolvedValue({ data: { sellType: [{ id: 1, sell_type: [{ label: 'pay_stack', name: 'Paystack' }] }], freight: '20', freeShipping: '10000', coin: 'NGN' }})
+  const vm = mount(Flow, { market, stage: 'catalog' })
+  await settle()
+  expect(vm.$el.querySelector('.ng-signup-product-price').textContent).toContain('AED 150')
+  vm.toggleProduct(vm.products[0])
+  vm.stage = 'checkout'
+  await settle()
+  expect(vm.$el.querySelector('.ng-purchase-summary').textContent).toContain('AED 170')
+  Object.assign(vm.form, { consignee: 'Recipient', acceptMobile: '123', email: 'guest@example.test', province: ['R1'], lgaName: 'District', cityName: 'City', detailaddress: 'Street' })
+  vm.openEmail()
+  await settle()
+  const dialog = descendants(vm).find(child => child.$options.name === 'PaystackPaymentDialog')
+  const amount = dialog.$el.querySelector('.ng-paystack-payment-amount strong')
+  expect(amount.textContent).toBe('NGN 170')
+  vm.pending = { SN: 'PENDING-ORDER', amount: 1280, currency: 'AED', subunits: 128000 }
+  await settle()
+  expect(amount.textContent).toBe('NGN 1,280')
+  vm.closePayment()
+  vm.openEmail()
+  await settle()
+  expect(amount.textContent).toBe('NGN 1,280')
+  expect(shop.createGuestOrder).not.toHaveBeenCalled()
 })
 })
 it.each(['ng', 'ae'])('renders and validates the %s checkout email between phone and region', async market => {
 it.each(['ng', 'ae'])('renders and validates the %s checkout email between phone and region', async market => {
   const vm = mount(Flow, { market, stage: 'catalog' })
   const vm = mount(Flow, { market, stage: 'catalog' })