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

Merge branch 'ui-refactor-phase-2' into develop

bill 1 неделя назад
Родитель
Сommit
2941dc9c9f

+ 1 - 1
.env.development

@@ -17,6 +17,6 @@ ENV='development'
  # CDN文件地址
  VUE_APP_CDN_API='https://ae-upload-uat.elkenafrica.com'
  # 会员页面地址
- VUE_APP_BASE_WEBSITE='http://16.163.228.151:8017'
+ VUE_APP_BASE_WEBSITE='https://ae-user-uat.elkenafrica.com'
  VUE_APP_BASE_PAY_STACK_PUBLIC_KEY='pk_test_2eed10135c4a958c5073795b22854ded9d1a6c55'
  VUE_APP_ACCESS_TOKEN_PREFIX='Bearer '

+ 36 - 0
build/release.js

@@ -0,0 +1,36 @@
+const path = require('path')
+const Service = require('@vue/cli-service')
+const { ContextReplacementPlugin } = require('webpack')
+
+const [mode, dest] = process.argv.slice(2)
+
+if (mode !== 'staging' && mode !== 'production') {
+  console.error('Usage: node build/release.js <staging|production> [output-directory]')
+  process.exit(1)
+}
+
+process.env.NODE_ENV = 'production'
+process.env.BABEL_ENV = 'production'
+
+const service = new Service(path.resolve(__dirname, '..'))
+service.init(mode)
+service.webpackChainFns.push(config => {
+  // Vue CLI 4 的缓存键只包含 NODE_ENV。发布包使用独立缓存,避免复用开发模式的 Babel 转换。
+  for (const rule of ['js', 'vue']) {
+    config.module.rule(rule).use('cache-loader').tap(options => ({
+      ...options,
+      cacheIdentifier: options.cacheIdentifier + '-release-babel-production'
+    }))
+  }
+
+  // 英文由 Moment 自带,额外保留站点支持的中文、西班牙文和日文。
+  config.plugin('release-moment-locales').use(ContextReplacementPlugin, [
+    /moment[\\/]locale$/,
+    /^\.\/(es|ja|zh-cn)(\.js)?$/
+  ])
+})
+
+service.run('build', { mode, dest }).catch(error => {
+  console.error(error)
+  process.exitCode = 1
+})

+ 4 - 0
src/ui-refactor/layouts/PublicHeader.vue

@@ -45,6 +45,10 @@ export default {
     },
     async logout() {
       await this.$store.dispatch('user/logout')
+      if (this.$route.name === 'GuestOrder') {
+        this.$router.replace('/login')
+        return
+      }
       this.$router.push(`/login?redirect=${this.$route.fullPath}`)
     }
   }

+ 12 - 2
src/ui-refactor/views/account/__tests__/MemberSummary.spec.js

@@ -30,6 +30,7 @@ const compiled = compileTemplate({ source: template.content, filename })
 if (compiled.errors.length) throw new Error(compiled.errors.join('\n'))
 Object.assign(MemberSummary, new Function(compiled.code + '; return { render, staticRenderFns }')())
 const instances = []
