From d3c236f9018c2dd7e6fd889035907ef8e39f5802 Mon Sep 17 00:00:00 2001
From: rde <deiters98@live.dk>
Date: Tue, 20 Sep 2022 14:58:47 +0200
Subject: [PATCH 1/8] Country code dropdown added to swish

---
 templates/form/swish.liquid | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/templates/form/swish.liquid b/templates/form/swish.liquid
index 3113f75..40b0ab7 100644
--- a/templates/form/swish.liquid
+++ b/templates/form/swish.liquid
@@ -8,7 +8,19 @@
 
       <div class="col-sm-8 col-sm-pull-4 col-xs-12">
         <div class="form-group">
-          <div class="col-xs-12">
+
+          <div class="col-xs-5">
+            <label for="swish-country-select" class="control-label">{% t Country %}</label>
+            <select id="swish-country-select" class="form-control" style= "height: 40px !important;">
+              <option value="45">🇩🇰 +45</option>
+              <option value="46">🇸🇪 +46</option>
+              <option value="47">🇳🇴 +47</option>
+              <option value="49">🇩🇪 +49</option>
+              <option value="358">🇫🇮 +358</option>
+            </select>
+          </div>
+
+          <div class="col-xs-7">
             <label for="mobile" class="control-label">{% t Mobile number %}</label>
             <input
               type="tel"

From 1edb9a35c0fcaa48e7e0224b50f0e1aedc74589f Mon Sep 17 00:00:00 2001
From: rde <deiters98@live.dk>
Date: Mon, 26 Sep 2022 11:18:07 +0200
Subject: [PATCH 2/8] funktionallity added and phone number length set to 14

---
 templates/form/swish.liquid | 40 +++++++++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/templates/form/swish.liquid b/templates/form/swish.liquid
index 40b0ab7..b88e5e3 100644
--- a/templates/form/swish.liquid
+++ b/templates/form/swish.liquid
@@ -1,5 +1,5 @@
 <div class="container">
-  <form class="form-horizontal" method="post" autocomplete="on" action="process_swish">
+  <form class="form-horizontal" method="post" autocomplete="on" action="process_swish" id="swishform">
     <input type="hidden" name="session_id" value="{{ model.session_id }}" />
     <div class="row">
       <div class="col-sm-4 col-sm-push-8 col-xs-6 col-xs-push-3">
@@ -10,16 +10,36 @@
         <div class="form-group">
 
           <div class="col-xs-5">
-            <label for="swish-country-select" class="control-label">{% t Country %}</label>
-            <select id="swish-country-select" class="form-control" style= "height: 40px !important;">
-              <option value="45">🇩🇰 +45</option>
-              <option value="46">🇸🇪 +46</option>
-              <option value="47">🇳🇴 +47</option>
-              <option value="49">🇩🇪 +49</option>
-              <option value="358">🇫🇮 +358</option>
+            <label for="swish-country-select" class="control-label" >{% t Country %}</label>
+            <select id="swish-country-select" class="form-control" name="country_code" form="swishform" style= "height: 40px !important;">
+              <option value=""> - Select - </option>
+              {% for country_code in model.country_codes %}
+                  <option value="{{ country_code }}" {% if model.mobile_number_first_2 == country_code || model.mobile_number_first_3 == country_code %}selected{% endif %}>
+                    {% case country_code %}
+                    {% when '31' %}
+                      {% t 🇳🇱 +31 %}
+                    {% when '41' %}
+                      {% t 🇨🇭 +41 %}
+                    {% when '43' %}
+                      {% t 🇦🇹 +43 %}
+                    {% when '44' %}
+                      {% t 🇬🇧 +44 %}
+                    {% when '45' %}
+                      {% t 🇩🇰 +45 %}
+                    {% when '46' %}
+                      {% t 🇸🇪 +46 %}
+                    {% when '47' %}
+                      {% t 🇳🇴 +47 %}
+                    {% when '49' %}
+                      {% t 🇩🇪 +49 %}
+                    {% when '358' %}
+                      {% t 🇫🇮 +358 %}
+                    {% endcase %}
+                  </option>
+                {% endfor %}
             </select>
           </div>
-
+          
           <div class="col-xs-7">
             <label for="mobile" class="control-label">{% t Mobile number %}</label>
             <input
@@ -28,7 +48,7 @@
               name="mobile"
               class="form-control"
               autocomplete="tel"
