Explorar el Código

fix: [AE-会员端] 修改问题

bill hace 2 semanas
padre
commit
2ec033a8d5
Se han modificado 28 ficheros con 653 adiciones y 193 borrados
  1. 1 1
      src/ui-refactor/views/account/components/order/AccountOrderCards.vue
  2. 9 1
      src/ui-refactor/views/guest-shop/GuestCheckoutFields.vue
  3. 75 2
      src/ui-refactor/views/guest-shop/GuestOrderDetails.vue
  4. 7 6
      src/ui-refactor/views/guest-shop/GuestOrderPage.vue
  5. 0 10
      src/ui-refactor/views/guest-shop/GuestPurchaseFlow.vue
  6. 6 4
      src/ui-refactor/views/guest-shop/README.md
  7. 29 11
      src/ui-refactor/views/guest-shop/__tests__/verifyBrowser.cjs
  8. 1 12
      src/ui-refactor/views/guest-shop/guestPurchase.js
  9. 2 0
      src/ui-refactor/views/guest-shop/shippingFields.js
  10. 7 3
      src/ui-refactor/views/purchase/CheckoutFields.vue
  11. 2 0
      src/ui-refactor/views/purchase/PurchaseFlow.vue
  12. 3 3
      src/ui-refactor/views/purchase/README.md
  13. 81 38
      src/ui-refactor/views/purchase/UpgradeLevelFields.vue
  14. 25 20
      src/ui-refactor/views/purchase/__tests__/OrderNavigation.spec.js
  15. 113 14
      src/ui-refactor/views/purchase/__tests__/PurchaseFlow.spec.js
  16. 22 4
      src/ui-refactor/views/purchase/purchaseBehavior.js
  17. 7 8
      src/ui-refactor/views/purchase/submitPurchase.js
  18. 7 1
      src/ui-refactor/views/signup/components/welcomePackRegistration.js
  19. 9 4
      src/ui-refactor/views/welcome-pack/MemberWelcomePack.vue
  20. 2 2
      src/ui-refactor/views/welcome-pack/README.md
  21. 7 4
      src/ui-refactor/views/welcome-pack/__tests__/MemberWelcomePack.spec.js
  22. 25 20
      src/ui-refactor/views/welcome-pack/__tests__/WelcomePackNavigation.spec.js
  23. 6 5
      src/views/user/welcome-pack.vue
  24. 29 12
      tests/unit/ui-refactor/guestShop.spec.js
  25. 67 1
      tests/unit/ui-refactor/guestShopOrder.spec.js
  26. 10 2
      tests/unit/ui-refactor/guestShopPaystack.spec.js
  27. 45 5
      tests/unit/ui-refactor/guestShopUi.spec.js
  28. 56 0
      tests/unit/ui-refactor/signup.spec.js

+ 1 - 1
src/ui-refactor/views/account/components/order/AccountOrderCards.vue

@@ -139,7 +139,7 @@ export default {
             '',
             formatMoney(tax)
           ],
-          total: formatMoney(price + tax)
+          total: formatMoney(price)
         }
       })
     },

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

@@ -42,7 +42,15 @@ export default {
               message: 'Please enter ' + field.label.toLowerCase() + '.',
               trigger: 'blur',
               ...(field.key === 'province' ? { type: 'array', min: 1 } : { whitespace: true })
-            }
+            },
+            ...(field.key === 'email'
+              ? [{
+                type: 'email',
+                message: 'Please enter a valid email address.',
+                trigger: 'blur',
+                transform: value => typeof value === 'string' ? value.trim() : value
+              }]
+              : [])
           ]
         ])
       )

+ 75 - 2
src/ui-refactor/views/guest-shop/GuestOrderDetails.vue

@@ -1,7 +1,7 @@
 <script>
 import UiSectionCard from '@/components/ui/UiSectionCard.vue'
 import tool from '@/utils/tool'
-import { amountFilter } from '@/filters'
+import { amountFilter, toThousandFilter } from '@/filters'
 
 const numeric = value =>
   (typeof value === 'number' || (typeof value === 'string' && value.trim() !== '')) &&
