edb/kassa
Archived
9
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Fix logic when selling new card membership to non-user

Browse Source
This commit is contained in:
ponas committed 2017-08-28 23:24:15 +02:00
1 parent 03aa3be229
commit 109ce2d6e7
2 files changed
+18 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

static/app/scripts/app.js
+9 -6
View File
@@ -486,16 +486,19 @@ $(document).ready(function(){
// FIXME: get from form // FIXME: get from form
// action: 'new_card_membership', 'update_card', 'add_or_renew', 'sms_card_notify' // action: 'new_card_membership', 'update_card', 'add_or_renew', 'sms_card_notify'
if (selectedUser === null && membershipOrder === null) { if (selectedUser === null && membershipOrder === null) {
// Unknown phone / card, new membership
payload.action = 'new_card_membership'; payload.action = 'new_card_membership';
} else if (selectedUser === null && membershipOrder !== null) { } else if (selectedUser === null && membershipOrder !== null &&
membershipOrder.member_card === null && membershipOrder.product.is_valid) {
// Associate member card with a valid membership orer
payload.action = 'sms_card_notify'; payload.action = 'sms_card_notify';
payload.order_uuid = membershipOrder.uuid; payload.order_uuid = membershipOrder.uuid;
} else if (selectedUser !== null && selectedUser.is_member) {
// Add member card to a user
payload.action = 'update_card';
} else { } else {
if (selectedUser.is_member) { // New order for user or non-user
payload.action = 'update_card'; payload.action = 'add_or_renew'; // Note: could also update card number
} else {
payload.action = 'add_or_renew'; // Note: could also update card number
}
} }
$.ajax(urls.registerCardAndMembership, { $.ajax(urls.registerCardAndMembership, {
data: JSON.stringify(payload), data: JSON.stringify(payload),
static/dist/scripts/app.js
Vendored
+9 -6
View File
@@ -486,16 +486,19 @@ $(document).ready(function(){
// FIXME: get from form // FIXME: get from form
// action: 'new_card_membership', 'update_card', 'add_or_renew', 'sms_card_notify' // action: 'new_card_membership', 'update_card', 'add_or_renew', 'sms_card_notify'
if (selectedUser === null && membershipOrder === null) { if (selectedUser === null && membershipOrder === null) {
// Unknown phone / card, new membership
payload.action = 'new_card_membership'; payload.action = 'new_card_membership';
} else if (selectedUser === null && membershipOrder !== null) { } else if (selectedUser === null && membershipOrder !== null &&
membershipOrder.member_card === null && membershipOrder.product.is_valid) {
// Associate member card with a valid membership orer
payload.action = 'sms_card_notify'; payload.action = 'sms_card_notify';
payload.order_uuid = membershipOrder.uuid; payload.order_uuid = membershipOrder.uuid;
} else if (selectedUser !== null && selectedUser.is_member) {
// Add member card to a user
payload.action = 'update_card';
} else { } else {
if (selectedUser.is_member) { // New order for user or non-user
payload.action = 'update_card'; payload.action = 'add_or_renew'; // Note: could also update card number
} else {
payload.action = 'add_or_renew'; // Note: could also update card number
}
} }
$.ajax(urls.registerCardAndMembership, { $.ajax(urls.registerCardAndMembership, {
data: JSON.stringify(payload), data: JSON.stringify(payload),