-              pattern="^\s*(?:\+?(\d{1,9}))?[-. (]*[0-9\s]*"
+              pattern="^\s*(?:\+?(\d{1,9}))?[-. (]*[0-14\s]*"
               inputmode="numeric"
               value="{{ model.mobile_number }}"
               placeholder="07XXXXXX"

From 48e002be413116cbf2b7b0e5ede09eb89d3ecaf0 Mon Sep 17 00:00:00 2001
From: rde <deiters98@live.dk>
Date: Mon, 26 Sep 2022 15:27:25 +0200
Subject: [PATCH 3/8] Little fix to get 1 to 14 numbers

---
 templates/form/swish.liquid | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/form/swish.liquid b/templates/form/swish.liquid
index b88e5e3..a365ba4 100644
--- a/templates/form/swish.liquid
+++ b/templates/form/swish.liquid
@@ -48,7 +48,7 @@
               name="mobile"
               class="form-control"
               autocomplete="tel"
-              pattern="^\s*(?:\+?(\d{1,9}))?[-. (]*[0-14\s]*"
+              pattern="^\s*(?:\+?(\d{1,14}))?[-. (]*[0-9\s]*"
               inputmode="numeric"
               value="{{ model.mobile_number }}"
               placeholder="07XXXXXX"

From 35822592056c8e0062d61d75210445901482c6ff Mon Sep 17 00:00:00 2001
From: rde <deiters98@live.dk>
Date: Thu, 29 Sep 2022 09:42:50 +0200
Subject: [PATCH 4/8] cleanup

---
 templates/form/swish.liquid | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/form/swish.liquid b/templates/form/swish.liquid
index a365ba4..e51da02 100644
--- a/templates/form/swish.liquid
+++ b/templates/form/swish.liquid
@@ -1,5 +1,5 @@
 <div class="container">
-  <form class="form-horizontal" method="post" autocomplete="on" action="process_swish" id="swishform">
+  <form class="form-horizontal" method="post" autocomplete="on" action="process_swish">
     <input type="hidden" name="session_id" value="{{ model.session_id }}" />
     <div class="row">
       <div class="col-sm-4 col-sm-push-8 col-xs-6 col-xs-push-3">
@@ -11,7 +11,7 @@
 
           <div class="col-xs-5">
             <label for="swish-country-select" class="control-label" >{% t Country %}</label>
-            <select id="swish-country-select" class="form-control" name="country_code" form="swishform" style= "height: 40px !important;">
+            <select id="swish-country-select" class="form-control" name="country_code" style= "height: 40px !important;">
               <option value=""> - Select - </option>
               {% for country_code in model.country_codes %}
                   <option value="{{ country_code }}" {% if model.mobile_number_first_2 == country_code || model.mobile_number_first_3 == country_code %}selected{% endif %}>

From 0a06c2a004a55d3c45a6073d2f47b395e0759c80 Mon Sep 17 00:00:00 2001
From: rde <deiters98@live.dk>
Date: Thu, 29 Sep 2022 12:23:09 +0200
Subject: [PATCH 5/8] Only one method for country code in phonenumber check

---
 templates/form/swish.liquid | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/form/swish.liquid b/templates/form/swish.liquid
index e51da02..1a350d0 100644
--- a/templates/form/swish.liquid
+++ b/templates/form/swish.liquid
@@ -14,7 +14,7 @@
             <select id="swish-country-select" class="form-control" name="country_code" style= "height: 40px !important;">
               <option value=""> - Select - </option>
               {% for country_code in model.country_codes %}
-                  <option value="{{ country_code }}" {% if model.mobile_number_first_2 == country_code || model.mobile_number_first_3 == country_code %}selected{% endif %}>
+                  <option value="{{ country_code }}" {% if model.country_codes_in_number contains country_code %}selected{% endif %}>
                     {% case country_code %}
                     {% when '31' %}
                       {% t 🇳🇱 +31 %}

From dd57fbe9c70f8c06fcb14132b2f92734afb4054d Mon Sep 17 00:00:00 2001
From: rde <deiters98@live.dk>
Date: Mon, 3 Oct 2022 10:54:41 +0200
Subject: [PATCH 6/8] validation added

---
 templates/form/swish.liquid | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/templates/form/swish.liquid b/templates/form/swish.liquid
index 1a350d0..b503fd4 100644
--- a/templates/form/swish.liquid
+++ b/templates/form/swish.liquid
@@ -1,14 +1,14 @@
 <div class="container">
   <form class="form-horizontal" method="post" autocomplete="on" action="process_swish">
     <input type="hidden" name="session_id" value="{{ model.session_id }}" />
