Merge remote-tracking branch 'upstream/master' into mohammad/webpack

Author: mohammad-deriv

scripts/bin/GenerateStaticData.pm

@@ -404,6 +404,7 @@ sub _texts {
         push @texts, localize('Withdrawal for your account is not allowed at this moment. Please contact [_1] to unlock it.');
 
         #strings for japanws page
+        push @texts, localize('Japan');
         push @texts, localize('Questions');
         push @texts, localize('True');
         push @texts, localize('False');

scripts/config/pages.pl

@@ -70,9 +70,9 @@ sub all_pages {
         ['new_account/maltainvestws',    'new_account/maltainvestws',   'default', 'Financial Account Opening'],
         ['new_account/knowledge_testws', 'japan/knowledge_test',        'default', 'Real Money Account Opening'],
 
-        ['resources',                'resources/index',           'default', 'Resources'],
-        ['resources/asset_indexws',  'resources/asset_indexws',   'default', 'Asset Index', 'ja'],
-        ['resources/market_timesws', 'resources/market_timesws',  'default', 'Trading Times'],
+        ['resources',                'resources/index',           'default', 'Resources',     'ja'],
+        ['resources/asset_indexws',  'resources/asset_indexws',   'default', 'Asset Index',   'ja'],
+        ['resources/market_timesws', 'resources/market_timesws',  'default', 'Trading Times', 'ja'],
 
         ['user/security/api_tokenws',       'user/security/api_tokenws',                      'default', 'API Token',               'ja'],
         ['user/security/change_passwordws', 'user/security/change_passwordws',                'default', 'Change Password'],

scripts/lib/BS.pm

@@ -213,6 +213,7 @@ sub menu {
     # resources
     my $resources_items_ref = {
         id         => 'topMenuResources',
+        class      => 'ja-hide',
         url        => url_for('/resources'),
         text       => localize('Resources'),
         link_class => 'pjaxload',

src/images/pages/about/mac-ja.png

@@ -396,7 +396,7 @@ function handle_residence_state_ws(){
             if (select) {
               appendTextValueChild(select, residence.text, residence.value, residence.disabled ? 'disabled' : undefined);
             }
-            if (phoneElement && phoneElement.value === '' && residence.phone_idd && residenceValue === residence.value) {
+            if (residenceValue !== 'jp' && phoneElement && phoneElement.value === '' && residence.phone_idd && residenceValue === residence.value) {
               phoneElement.value = '+' + residence.phone_idd;
             }
           }
@@ -411,11 +411,15 @@ function handle_residence_state_ws(){
       } else if (type === 'website_status') {
         var status  = response.website_status;
         if (status && status.clients_country) {
+          if (status.clients_country === 'jp' || japanese_client()) {
+              $('#residence').replaceWith('<label>' + text.localize('Japan') + '</label>');
+          }
           var clientCountry = $('#residence option[value="' + status.clients_country + '"]');
           if (!clientCountry.attr('disabled')) {
               clientCountry.prop('selected', true);
           }
         }
+        $('#residence').removeClass('invisible');
         return;
       } else if (type === 'get_financial_assessment' && objectNotEmpty(response.get_financial_assessment)) {
           for (var key in response.get_financial_assessment) {

src/javascript/binary/common_functions/frontend.js

@@ -124,7 +124,10 @@ var Highchart = (function() {
 
       // display comma after every three digits instead of space
       Highcharts.setOptions({
-        lang: {thousandsSep: ','}
+          global: {
+              timezoneOffset: japanese_client() ? -9 * 60 : 0 // Converting chart time to JST.
+          },
+          lang: {thousandsSep: ','}
       });
 
       // display a guide for clients to know how we are marking entry and exit spots

src/javascript/binary/websocket_pages/trade/charts/highchartws.js

@@ -911,7 +911,10 @@ function chartFrameSource() {
 }
 
 function setChartSource() {
-  document.getElementById('chart_frame').src = 'https://webtrader.binary.com?affiliates=true&instrument=' + document.getElementById('underlying').value + '&timePeriod=1t&gtm=true&lang=' + (page.language() || 'en').toLowerCase();
+    var ja = japanese_client();
+  document.getElementById('chart_frame').src = 'https://webtrader.binary.com?affiliates=true&instrument=' + document.getElementById('underlying').value + '&timePeriod=1t&gtm=true&lang=' + (page.language() || 'en').toLowerCase() +
+  '&hideOverlay=' + (ja ? 'true' : 'false') + '&hideShare=' + (ja ? 'true' : 'false') + '&timezone=GMT+' + (ja ? '9' : '0') +
+  '&hideFooter=' + (ja ? 'true' : 'false');
 }
 
 // ============= Functions used in /trading_beta =============

src/javascript/binary/websocket_pages/trade/common.js

@@ -175,13 +175,17 @@ var SettingsDetailsWS = (function() {
 
     function getJPSchema(data) {
         var V2 = ValidateV2;
-        return {
-            hedge_asset_amount: [
-                function(v) { return dv.ok(v.trim()); },
-                V2.required,
-                V2.regex(/^\d+$/, [Content.localize().textNumbers]),
-            ],
-        };
+        if (/Hedging/.test($('#PurposeOfTrading').val())) {
+            return {
+                hedge_asset_amount: [
+                    function(v) { return dv.ok(v.trim()); },
+                    V2.required,
+                    V2.regex(/^\d+$/, [Content.localize().textNumbers]),
+                ]
+            };
+        } else {
+            return true;
+        }
     }
 
     function submitNonJP(data) {

src/javascript/binary/websocket_pages/user/account/settings/settings_detailsws.js

@@ -47,6 +47,7 @@ pjax_config_page("new_account/virtualws", function() {
         Content.populate();
         handle_residence_state_ws();
         BinarySocket.send({residence_list: 1});
+        BinarySocket.send({website_status: 1});
 
         var form = $('#virtual-form')[0];
         if (!form) return;

src/javascript/binary/websocket_pages/user/new_account/virtual_acc_opening.js

@@ -85,18 +85,12 @@ var KnowledgeTest = (function() {
     }
 
     function showDisallowedMsg(jpStatus) {
-        var nextTestEpoch = jpStatus.next_test_epoch;
-        var lastTestEpoch = jpStatus.last_test_epoch;
-
-        var nextTestDate = new Date(nextTestEpoch * 1000);
-        var lastTestDate = new Date(lastTestEpoch * 1000);
-
         var msgTemplate =
             '{JAPAN ONLY}Dear customer, you are not allowed to take knowledge test until [_1]. Last test taken at [_2].';
 
         var msg = page.text.localize(msgTemplate, [
-            nextTestDate.toUTCString(),
-            lastTestDate.toUTCString(),
+            toJapanTimeIfNeeded(jpStatus.next_test_epoch),
+            toJapanTimeIfNeeded(jpStatus.last_test_epoch)
             ]);
 
         showMsgOnly(msg);

src/javascript/binary_japan/knowledge_test/knowledge_test.init.js

@@ -6,7 +6,8 @@
       </h1>
       <div class="gr-row">
           <div class="gr-7 gr-12-m">
-            <img class="mac responsive" src="[% request.url_for('images/pages/about/mac.svg') %]"/>
+            <img class="mac responsive ja-hide" src="[% request.url_for('images/pages/about/mac.svg') %]"/>
+            <img class="mac responsive hidden ja-show" src="[% request.url_for('images/pages/about/mac-ja.png') %]"/>
           </div>
           <div class="gr-5 gr-12-m">
             <p>

src/templates/about/index.html.tt

@@ -238,8 +238,8 @@
                     <ul class="checked">
                         <li>[% l("{Japan Only}Trade the major currencies") %]</li>
                         <li>[% l("{Japan Only}Trade all binary option types") %]</li>
-                        <li>[% l("{Japan Only}") %]Payout from 1 to 10</li>
-                        <li>[% l("{Japan Only}") %]Two-way pricing</li>
+                        <li>[% l("{Japan Only}Payout from 1 to 10") %]</li>
+                        <li>[% l("{Japan Only}Two-way pricing") %]</li>
                     </ul>
                 </div>
                 <div class="gr-5">

src/templates/home/index.html.tt

@@ -1,4 +1,4 @@
-<div class="gr-parent gr-padding-30">
+<div class="gr-parent gr-padding-30 static_full">
     <h2>[% l("{JAPAN ONLY}Company Profile") %]</h2>
     <table>
         <tr>

src/templates/japan/company_profile.html.tt

@@ -352,7 +352,7 @@
                           </div>
                       </div>
                       <div class="gr-padding-10 gr-row clear">
-                          <div class="gr-4 form_label">
+                          <div class="gr-4 form_label nowrap">
                               <label for="otc-derivative-trading">[% l('OTC Derivative (Option) Trading') %]</label>
                           </div>
                           <div class="gr-8">

src/templates/new_account/japanws.html.tt

@@ -43,7 +43,7 @@
                 <label for="residence">[% l('Country of residence') %]</label>
               </div>
               <div class="gr-8">
-                <select name="residence" id="residence"></select>
+                <select name="residence" id="residence" class="invisible"></select>
               </div>
             </div>
           </fieldset>

src/templates/new_account/virtualws.html.tt

@@ -1,7 +1,7 @@
 <h1>[% l("Resources") %]</h1>
 <p>[% l("Do you want to learn more about the markets and how to trade them? Check out the resources below.") %]</p>
 <div class="gr-row">
-  <div class="gr-3 gr-8-m gr-parent ja-hide">
+  <div class="gr-3 gr-8-m gr-parent">
     <div class="gr-8 gr-padding-10">
       <a class="pjaxload" href="[% request.url_for('/resources/asset_indexws') %]" id="asset-index">
         <img class="responsive charting-page-icon" id="charting_icon" src="[% request.url_for('images/pages/resources/asset-index.svg') %]"/>