Merge pull request #1341 from negar-binary/negar/new_menu

negar/new_menu

Author: ashkanx

scripts/bin/GenerateStaticData.pm

@@ -388,12 +388,13 @@ sub _texts {
         push @texts, localize('Your account has no trading activity.');
 
         #strings for authenticate page
-        push @texts, localize('Your account is fully authenticated. You can view your [_1]trading limits here');
         push @texts, localize('To authenticate your account, kindly email the following to [_1]');
-        push @texts, localize('- A scanned copy of your passport, driving licence (provisional or full) or identity card, showing your name and date of birth.');
-        push @texts, localize('and');
-        push @texts, localize('- A scanned copy of a utility bill or bank statement (no more than 3 months old).');
+        push @texts, localize('A scanned copy of your passport, driving licence (provisional or full) or identity card, showing your name and date of birth. Your document must be valid for at least 6 months after this date.');
+        push @texts, localize('A scanned copy of a utility bill or bank statement (no more than 3 months old).');
         push @texts, localize('This feature is not relevant to virtual-money accounts.');
+        push @texts, localize('Your account is currently suspended. Only withdrawals are now permitted. For further information, please contact [_1].');
+        push @texts, localize('Deposits and withdrawal for your account is not allowed at this moment. Please contact [_1] to unlock it.');
+        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('Questions');
@@ -572,14 +573,6 @@ sub _texts {
         push @texts, localize('Number of ticks');
         push @texts, localize('Last digit stats for the latest [_1] ticks on [_2]');
 
-        #strings for my_accountws
-        push @texts, localize('You are currently logged in to your real money account with [_1] ([_2]).');
-        push @texts, localize('You are currently logged in to your virtual money account ([_2]).');
-        push @texts, localize('Deposit [_1] [_2] virtual money into your account [_3]');
-        push @texts, localize('Your [_1] account is unavailable. For any questions please contact [_2].');
-        push @texts, localize('Your [_1] accounts are unavailable. For any questions please contact [_2].');
-        push @texts, localize('Customer Support');
-
         #strings for tnc_approvalws
         push @texts, localize('[_1] has updated its [_2]. By clicking OK, you confirm that you have read and accepted the updated [_2].');
         push @texts, localize('Terms & Conditions');
@@ -791,8 +784,9 @@ sub _texts {
         push @texts, localize('If you need assistance feel free to contact our [_1]Customer Support');
         push @texts, localize('Your account is not fully authenticated. Please visit the <a href="[_1]">authentication</a> page for more information.');
         push @texts, localize('details');
+        push @texts, localize('Deposit [_1] [_2] virtual money into your account [_3]');
 
-        # strings for user/settings/metatrader page
+        # strings for user/metatrader page
         push @texts, localize('Login');
         push @texts, localize('To create a real account for MetaTrader, switch to your [_1] real money account.');
         push @texts, localize('To create a real account for MetaTrader, <a href="[_1]">upgrade to [_2] real money account</a>.');

scripts/config/pages.pl

@@ -53,7 +53,7 @@ sub all_pages {
         ## ws
         ['user/authenticatews',          'user/authenticatews',                       'default', 'Authenticate', 'ja'],
         ['cashier/forwardws',            'cashier/deposit_withdraw_ws',               'default', 'Cashier'],
-        ['user/settings/limitsws',       'user/settings/limitsws',                    'default', 'Account Limits'],
+        ['user/security/limitsws',       'user/security/limitsws',                    'default', 'Account Limits'],
         ['account/account_transferws',   'cashier/account_transferws',                'default', 'Account Transfer'],
         ['cashier/payment_agent_listws', 'cashier/payment_agent_listws',              'default', 'Payment Agent Deposit'],
         ['cashier/top_up_virtualws',     'user/top_up_virtualws',                     'default', 'Give Me More Money!'],
@@ -73,23 +73,23 @@ sub all_pages {
         ['resources/asset_indexws',  'resources/asset_indexws',   'default', 'Asset Index', 'ja'],
         ['resources/market_timesws', 'resources/market_timesws',  'default', 'Trading Times'],
 
-        ['user/settings/api_tokenws',       'user/settings/api_tokenws',                      'default', 'API Token',               'ja'],
-        ['user/settings/metatrader',        'user/settings/metatrader',                       'default', 'MetaTrader'],
-        ['user/change_passwordws',          'user/settings/change_passwordws',                'default', 'Change Password'],
+        ['user/security/api_tokenws',       'user/security/api_tokenws',                      'default', 'API Token',               'ja'],
+        ['user/metatrader',                 'user/metatrader',                                'default', 'MetaTrader'],
+        ['user/security/change_passwordws', 'user/security/change_passwordws',                'default', 'Change Password'],
         ['user/portfoliows',                'user/portfoliows',                               'default', 'Portfolio'],
         ['user/profit_tablews',             'user/profit_tablews',                            'default', 'Profit Table'],
-        ['user/settings/self_exclusionws',  'user/settings/self_exclusionws',                 'default', 'Account Details'],
-        ['user/settings/detailsws',         'user/settings/settings_detailsws',               'default', 'Personal Details'],
-        ['user/settings/securityws',        'user/settings/settings_securityws',              'default', 'Security'],
+        ['user/security/self_exclusionws',  'user/security/self_exclusionws',                 'default', 'Account Details'],
+        ['user/security/cashier_passwordws','user/security/cashier_passwordws',               'default', 'Cashier Password'],
         ['user/statementws',                'user/statementws',                               'default', 'Statement'],
-        ['user/my_accountws',               'user/my_accountws',                              'default', 'My Account'],
         ['user/settingsws',                 'user/settingsws',                                'default', 'Settings'],
-        ['user/settings/iphistoryws',       'user/settings/iphistory',                        'default', 'Login History',           'ja'],
+        ['user/securityws',                 'user/securityws',                                'default', 'Security'],
+        ['user/security/iphistoryws',       'user/security/iphistory',                        'default', 'Login History',           'ja'],
         ['user/tnc_approvalws',             'legal/tnc_approvalws',                           'default', 'Terms and Conditions Approval'],
+        ['user/settings/detailsws',         'user/settings/detailsws',                        'default', 'Personal Details'],
         ['user/settings/assessmentws',      'user/settings/financial_assessmentws',           'default', 'Financial Assessment',    'ja'],
         ['user/lost_passwordws',            'user/lost_passwordws',                           'default', 'Password Reset'],
         ['user/reset_passwordws',           'user/reset_passwordws',                          'default', 'Password Reset'],
-        ['user/settings/authorised_appsws', 'user/settings/authorised_appsws',                'default', 'Authorised Applications', 'ja'],
+        ['user/security/authorised_appsws', 'user/security/authorised_appsws',                'default', 'Authorised Applications', 'ja'],
         ['user/reality_check_frequencyws',  'user/reality_check_frequencyws',                 'default', 'Reality Check'],
         ['user/reality_check_summaryws',    'user/reality_check_summaryws',                   'default', 'Reality Check'],
 

scripts/lib/BS.pm

@@ -191,96 +191,34 @@ sub js_config {
 sub menu {
     my @menu;
 
-    # trade page
-    push @menu,
-        {
-        id         => 'topMenuTrading',
-        class      => 'ja-hide',
-        url        => url_for('/trading'),
-        text       => localize('Start Trading'),
-        link_class => 'pjaxload'
-        };
-
-    # japan's trade page
-    push @menu,
-        {
-        id         => 'topMenuJPTrading',
-        class      => 'all-hide ja-show',
-        url        => url_for('/jptrading'),
-        text       => localize('Start Trading'),
-        link_class => 'pjaxload'
-        };
-
-    # myaccount
-    my $my_account_ref = {
-        id         => 'topMenuMyAccount',
-        url        => url_for('/user/my_accountws'),
-        text       => localize('My Account'),
-        class      => 'by_client_type client_real client_virtual',
-        link_class => 'with_login_cookies pjaxload',
-        sub_items  => [],
-    };
-
     # Portfolio
-    push @{$my_account_ref->{sub_items}},
+    push @menu,
         {
         id         => 'topMenuPortfolio',
         url        => url_for('/user/portfoliows'),
         text       => localize('Portfolio'),
-        link_class => 'with_login_cookies pjaxload',
+        class      => 'client_logged_in invisible',
+        link_class => 'pjaxload',
         };
 
-    push @{$my_account_ref->{sub_items}},
+    push @menu,
         {
         id         => 'topMenuProfitTable',
         url        => url_for('/user/profit_tablews'),
         text       => localize('Profit Table'),
-        link_class => 'with_login_cookies pjaxload',
+        class      => 'client_logged_in invisible',
+        link_class => 'pjaxload',
         };
 
-    push @{$my_account_ref->{sub_items}},
+    push @menu,
         {
         id         => 'topMenuStatement',
         url        => url_for('/user/statementws'),
         text       => localize('Statement'),
-        link_class => 'with_login_cookies pjaxload',
-        };
-
-    push @{$my_account_ref->{sub_items}},
-        {
-        id         => 'topMenuChangePassword',
-        url        => url_for('/user/change_passwordws'),
-        text       => localize('Password'),
-        link_class => 'with_login_cookies pjaxload',
-        };
-
-    push @{$my_account_ref->{sub_items}},
-        {
-        id         => 'topMenuAccountSettings',
-        url        => url_for('/user/settingsws'),
-        text       => localize('Settings'),
-        link_class => 'with_login_cookies pjaxload',
-        };
-
-    push @{$my_account_ref->{sub_items}},
-        {
-        id         => 'topMenuBecomeAffiliate',
-        class      => 'ja-hide',
-        url        => url_for('/affiliate/signup'),
+        class      => 'client_logged_in invisible',
         link_class => 'pjaxload',
-        text       => localize('Affiliate'),
         };
 
-    push @{$my_account_ref->{sub_items}},
-        {
-        id         => 'topMenuAuthenticateAccount',
-        url        => url_for('/user/authenticatews'),
-        text       => localize('Authenticate'),
-        class      => 'by_client_type client_real ja-hide',
-        link_class => 'with_login_cookies pjaxload',
-        };
-    push @menu, $my_account_ref;
-
     # cashier
     push @menu,
         {
@@ -316,7 +254,6 @@ sub menu {
     $resources_items_ref->{'sub_items'} = [$asset_index_ref, $trading_times_ref];
     push @menu, $resources_items_ref;
 
-    # Portfolio
     push @menu,
         {
         id         => 'topMenuShop',
@@ -326,6 +263,15 @@ sub menu {
         target     => '_blank'
         };
 
+    push @menu,
+        {
+        id         => 'topMenuPaymentAgent',
+        class      => 'invisible',
+        url        => url_for('/paymentagent/transferws'),
+        text       => localize('Payment Agent'),
+        link_class => 'pjaxload'
+        };
+
     # push @{$menu}, $self->_main_menu_trading();
 
     return \@menu;

src/images/pages/cashier/virtual_topup.svg

@@ -18,11 +18,12 @@ var LoggedInHandler = (function() {
                 // set cookies
                 page.client.set_cookie('loginid'     , loginid);
                 page.client.set_cookie('loginid_list', loginid_list);
+
+                if (!$('body').hasClass('BlueTopBack')) sessionStorage.setItem('check_tnc', loginid_list);
             }
             page.client.set_cookie('login', tokens[loginid]);
 
             // set flags
-            sessionStorage.setItem('check_tnc', '1');
             if (!$('body').hasClass('BlueTopBack')) localStorage.setItem('risk_classification', 'check');
             GTM.set_login_flag();