From bc711dcd48487bb5df0bb3b3355a750c1885cba9 Mon Sep 17 00:00:00 2001
From: Jonas Braathen <jonas@ponas.no>
Date: Tue, 29 Aug 2017 00:04:20 +0200
Subject: [PATCH] Treat a new card for an expired order as a new card
 membership

---
 static/app/scripts/app.js  | 16 ++++++++++------
 static/dist/scripts/app.js | 14 +++++++++-----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/static/app/scripts/app.js b/static/app/scripts/app.js
index 79b4724..b82fb0c 100644
--- a/static/app/scripts/app.js
+++ b/static/app/scripts/app.js
@@ -488,16 +488,20 @@ $(document).ready(function(){
         if (selectedUser === null && membershipOrder === null) {
             // Unknown phone / card, new membership
             payload.action = 'new_card_membership';
-        } 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 && membershipOrder !== null) {
+            if (membershipOrder.member_card === null && membershipOrder.product.is_valid) {
+                // Associate member card with a valid membership order
+                payload.action = 'sms_card_notify';
+                payload.order_uuid = membershipOrder.uuid;
+            } else {
+                // New card for expired order -- treat as new card membership
+                payload.action = 'new_card_membership';
+            }
         } else if (selectedUser !== null && selectedUser.is_member) {
             // Add member card to a user
             payload.action = 'update_card';
         } else {
-            // New order for user or non-user
+            // New order for user
             payload.action = 'add_or_renew'; // Note: could also update card number
         }
         $.ajax(urls.registerCardAndMembership, {
diff --git a/static/dist/scripts/app.js b/static/dist/scripts/app.js
index 79b4724..f0ec3ca 100644
--- a/static/dist/scripts/app.js
+++ b/static/dist/scripts/app.js
@@ -488,11 +488,15 @@ $(document).ready(function(){
         if (selectedUser === null && membershipOrder === null) {
             // Unknown phone / card, new membership
             payload.action = 'new_card_membership';
-        } 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 && membershipOrder !== null) {
+            if (membershipOrder.member_card === null && membershipOrder.product.is_valid) {
+                // Associate member card with a valid membership order
+                payload.action = 'sms_card_notify';
+                payload.order_uuid = membershipOrder.uuid;
+            } else {
+                // New card for expired order -- treat as new card membership
+                payload.action = 'new_card_membership';
+            }
         } else if (selectedUser !== null && selectedUser.is_member) {
             // Add member card to a user
             payload.action = 'update_card';