@@ -13,6 +13,16 @@ export default {
   components: { UiSectionCard },
   props: { order: { type: Object, required: true }, items: { type: Array, default: () => [] }},
   computed: {
+    showBv() {
+      return this.order.SHOW_BV === true
+    },
+    totalBv() {
+      return this.order.PAY_PV != null ? this.order.PAY_PV : this.order.PV
+    },
+    totalBvLabel() {
+      const value = this.bv(this.totalBv)
+      return value === '—' ? value : '+' + value + ' BV'
+    },
     currency() {
       const code = this.order.CURRENCY
       return typeof code === 'string' && /^[A-Z]{3}$/.test(code) ? code : ''
@@ -64,6 +74,12 @@ export default {
           ? value
           : '—'
     },
+    paidAt() {
+      const value = this.order.PAY_AT
+      if (numeric(value) && Number(value) > 0) return tool.formatDate(value)
+      if (typeof value === 'string' && value.trim() && !numeric(value)) return value
+      return /^unpaid$/i.test(this.status) ? 'Not yet paid' : '—'
+    },
     paymentMethod() {
       return this.order.PAY_TYPE === 'pay_stack' ? 'Paystack' : this.order.PAY_TYPE || '—'
     },
@@ -74,6 +90,9 @@ export default {
     }
   },
   methods: {
+    bv(value) {
+      return numeric(value) ? toThousandFilter(value) : '—'
+    },
     money(value) {
       return numeric(value)
         ? (this.currency ? this.currency + ' ' : '') +
@@ -122,6 +141,7 @@ export default {
             <div class="ng-guest-order-item-name">
               <strong>{{ item.GOODS_TITLE || '—' }}</strong>
               <p>{{ item.SKU_CODE || '—' }} · {{ money(item.REAL_PRICE) }} each</p>
+              <p v-if="showBv" class="ng-guest-order-item-bv">{{ bv(item.REAL_PV) }} BV each</p>
             </div>
             <div class="ng-guest-order-item-amount">
               <span>×{{ item.BUY_NUMS == null ? '—' : item.BUY_NUMS }}</span><strong>{{ money(lineTotal(item)) }}</strong>
@@ -138,9 +158,13 @@ export default {
               <dd>{{ money(shipping) }}</dd>
             </div>
             <div>
-              <dt>Tax (included)</dt>
+              <dt>Tax (7.5% incl.)</dt>
               <dd>{{ money(tax) }}</dd>
             </div>
+            <div v-if="showBv" class="ng-guest-order-bv-total">
+              <dt>BV earned</dt>
+              <dd style="color: deepskyblue">{{ totalBvLabel }}</dd>
+            </div>
             <div class="ng-guest-order-total">
               <dt>Total</dt>
               <dd>{{ money(total) }}</dd>
@@ -162,6 +186,30 @@ export default {
             Order reference <strong>{{ order.SN }}</strong>
           </p>
         </ui-section-card>
+        <ui-section-card title="Member" class="ng-guest-order-member">
+          <dl class="ng-guest-order-member-fields">
+            <div>
+              <dt>Member ID</dt>
+              <dd>{{ showBv ? order.USER_NAME || '-' : '-' }}</dd>
+            </div>
+            <div>
+              <dt>Name</dt>
+              <dd>{{ showBv ? order.REAL_NAME || '-' : '-' }}</dd>
+            </div>
+            <div>
+              <dt>Placed</dt>
+              <dd>{{ placedAt }}</dd>
+            </div>
+            <div>
+              <dt>Paid</dt>
+              <dd>{{ paidAt }}</dd>
+            </div>
+            <div>
+              <dt>Currency</dt>
+              <dd>{{ currency || '—' }}</dd>
+            </div>
+          </dl>
+        </ui-section-card>
       </el-col>
       <el-col :xs="24" :md="8"><slot name="sidebar" /></el-col>
     </el-row>
@@ -265,6 +313,31 @@ export default {
 .ng-guest-order-address {
   white-space: pre-line;
 }
+.ng-guest-order-member-fields {
+  margin: 0 0 20px;
+}
+.ng-guest-order-member-fields > div {
+  display: flex;
+  justify-content: space-between;
+  align-items: baseline;
+  gap: 16px;
+  padding: 12px 0;
+  border-bottom: 1px solid #dfe4eb;
+}
+.ng-guest-order-member-fields > div:last-child {
+  border-bottom: 0;
+}
+.ng-guest-order-member-fields dt {
+  color: #606266;
+  font-size: 12px;
+  text-transform: uppercase;
+}
+.ng-guest-order-member-fields dd {
+  min-width: 0;
+  margin: 0;
+  text-align: right;
+  overflow-wrap: anywhere;
+}
 @media (max-width: 767px) {
   .ng-guest-order-heading h2 {
     font-size: 20px;

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

@@ -141,15 +141,16 @@ export default {
             @click="copyLink"
           >Copy</el-button>
           <p>This link is stored in your browser, so it only opens on this device. Send it to your email to keep a copy — your email app opens with the message pre-filled. (Static demo: no server-side email is sent.)</p>
+          <el-button
+            type="text"
+            native-type="button"
+            icon="el-icon-back"
+            @click="$router.push('/login')"
+          >Back to home</el-button>
         </ui-section-card>
       </template>
     </guest-order-details>
-    <el-button
-      type="text"
-      native-type="button"
-      icon="el-icon-back"
-      @click="$router.push('/login')"
-    >Back to home</el-button>
+
   </section>
 </template>
 

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

@@ -137,13 +137,6 @@
               >Continue shopping</el-button>
             </template>
             <template v-else>
-              <el-alert
-                v-if="pending"
-                class="ng-guest-pending"
-                title="Your unpaid order is saved for this visit. Continue payment to complete it."
-                type="info"
-                :closable="false"
-              />
               <el-button
                 type="primary"
                 class="ng-purchase-place-order ng-guest-action"
@@ -322,9 +315,6 @@ export default {
   white-space: normal;
   line-height: 1.5;
 }
-.ng-guest-pending {
-  margin: 12px 0;
-}
 .ng-guest-back {
   margin: 24px 0;
 }

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

@@ -25,17 +25,19 @@
 
 下单只发送 `countryId / goodsId / goodsNum / email / payType / consignee / acceptMobile / province / lgaName / cityName / detailaddress`。手机号区号跟随国家显示,`acceptMobile` 仍传用户输入值,`province` 保留地区路径数组。不发送会员编号、报单中心、支付密码或会员地址 ID。
 
-游客商品卡片、购物车单价/行金额、结账汇总与税额统一使用接口 `MARKET_PRICE`,不套用会员销售价或折扣;保留原含税算法及免运费阈值,税不再叠加到应付金额。游客和注册详情隐藏 Sales Price,登录后的展示与计价保持原样。商品、购物车和结账展示优先使用商品 `COIN`,结算配置的 `coin` 只作兜底;两个 GET 的返回顺序不影响商品币种。Place order 先验证地址,再确认金额并下单,不再要求输入邮箱;下单请求保留 `email` 字段为空字符串。非 Paystack 以匿名下单成功返回的 SN 进入公开详情页。
+游客商品卡片、购物车单价/行金额、结账汇总与税额统一使用接口 `MARKET_PRICE`,不套用会员销售价或折扣;保留原含税算法及免运费阈值,税不再叠加到应付金额。游客和注册详情隐藏 Sales Price,登录后的展示与计价保持原样。商品、购物车和结账展示优先使用商品 `COIN`,结算配置的 `coin` 只作兜底;两个 GET 的返回顺序不影响商品币种。按用户 2026-10-27 最新确认,Nigeria / UAE 结账地址表单在 Phone 和 Region / State 之间填写必填 Email,使用邮箱输入类型和自动填充,提交前校验非空及格式。Place order 先验证邮箱和地址,再确认金额并下单;请求 `email` 使用填写值去掉首尾空格。支付弹窗不重复要求邮箱。非 Paystack 以匿名下单成功返回的 SN 进入公开详情页。
 
-匿名下单实际可返回订单记录 `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,也不重复下单。真实接口能否接受空邮箱并返回有效 `EMAIL` 尚需联调确认。
+匿名下单实际可返回订单记录 `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 返回的错误沿原错误处理上报。
 
-支付金额为主币单位,只在支付适配时转为最小单位一次。最终金额或币种变化时更新弹窗并要求再次确认,不自行换汇。按 2026-10-27 用户要求,`OrderPaystack` 调用 V1 SDK `setup` 时的 `currency` 固定传 `NGN`,不区分国家;金额数值及商品、订单页面的币种展示保持原逻辑。继续复消 V1 的 SN / metadata 协议,并处理脚本失败、超时及 SDK 异常;不使用注册的 accessCode / draft 协议。响应中的 `STATUS / PAY_AT` 不作为前端确认已付款的依据。
+支付金额为主币单位,只在支付适配时转为最小单位一次。下单成功、支付数据有效后直接按返回的最终金额调用 SDK,金额或展示币种变化不再中断流程要求二次确认,不自行换汇。页面移除未付订单已保存的提示;内部仍保留本次 SN,取消支付后继续支付不重复下单。按 2026-10-27 用户要求,`OrderPaystack` 调用 V1 SDK `setup` 时的 `currency` 固定传 `NGN`,不区分国家;金额数值及商品、订单页面的币种展示保持原逻辑。继续复消 V1 的 SN / metadata 协议,并处理脚本失败、超时及 SDK 异常;不使用注册的 accessCode / draft 协议。响应中的 `STATUS / PAY_AT` 不作为前端确认已付款的依据。
 
 请求期间防止重复提交。关闭支付保留 SN,重开只恢复支付,不重复 POST,也不调用会员取消接口;未付单存在时锁定商品、地址和支付方式。异步响应和 SDK 回调受组件生命周期与本次支付序号约束。
 
 `/guest-order?order=<SN>` 在进入、刷新和订单参数变化时调用匿名详情接口,传 `orderSn`,响应为 `{ order, goods }`。订单号必须与请求一致;加载中清除旧明细,失败可重试,离开页面或更换订单后忽略旧响应。`GuestOrderPage` 管理请求、下载与复制,`GuestOrderDetails` 负责展示;卡片复用 `UiSectionCard`,图片、按钮和状态使用 Element UI。
 
-详情以 `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`。支付状态只取详情接口,数字状态不推断为 Paid,前端支付回调和 URL 参数均不能改变状态;不显示会员身份、PV 或 BV。
+详情以 `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`。
 
 复制链接使用当前访问地址和 Vue Router 解析后的路径,自动适配测试/生产域名、部署目录与 Hash 路由;复用既有 clipboard 工具。下载根据现有登录状态选择接口:游客使用 `GET /v1/shop/no-login-order-export/{orderSn}`,已登录使用原 `downloadOrder` 与 `/v1/shop/order-export/{orderSn}`;两者沿用 `fileUrl / targetName` 返回字段。游客调用中的 HTTP 401 留给页面处理,避免会员请求拦截器清缓存并跳回登录;不修改全局拦截器或会员导出方法。下载支持失败重试、阻止重复请求并忽略离开后的响应。不缓存本地订单,不提供邮件发送、物流查询或前端生成收据。
 

+ 29 - 11
src/ui-refactor/views/guest-shop/__tests__/verifyBrowser.cjs

@@ -61,8 +61,8 @@ async function main() {
           detailRequests.push(sn)
           if (detailMode === 'error') return route.fulfill({ contentType: 'application/json', body: JSON.stringify({ success: false, message: 'Sample query failure' }) })
           data = {
-            order: { SN: sn, STATUS: 'Unpaid', CURRENCY: 'NGN', CREATED_AT: 1792000000, ORDER_AMOUNT: '120.00', PAY_AMOUNT: '130.00', PAY_FREIGHT: '10.00', CONSIGNEE: 'Sample recipient', MOBILE: '+234123456789', FULL_ADDRESS: 'Sample street, Lagos', COUNTRY: 'Nigeria', PAY_TYPE: 'Paystack', USER_NAME: 'PRIVATE-MEMBER', SHOW_BV: true },
-            goods: [{ GOODS_TITLE: 'Sample ordered product', SKU_CODE: 'SAMPLE-SKU', COVER: 'guest-fixture.png', REAL_PRICE: '120.00', BUY_NUMS: 1, TAX_RATE: 7.5 }]
+            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' },
+            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') {
             data.goods = []
@@ -81,11 +81,11 @@ async function main() {
           assert.equal(request.method(), 'POST')
           const params = request.postDataJSON()
           assert(!('payPassword' in params) && !('userName' in params) && !('decUserName' in params))
-          assert.equal(params.email, '')
+          assert.equal(params.email, params.countryId === ids.ae ? 'buyer-ae@example.test' : 'buyer-ng@example.test')
           orders.push(params)
           data = params.countryId === ids.ae
             ? { SN: 'SAMPLE-ORDER-' + orders.length, amount: 10, currency: 'USD', EMAIL: 'visitor@example.test' }
-            : { SN: 'SAMPLE-ORDER-' + orders.length, DEC_SN: 'SAMPLE-DECLARATION', COUNTRY_ID: ids.ng, CURRENCY_ID: '104', ORDER_AMOUNT: 130, PAY_AMOUNT: 130, PAY_FREIGHT: 0, PAY_AMOUNT_STANDARD: 0.075, EXCHANGE_RATE: '1200', EMAIL: 'visitor@example.test', STATUS: 1 }
+            : { SN: 'SAMPLE-ORDER-' + orders.length, DEC_SN: 'SAMPLE-DECLARATION', COUNTRY_ID: ids.ng, CURRENCY_ID: '104', ORDER_AMOUNT: 130, PAY_AMOUNT: 130, PAY_FREIGHT: 0, PAY_AMOUNT_STANDARD: 0.075, EXCHANGE_RATE: '1200', EMAIL: '', STATUS: 1 }
         } else { unknown.push(api); return route.abort() }
         return route.fulfill({ contentType: 'application/json', body: JSON.stringify({ success: true, data: { data }}) })
       }
@@ -155,11 +155,22 @@ async function main() {
       await page.locator('#ng-guest-consignee').press('Tab')
       assert.equal(await page.evaluate(() => document.activeElement.id), 'ng-guest-acceptMobile')
       await page.locator('#ng-guest-acceptMobile').fill('123456789')
+      await page.locator('#ng-guest-acceptMobile').press('Tab')
+      assert.equal(await page.evaluate(() => document.activeElement.id), 'ng-guest-email')
+      await page.locator('#ng-guest-email').fill('invalid')
       await page.locator('#ng-guest-province input').click()
       await page.locator('.el-cascader-node:visible').first().click()
       await page.locator('#ng-guest-lgaName').fill('Sample district')
       await page.locator('#ng-guest-cityName').fill('Sample city')
       await page.locator('#ng-guest-detailaddress').fill('Sample street')
+      const ordersBeforeValidation = orders.length
+      await page.getByRole('button', { name: 'Place order', exact: true }).click()
+      await page.getByText('Please enter a valid email address.', { exact: true }).waitFor()
+      assert.equal(orders.length, ordersBeforeValidation)
+      assert.equal(await page.locator('.ng-paystack-payment-dialog:visible').count(), 0)
+      await page.locator('#ng-guest-email').fill('buyer-' + market + '@example.test')
+      await page.locator('#ng-guest-email').press('Tab')
+      assert(await page.locator('#ng-guest-province').evaluate(element => element.contains(document.activeElement)))
       await layouts(market + '-checkout')
       await page.getByRole('button', { name: 'Place order', exact: true }).click()
       assert.equal(await page.locator('.ng-paystack-payment-dialog input').count(), 0)
@@ -167,11 +178,6 @@ async function main() {
       await layouts(market + '-payment', true)
       await page.getByRole('button', { name: 'Continue to Paystack', exact: true }).focus()
       await page.keyboard.press('Enter')
-      if (market === 'ae') {
-        await page.locator('.ng-paystack-payment-amount strong').filter({ hasText: 'USD 10' }).waitFor()
-        assert.equal(await page.evaluate(() => !!window.samplePaymentOpened), false)
-        await page.getByRole('button', { name: 'Continue to Paystack', exact: true }).click()
-      }
       try { await page.waitForFunction(() => window.samplePaymentOpened === true, null, { timeout: 10000 }) } catch (error) {
         await page.screenshot({ path: path.join(output, 'failure.png'), fullPage: true })
         console.error(JSON.stringify({ errors, unknown, text: await page.locator('.ng-guest-shop').textContent(), messages: await page.locator('.el-message').allTextContents() }))
@@ -179,9 +185,11 @@ async function main() {
       }
       const payment = await page.evaluate(() => ({ amount: window.samplePayment.amount, currency: window.samplePayment.currency, cart: window.samplePayment.metadata.cart_id, email: window.samplePayment.email }))
       assert.equal(payment.amount, market === 'ae' ? 1000 : 13000)
-      assert.equal(payment.currency, market === 'ae' ? 'USD' : 'NGN')
+      assert.equal(payment.currency, 'NGN')
       assert.equal(payment.cart, 'SAMPLE-ORDER-' + orders.length)
-      assert.equal(payment.email, 'visitor@example.test')
+      assert.equal(payment.email, 'buyer-' + market + '@example.test')
+      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.'))
       const before = orders.length
       await page.evaluate(() => { window.samplePayment.onClose(); window.samplePaymentOpened = false })
       await page.getByRole('button', { name: 'Continue payment', exact: true }).click()
@@ -213,6 +221,16 @@ async function main() {
       assert.equal((await downloadPromise).suggestedFilename(), 'sample-receipt.pdf')
       receiptUnauthorized = true
     }
+    detailMode = 'member'
+    await page.goto(origin + '/#/guest-order?order=SAMPLE-ORDER-MEMBER')
+    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.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' })
     detailMode = 'empty'
     await page.goto(origin + '/#/guest-order?order=SAMPLE-ORDER-EMPTY')
     await page.getByText('Item details are unavailable.', { exact: true }).waitFor()

+ 1 - 12
src/ui-refactor/views/guest-shop/guestPurchase.js

@@ -320,7 +320,7 @@ export default {
       if (!this.pending && (!this.canCheckout || !validShipping(this.form) || !this.regionsReady)) {
         if (this.$refs.shipping) this.$refs.shipping.validate()
         this.fail(
-          'Please complete your shipping address and load delivery regions before placing the order.'
+          'Please complete your email and shipping address before placing the order.'
         )
         return
       }
@@ -343,7 +343,6 @@ export default {
           countryId: this.country.ID,
           goodsId: this.items.map(item => item.ID),
           goodsNum: this.items.map(item => item.quantity),
-          email: this.form.email.trim(),
           payType: type,
           ...Object.fromEntries(shippingFields.map(key => [key, this.form[key].trim()])),
           province: [...this.form.province]
@@ -370,14 +369,7 @@ export default {
           amount: data.amount ?? data.PAY_AMOUNT ?? data.ORDER_AMOUNT,
           currency: data.currency ?? currencyProduct?.COIN
         }
-        this.form.email = typeof data.EMAIL === 'string' ? data.EMAIL.trim() : ''
         this.pending = paymentOrder(this.pending)
-        if (this.pending.amount !== this.totals.total || this.pending.currency !== this.currency) {
-          this.$message.info(
-            'The final payment amount has been updated. Please review it and continue to Paystack.'
-          )
-          return
-        }
         await this.startPayment()
       } catch (error) {
         if (this.current(no)) this.fail(error)
@@ -388,9 +380,6 @@ export default {
     async startPayment() {
       try {
         this.pending = paymentOrder(this.pending)
-        if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(this.form.email)) {
-          throw new Error('The order did not return a valid payment email. Please contact customer service with your order number.')
-        }
         this.paymentAttempt++
         this.sdkActive = true
         await this.$nextTick()

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

@@ -1,6 +1,7 @@
 export const addressFields = [
   { key: 'consignee', label: 'Recipient' },
   { key: 'acceptMobile', label: 'Phone' },
+  { key: 'email', label: 'Email' },
   { key: 'province', label: 'Region / State' },
   { key: 'lgaName', label: 'Area / District' },
   { key: 'cityName', label: 'City' },
@@ -13,5 +14,6 @@ export const shippingFields = addressFields
 
 export const validShipping = form =>
   shippingFields.every(key => typeof form[key] === 'string' && form[key].trim()) &&
+  /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(form.email.trim()) &&
   Array.isArray(form.province) &&
   form.province.length > 0

+ 7 - 3
src/ui-refactor/views/purchase/CheckoutFields.vue

@@ -65,10 +65,13 @@
           :type="
             field.key === 'remark'
               ? 'textarea'
-              : guest && field.key === 'acceptMobile'
-                ? 'tel'
-                : 'text'
+              : field.key === 'email'
+                ? 'email'
+                : guest && field.key === 'acceptMobile'
+                  ? 'tel'
+                  : 'text'
           "
+          :autocomplete="field.key === 'email' ? 'email' : undefined"
           :disabled="disabled"
           @input="change(field.key, $event)"
         >
@@ -196,6 +199,7 @@ export default {
       const fields = [
         { key: 'consignee', label: 'Recipient' },
         { key: this.upgrade ? 'acceptMobile' : 'mobile', label: 'Phone' },
+        ...(this.guest ? [{ key: 'email', label: 'Email' }] : []),
         { key: 'areaSelected', label: 'Region / State' },
         { key: 'lgaName', label: 'Area / District' },
         { key: 'cityName', label: 'City' },

+ 2 - 0
src/ui-refactor/views/purchase/PurchaseFlow.vue

@@ -210,6 +210,7 @@
               :upgrade-method="form.upgradeFunc"
               :difference="needDiffPv"
               :bv="pricePvSum"
+              :ready="upgradeReady"
               :disabled="busy"
               @change="handleChangeLevel"
             />
@@ -291,6 +292,7 @@
               :upgrade-method="form.upgradeFunc"
               :difference="needDiffPv"
               :bv="pricePvSum"
+              :ready="upgradeReady"
               :disabled="busy"
               @change="handleChangeLevel"
             />

+ 3 - 3
src/ui-refactor/views/purchase/README.md

@@ -14,7 +14,7 @@
 
 购物车摘要和结算页共用 `UpgradeLevelFields.vue`,只使用 Element UI Card / Form / Select / Descriptions 展示当前等级、升级方式、目标等级、补差 BV 和当前商品 BV。两处绑定原 `form.upgradeValue`,选项继续取旧接口 `LEVEL_LIST` 的 `ID` / `LEVEL_NAME` / `REPAIR_PV`,change 事件直接调用继承的旧 `handleChangeLevel`,不重算补差值。会员查询处保留原 `ADD_AT` 的入会日期展示,结算会员编号使用升级语义。
 
-旧 `src/views/user/member-upgrade.vue`、查询适配、计价、提交、支付及草稿逻辑均不修改。旧提交没有以商品 BV 对比补差 BV 的前端拦截,本次不移植原型中的这条规则;等级与会员必填、余额检查、请求字段和原支付链路保持现有逻辑。
+旧 `src/views/user/member-upgrade.vue` 保留。按用户 2026-10-27 最新确认,新适配层在购物车和结算校验商品总 BV 是否达到所选等级的补差 BV;补差值沿用 `REPAIR_PV → needDiffPv`,不自行计算。等级与会员必填、余额检查、请求字段和原支付链路保持现有逻辑。
 
 ## 状态和业务边界
 
@@ -23,9 +23,9 @@
 - 所有分页商品进入同一选择列表,再投影为旧代码使用的 `chose_num` / `goodsNum` 数据形状。数量为正整数且不得超过库存,未知价格/BV/税率/折扣不可结算。
 - 复消三类保留原 `SELL_PRICE × 数量 × DISCOUNT / 100`、BV 折扣、税额展示、自提及免运费逻辑;升级仍按原价格/BV计算。税额不再次加到总额。
 - 自动续期门槛来自 `ampDivideLine`,未取得有效门槛或不足时禁止结算和提交,支付方式继续排除 `prp`。
-- 升级保留会员查询、目标等级选择、商品选择的原顺序;保留满级/报单中心限制、等级及差额字段、原提交校验。未增加差额 BV 拦截。
+- 升级保留会员查询、目标等级选择、商品选择的原顺序;保留满级/报单中心限制、等级及差额字段、原提交校验。等级列表兼容数组与以 ID 为键的对象,选项展示和提示中的等级查找使用同一列表。购物车总 BV 小于补差 BV 时标红、显示当前/所需 BV 和目标等级并禁用结算;达到或超过时标绿并允许继续,等级仍可选择。未选等级、补差值缺失/无效时不允许结算,数值或字符串零补差有效。数量或等级变化实时更新,直接进入结算及调用提交方法也受同一校验约束,不改变付款金额或后端请求字段。
 - Reporting Center ID 沿用旧 `isDec` 规则:普通会员可编辑且必填;报单中心(`Number(isDec) === 1`)默认填当前报单中心账号并禁用编辑。默认账号继续由旧 watcher 与会员切换逻辑填入。会员升级不展示该字段,也不增加人工填写校验,提交仍保留原接口返回的 `decUserName`。
-- 支付方式、支付密码提示、API、金额来源、Paystack channels、取消中间订单沿用对应旧页。余额支付成功、Paystack 成功倒计时结束或点击返回按钮后,新页面将旧订单地址转为 `/guest-order?order=<本次响应的 SN>`,打开订单详情;旧响应缺少 SN 时仍回到首页 Orders 对应分类。旧页面、旧路由及提交方法保留。新层锁定提交上下文,阻止重复提交、支付中切换和上一交易的迟到回调;取消失败保留支付窗口和商品,便于重试。
+- 支付方式、支付密码提示、API、金额来源、Paystack channels、取消中间订单沿用对应旧页。余额支付成功或 Paystack 成功回调后,立即使用本次响应的 `SN` 跳转 `/guest-order?order=<SN>`,不再等待成功倒计时或先打开旧订单列表。兼容接口包装的 `data` 与直接返回的订单对象;缺少 SN 时仍回到首页 Orders 对应分类。旧页面、旧路由及提交方法保留。新层锁定提交上下文,阻止重复提交、支付中切换和上一交易的迟到回调;取消失败保留支付窗口和商品,便于重试。
 
 ## 验证证据
 

+ 81 - 38
src/ui-refactor/views/purchase/UpgradeLevelFields.vue

@@ -1,42 +1,52 @@
 <template>
-  <el-card shadow="never" class="ng-purchase-upgrade">
-    <h3 class="ng-purchase-upgrade-title">Upgrade member</h3>
-    <p class="ng-purchase-upgrade-note">
-      Current level: <strong>{{ currentLevel || '—' }}</strong>. Select the level to upgrade to.
+  <div class="ng-purchase-upgrade-block">
+    <el-card
+      shadow="never"
+      class="ng-purchase-upgrade"
+      :class="{ 'is-sufficient': value && ready, 'is-insufficient': value && !ready }"
+    >
+      <h3 class="ng-purchase-upgrade-title">Upgrade member</h3>
+      <p class="ng-purchase-upgrade-note">
+        Current level: <strong>{{ currentLevel || '—' }}</strong>. Select the level to upgrade to.
+        Cart BV must cover the upgrade difference.
+      </p>
+      <el-form label-position="top" :disabled="disabled" @submit.native.prevent>
+        <el-form-item label="Upgrade method">
+          <el-input :value="upgradeMethod" disabled />
+        </el-form-item>
+        <el-form-item label="Upgrade to" for="ng-purchase-upgrade-level" required>
+          <el-select
+            id="ng-purchase-upgrade-level"
+            :value="value"
+            value-key="value"
+            placeholder="Select level"
+            popper-class="ng-refactor-popper"
+            @input="$emit('input', $event)"
+            @change="$emit('change', $event)"
+          >
+            <el-option
+              v-for="level in levelOptions"
+              :key="level.ID"
+              :label="level.LEVEL_NAME"
+              :value="{ value: level.ID, diffPv: level.REPAIR_PV }"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-descriptions :column="1" :colon="false">
+        <el-descriptions-item label="Upgrade difference">
+          <template
+            v-if="difference !== '' && difference != null"
+          >{{ difference | toThousandFilter }} BV</template>
+          <span v-else>—</span>
+        </el-descriptions-item>
+        <el-descriptions-item label="Current BV">{{ bv | toThousandFilter }} BV</el-descriptions-item>
+      </el-descriptions>
+    </el-card>
+    <p v-if="value && !ready" class="ng-purchase-upgrade-warning" role="alert">
+      <i class="el-icon-warning-outline" aria-hidden="true" /> {{ warning }}
     </p>
-    <el-form label-position="top" :disabled="disabled" @submit.native.prevent>
-      <el-form-item label="Upgrade method">
-        <el-input :value="upgradeMethod" disabled />
-      </el-form-item>
-      <el-form-item label="Upgrade to" for="ng-purchase-upgrade-level" required>
-        <el-select
-          id="ng-purchase-upgrade-level"
-          :value="value"
-          value-key="value"
-          placeholder="Select level"
-          popper-class="ng-refactor-popper"
-          @input="$emit('input', $event)"
-          @change="$emit('change', $event)"
-        >
-          <el-option
-            v-for="level in options"
-            :key="level.ID"
-            :label="level.LEVEL_NAME"
-            :value="{ value: level.ID, diffPv: level.REPAIR_PV }"
-          />
-        </el-select>
-      </el-form-item>
-    </el-form>
-    <el-descriptions :column="1" :colon="false">
-      <el-descriptions-item label="Upgrade difference">
-        <template
-          v-if="difference !== '' && difference != null"
-        >{{ difference | toThousandFilter }} BV</template>
-        <span v-else>—</span>
-      </el-descriptions-item>
-      <el-descriptions-item label="Current BV">{{ bv | toThousandFilter }} BV</el-descriptions-item>
-    </el-descriptions>
-  </el-card>
+  </div>
 </template>
 
 <script>
@@ -47,12 +57,26 @@ export default {
   filters: { toThousandFilter },
   props: {
     value: { type: [Object, String], default: '' },
-    options: { type: Array, required: true },
+    options: { type: [Array, Object], required: true },
     currentLevel: { type: String, default: '' },
     upgradeMethod: { type: String, default: '' },
     difference: { type: [Number, String], default: '' },
     bv: { type: [Number, String], default: 0 },
+    ready: Boolean,
     disabled: { type: Boolean, default: false }
+  },
+  computed: {
+    levelOptions() {
+      return Object.values(this.options)
+    },
+    warning() {
+      if (
+        this.difference === '' || this.difference == null ||
+        !Number.isFinite(Number(this.difference)) || Number(this.difference) < 0
+      ) return 'Upgrade BV requirement is unavailable. Please select a level again.'
+      const level = this.levelOptions.find(level => level.ID === this.value?.value)
+      return `Cart BV (${toThousandFilter(this.bv)}) must be ≥ ${toThousandFilter(this.difference)} BV to upgrade to ${level?.LEVEL_NAME || 'the selected level'}.`
+    }
   }
 }
 </script>
@@ -60,9 +84,28 @@ export default {
 <style lang="scss" scoped>
 .ng-purchase-upgrade {
   min-width: 0;
+}
+
+.ng-purchase-upgrade-block {
   margin-bottom: 16px;
 }
 
+.ng-purchase-upgrade.is-insufficient {
+  border-left: 3px solid #f56c6c;
+}
+
+.ng-purchase-upgrade.is-sufficient {
+  border-left: 3px solid #1f6b3f;
+}
+
+.ng-purchase-upgrade-warning {
+  margin: 12px 0 0;
+  color: #f56c6c;
+  font-size: 13px;
+  line-height: 1.6;
+  overflow-wrap: anywhere;
+}
+
 .ng-purchase-upgrade-title {
   margin: 0 0 12px;
   font-size: 16px;

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

@@ -69,7 +69,7 @@ async function checkout(source) {
   const context = await mount('/dashboard/' + source)
   const flow = context.root.$children[0].$refs.flow
   if (!flow.isSelf) { flow.memberSearch = 'NG2'; await flow.searchMember(); await settle() }
-  if (flow.isUpgrade) { flow.form.upgradeValue = { value: 'L2', diffPv: 300 }; flow.handleChangeLevel(flow.form.upgradeValue) }
+  if (flow.isUpgrade) { flow.form.upgradeValue = { value: 'L2', diffPv: 120 }; flow.handleChangeLevel(flow.form.upgradeValue) }
   flow.toggleProduct(flow.tableData[0])
   flow.changeQuantity({ row: product, value: 2 })
   flow.navigate('checkout')
@@ -107,7 +107,7 @@ beforeEach(() => {
   shop.fetchShoppingCart.mockResolvedValue({ data: { allAddress: [{ ID: 'A1', IS_DEFAULT: '1', ADDRESS: 'Street', MOBILE: '123', CONSIGNEE: 'Recipient' }], userBalance: { cash: 10000 }, payList: { cash: { name: 'Ecoin' }, pay_stack: { name: 'Paystack' }}, sellType: [{ id: 1, sell_type: payList }], freeShipping: 500, freight: 10, coin: 'NGN', isDec: '0', ampDivideLine: '90' }})
   user.getUserInfo.mockResolvedValue({ data: { IS_DEC: '1' }})
   user.fetchFullInfo.mockResolvedValue({ data: { userId: 'U2', countryId: '1', REAL_NAME: 'Target member' }})
-  user.fetchUpgradeInfo.mockResolvedValue({ data: { baseInfo: { REAL_NAME: 'Target member', DEC_NAME: 'Member', IS_MAX: false, LEVEL_LIST: [{ ID: 'L2', LEVEL_NAME: 'Silver', REPAIR_PV: 300 }], NOW_PERF: 0, NEXT_PERF: 300 }}})
+  user.fetchUpgradeInfo.mockResolvedValue({ data: { baseInfo: { REAL_NAME: 'Target member', DEC_NAME: 'Member', IS_MAX: false, LEVEL_LIST: [{ ID: 'L2', LEVEL_NAME: 'Silver', REPAIR_PV: 120 }], NOW_PERF: 0, NEXT_PERF: 300 }}})
   user.fetchUpgrade.mockResolvedValue({ data: { userBalance: { cash: 10000 }, decUserName: 'RC1', allDecPackage: {}, allGoods: [product], region: [], sellType: [{ sell_type: payList }] }})
   for (const [, , cash, paystack] of cases) for (const api of [cash, paystack]) api.mockResolvedValue({ data: { SN: 'ORDER1', ORDER_AMOUNT: 200 }})
   shop.deleteApproachOrder.mockResolvedValue({})
@@ -120,26 +120,31 @@ afterEach(() => {
   jest.useRealTimers()
 })
 
-describe.each(['cash', 'paystack-countdown', 'paystack-button'])('%s success navigation', payment => {
-  it.each(cases)('opens the paid order details for %s', async source => {
-    const context = await checkout(source)
-    const { flow } = context
-    expect(flow.canCheckout).toBe(true)
-    flow.activePayType = payment === 'cash' ? 'cash' : 'pay_stack'
-    flow.$el.querySelector('.ng-purchase-place-order').click()
-    await settle()
-    if (payment !== 'cash') {
-      expect(context.router.currentRoute.path).toBe('/dashboard/checkout')
-      flow.processPayment()
+describe.each(['wrapped', 'direct'])('%s order response', shape => {
+  describe.each(['cash', 'pay_stack'])('%s success navigation', payment => {
+    it.each(cases)('opens the paid order details immediately for %s', async(source, category, cash, paystack) => {
+      const context = await checkout(source)
+      const { flow } = context
+      const order = { SN: 'ORDER1', ORDER_AMOUNT: 200 }
+      const api = payment === 'cash' ? cash : paystack
+      api.mockResolvedValueOnce(shape === 'wrapped' ? { data: order } : order)
+      const push = jest.spyOn(context.router, 'push')
+      expect(flow.canCheckout).toBe(true)
+      flow.activePayType = payment
+      flow.$el.querySelector('.ng-purchase-place-order').click()
       await settle()
-      if (payment === 'paystack-countdown') jest.advanceTimersByTime(5000)
-      else {
-        const dialog = Array.from(document.querySelectorAll('.el-dialog')).find(element => element.querySelector('.el-dialog__title')?.textContent === 'Order successful')
-        dialog.querySelector('.el-dialog__footer button').click()
+      if (payment === 'pay_stack') {
+        expect(context.router.currentRoute.path).toBe('/dashboard/checkout')
+        flow.processPayment()
+        await settle()
       }
+      expectOrderDetails(context)
+      expect(push).toHaveBeenCalledTimes(1)
+      expect(push).toHaveBeenCalledWith({ path: '/guest-order', query: { order: 'ORDER1' }})
+      jest.advanceTimersByTime(6000)
       await settle()
-    }
-    expectOrderDetails(context)
+      expect(push).toHaveBeenCalledTimes(1)
+    })
   })
 })
 
@@ -149,7 +154,7 @@ it.each(['cash', 'pay_stack'])('opens auto-maintenance order details regardless
   context.flow.activePayType = payment
   context.flow.submitOrder()
   await settle()
-  if (payment === 'pay_stack') { context.flow.processPayment(); jest.advanceTimersByTime(5000); await settle() }
+  if (payment === 'pay_stack') { context.flow.processPayment(); await settle() }
   expectOrderDetails(context)
 })
 

+ 113 - 14
src/ui-refactor/views/purchase/__tests__/PurchaseFlow.spec.js

@@ -52,7 +52,7 @@ async function instance(source = names[0]) {
 async function withProducts(source = names[0]) {
   const vm = await instance(source)
   if (!vm.isSelf) { vm.memberSearch = 'NG2'; await settle(); await vm.searchMember(); await settle() }
-  if (vm.isUpgrade) { vm.form.upgradeValue = { value: 'L2', diffPv: 999 }; vm.handleChangeLevel(vm.form.upgradeValue) }
+  if (vm.isUpgrade) { vm.form.upgradeValue = { value: 'L2', diffPv: vm.upgradeOption[0].REPAIR_PV }; vm.handleChangeLevel(vm.form.upgradeValue) }
   vm.toggleProduct(vm.tableData[0])
   vm.changeQuantity({ row: product, value: 2 })
   vm.stage = 'checkout'
@@ -110,7 +110,7 @@ beforeEach(() => {
   shop.fetchShoppingCart.mockImplementation(async() => settings())
   user.getUserInfo.mockResolvedValue({ data: { IS_DEC: '1' }})
   user.fetchFullInfo.mockResolvedValue({ data: { userId: 'U2', countryId: '1', REAL_NAME: 'Target member' }})
-  user.fetchUpgradeInfo.mockResolvedValue({ data: { baseInfo: { ADD_AT: '2020-01-01', REAL_NAME: 'Target member', DEC_NAME: 'Silver', IS_MAX: false, LEVEL_LIST: [{ ID: 'L2', LEVEL_NAME: 'Gold', REPAIR_PV: 999 }], UPGRADE_FUNC: 'Product', NOW_PERF: 10, NEXT_PERF: 1009 }}})
+  user.fetchUpgradeInfo.mockResolvedValue({ data: { baseInfo: { ADD_AT: '2020-01-01', REAL_NAME: 'Target member', DEC_NAME: 'Silver', IS_MAX: false, LEVEL_LIST: [{ ID: 'L2', LEVEL_NAME: 'Gold', REPAIR_PV: 120 }], UPGRADE_FUNC: 'Product', NOW_PERF: 10, NEXT_PERF: 1009 }}})
   user.fetchUpgrade.mockResolvedValue({ data: { userBalance: { cash: 10000 }, decUserName: 'RC1', allDecPackage: {}, allGoods: [product], region: [], sellType: [{ sell_type: payList }] }})
   getRegionList.mockResolvedValue({ data: [] })
   ;[shop.createOrder, shop.createApproachOrder, shop.createReconsumeOrder, shop.createApproachReconsumeOrder, shop.createAutoMaintenanceOrder, shop.createApproachAutoMaintenanceOrder, user.fetchSendUpgrade].forEach(api => api.mockResolvedValue({ data: { SN: 'ORDER1', ORDER_AMOUNT: 200 }}))
@@ -457,16 +457,82 @@ it('uses the returned maintenance threshold and excludes PRP', async() => {
   expect(shop.createAutoMaintenanceOrder).not.toHaveBeenCalled()
 })
 
-it('preserves upgrade information and does not introduce a difference-BV rejection', async() => {
+it.each(['cash', 'pay_stack'])('blocks an insufficient upgrade cart and submission with %s', async payType => {
   const vm = await withProducts('member-upgrade')
+  vm.form.upgradeValue = { value: 'L2', diffPv: 220 }
+  vm.handleChangeLevel(vm.form.upgradeValue)
+  vm.stage = 'cart'
+  await settle()
   expect(user.fetchUpgradeInfo).toHaveBeenCalledWith({ userName: 'NG2' })
   expect(user.fetchUpgrade).toHaveBeenCalledWith({ userName: 'NG2' })
-  expect(vm.needDiffPv).toBe(999)
+  expect(vm.needDiffPv).toBe(220)
   expect(vm.pricePvSum).toBe('120.00')
-  vm.activePayType = 'cash'
+  expect(vm.canCheckout).toBe(false)
+  expect(vm.$el.querySelector('.ng-purchase-upgrade.is-insufficient')).not.toBeNull()
+  expect(vm.$el.querySelector('.ng-purchase-upgrade-warning').textContent).toContain('Cart BV (120) must be ≥ 220 BV to upgrade to Gold.')
+  const button = vm.$el.querySelector('.ng-purchase-summary .el-button--primary')
+  expect(button.disabled).toBe(true)
+  router.push.mockClear()
+  button.click()
+  vm.navigate('checkout')
+  expect(router.push).not.toHaveBeenCalled()
+  vm.stage = 'checkout'
+  await settle()
+  expect(router.push).toHaveBeenCalledWith(expect.objectContaining({ path: '/dashboard/cart' }))
+  vm.activePayType = payType
   vm.submitOrder()
   await settle()
-  expect(user.fetchSendUpgrade).toHaveBeenCalledWith(expect.objectContaining({ decLv: 'L2', insertUserName: 'NG2', goodsId: ['P1'], goodsNum: [2], province: 'S1', nowPerf: 10, nextPerf: 1009 }))
+  expect(user.fetchSendUpgrade).not.toHaveBeenCalled()
+})
+
+it('updates upgrade eligibility when quantity or the target level changes', async() => {
+  const vm = await withProducts('member-upgrade')
+  vm.stage = 'cart'
+  vm.form.upgradeValue = { value: 'L2', diffPv: '220' }
+  vm.handleChangeLevel(vm.form.upgradeValue)
+  await settle()
+  expect(vm.canCheckout).toBe(false)
+  vm.changeQuantity({ row: product, value: 4 })
+  await settle()
+  expect(vm.pricePvSum).toBe('240.00')
+  expect(vm.canCheckout).toBe(true)
+  expect(vm.$el.querySelector('.ng-purchase-upgrade.is-sufficient')).not.toBeNull()
+  expect(vm.$el.querySelector('.ng-purchase-upgrade-warning')).toBeNull()
+  expect(vm.$el.querySelector('.ng-purchase-summary .el-button--primary').disabled).toBe(false)
+  vm.upgradeOption.push({ ID: 'L3', LEVEL_NAME: 'Platinum', REPAIR_PV: '300' })
+  vm.form.upgradeValue = { value: 'L3', diffPv: '300' }
+  vm.handleChangeLevel(vm.form.upgradeValue)
+  await settle()
+  expect(vm.canCheckout).toBe(false)
+  expect(vm.$el.querySelector('.ng-purchase-upgrade-warning').textContent).toContain('≥ 300 BV to upgrade to Platinum.')
+  vm.changeQuantity({ row: product, value: 5 })
+  await settle()
+  expect(vm.pricePvSum).toBe('300.00')
+  expect(vm.canCheckout).toBe(true)
+  expect(vm.$el.querySelector('.ng-purchase-upgrade.is-sufficient')).not.toBeNull()
+  vm.changeQuantity({ row: product, value: 4 })
+  await settle()
+  expect(vm.canCheckout).toBe(false)
+})
+
+it.each([undefined, null, '', -1, 'bad', Infinity])('blocks upgrading when the required BV is invalid: %s', async difference => {
+  const vm = await withProducts('member-upgrade')
+  vm.handleChangeLevel({ value: 'L2', diffPv: difference })
+  expect(vm.canCheckout).toBe(false)
+  vm.submitOrder()
+  await settle()
+  expect(user.fetchSendUpgrade).not.toHaveBeenCalled()
+})
+
+it('allows equality, zero and numeric string upgrade requirements across stock quantities', async() => {
+  const vm = await withProducts('member-upgrade')
+  for (const difference of [0, '0', 60, '120', 220]) {
+    vm.handleChangeLevel({ value: 'L2', diffPv: difference })
+    for (let quantity = 1; quantity <= product.STORE_NUMS; quantity++) {
+      vm.changeQuantity({ row: product, value: quantity })
+      expect(vm.canCheckout).toBe(quantity * 60 >= Number(difference))
+    }
+  }
 })
 
 it.each([NaN, 0, -1, 1.5, 10, Infinity])('rejects invalid quantity %s without corrupting totals', async quantity => {
@@ -556,7 +622,7 @@ it('does not add a Reporting Center ID requirement to the upgrade request', asyn
   expect(user.fetchSendUpgrade).toHaveBeenCalledWith(expect.objectContaining({ decUserName: '' }))
 })
 
-it.each(submissions)('%s submits once, preserving the original member and delivery fields', async(source, api, unused, destination) => {
+it.each(submissions)('%s submits once, preserving the original member and delivery fields', async(source, api) => {
   const vm = await withProducts(source)
   vm.activePayType = 'cash'
   vm.submitOrder()
@@ -569,7 +635,7 @@ it.each(submissions)('%s submits once, preserving the original member and delive
   expect(sent.payType).toBe('cash')
   if (vm.isSelf) expect(sent).toEqual({ goodsId: ['P1'], goodsNum: [2], payPassword: 'fixture-password', email: 'operator@example.test', addressId: 'A1', address: undefined, payType: 'cash', userName: 'RC1' })
   else if (!vm.isUpgrade) expect(sent).toEqual({ goodsId: ['P1'], goodsNum: [2], payPassword: 'fixture-password', email: 'operator@example.test', addressId: 'A1', payType: 'cash', userName: 'NG2', consignee: 'Recipient', acceptMobile: '123', province: ['S1'], lgaName: 'District', cityName: 'City', detailaddress: 'Street', decUserName: 'RC1' })
-  expect(router.push).toHaveBeenLastCalledWith({ path: destination })
+  expect(router.push).toHaveBeenLastCalledWith({ path: '/guest-order', query: { order: 'ORDER1' }})
   expect(vm.cartItems).toEqual([])
   expect(drafts.readDraft(source, 'OP1:login-1')).toBeNull()
 })
@@ -621,12 +687,14 @@ it('handles cancellation failure and accepts a payment callback only once', asyn
   expect(vm.visible).toBe(true)
   expect(vm.cartItems).toHaveLength(1)
   vm.processPayment()
-  const timer = vm.countdownTimer
+  expect(router.push).toHaveBeenCalledWith({ path: '/guest-order', query: { order: 'ORDER1' }})
+  const navigationCount = router.push.mock.calls.length
   vm.processPayment()
-  expect(vm.countdownTimer).toBe(timer)
+  expect(vm.payDialog).toBe(false)
+  expect(vm.countdownTimer).toBeNull()
   expect(vm.cartItems).toEqual([])
   jest.advanceTimersByTime(5000)
-  expect(router.push).toHaveBeenLastCalledWith({ path: '/shop/member-order' })
+  expect(router.push).toHaveBeenCalledTimes(navigationCount)
 })
 
 it.each(submissions)('%s matches the actual legacy submission payload', async(source, api) => {
@@ -789,7 +857,7 @@ it('restricts cart origins and keeps all six new routes out of the login whiteli
   ;['__proto__', 'https://example.test', '', undefined].forEach(source => expect(routes.purchasePath(source)).toBe('/dashboard/index'))
 })
 
-it.each(['cart', 'checkout'])('selects the upgrade level through the %s UI and submits the original fields without a new BV gate', async stage => {
+it.each(['cart', 'checkout'])('selects an eligible upgrade level through the %s UI and submits the original fields', async stage => {
   const vm = await withProducts('member-upgrade')
   vm.form.upgradeValue = ''
   vm.toLevel = ''
@@ -800,15 +868,16 @@ it.each(['cart', 'checkout'])('selects the upgrade level through the %s UI and s
   const input = vm.$el.querySelector('#ng-purchase-upgrade-level')
   expect(input).not.toBeNull()
   expect(vm.$el.querySelector('.ng-purchase-upgrade').textContent).toMatch(/Upgrade difference\s*—/)
+  expect(vm.canCheckout).toBe(false)
   input.click()
   await settle()
   const option = Array.from(document.querySelectorAll('.ng-refactor-popper .el-select-dropdown__item')).find(node => node.textContent.trim() === 'Gold')
   expect(option).toBeDefined()
   option.click()
   await settle()
-  expect(vm.form.upgradeValue).toEqual({ value: 'L2', diffPv: 999 })
+  expect(vm.form.upgradeValue).toEqual({ value: 'L2', diffPv: 120 })
   expect(vm.toLevel).toBe('L2')
-  expect(vm.needDiffPv).toBe(999)
+  expect(vm.needDiffPv).toBe(120)
   expect(Number(vm.pricePvSum)).toBe(120)
   expect(vm.canCheckout).toBe(true)
   vm.stage = stage === 'cart' ? 'checkout' : 'cart'
@@ -842,6 +911,36 @@ it('displays an interface-provided zero upgrade difference without replacing it
   expect(vm.$el.querySelector('.ng-purchase-upgrade').textContent).toMatch(/Upgrade difference\s*0 BV/)
 })
 
+it.each(['cart', 'checkout'])('selects an object-keyed upgrade level in %s without a render error when BV is insufficient', async stage => {
+  const response = { data: { baseInfo: { REAL_NAME: 'Target member', DEC_NAME: 'Silver', IS_MAX: false, LEVEL_LIST: { 4: { ID: '4', LEVEL_NAME: 'Gold', REPAIR_PV: '220' }}, NOW_PERF: 10, NEXT_PERF: 230 }}}
+  user.fetchUpgradeInfo.mockResolvedValue(response)
+  const vm = await instance('member-upgrade')
+  vm.memberSearch = 'NG2'
+  await vm.searchMember()
+  vm.toggleProduct(vm.tableData[0])
+  vm.stage = stage
+  await settle()
+  vm.$el.querySelector('#ng-purchase-upgrade-level').click()
+  await settle()
+  const option = Array.from(document.querySelectorAll('.ng-refactor-popper .el-select-dropdown__item')).find(node => node.textContent.trim() === 'Gold')
+  expect(option).toBeDefined()
+  option.click()
+  await settle()
+  expect(componentErrors).toEqual([])
+  expect(vm.$el.querySelector('#ng-purchase-upgrade-level').value).toBe('Gold')
+  expect(vm.toLevel).toBe('4')
+  expect(vm.needDiffPv).toBe('220')
+  expect(vm.$el.querySelector('.ng-purchase-upgrade-warning').textContent).toContain('Cart BV (60) must be ≥ 220 BV to upgrade to Gold.')
+  expect(vm.$el.querySelector('.ng-purchase-upgrade.is-insufficient')).not.toBeNull()
+  expect(vm.canCheckout).toBe(false)
+  vm.changeQuantity({ row: product, value: 4 })
+  await settle()
+  expect(vm.$el.querySelector('#ng-purchase-upgrade-level').value).toBe('Gold')
+  expect(vm.$el.querySelector('.ng-purchase-upgrade-warning')).toBeNull()
+  expect(vm.$el.querySelector('.ng-purchase-upgrade.is-sufficient')).not.toBeNull()
+  expect(vm.canCheckout).toBe(true)
+})
+
 it.each(names)('%s connects the shared payment selection without changing totals or submitting', async source => {
   const vm = await withProducts(source)
   const radios = Array.from(vm.$el.querySelectorAll('.ng-payment-methods-options input'))

+ 22 - 4
src/ui-refactor/views/purchase/purchaseBehavior.js

@@ -120,12 +120,23 @@ export default {
           Number(this.pricePvSum) >= Number(this.ampDivideLine))
       )
     },
+    upgradeReady() {
+      return (
+        !this.isUpgrade ||
+        (!!this.toLevel &&
+          numeric(this.needDiffPv) &&
+          Number(this.needDiffPv) >= 0 &&
+          numeric(this.pricePvSum) &&
+          Number(this.pricePvSum) >= Number(this.needDiffPv))
+      )
+    },
     canCheckout() {
       return (
         this.catalogReady &&
         this.itemsValid &&
         this.settingsReady &&
         this.maintenanceReady &&
+        this.upgradeReady &&
         [this.orderTotal, this.pricePvSum, this.taxSum].every(
           value => numeric(value) && Number(value) >= 0
         ) &&
@@ -482,14 +493,14 @@ export default {
       clearDraft(this.source, this.sessionKey)
     },
     navigate(stage) {
-      if (this.busy) return
+      if (this.busy || (stage === 'checkout' && !this.upgradeReady)) return
       const path = stage === 'catalog' ? purchasePath(this.source) : '/dashboard/' + stage
       this.$router.push({ path, query: { ...this.$route.query, from: this.source }})
     },
     prepareCheckout() {
       if (this.stage !== 'checkout') return
       this.syncCart()
-      if (!this.itemsValid || !this.catalogReady || !this.maintenanceReady) {
+      if (!this.itemsValid || !this.catalogReady || !this.maintenanceReady || !this.upgradeReady) {
         this.navigate('cart')
         return
       }
@@ -542,8 +553,15 @@ export default {
       this.visible = false
       this.payStackLoading = false
       this.finishOrder()
-      this.payDialog = true
-      this.handleCountdown()
+      this.handleOrderList()
+    },
+    handleOrderList() {
+      if (!this.completed || !this.isCurrent()) return
+      const ownOrder =
+        this.isSelf || (this.isMaintenance && this.newOrder.userName === this.memberDetails.number)
+      this.$router.push(this.payment.orderSn
+        ? { path: '/guest-order', query: { order: this.payment.orderSn }}
+        : { path: ownOrder ? '/shop/own-order' : '/shop/member-order' })
     },
     handleCountdown() {
       clearInterval(this.countdownTimer)

+ 7 - 8
src/ui-refactor/views/purchase/submitPurchase.js

@@ -113,22 +113,21 @@ export default async function submitPurchase() {
           : shop.createReconsumeOrder
   const response = await api(params)
   if (!this.isCurrent()) return
-  this.payment.orderSn = response.data?.SN
+  const order = response?.data || response || {}
+  this.payment.orderSn = order.SN
   if (type === 'pay_stack') {
-    const amount = this.isUpgrade ? response.data.ORDER_AMOUNT : this.cashSum
-    if (!response.data.SN || !Number.isFinite(Number(amount)) || Number(amount) < 0) {
+    const amount = this.isUpgrade ? order.ORDER_AMOUNT : this.cashSum
+    if (!order.SN || !Number.isFinite(Number(amount)) || Number(amount) < 0) {
       throw new Error('Invalid payment order returned. Please contact customer service.')
     }
     this.payment.amount = amount
-    if (!this.isUpgrade) this.payment.metadata.cart_id = response.data.SN
-    this.payment.metadata.custom_fields[0].value = response.data.SN
+    if (!this.isUpgrade) this.payment.metadata.cart_id = order.SN
+    this.payment.metadata.custom_fields[0].value = order.SN
     this.paymentAttempt++
     this.visible = true
   } else {
-    const ownOrder =
-      this.isSelf || (this.isMaintenance && this.newOrder.userName === this.memberDetails.number)
     this.finishOrder()
     this.$message({ message: this.$t('common.successfully'), type: 'success', duration: 5000 })
-    this.$router.push({ path: ownOrder ? '/shop/own-order' : '/shop/member-order' })
+    this.handleOrderList()
   }
 }

+ 7 - 1
src/ui-refactor/views/signup/components/welcomePackRegistration.js

@@ -176,7 +176,13 @@ export default {
           this.handleSureChange()
 
           // 支付方式
-          this.payList = response.data.payList || response.data.sellType[0]['sell_type']
+          const payList = response.data.payList || response.data.sellType[0]['sell_type']
+          // 对象格式可能只以键标识支付方式,补全单选框和提交所需的 label。
+          this.payList = Array.isArray(payList)
+            ? payList
+            : Object.fromEntries(Object.entries(payList).map(([label, option]) => [
+              label, { ...option, label: option.label || label }
+            ]))
           // 延续默认选中第二项的规则;单项或空列表时回退,避免读取不存在的选项。
           this.form.payType =
             (Object.values(this.payList)[1] || Object.values(this.payList)[0] || {}).label || ''

+ 9 - 4
src/ui-refactor/views/welcome-pack/MemberWelcomePack.vue

@@ -120,7 +120,8 @@ export default {
         this.submitButtonStat ||
         this.visible ||
         this.payDialog ||
-        this.cancelLoading
+        this.cancelLoading ||
+        this.orderListOpened
       )
     },
     selectedIds() {
@@ -257,7 +258,9 @@ export default {
     processPayment(event) {
       if (!this.visible || this.cancelLoading || !this.isCurrent()) return
       if (event && event.orderSn !== this.payForm.orderSn) return
-      Legacy.methods.processPayment.call(this)
+      this.visible = false
+      this.payStackLoading = false
+      this.handleOrderList()
     },
     handleCountdown() {
       clearInterval(this.countdownTimer)
@@ -268,9 +271,11 @@ export default {
     },
     handleOrderList() {
       clearInterval(this.countdownTimer)
-      if (this.orderListOpened) return
+      if (this.orderListOpened || !this.isCurrent()) return
       this.orderListOpened = true
-      Legacy.methods.handleOrderList.call(this)
+      this.$router.push(this.payForm.orderSn
+        ? { path: '/guest-order', query: { order: this.payForm.orderSn }}
+        : { path: '/shop/member-order' })
     }
   }
 }

+ 2 - 2
src/ui-refactor/views/welcome-pack/README.md

@@ -8,7 +8,7 @@
 - Country 使用登录缓存 `baseData.COUNTRY_ID`,只读;新会员编号继续取会员 `GET /v1/user/dec` 的 `userName`。
 - Reporting Center ID 按旧 `isDec` 规则处理:普通会员可编辑且必填;stockist 默认填当前报单中心账号并禁用编辑。加载或提交期间沿用外层表单的禁用状态,原提交字段保留。
 - 国家/语言列表使用现有接口;产品、等级、地区、银行、余额及支付方式取登录后的 Welcome Pack 接口。
-- 提交保持旧 `POST /v1/user/dec` 字段、MARKET_PRICE 计价、BV/含税算法与自动安置;成功后跳转首页 Orders 下的 Member orders(`/dashboard/index?tab=orders&orderCategory=member`)。保留银行信息,配送方式不额外加入旧请求体。
+- 提交保持旧 `POST /v1/user/dec` 字段、MARKET_PRICE 计价、BV/含税算法与自动安置;余额或 Paystack 支付成功后立即打开本次订单详情(`/guest-order?order=<SN>`)。保留银行信息,配送方式不额外加入旧请求体。
 - 支付展示按截图区分 Paystack 和 Account Balance,金额及余额来自实际状态,不移植演示数值或游客 accessCode 协议。
 - 请求中阻止重复提交和修改表单;失败恢复可操作。取消 Paystack 仍先确认并调用旧取消接口,使用本次响应中的 `payForm.orderSn`;取消失败保留支付窗口。
 - 测试覆盖身份/国家初始化、旧请求体等价、数量/金额、余额不足、缺失商品/等级/报单中心、两种支付成功/失败/取消以及入口。
@@ -49,7 +49,7 @@
 
 ### 2026-10-27 支付成功后打开订单详情
 
-余额 Save 成功、Paystack 成功倒计时结束或点击返回按钮,均携带本次下单响应的 `SN` 进入 `/guest-order?order=<SN>`。旧提交脚本在两种支付方式下均保留 `payForm.orderSn`,新页面的路由守卫负责转换成功去向;响应缺少订单号时继续回到首页 Orders 的 Member orders 分类。支付接口、金额、取消和进行中的离开保护保持原有行为。
+余额 Save 成功或 Paystack 成功回调后,立即携带本次下单响应的 `SN` 进入 `/guest-order?order=<SN>`,不再显示成功倒计时或先跳旧订单列表。旧提交脚本兼容 `data` 包装和直接返回的订单对象,在两种支付方式下均保留 `payForm.orderSn`;新页面统一处理成功导航,阻止重复回调和再次提交。响应缺少订单号时继续回到首页 Orders 的 Member orders 分类。支付接口、金额、取消和进行中的离开保护保持原有行为。
 
 ## 复现
 

+ 7 - 4
src/ui-refactor/views/welcome-pack/__tests__/MemberWelcomePack.spec.js

@@ -128,7 +128,7 @@ it.each(['cash', 'pay_stack'])('keeps the exact legacy %s request and payment re
   expect(expected).not.toHaveProperty('draftId')
   expect(expected).not.toHaveProperty('accessToken')
   await settle()
-  if (payType === 'cash') expect(vm.$router.push).toHaveBeenCalledWith({ path: '/shop/member-order' })
+  if (payType === 'cash') expect(vm.$router.push).toHaveBeenCalledWith({ path: '/guest-order', query: { order: 'ORDER-1' }})
   else {
     expect(vm.visible).toBe(true)
     expect(vm.payForm).toMatchObject({ orderSn: 'ORDER-1', amount: 120, email: 'pay@example.test' })
@@ -207,7 +207,8 @@ it('ignores a delayed callback belonging to a cancelled order', async() => {
   expect(vm.payDialog).toBe(false)
   vm.processPayment({ orderSn: 'ORDER-2' })
   expect(vm.visible).toBe(false)
-  expect(vm.payDialog).toBe(true)
+  expect(vm.payDialog).toBe(false)
+  expect(vm.$router.push).toHaveBeenCalledWith({ path: '/guest-order', query: { order: 'ORDER-2' }})
 })
 
 it('does not submit or cancel against a changed login session', async() => {
@@ -276,14 +277,16 @@ it('does not cancel an order when the confirmation is dismissed', async() => {
   expect(vm.visible).toBe(true)
 })
 
-it('cleans the successful-payment countdown on leaving and redirects only once', async() => {
+it('opens the successful order immediately and redirects only once', async() => {
   const vm = await order()
   vm.form.payType = 'pay_stack'
   vm.onSubmit()
   await settle()
   vm.processPayment()
   vm.processPayment()
-  expect(vm.payDialog).toBe(true)
+  expect(vm.payDialog).toBe(false)
+  expect(vm.$router.push).toHaveBeenCalledTimes(1)
+  expect(vm.$router.push).toHaveBeenCalledWith({ path: '/guest-order', query: { order: 'ORDER-1' }})
   jest.advanceTimersByTime(6000)
   expect(vm.$router.push).toHaveBeenCalledTimes(1)
   vm.$destroy()

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

@@ -68,28 +68,33 @@ afterEach(() => {
   jest.useRealTimers()
 })
 
-it.each(['cash', 'paystack-countdown', 'paystack-button'])('opens the paid order details after successful %s payment', async payment => {
-  const { root, router } = await mount('/dashboard/member-welcome-pack')
-  const page = root.$children[0]
-  Object.assign(page.form, { decLv: 'L1', decUserName: 'CENTER', payType: payment === 'cash' ? 'cash' : 'pay_stack' })
-  page.toggleProduct(page.tableData[0])
-  root.$el.querySelector('.ng-welcome-save').click()
-  await settle()
-  if (payment !== 'cash') {
-    expect(router.currentRoute.path).toBe('/dashboard/member-welcome-pack')
-    page.processPayment({ orderSn: 'ORDER-1' })
-    if (payment === 'paystack-countdown') jest.advanceTimersByTime(5000)
-    else {
-      const dialog = Array.from(document.querySelectorAll('.el-dialog')).find(element => element.querySelector('.el-dialog__title')?.textContent === 'Order successful')
-      dialog.querySelector('.el-dialog__footer button').click()
+describe.each(['wrapped', 'direct'])('%s order response', shape => {
+  it.each(['cash', 'pay_stack'])('opens the paid order details immediately after successful %s payment', async payment => {
+    const { root, router } = await mount('/dashboard/member-welcome-pack')
+    const page = root.$children[0]
+    const order = { SN: 'ORDER-1', ORDER_AMOUNT: 120, EMAIL: 'sample@example.test' }
+    createWelcomePack.mockResolvedValueOnce(shape === 'wrapped' ? { data: order } : order)
+    const push = jest.spyOn(router, 'push')
+    Object.assign(page.form, { decLv: 'L1', decUserName: 'CENTER', payType: payment })
+    page.toggleProduct(page.tableData[0])
+    root.$el.querySelector('.ng-welcome-save').click()
+    await settle()
+    if (payment === 'pay_stack') {
+      expect(router.currentRoute.path).toBe('/dashboard/member-welcome-pack')
+      page.processPayment({ orderSn: 'ORDER-1' })
+      await settle()
     }
+    expect(router.currentRoute.path).toBe('/guest-order')
+    expect(router.currentRoute.query).toEqual({ order: 'ORDER-1' })
+    expect(root.$el.querySelector('h1').textContent).toBe('Order details')
+    expect(root.$el.querySelector('.ng-guest-order-details')).not.toBeNull()
+    expect(fetchGuestOrderDetail).toHaveBeenCalledWith({ orderSn: 'ORDER-1' })
+    expect(push).toHaveBeenCalledTimes(1)
+    expect(push).toHaveBeenCalledWith({ path: '/guest-order', query: { order: 'ORDER-1' }})
+    jest.advanceTimersByTime(6000)
     await settle()
-  }
-  expect(router.currentRoute.path).toBe('/guest-order')
-  expect(router.currentRoute.query).toEqual({ order: 'ORDER-1' })
-  expect(root.$el.querySelector('h1').textContent).toBe('Order details')
-  expect(root.$el.querySelector('.ng-guest-order-details')).not.toBeNull()
-  expect(fetchGuestOrderDetail).toHaveBeenCalledWith({ orderSn: 'ORDER-1' })
+    expect(push).toHaveBeenCalledTimes(1)
+  })
 })
 
 it('keeps the order list fallback when the paid Welcome Pack response has no order number', async() => {

+ 6 - 5
src/views/user/welcome-pack.vue

@@ -747,7 +747,8 @@ export default {
         languageId: this.form.languageId
       }
       createWelcomePack(params).then(response => {
-        this.payForm.orderSn = response.data?.SN
+        const order = response?.data || response || {}
+        this.payForm.orderSn = order.SN
         if (this.form.payType !== 'pay_stack') {
           // 余额支付
           this.$message({
@@ -755,12 +756,12 @@ export default {
             type: 'success'
           })
           this.submitButtonStat = false
-          this.$router.push({ path: `/shop/member-order` })
+          this.handleOrderList()
         } else {
           this.submitButtonStat = false
-          this.payForm.amount = response.data.ORDER_AMOUNT
-          this.payForm.metadata.custom_fields[0].value = response.data.SN
-          this.payForm.email = response.data.EMAIL
+          this.payForm.amount = order.ORDER_AMOUNT
+          this.payForm.metadata.custom_fields[0].value = order.SN
+          this.payForm.email = order.EMAIL
           if (this.form.decType === 'ba') {
             this.payForm.metadata.custom_fields[1].value = 'baUpgrade'
           } else {

+ 29 - 12
tests/unit/ui-refactor/guestShop.spec.js

@@ -10,7 +10,7 @@ jest.mock('@/router', () => ({ push: jest.fn(), replace: jest.fn() }))
 
 const product = { ID: 'P1', GOODS_NAME: 'Product', SELL_PRICE: 100, MARKET_PRICE: 120, DISCOUNT: 80, STORE_NUMS: 5, TAX_RATE: 7.5, COIN: 'NGN' }
 const instances = []
-const shipping = { consignee: 'Recipient', acceptMobile: '123456789', province: ['R1'], lgaName: 'District', cityName: 'City', detailaddress: 'Street' }
+const shipping = { consignee: 'Recipient', acceptMobile: '123456789', email: 'guest@example.test', province: ['R1'], lgaName: 'District', cityName: 'City', detailaddress: 'Street' }
 async function settle() { for (let i = 0; i < 12; i++) { await Promise.resolve(); await Vue.nextTick() } }
 async function instance(market = 'ng', stage = 'catalog') {
   const vm = new (Vue.extend(behavior))({ propsData: { market, stage }})
@@ -124,7 +124,7 @@ it('keeps selections across pages and rejects unavailable or fractional quantiti
   vm.toggleProduct({ ...product, ID: 'P3', STORE_NUMS: 0 })
   expect(vm.items).toHaveLength(2)
 })
-it('requires shipping but no email input before calling the order API, with no passwords or member identity', async() => {
+it('submits the checkout email and shipping with no passwords or member identity', async() => {
   const vm = await instance()
   vm.toggleProduct(product)
   vm.stage = 'checkout'
@@ -134,25 +134,38 @@ it('requires shipping but no email input before calling the order API, with no p
   Object.assign(vm.form, shipping)
   vm.openEmail()
   await vm.continuePayment()
-  expect(shop.createGuestOrder).toHaveBeenCalledWith({ ...shipping, email: '', countryId: '620699181539139625', goodsId: ['P1'], goodsNum: [1], payType: 'pay_stack' })
+  expect(shop.createGuestOrder).toHaveBeenCalledWith({ ...shipping, countryId: '620699181539139625', goodsId: ['P1'], goodsNum: [1], payType: 'pay_stack' })
   expect(vm.form.email).toBe('guest@example.test')
   expect(vm.$refs.paystack.payWithPaystack).toHaveBeenCalledTimes(1)
 })
-it.each([undefined, '', 'invalid', null, 123])('retains the order and reports a missing or invalid server payment email %s without creating another order', async email => {
+it.each(['', '  ', 'invalid', 'buyer@', 'buyer@host'])('blocks missing or invalid checkout email %s before placing an order', async email => {
+  const vm = await checkout()
+  vm.closePayment()
+  vm.form.email = email
+  vm.openEmail()
+  expect(vm.emailVisible).toBe(false)
+  expect(vm.$message.error).toHaveBeenCalled()
+  vm.emailVisible = true
+  await vm.continuePayment()
+  expect(shop.createGuestOrder).not.toHaveBeenCalled()
+  expect(vm.$refs.paystack.payWithPaystack).not.toHaveBeenCalled()
+})
+it.each([undefined, '', 'invalid', null, 123, 'another@example.test'])('keeps the entered email when the server returns %s without duplicate orders', async email => {
   const vm = await checkout()
   shop.createGuestOrder.mockResolvedValue({ data: { SN: 'ORDER1', amount: 130, currency: 'NGN', EMAIL: email }})
   await vm.continuePayment()
   expect(shop.createGuestOrder).toHaveBeenCalledTimes(1)
   expect(vm.pending.SN).toBe('ORDER1')
-  expect(vm.sdkActive).toBe(false)
+  expect(vm.sdkActive).toBe(true)
   expect(vm.submitting).toBe(false)
-  expect(vm.$refs.paystack.payWithPaystack).not.toHaveBeenCalled()
-  expect(vm.$message.error).toHaveBeenCalledWith('The order did not return a valid payment email. Please contact customer service with your order number.')
+  expect(vm.$refs.paystack.payWithPaystack).toHaveBeenCalledTimes(1)
+  expect(vm.form.email).toBe(shipping.email)
+  expect(vm.$message.error).not.toHaveBeenCalled()
   vm.closePayment()
   vm.openEmail()
   await vm.continuePayment()
   expect(shop.createGuestOrder).toHaveBeenCalledTimes(1)
-  expect(vm.$refs.paystack.payWithPaystack).not.toHaveBeenCalled()
+  expect(vm.$refs.paystack.payWithPaystack).toHaveBeenCalledTimes(2)
 })
 it('blocks duplicate submit and retains the same unpaid order after cancellation', async() => {
   const vm = await checkout()
@@ -178,12 +191,14 @@ it('blocks duplicate submit and retains the same unpaid order after cancellation
   expect(vm.$router.push).toHaveBeenCalledTimes(1)
   expect(vm.$router.push).toHaveBeenCalledWith({ path: '/guest-order', query: { order: 'ORDER1' }})
 })
-it('requires review of a changed server payment amount and currency before starting the SDK', async() => {
+it('starts the SDK immediately with the returned amount and currency without another confirmation', async() => {
   const vm = await checkout()
   shop.createGuestOrder.mockResolvedValue({ data: { SN: 'ORDER1', amount: 10, currency: 'USD', EMAIL: 'guest@example.test' }})
   await vm.continuePayment()
   expect(vm.pending.currency).toBe('USD')
-  expect(vm.$refs.paystack.payWithPaystack).not.toHaveBeenCalled()
+  expect(vm.pending.subunits).toBe(1000)
+  expect(vm.$refs.paystack.payWithPaystack).toHaveBeenCalledTimes(1)
+  expect(vm.$message.info).not.toHaveBeenCalled()
   await vm.continuePayment()
   expect(vm.$refs.paystack.payWithPaystack).toHaveBeenCalledTimes(1)
   expect(shop.createGuestOrder).toHaveBeenCalledTimes(1)
@@ -220,13 +235,15 @@ it('accepts ORDER_AMOUNT when the returned order record has no PAY_AMOUNT', asyn
   expect(vm.pending).toEqual({ SN: 'RECORD1', amount: 130, currency: 'NGN', subunits: 13000 })
   expect(vm.$refs.paystack.payWithPaystack).toHaveBeenCalledTimes(1)
 })
-it('updates the payment amount and requests confirmation when the order record changes the total', async() => {
+it('starts payment using the final order amount without requesting another confirmation', async() => {
   shop.fetchGuestProducts.mockResolvedValue({ data: { list: [{ ...product, LOCAL_CURRENCY_ID: '104' }], totalCount: 1 }})
   const vm = await checkout()
   shop.createGuestOrder.mockResolvedValue({ data: { SN: 'RECORD1', COUNTRY_ID: '620699181539139625', CURRENCY_ID: '104', PAY_AMOUNT: 95, EMAIL: 'guest@example.test' }})
   await vm.continuePayment()
   expect(vm.pending.amount).toBe(95)
-  expect(vm.$refs.paystack.payWithPaystack).not.toHaveBeenCalled()
+  expect(vm.pending.subunits).toBe(9500)
+  expect(vm.$refs.paystack.payWithPaystack).toHaveBeenCalledTimes(1)
+  expect(vm.$message.info).not.toHaveBeenCalled()
   await vm.continuePayment()
   expect(vm.$refs.paystack.payWithPaystack).toHaveBeenCalledTimes(1)
   expect(shop.createGuestOrder).toHaveBeenCalledTimes(1)

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

@@ -6,6 +6,7 @@ import { load } from './loadGuestComponent'
 import { fetchGuestOrderDetail, downloadGuestOrder, downloadOrder } from '@/api/shop'
 import handleClipboard from '@/utils/clipboard'
 import usersInfo from '@/utils/usersInfo'
+import tool from '@/utils/tool'
 
 jest.mock('@/api/shop', () => ({ fetchGuestOrderDetail: jest.fn(), downloadGuestOrder: jest.fn(), downloadOrder: jest.fn() }))
 jest.mock('@/utils/clipboard', () => jest.fn())
@@ -256,7 +257,7 @@ it('renders the confirmed order/goods response with an empty goods list and miss
         STATUS: 'Paid',
         FULL_ADDRESS: '',
         PROVINCE: '1',
-        SHOW_BV: true,
+        SHOW_BV: false,
         USER_NAME: 'PRIVATE-MEMBER'
       },
       goods: []
@@ -312,3 +313,68 @@ it('uses the response currency and final amount without exchange or another tax
     'AED 41,000.50'
   )
 })
+
+it.each([
+  ['Registration', true, 'NGN', 'Nigeria'],
+  ['Guest Nigeria', false, 'NGN', 'Nigeria'],
+  ['Guest UAE', false, 'AED', 'UAE'],
+  ['Repeat Purchase', true, 'NGN', 'Nigeria'],
+  ['Member Welcome Pack', true, 'NGN', 'Nigeria'],
+  ['Member Repeat Purchase', true, 'NGN', 'Nigeria'],
+  ['AMP', 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) => {
+  const record = {
+    ...sample, ORDER_TYPE: type, SHOW_BV: showBv, CURRENCY: currency, COUNTRY: country,
+    USER_NAME: 'SAMPLE-MEMBER', REAL_NAME: 'Sample member',
+    CREATED_AT: '1792726465', PAY_AT: '1792726516', STATUS: 'Paid',
+    ORDER_AMOUNT: '3398000.00', PAY_AMOUNT: '3398000.00',
+    PV: '999.00', PAY_PV: '769.00'
+  }
+  fetchGuestOrderDetail.mockResolvedValue({ data: { order: record, goods: [
+    { GOODS_TITLE: 'Sample device', SKU_CODE: 'DEVICE-1', BUY_NUMS: '1', TAX_RATE: '7.50', REAL_PV: '699.00', REAL_PRICE: '2999000.00' },
+    { GOODS_TITLE: 'Sample filter', SKU_CODE: 'FILTER-1', BUY_NUMS: '1', TAX_RATE: '7.50', REAL_PV: '70.00', REAL_PRICE: '399000.00' }
+  ] }})
+  const vm = mount()
+  await settle()
+  const member = vm.$el.querySelector('.ng-guest-order-member')
+  expect(member).not.toBeNull()
+  expect(member.querySelector('h2').textContent).toBe('Member')
+  const fields = Object.fromEntries(Array.from(member.querySelectorAll('dl > div'), row => [row.querySelector('dt').textContent, row.querySelector('dd').textContent.trim()]))
+  expect(fields).toEqual({
+    'Member ID': showBv ? 'SAMPLE-MEMBER' : '-',
+    Name: showBv ? 'Sample member' : '-',
+    Placed: tool.formatDate(record.CREATED_AT),
+    Paid: tool.formatDate(record.PAY_AT),
+    Currency: currency
+  })
+  const bvItems = vm.$el.querySelectorAll('.ng-guest-order-item-bv')
+  expect(bvItems).toHaveLength(showBv ? 2 : 0)
+  if (showBv) {
+    expect(Array.from(bvItems, item => item.textContent.trim())).toEqual(['699 BV each', '70 BV each'])
+    expect(vm.$el.querySelector('.ng-guest-order-bv-total dd').textContent).toBe('+769 BV')
+  } else {
+    expect(vm.$el.querySelector('.ng-guest-order-bv-total')).toBeNull()
+    expect(vm.$el.textContent).not.toContain('BV')
+    expect(member.textContent).not.toContain('SAMPLE-MEMBER')
+    expect(member.textContent).not.toContain('Sample member')
+  }
+  expect(vm.$el.querySelector('.ng-guest-order-grand-total strong').textContent).toBe(currency + ' 3,398,000.00')
+  expect(vm.$el.querySelector('.ng-guest-order-total dd').textContent).toBe(currency + ' 3,398,000.00')
+})
+
+it('handles missing member fields, zero BV and an unpaid timestamp without invented values', async() => {
+  fetchGuestOrderDetail.mockResolvedValue({ data: { order: { ...sample, SHOW_BV: true, PAY_PV: null, PV: '0.00', PAY_AT: '0' }, goods: [] }})
+  const vm = mount()
+  await settle()
+  const values = Array.from(vm.$el.querySelectorAll('.ng-guest-order-member dd'), field => field.textContent.trim())
+  expect(values).toEqual(['-', '-', tool.formatDate(sample.CREATED_AT), 'Not yet paid', 'NGN'])
+  expect(vm.$el.querySelector('.ng-guest-order-bv-total dd').textContent).toBe('+0 BV')
+})
+
+it.each([null, undefined])('keeps unavailable BV %s distinct from zero', async value => {
+  fetchGuestOrderDetail.mockResolvedValue({ data: { order: { ...sample, SHOW_BV: true, PAY_PV: value, PV: value }, goods: [] }})
+  const vm = mount()
+  await settle()
+  expect(vm.$el.querySelector('.ng-guest-order-bv-total dd').textContent).toBe('—')
+})

+ 10 - 2
tests/unit/ui-refactor/guestShopPaystack.spec.js

@@ -7,8 +7,8 @@ jest.mock('vue-paystack', () => ({
   render: h => h('button')
 }))
 const instances = []
-function instance(currency = 'USD') {
-  const vm = new (Vue.extend(OrderPaystack))({ propsData: { paystackkey: 'test-key', email: 'guest@example.test', amount: 29, currency, reference: 'guest-ORDER1-1', metadata: { cart_id: 'ORDER1' }, channels: ['card'], callback: jest.fn(), close: jest.fn() }})
+function instance(currency = 'USD', email = 'guest@example.test') {
+  const vm = new (Vue.extend(OrderPaystack))({ propsData: { paystackkey: 'test-key', email, amount: 29, currency, reference: 'guest-ORDER1-1', metadata: { cart_id: 'ORDER1' }, channels: ['card'], callback: jest.fn(), close: jest.fn() }})
   instances.push(vm)
   return vm
 }
@@ -38,6 +38,14 @@ it('reports script load failure and allows the page to recover', async() => {
   await vm.payWithPaystack()
   expect(error).toHaveBeenCalledWith(expect.any(Error))
 })
+it('passes an empty email to Paystack without adding an email requirement', async() => {
+  const openIframe = jest.fn()
+  window.PaystackPop = { setup: jest.fn(() => ({ openIframe })) }
+  const vm = instance('NGN', '')
+  await vm.payWithPaystack()
+  expect(window.PaystackPop.setup).toHaveBeenCalledWith(expect.objectContaining({ email: '', currency: 'NGN', amount: 29 }))
+  expect(openIframe).toHaveBeenCalledTimes(1)
+})
 it('reports unsupported currency or SDK setup errors without claiming success', async() => {
   window.PaystackPop = { setup: jest.fn(() => { throw new Error('Currency unavailable') }) }
   const vm = instance()

+ 45 - 5
tests/unit/ui-refactor/guestShopUi.spec.js

@@ -94,7 +94,7 @@ it('connects product, cart and checkout controls without guest BV or member fiel
   recipient.dispatchEvent(new Event('input', { bubbles: true }))
   await settle()
   expect(vm.form.consignee).toBe('Recipient')
-  Object.assign(vm.form, { acceptMobile: '123', province: ['R1'], lgaName: 'District', cityName: 'Dubai', detailaddress: 'Street' })
+  Object.assign(vm.form, { acceptMobile: '123', email: 'guest@example.test', province: ['R1'], lgaName: 'District', cityName: 'Dubai', detailaddress: 'Street' })
   vm.$el.querySelector('.ng-purchase-place-order').click()
   await settle()
   const dialog = vm.$children.find(child => child.$options.name === 'PaystackPaymentDialog')
@@ -116,19 +116,52 @@ it('keeps Nigeria merchandise, cart, checkout and email amounts in the product c
   vm.stage = 'checkout'
   await settle()
   expect(vm.$el.querySelector('.ng-purchase-summary').textContent).toContain('NGN 130')
-  Object.assign(vm.form, { consignee: 'Recipient', acceptMobile: '123', province: ['R1'], lgaName: 'District', cityName: 'Lagos', detailaddress: 'Street' })
+  Object.assign(vm.form, { consignee: 'Recipient', acceptMobile: '123', email: 'guest@example.test', province: ['R1'], lgaName: 'District', cityName: 'Lagos', detailaddress: 'Street' })
   vm.openEmail()
   await settle()
   const dialog = descendants(vm).find(child => child.$options.name === 'PaystackPaymentDialog')
   expect(dialog.visible).toBe(true)
   expect(dialog.$el.querySelector('.ng-paystack-payment-amount').textContent).toContain('NGN 130')
 })
-it('opens Paystack with the order record amount, product currency and server email without user input', async() => {
+it.each(['ng', 'ae'])('renders and validates the %s checkout email between phone and region', async market => {
+  const vm = mount(Flow, { market, stage: 'catalog' })
+  await settle()
+  vm.toggleProduct(vm.products[0])
+  vm.stage = 'checkout'
+  await settle()
+  Object.assign(vm.form, { consignee: 'Recipient', acceptMobile: '123', province: ['R1'], lgaName: 'District', cityName: 'City', detailaddress: 'Street' })
+  const input = vm.$el.querySelector('#ng-guest-email')
+  expect(input).not.toBeNull()
+  expect(input.type).toBe('email')
+  expect(input.autocomplete).toBe('email')
+  expect(Array.from(vm.$el.querySelectorAll('.ng-purchase-shipping-address label')).map(label => label.htmlFor)).toEqual(['ng-guest-consignee', 'ng-guest-acceptMobile', 'ng-guest-email', 'ng-guest-province', 'ng-guest-lgaName', 'ng-guest-cityName', 'ng-guest-detailaddress'])
+  vm.$el.querySelector('.ng-purchase-place-order').click()
+  await settle()
+  expect(vm.emailVisible).toBe(false)
+  expect(input.closest('.el-form-item').textContent).toContain('Please enter email.')
+  input.value = 'invalid'
+  input.dispatchEvent(new Event('input', { bubbles: true }))
+  await settle()
+  expect(vm.form.email).toBe('invalid')
+  input.dispatchEvent(new Event('blur'))
+  vm.$el.querySelector('.ng-purchase-place-order').click()
+  await settle()
+  expect(vm.emailVisible).toBe(false)
+  expect(input.closest('.el-form-item').textContent).toContain('Please enter a valid email address.')
+  expect(shop.createGuestOrder).not.toHaveBeenCalled()
+  input.value = 'guest@example.test'
+  input.dispatchEvent(new Event('input', { bubbles: true }))
+  vm.$el.querySelector('.ng-purchase-place-order').click()
+  await settle()
+  expect(vm.form.email).toBe('guest@example.test')
+  expect(vm.emailVisible).toBe(true)
+})
+it.each(['visitor@example.test', ''])('opens Paystack with the entered email when server EMAIL is %s', async email => {
   const openIframe = jest.fn()
   window.PaystackPop = { setup: jest.fn(() => ({ openIframe })) }
   shop.fetchGuestProducts.mockResolvedValue({ data: { list: [{ ID: 'P1', GOODS_NAME: 'Nigeria product', SELL_PRICE: 62500, MARKET_PRICE: 50000, DISCOUNT: 80, TAX_RATE: 7.5, STORE_NUMS: 5, COIN: 'NGN', LOCAL_CURRENCY_ID: '104' }], totalCount: 1 }})
   shop.fetchGuestCart.mockResolvedValue({ data: { sellType: [{ id: 1, sell_type: [{ label: 'pay_stack', name: 'Paystack' }] }], freight: 0, freeShipping: 0, coin: 'NGN' }})
-  shop.createGuestOrder.mockResolvedValue({ data: { SN: 'SAMPLE-ORDER', DEC_SN: 'SAMPLE-DECLARATION', ORDER_AMOUNT: 50000, PAY_AMOUNT: 50000, PAY_FREIGHT: 0, COUNTRY_ID: '620699181539139625', CURRENCY_ID: '104', EMAIL: 'visitor@example.test', STATUS: 1 }})
+  shop.createGuestOrder.mockResolvedValue({ data: { SN: 'SAMPLE-ORDER', DEC_SN: 'SAMPLE-DECLARATION', ORDER_AMOUNT: 399000, PAY_AMOUNT: 399000, PAY_FREIGHT: 0, COUNTRY_ID: '620699181539139625', CURRENCY_ID: '104', EMAIL: email, STATUS: 0 }})
   const vm = mount(Flow, { market: 'ng', stage: 'catalog' })
   vm.publicKey = 'sample-key'
   await settle()
@@ -136,13 +169,19 @@ it('opens Paystack with the order record amount, product currency and server ema
   vm.stage = 'checkout'
   await settle()
   Object.assign(vm.form, { consignee: 'Recipient', acceptMobile: '123', province: ['R1'], lgaName: 'District', cityName: 'Lagos', detailaddress: 'Street' })
+  const emailInput = vm.$el.querySelector('#ng-guest-email')
+  emailInput.value = '  buyer@example.test  '
+  emailInput.dispatchEvent(new Event('input', { bubbles: true }))
   vm.$el.querySelector('.ng-purchase-place-order').click()
   await settle()
   const dialog = descendants(vm).find(child => child.$options.name === 'PaystackPaymentDialog')
   dialog.$el.querySelector('.ng-paystack-payment-continue').click()
   await settle()
   expect(openIframe).toHaveBeenCalledTimes(1)
-  expect(window.PaystackPop.setup.mock.calls[0][0]).toMatchObject({ amount: 5000000, currency: 'NGN', email: 'visitor@example.test', metadata: { cart_id: 'SAMPLE-ORDER' }})
+  expect(shop.createGuestOrder).toHaveBeenCalledWith(expect.objectContaining({ email: 'buyer@example.test' }))
+  expect(window.PaystackPop.setup.mock.calls[0][0]).toMatchObject({ amount: 39900000, currency: 'NGN', email: 'buyer@example.test', metadata: { cart_id: 'SAMPLE-ORDER' }})
+  expect(dialog.$el.querySelector('input')).toBeNull()
+  expect(vm.$el.textContent).not.toContain('Your unpaid order is saved for this visit.')
   expect(push).not.toHaveBeenCalled()
   window.PaystackPop.setup.mock.calls[0][0].onClose()
   await settle()
@@ -152,6 +191,7 @@ it('opens Paystack with the order record amount, product currency and server ema
   await settle()
   expect(shop.createGuestOrder).toHaveBeenCalledTimes(1)
   expect(openIframe).toHaveBeenCalledTimes(2)
+  expect(window.PaystackPop.setup.mock.calls[1][0].email).toBe('buyer@example.test')
   window.PaystackPop.setup.mock.calls[1][0].callback({ reference: 'sample-reference' })
   await settle()
   expect(push).toHaveBeenCalledWith({ path: '/guest-order', query: { order: 'SAMPLE-ORDER' }})

+ 56 - 0
tests/unit/ui-refactor/signup.spec.js

@@ -1,6 +1,9 @@
 /* eslint-env jest */
 import Vue from 'vue'
+import ElementUI from 'element-ui'
+import path from 'path'
 import registration from '@/ui-refactor/views/signup/components/welcomePackRegistration'
+import { load } from '@/ui-refactor/views/purchase/__tests__/loadComponent'
 import { getLanguages } from '@/api/setting'
 import request from '@/utils/request'
 
@@ -8,6 +11,9 @@ jest.mock('@/api/setting', () => ({ getLanguages: jest.fn() }))
 jest.mock('@/utils/usersInfo', () => ({ userName: () => null, userEmail: () => null }))
 jest.mock('@/utils/request', () => jest.fn())
 
+Vue.use(ElementUI)
+const PaymentMethods = load(path.resolve('src/ui-refactor/components/PaymentMethods.vue'))
+
 function instance() {
   const vm = registration.data()
   vm.$message = jest.fn()
@@ -203,6 +209,56 @@ describe('Signup welcome-pack compatibility', () => {
     expect(vm.loading).toBe(false)
   })
 
+  it.each([
+    [{ pay_stack: { name: 'PayStack' }}, ['pay_stack']],
+    [[{ label: 'cash', name: 'Account Balance' }, { label: 'pay_stack', name: 'PayStack' }], ['cash', 'pay_stack']],
+    [undefined, ['cash', 'pay_stack']]
+  ])('keeps country payment methods selectable for response format %#', async(payList, labels) => {
+    const vm = instance()
+    vm.form.countryId = 'country'
+    const original = JSON.stringify(payList)
+    request.mockResolvedValue({ data: {
+      draft: { insertUserName: 'test-guest', currency: 'NGN' },
+      allGoods: [], region: [], decLevel: [], payList,
+      sellType: [{ sell_type: [
+        { label: 'cash', name: 'Account Balance' },
+        { label: 'pay_stack', name: 'PayStack' }
+      ] }]
+    }})
+
+    vm.countriesChange()
+    await settle()
+    jest.runOnlyPendingTimers()
+    expect(Object.values(vm.payList).map(option => option.label)).toEqual(labels)
+    expect(vm.form.payType).toBe('pay_stack')
+    expect(JSON.stringify(payList)).toBe(original)
+
+    const page = new Vue({
+      data: () => ({ form: vm.form, payList: vm.payList }),
+      render(h) {
+        return h(PaymentMethods, {
+          props: { options: this.payList, value: this.form.payType, summary: { amount: 100 }},
+          on: { input: value => { this.form.payType = value } }
+        })
+      }
+    }).$mount()
+    try {
+      const inputs = Array.from(page.$el.querySelectorAll('input[type="radio"]'))
+      expect(inputs.map(input => input.value)).toEqual(labels)
+      const paystack = inputs.find(input => input.value === 'pay_stack')
+      expect(paystack.checked).toBe(true)
+      page.form.payType = ''
+      await Vue.nextTick()
+      paystack.click()
+      await Vue.nextTick()
+      expect(page.form.payType).toBe('pay_stack')
+      expect(paystack.checked).toBe(true)
+      expect(page.$el.querySelector('.ng-payment-methods-detail').textContent).toContain('Paystack')
+    } finally {
+      page.$destroy()
+    }
+  })
+
   it('clears the previous identity when reloading and keeps it cleared if the GET fails', async() => {
     const vm = instance()
     vm.draft = { draftId: 'old-draft', accessToken: 'test-only-old-token' }