+const originalWebsite = process.env.VUE_APP_BASE_WEBSITE
 
 function instance(dispatch = jest.fn().mockResolvedValue({ data: {}})) {
   const router = { push: jest.fn() }
@@ -71,17 +72,26 @@ describe('MemberSummary migration', () => {
 
   afterEach(() => {
     instances.splice(0).forEach(vm => vm.$destroy())
+    if (originalWebsite === undefined) {
+      delete process.env.VUE_APP_BASE_WEBSITE
+    } else {
+      process.env.VUE_APP_BASE_WEBSITE = originalWebsite
+    }
     jest.restoreAllMocks()
     jest.useRealTimers()
   })
 
-  it('reads cached identity and levels without importing the old dashboard', async() => {
+  it.each([
+    ['https://members.example.com', 'https://members.example.com/#/login?ref=TEST-MEMBER'],
+    ['https://members.example.test/', 'https://members.example.test/#/login?ref=TEST-MEMBER']
+  ])('reads cached identity and uses the configured referral website %s', async(website, expectedLink) => {
+    process.env.VUE_APP_BASE_WEBSITE = website
     const { vm } = instance()
     await settle()
     expect(vm.memberName).toBe('Test member')
     expect(vm.memberId).toBe('TEST-MEMBER')
     expect(vm.memberDetails.slice(1).map(item => item.value)).toEqual(['cached-period', 'Cached Silver', 'Cached Honor', 'Cached Elite'])
-    expect(vm.referralLink).toBe('https://meads.elken.com/#/login?ref=TEST-MEMBER')
+    expect(vm.referralLink).toBe(expectedLink)
     expect(vm.$el.querySelector('h1').textContent).toBe('Test member')
     expect(vm.$el.querySelector('input').value).toBe(vm.referralLink)
   })

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

@@ -56,7 +56,7 @@ export default {
         {
           label: 'Talk to support',
           note: 'Avg reply 2 min · WhatsApp',
-          href: 'https://wa.me/2348000000000'
+          href: 'https://wa.me/2349131178401'
         }
       ]
     }

+ 3 - 1
src/ui-refactor/views/account/components/MemberSummary.vue

@@ -92,7 +92,9 @@ export default {
       return moment(this.memberNowTime).utcOffset('+0100').format('YYYY-MM-DD HH:mm:ss') + ' (WAT)'
     },
     referralLink() {
-      return this.memberId ? 'https://meads.elken.com/#/login?ref=' + this.memberId : ''
+      if (!this.memberId) return ''
+      const website = process.env.VUE_APP_BASE_WEBSITE || window.location.origin
+      return website.replace(/\/+$/, '') + '/#/login?ref=' + this.memberId
     },
     memberDetails() {
       return [

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

@@ -96,6 +96,12 @@
               :disabled="locked"
               @click="navigate('cart')"
             >Back to cart</el-button>
+            <el-button
+              type="primary"
+              :loading="submitting"
+              :disabled="sdkActive || (!pending && (!canCheckout || !regionsReady))"
+              @click="openEmail"
+            >{{ pending ? 'Continue payment' : 'Place order' }}</el-button>
           </template>
         </el-col>
         <el-col :xs="24" :lg="8" class="ng-guest-summary-column">
@@ -316,7 +322,7 @@ export default {
   line-height: 1.5;
 }
 .ng-guest-back {
-  margin: 24px 0;
+  //margin: 24px 0;
 }
 .ng-guest-empty {
   min-height: 280px;

+ 1 - 1
src/ui-refactor/views/purchase/CheckoutFields.vue

@@ -21,7 +21,7 @@
       </el-form-item>
       <el-form-item
         v-if="!upgrade"
-        label="Reporting Center ID"
+        label="Stockist ID"
         :prop="self ? 'recUserName' : 'decUserName'"
         :required="!stockist"
         for="ng-purchase-stockist"

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

@@ -260,6 +260,14 @@
               :disabled="busy"
             />
             <el-button :disabled="busy" @click="navigate('cart')">Back to cart</el-button>
+            <el-button
+              type="primary"
+              :disabled="!canCheckout"
+              :loading="submitButtonStat || submissionLocked"
+              @click="submitOrder"
+            >
+              {{ submitButtonStat || submissionLocked ? 'Processing...' : 'Place order' }}
+            </el-button>
           </template>
         </div>
         <order-summary

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

@@ -425,7 +425,13 @@ export default {
     confirmRegistration() {
       if (!this.registrationSuccessVisible) return
       this.registrationSuccessVisible = false
-      this.$router.replace(this.loginRoute)
+      const loginRoute = this.loginRoute
+      const query = { ...loginRoute.query }
+      if (typeof query.redirect === 'string' && this.$router.match(query.redirect).name === 'GuestOrder') {
+        delete query.redirect
+        delete query.order
+      }
+      this.$router.replace({ ...loginRoute, query })
     },
     // BA会员查询
     checkBaUser() {

+ 1 - 1
src/ui-refactor/views/welcome-pack/WelcomePackFields.vue

@@ -96,7 +96,7 @@
         </el-form-item>
         <el-form-item
           class="ng-welcome-full"
-          label="Reporting Center ID"
+          label="Stockist ID"
           for="ng-welcome-center"
           :required="!guest && !stockist"
         >

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

@@ -31,6 +31,7 @@ Vue.prototype.$confirm = jest.fn().mockResolvedValue()
 const countries = [{ ID: 'C1', NAME: 'Nigeria', DEFAULT_LANGUAGE_ID: 'EN' }]
 Vue.prototype.$store = { getters: { getCountriesList: countries }, dispatch: jest.fn().mockResolvedValue(countries) }
 const Page = load(path.resolve(__dirname, '../MemberWelcomePack.vue'))
+const PublicHeader = load(path.resolve('src/ui-refactor/layouts/PublicHeader.vue'), true)
 const product = { ID: 'P1', GOODS_NAME: 'Sample product', GOODS_NO: 'SKU1', SELL_PRICE: '199000.00', MARKET_PRICE: '299900.00', TAX_RATE: 7.5, PRICE_PV: 70, STORE_NUMS: 10, CODE: 'NGN' }
 const instances = []
 const errors = []
@@ -41,7 +42,8 @@ async function mount(location) {
   const router = new Router({ mode: 'abstract', routes: [
     { path: '/signup', component: Page, props: { mode: 'guest' }},
     { path: '/dashboard/member-welcome-pack', component: Page, props: { mode: 'member' }},
-    ...['/login', '/guest-order', '/dashboard/index'].map(route => ({ path: route, component: { render: h => h('div', route) }}))
+    { path: '/guest-order', name: 'GuestOrder', component: { render: h => h('div') }},
+    ...['/login', '/dashboard/index'].map(route => ({ path: route, component: { render: h => h('div', route) }}))
   ] })
   const root = new Vue({ router, render: h => h('router-view') }).$mount()
   document.body.appendChild(root.$el)
@@ -272,6 +274,26 @@ it('keeps member navigation blocked while payment is active and uses the shared
   expect(entry.$refs.flow.form.countryId).toBe('')
 })
 
+it('replaces the signed-out order detail with a clean login URL', async() => {
+  const { router } = await mount('/guest-order?order=OLD-ORDER')
+  await PublicHeader.methods.logout.call({ $store: Vue.prototype.$store, $router: router, $route: router.currentRoute })
+  expect(Vue.prototype.$store.dispatch).toHaveBeenCalledWith('user/logout')
+  expect(router.currentRoute.fullPath).toBe('/login')
+  expect(router.history.stack.map(route => route.fullPath)).toEqual(['/login'])
+})
+
+it('drops a previous order redirect when a new member confirms registration', async() => {
+  const { router, entry } = await mount('/signup?redirect=/guest-order?order=OLD-ORDER&order=OLD-ORDER&ref=INVITER')
+  const flow = entry.$refs.flow
+  flow.paymentOrder = { reference: 'guest-reference' }
+  flow.processPayment({ reference: 'guest-reference' })
+  expect(flow.registrationSuccessVisible).toBe(true)
+  flow.confirmRegistration()
+  await settle()
+  expect(router.currentRoute.path).toBe('/login')
+  expect(router.currentRoute.query).toEqual({ ref: 'INVITER' })
+})
+
 it('shows the submitted Member ID after guest payment, copies it and returns to login on confirmation', async() => {
   const { root, router, entry } = await mount('/signup?ref=INVITER&redirect=/dashboard/repeat-purchase')
   await verifyGuestReferrer(root)

+ 1 - 1
tests/unit/ui-refactor/signup.spec.js

@@ -25,7 +25,7 @@ function instance(referrer = 'test-referrer') {
       this.$message = Object.assign(jest.fn(), { error: jest.fn() })
       this.$t = key => key
       this.$route = { query: {}}
-      this.$router = { push: jest.fn(), replace: jest.fn() }
+      this.$router = { push: jest.fn(), replace: jest.fn(), match: jest.fn().mockReturnValue({}) }
     }
   })
   instances.push(vm)