From 109ce2d6e7a78e80461b1fe1d971b3f36eb0f89e Mon Sep 17 00:00:00 2001
From: Jonas Braathen <jonas@ponas.no>
Date: Mon, 28 Aug 2017 23:24:15 +0200
Subject: [PATCH] Fix logic when selling new card membership to non-user

---
 static/app/scripts/app.js  | 15 +++++++++------
 static/dist/scripts/app.js | 15 +++++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/static/app/scripts/app.js b/static/app/scripts/app.js
index 89549d6..1fb0432 100644
--- a/static/app/scripts/app.js
+++ b/static/app/scripts/app.js
@@ -486,16 +486,19 @@ $(document).ready(function(){
         // FIXME: get from form
         // action: 'new_card_membership', 'update_card', 'add_or_renew', 'sms_card_notify'
         if (selectedUser === null && membershipOrder === null) {
+            // Unknown phone / card, new 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.order_uuid = membershipOrder.uuid;
+        } else if (selectedUser !== null && selectedUser.is_member) {
+            // Add member card to a user
+            payload.action = 'update_card';
         } else {
-            if (selectedUser.is_member) {
-                payload.action = 'update_card';
-            } else {
-                payload.action = 'add_or_renew'; // Note: could also update card number
-            }
+            // New order for user or non-user
+            payload.action = 'add_or_renew'; // Note: could also update card number
         }
         $.ajax(urls.registerCardAndMembership, {
             data: JSON.stringify(payload),
diff --git a/static/dist/scripts/app.js b/static/dist/scripts/app.js
index 89549d6..1fb0432 100644
--- a/static/dist/scripts/app.js
+++ b/static/dist/scripts/app.js
@@ -486,16 +486,19 @@ $(document).ready(function(){
         // FIXME: get from form
         // action: 'new_card_membership', 'update_card', 'add_or_renew', 'sms_card_notify'
         if (selectedUser === null && membershipOrder === null) {
+            // Unknown phone / card, new 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.order_uuid = membershipOrder.uuid;
+        } else if (selectedUser !== null && selectedUser.is_member) {
+            // Add member card to a user
+            payload.action = 'update_card';
         } else {
-            if (selectedUser.is_member) {
-                payload.action = 'update_card';
-            } else {
-                payload.action = 'add_or_renew'; // Note: could also update card number
-            }
+            // New order for user or non-user
+            payload.action = 'add_or_renew'; // Note: could also update card number
         }
         $.ajax(urls.registerCardAndMembership, {
             data: JSON.stringify(payload),