+    <input type="hidden" name="mobile_with_country_code" id="mwcc"/>
     <div class="row">
       <div class="col-sm-4 col-sm-push-8 col-xs-6 col-xs-push-3">
           <img src="/assets/v2/images/brands/swish.svg" alt="swish" title="swish" style="width:100%">
       </div>
 
       <div class="col-sm-8 col-sm-pull-4 col-xs-12">
-        <div class="form-group">
-
+        <div class="form-group{% if model.invalid_number? %} has-error{% endif %}">
           <div class="col-xs-5">
             <label for="swish-country-select" class="control-label" >{% t Country %}</label>
             <select id="swish-country-select" class="form-control" name="country_code" style= "height: 40px !important;">
@@ -53,6 +53,9 @@
               value="{{ model.mobile_number }}"
               placeholder="07XXXXXX"
             />
+            <span id="invalid_number_length" class="help-block{% if model.invalid_number? != true %} hidden{% endif %}">
+              {% t Number too long for selected country %}
+            </span>
           </div>
         </div>
 

From 0e4feb21e977851c436dca996325f1fe211871a9 Mon Sep 17 00:00:00 2001
From: rde <deiters98@live.dk>
Date: Tue, 4 Oct 2022 10:06:03 +0200
Subject: [PATCH 7/8] Validation added

---
 templates/form/swish.liquid | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/templates/form/swish.liquid b/templates/form/swish.liquid
index b503fd4..0b6ae3e 100644
--- a/templates/form/swish.liquid
+++ b/templates/form/swish.liquid
@@ -8,10 +8,10 @@
       </div>
 
       <div class="col-sm-8 col-sm-pull-4 col-xs-12">
-        <div class="form-group{% if model.invalid_number? %} has-error{% endif %}">
+        <div class="form-group{% if model.invalid_number? or model.country_not_chosen? %} has-error{% endif %}">
           <div class="col-xs-5">
             <label for="swish-country-select" class="control-label" >{% t Country %}</label>
-            <select id="swish-country-select" class="form-control" name="country_code" style= "height: 40px !important;">
+            <select id="swish-country-select" class="form-control" name="country_code" style= "height: 40px !important;" required>
               <option value=""> - Select - </option>
               {% for country_code in model.country_codes %}
                   <option value="{{ country_code }}" {% if model.country_codes_in_number contains country_code %}selected{% endif %}>
@@ -38,6 +38,9 @@
                   </option>
                 {% endfor %}
             </select>
+            <span id="no_country_selected" class="help-block{% if model.country_not_chosen? != true %} hidden{% endif %}">
+              {% t Choose a country %}
+            </span>
           </div>
           
           <div class="col-xs-7">
@@ -52,6 +55,7 @@
               inputmode="numeric"
               value="{{ model.mobile_number }}"
               placeholder="07XXXXXX"
+              required
             />
             <span id="invalid_number_length" class="help-block{% if model.invalid_number? != true %} hidden{% endif %}">
               {% t Number too long for selected country %}

From 0933df310211d3ae925f02e13150c3ff127bb191 Mon Sep 17 00:00:00 2001
From: rde <deiters98@live.dk>
Date: Tue, 11 Oct 2022 09:26:01 +0200
Subject: [PATCH 8/8] Cleanup from removing javascript for params validation

---
 templates/form/swish.liquid | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/templates/form/swish.liquid b/templates/form/swish.liquid
index 0b6ae3e..b12363c 100644
--- a/templates/form/swish.liquid
+++ b/templates/form/swish.liquid
@@ -1,7 +1,6 @@
 <div class="container">
-  <form class="form-horizontal" method="post" autocomplete="on" action="process_swish">
+  <form class="form-horizontal" method="post" autocomplete="on" action="process_swish" id="swish-form">
     <input type="hidden" name="session_id" value="{{ model.session_id }}" />
-    <input type="hidden" name="mobile_with_country_code" id="mwcc"/>
     <div class="row">
       <div class="col-sm-4 col-sm-push-8 col-xs-6 col-xs-push-3">
           <img src="/assets/v2/images/brands/swish.svg" alt="swish" title="swish" style="width:100%">
@@ -65,7 +64,7 @@
 
         <div class="form-group">
           <div class="col-xs-12">
-            <button type="submit" class="btn btn-info btn">{% t Proceed %}</button>
+            <button type="submit" class="btn btn-info btn" id="button-proceed">{% t Proceed %} </button>
           </div>
         </div>
       </div>