From 6f91d600300d9ae0748b01a8858b00e271724386 Mon Sep 17 00:00:00 2001 From: Kenneth Kehl <@kkehl@flexion.us> Date: Tue, 24 Sep 2024 10:35:22 -0700 Subject: [PATCH 1/2] make sure phone number is always last in the one-off csv --- app/main/views/send.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/main/views/send.py b/app/main/views/send.py index 7899af5a8..1b723cb22 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -1009,9 +1009,17 @@ def _send_notification(service_id, template_id): keys = [] values = [] + # Guarantee that the real phone number comes last, because some + # users will have placeholders like "add your second phone number" + # or something like as custom placeholders. for k, v in session["placeholders"].items(): - keys.append(k) - values.append(v) + if k != "phone number": + keys.append(k) + values.append(v) + for k, v in session["placeholders"].items(): + if k == "phone number": + keys.append(k) + values.append(v) data = ",".join(keys) vals = ",".join(values) From bdc5614fff8cfc17e42f98643fc8e6009912ee6f Mon Sep 17 00:00:00 2001 From: Kenneth Kehl Date: Fri, 27 Sep 2024 07:20:40 -0700 Subject: [PATCH 2/2] Update app/main/views/send.py Co-authored-by: Carlo Costino --- app/main/views/send.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/main/views/send.py b/app/main/views/send.py index 1b723cb22..99e63706a 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -1016,10 +1016,9 @@ def _send_notification(service_id, template_id): if k != "phone number": keys.append(k) values.append(v) - for k, v in session["placeholders"].items(): - if k == "phone number": - keys.append(k) - values.append(v) + if "phone number" in session["placeholders"].keys(): + keys.append("phone number") + values.append(session["placeholders"]["phone number"]) data = ",".join(keys) vals = ",".join(values)