binary-com · ashkanx · Sep 8, 2016 · Sep 6, 2016
diff --git a/src/javascript/binary/common_functions/frontend.js b/src/javascript/binary/common_functions/frontend.js
@@ -345,65 +345,8 @@ function handle_residence_state_ws(){
       var select;
       var response = JSON.parse(msg.data);
       var type = response.msg_type;
-      var country;
       var residenceDisabled = $('#residence-disabled');
-      if (type === 'get_settings') {
-        country = response.get_settings.country_code;
-        if (country && country !== null) {
-          page.client.residence = country;
-          generateBirthDate(country);
-          generateState();
-          if (/maltainvestws/.test(window.location.pathname)) {
-            var settings = response.get_settings;
-            var title = document.getElementById('title'),
-                fname = document.getElementById('fname'),
-                lname = document.getElementById('lname'),
-                dobdd = document.getElementById('dobdd'),
-                dobmm = document.getElementById('dobmm'),
-                dobyy = document.getElementById('dobyy');
-            var inputs = document.getElementsByClassName('input-disabled');
-            if (settings.salutation) {
-              title.value = settings.salutation;
-              fname.value = settings.first_name;
-              lname.value = settings.last_name;
-              var date = moment.utc(settings.date_of_birth * 1000);
-              dobdd.value = date.format('DD').replace(/^0/, '');
-              dobmm.value = date.format('MM');
-              dobyy.value = date.format('YYYY');
-              for (i = 0; i < inputs.length; i++) {
-                  inputs[i].disabled = true;
-              }
-              document.getElementById('address1').value = settings.address_line_1;
-              document.getElementById('address2').value = settings.address_line_2;
-              document.getElementById('address-town').value = settings.address_city;
-              window.state = settings.address_state;
-              document.getElementById('address-postcode').value = settings.address_postcode;
-              document.getElementById('tel').value = settings.phone;
-            } else {
-              for (i = 0; i < inputs.length; i++) {
-                  inputs[i].disabled = false;
-              }
-            }
-          }
-          return;
-        } else if (document.getElementById('move-residence-here')) {
-          var residenceForm = $('#residence-form');
-          $('#real-form').hide();
-          residenceDisabled.insertAfter('#move-residence-here');
-          $('#error-residence').insertAfter('#residence-disabled');
-          residenceDisabled.removeAttr('disabled');
-          residenceForm.show();
-          residenceForm.submit(function(evt) {
-            evt.preventDefault();
-            if (Validate.fieldNotEmpty(residenceDisabled.val(), document.getElementById('error-residence'))) {
-              page.client.residence = residenceDisabled.val();
-              BinarySocket.send({set_settings:1, residence:page.client.residence});
-            }
-            return;
-          });
-          return;
-        }
-      } else if (type === 'set_settings') {
+      if (type === 'set_settings') {
         var errorElement = document.getElementById('error-residence');
         if (response.hasOwnProperty('error')) {
           if (response.error.message) {
@@ -425,13 +368,14 @@ function handle_residence_state_ws(){
           window.location.href = page.url.url_for('new_account/japanws');
           return;
         } else if (!$('#real-form').is(':visible')) {
+          BinarySocket.send({residence_list:1});
           $('#residence-form').hide();
           residenceDisabled.insertAfter('#move-residence-back');
           $('#error-residence').insertAfter('#residence-disabled');
           residenceDisabled.attr('disabled', 'disabled');
-          $('#real-form').show();
-          generateBirthDate(country);
+          generateBirthDate(page.client.residence);
           generateState();
+          $('#real-form').show();
           return;
         }
       } else if (type === 'states_list') {
@@ -577,6 +521,71 @@ function jqueryuiTabsToDropdown($container) {
     return $ddl;
 }
 
+function handle_account_opening_settings(response) {
+    var country = response.get_settings.country_code;
+    if (country && country !== null) {
+      $('#real-form').show();
+      page.client.residence = country;
+      generateBirthDate(country);
+      generateState();
+      if (/maltainvestws/.test(window.location.pathname)) {
+        var settings = response.get_settings;
+        var title = document.getElementById('title'),
+            fname = document.getElementById('fname'),
+            lname = document.getElementById('lname'),
+            dobdd = document.getElementById('dobdd'),
+            dobmm = document.getElementById('dobmm'),
+            dobyy = document.getElementById('dobyy');
+        var inputs = document.getElementsByClassName('input-disabled');
+        if (settings.salutation) {
+          title.value = settings.salutation;
+          fname.value = settings.first_name;
+          lname.value = settings.last_name;
+          var date = moment.utc(settings.date_of_birth * 1000);
+          dobdd.value = date.format('DD').replace(/^0/, '');
+          dobmm.value = date.format('MM');
+          dobyy.value = date.format('YYYY');
+          for (i = 0; i < inputs.length; i++) {
+              inputs[i].disabled = true;
+          }
+          document.getElementById('address1').value = settings.address_line_1;
+          document.getElementById('address2').value = settings.address_line_2;
+          document.getElementById('address-town').value = settings.address_city;
+          window.state = settings.address_state;
+          document.getElementById('address-postcode').value = settings.address_postcode;
+          document.getElementById('tel').value = settings.phone;
+        } else {
+          for (i = 0; i < inputs.length; i++) {
+              inputs[i].disabled = false;
+          }
+        }
+      }
+      return;
+    } else if (document.getElementById('move-residence-here') && $('#residence-form').is(':hidden')) {
+      show_residence_form();
+      return;
+    }
+}
+
+
+function show_residence_form() {
+    var residenceForm = $('#residence-form');
+    var residenceDisabled = $('#residence-disabled');
+    residenceDisabled.insertAfter('#move-residence-here');
+    $('#error-residence').insertAfter('#residence-disabled');
+    residenceDisabled.removeAttr('disabled');
+    residenceForm.show();
+    residenceForm.submit(function(evt) {
+      evt.preventDefault();
+      if (Validate.fieldNotEmpty(residenceDisabled.val(), document.getElementById('error-residence'))) {
+        page.client.set_cookie('residence', residenceDisabled.val());
+        page.client.residence = residenceDisabled.val();
+        BinarySocket.send({set_settings:1, residence:page.client.residence});
+      }
+      return;
+    });
+}
+
 $(function() {
     $( "#accordion" ).accordion({
       heightStyle: "content",

diff --git a/src/javascript/binary/websocket_pages/socket.js b/src/javascript/binary/websocket_pages/socket.js
@@ -193,6 +193,11 @@ function BinarySocketClass() {
                       page.client.set_cookie('residence', response.get_settings.country_code);
                       page.client.residence = response.get_settings.country_code;
                       send({landing_company: Cookies.get('residence')});
+                    } else if (response.get_settings.country_code === null && response.get_settings.country === null) {
+                        page.contents.topbar_message_visibility('show_residence');
+                    }
+                    if (/realws|maltainvestws|japanws/.test(window.location.href)) {
+                        handle_account_opening_settings(response);
                     }
                     GTM.event_handler(response.get_settings);
                     page.client.set_storage_value('tnc_status', response.get_settings.client_tnc_status || '-');

diff --git a/src/javascript/binary/websocket_pages/user/new_account/financial_acc_opening.js b/src/javascript/binary/websocket_pages/user/new_account/financial_acc_opening.js
@@ -12,7 +12,6 @@ pjax_config_page_require_auth("new_account/maltainvestws", function(){
       }
       handle_residence_state_ws();
       BinarySocket.send({residence_list:1});
-      BinarySocket.send({get_settings:1});
       BinarySocket.send({get_financial_assessment:1});
       $('#financial-form').submit(function(evt) {
         evt.preventDefault();

diff --git a/src/javascript/binary/websocket_pages/user/new_account/japan_acc_opening.js b/src/javascript/binary/websocket_pages/user/new_account/japan_acc_opening.js
@@ -8,7 +8,6 @@ pjax_config_page("new_account/japanws", function(){
         return;
       }
       handle_residence_state_ws();
-      BinarySocket.send({get_settings:1});
       detect_hedging($('#trading-purpose'), $('.hedging-assets'));
       $('#japan-form').submit(function(evt) {
         evt.preventDefault();

diff --git a/src/javascript/binary/websocket_pages/user/new_account/real_acc_opening.js b/src/javascript/binary/websocket_pages/user/new_account/real_acc_opening.js
@@ -7,7 +7,6 @@ pjax_config_page("new_account/realws", function(){
       if (page.client.residence) {
         BinarySocket.send({landing_company: page.client.residence});
       }
-      BinarySocket.send({get_settings:1});
       BinarySocket.send({residence_list:1});
       $('#real-form').submit(function(evt) {
         evt.preventDefault();

diff --git a/src/templates/new_account/realws.html.tt b/src/templates/new_account/realws.html.tt
@@ -22,7 +22,7 @@
                     </div>
                   </fieldset>
                 </form>
-                <form id="real-form">
+                <form id="real-form" style="display:none">
                     <fieldset>
                         <legend id="details">[% l('Details') %]</legend>
                         <div class="gr-padding-10 gr-row clear">