|
|
@@ -57,9 +57,13 @@ async function withProducts(source = names[0]) {
|
|
|
vm.changeQuantity({ row: product, value: 2 })
|
|
|
vm.stage = 'checkout'
|
|
|
await settle()
|
|
|
- if (vm.isSelf) vm.payForm.recUserName = 'RC1'
|
|
|
- else if (!vm.isUpgrade) Object.assign(vm.newOrder, { decUserName: 'RC1', consignee: 'Recipient', mobile: '123', areaSelected: ['S1'], lgaName: 'District', cityName: 'City', address: 'Street' })
|
|
|
- else Object.assign(vm.form, { consignee: 'Recipient', acceptMobile: '123', areaSelected: ['S1'], lgaName: 'District', cityName: 'City', address: 'Street', remark: 'Note' })
|
|
|
+ if (vm.isSelf) {
|
|
|
+ if (Number(vm.isDec) !== 1) vm.payForm.recUserName = 'RC1'
|
|
|
+ } else if (!vm.isUpgrade) {
|
|
|
+ Object.assign(vm.newOrder, { ...(Number(vm.isDec) === 1 ? {} : { decUserName: 'RC1' }), consignee: 'Recipient', mobile: '123', areaSelected: ['S1'], lgaName: 'District', cityName: 'City', address: 'Street' })
|
|
|
+ } else {
|
|
|
+ Object.assign(vm.form, { consignee: 'Recipient', acceptMobile: '123', areaSelected: ['S1'], lgaName: 'District', cityName: 'City', address: 'Street', remark: 'Note' })
|
|
|
+ }
|
|
|
await settle()
|
|
|
return vm
|
|
|
}
|
|
|
@@ -221,7 +225,7 @@ it.each(names.filter(source => source !== 'repeat-purchase'))('separates %s ship
|
|
|
const shippingCard = vm.$el.querySelector('.ng-purchase-shipping-address')
|
|
|
expect(memberCard.nextElementSibling).toBe(shippingCard)
|
|
|
expect(memberCard.querySelector('#ng-purchase-member-readonly')).not.toBeNull()
|
|
|
- expect(memberCard.querySelector('#ng-purchase-stockist')).not.toBeNull()
|
|
|
+ expect(Boolean(memberCard.querySelector('#ng-purchase-stockist'))).toBe(!vm.isUpgrade)
|
|
|
expect(memberCard.querySelector('#ng-purchase-consignee')).toBeNull()
|
|
|
expect(shippingCard.querySelector('h2').textContent).toBe('Shipping address')
|
|
|
expect(shippingCard.querySelector('#ng-purchase-consignee')).not.toBeNull()
|
|
|
@@ -478,37 +482,33 @@ const submissions = [
|
|
|
['member-auto-maintenance', shop.createAutoMaintenanceOrder, shop.createApproachAutoMaintenanceOrder, '/shop/own-order'],
|
|
|
['member-upgrade', user.fetchSendUpgrade, user.fetchSendUpgrade, '/shop/member-order']
|
|
|
]
|
|
|
-it.each(names)('%s keeps Reporting Center ID required and editable for every stockist status', async source => {
|
|
|
+it.each(names.filter(source => source !== 'member-upgrade'))('%s locks the default Reporting Center ID only for stockist accounts', async source => {
|
|
|
const vm = await withProducts(source)
|
|
|
for (const status of [0, '0', 1, '1', false, true]) {
|
|
|
vm.isDec = status
|
|
|
await settle()
|
|
|
const input = vm.$el.querySelector('#ng-purchase-stockist')
|
|
|
- expect(input.disabled).toBe(false)
|
|
|
- expect(input.closest('.el-form-item').classList.contains('is-required')).toBe(true)
|
|
|
+ const stockist = Number(status) === 1
|
|
|
+ expect(input.disabled).toBe(stockist)
|
|
|
+ expect(input.closest('.el-form-item').classList.contains('is-required')).toBe(!stockist)
|
|
|
+ if (stockist) expect(input.value).toBe('OP1')
|
|
|
}
|
|
|
})
|
|
|
|
|
|
-it.each(submissions)('%s submits the Reporting Center ID entered in the form', async(source, api) => {
|
|
|
+it.each(submissions.filter(([source]) => source !== 'member-upgrade'))('%s submits the Reporting Center ID entered by a regular member', async(source, api) => {
|
|
|
const vm = await withProducts(source)
|
|
|
vm.activePayType = 'cash'
|
|
|
const input = vm.$el.querySelector('#ng-purchase-stockist')
|
|
|
input.value = 'RC-EDITED'
|
|
|
input.dispatchEvent(new Event('input', { bubbles: true }))
|
|
|
- if (vm.isUpgrade) {
|
|
|
- const recipient = vm.$el.querySelector('#ng-purchase-consignee')
|
|
|
- recipient.value = 'Edited recipient'
|
|
|
- recipient.dispatchEvent(new Event('input', { bubbles: true }))
|
|
|
- }
|
|
|
await settle()
|
|
|
expect(vm.$el.querySelector('#ng-purchase-stockist').value).toBe('RC-EDITED')
|
|
|
vm.submitOrder()
|
|
|
await settle()
|
|
|
expect(api).toHaveBeenCalledWith(expect.objectContaining({ [vm.isSelf ? 'userName' : 'decUserName']: 'RC-EDITED' }))
|
|
|
- if (vm.isUpgrade) expect(api).toHaveBeenCalledWith(expect.objectContaining({ consignee: 'Edited recipient' }))
|
|
|
})
|
|
|
|
|
|
-it.each(submissions)('%s blocks submission when the entered Reporting Center ID is empty', async(source, api) => {
|
|
|
+it.each(submissions.filter(([source]) => source !== 'member-upgrade'))('%s blocks submission when the regular member Reporting Center ID is empty', async(source, api) => {
|
|
|
const vm = await withProducts(source)
|
|
|
const input = vm.$el.querySelector('#ng-purchase-stockist')
|
|
|
input.value = ''
|
|
|
@@ -521,6 +521,41 @@ it.each(submissions)('%s blocks submission when the entered Reporting Center ID
|
|
|
expect(vm.busy).toBe(false)
|
|
|
})
|
|
|
|
|
|
+it.each(submissions.filter(([source]) => source !== 'member-upgrade'))('%s submits the default stockist account without requiring an edit', async(source, api) => {
|
|
|
+ shop.fetchShoppingCart.mockImplementation(async() => { const value = settings(); value.data.isDec = '1'; return value })
|
|
|
+ const vm = await withProducts(source)
|
|
|
+ vm.activePayType = 'cash'
|
|
|
+ const input = vm.$el.querySelector('#ng-purchase-stockist')
|
|
|
+ expect(input.disabled).toBe(true)
|
|
|
+ expect(input.value).toBe('OP1')
|
|
|
+ vm.submitOrder()
|
|
|
+ await settle()
|
|
|
+ expect(api).toHaveBeenCalledWith(expect.objectContaining({ [vm.isSelf ? 'userName' : 'decUserName']: 'OP1' }))
|
|
|
+})
|
|
|
+
|
|
|
+it.each(['cash', 'pay_stack'])('hides Reporting Center ID for upgrade and preserves backend values with %s', async payType => {
|
|
|
+ const vm = await withProducts('member-upgrade')
|
|
|
+ expect(vm.$el.querySelector('#ng-purchase-stockist')).toBeNull()
|
|
|
+ expect(vm.$el.textContent).not.toContain('Reporting Center ID')
|
|
|
+ expect(vm.$el.querySelector('#ng-purchase-member-readonly')).not.toBeNull()
|
|
|
+ const recipient = vm.$el.querySelector('#ng-purchase-consignee')
|
|
|
+ recipient.value = 'Edited recipient'
|
|
|
+ recipient.dispatchEvent(new Event('input', { bubbles: true }))
|
|
|
+ vm.activePayType = payType
|
|
|
+ vm.submitOrder()
|
|
|
+ await settle()
|
|
|
+ expect(user.fetchSendUpgrade).toHaveBeenCalledWith(expect.objectContaining({ decUserName: 'RC1', consignee: 'Edited recipient' }))
|
|
|
+})
|
|
|
+
|
|
|
+it('does not add a Reporting Center ID requirement to the upgrade request', async() => {
|
|
|
+ const vm = await withProducts('member-upgrade')
|
|
|
+ vm.decUserName = ''
|
|
|
+ vm.activePayType = 'cash'
|
|
|
+ vm.submitOrder()
|
|
|
+ await settle()
|
|
|
+ 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) => {
|
|
|
const vm = await withProducts(source)
|
|
|
vm.activePayType = 'cash'
|