Merge pull request binary-com#1500 from shahrizal-shaari/shahrizal/japanui_fix

Shahrizal/japanui fix

Author: ashkanx

src/javascript/binary/common_functions/__tests__/currency_to_symbol.js

@@ -8,7 +8,8 @@ describe('format_money', function() {
 		expect(format_money('GBP', '123.00')).to.eq('£123.00');
 		expect(format_money('EUR', '123.00')).to.eq('€123.00');
 		expect(format_money('AUD', '123.00')).to.eq('A$123.00');
-		expect(format_money('JPY', '123.00')).to.eq('¥123.00');
+		expect(format_money('JPY', '123.00')).to.eq('¥123');
+                expect(format_money('JPY', '1234.00')).to.eq('¥1,234');
 	});
 
 	it('works for unexpected currencies', function() {

src/javascript/binary/common_functions/currency_to_symbol.js

@@ -1,11 +1,35 @@
 function format_money(currency, amount) {
+    var updatedAmount = amount;
+    if(currency === 'JPY') { // remove decimal points for JPY and add comma.
+        updatedAmount = updatedAmount.replace(/\.\d+$/, '').replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+    }
+
     var symbol = format_money.map[currency];
     if (symbol === undefined) {
-        return currency + ' ' + amount;
+        return currency + ' ' + updatedAmount;
     }
-    return symbol + amount;
+    return symbol + updatedAmount;
 }
 
+function format_money_jp(currency, amount) {
+    var sign = '';
+    var updatedAmount = amount;
+    if(currency === 'JPY') { // remove decimal points and add comma.
+        if (Number(amount) < 0 ) {
+           sign = '-';
+        }
+
+        updatedAmount = updatedAmount.replace(/\.\d+$/, '').replace('-','').replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+    }
+
+    var symbol = format_money.map[currency];
+    if (symbol === undefined) {
+        return currency + ' ' + updatedAmount;
+    }
+    return sign + symbol + updatedAmount;
+}
+
+
 // Taken with modifications from:
 //    https://github.com/bengourley/currency-symbol-map/blob/master/map.js
 // When we need to handle more currencies please look there.
@@ -20,5 +44,6 @@ format_money.map = {
 if (typeof module !== 'undefined') {
     module.exports = {
         format_money: format_money,
+        format_money_jp : format_money_jp,
     };
 }

src/javascript/binary/websocket_pages/user/account/profit_table/profit_table.ui.js

@@ -18,7 +18,9 @@ var ProfitTableUI = (function(){
             Content.localize().textDetails
         ];
 
-        header[7] = header[7] + (TUser.get().currency ? " (" + TUser.get().currency + ")" : "");
+        var jpClient = japanese_client();
+
+        header[7] = header[7] + (jpClient ? "" : (TUser.get().currency ? " (" + TUser.get().currency + ")" : ""));
 
         var footer = [Content.localize().textTotalProfitLoss, "", "", "", "", "", "", "", ""];
 
@@ -59,7 +61,9 @@ var ProfitTableUI = (function(){
 
         var total = accTotal + currentTotal;
 
-        $("#pl-day-total > .pl").text(addComma(Number(total).toFixed(2)));
+        var jpClient = japanese_client();
+
+        $("#pl-day-total > .pl").text(jpClient ? format_money_jp(TUser.get().currency, total.toString()) : addComma(Number(total).toFixed(2)));
 
         var subTotalType = (total >= 0 ) ? "profit" : "loss";
         $("#pl-day-total > .pl").removeClass("profit").removeClass("loss");
@@ -70,7 +74,9 @@ var ProfitTableUI = (function(){
         var profit_table_data = ProfitTable.getProfitTabletData(transaction);
         var plType = (profit_table_data.pl >= 0) ? "profit" : "loss";
 
-        var data = [profit_table_data.buyDate, '<span' + showTooltip(profit_table_data.app_id, oauth_apps[profit_table_data.app_id]) + '>' + profit_table_data.ref + '</span>', profit_table_data.payout, '', profit_table_data.buyPrice, profit_table_data.sellDate, profit_table_data.sellPrice, profit_table_data.pl, ''];
+        var jpClient = japanese_client();
+
+        var data = [profit_table_data.buyDate, '<span' + showTooltip(profit_table_data.app_id, oauth_apps[profit_table_data.app_id]) + '>' + profit_table_data.ref + '</span>', jpClient ? format_money_jp(TUser.get().currency, profit_table_data.payout) : profit_table_data.payout , '', jpClient ? format_money_jp(TUser.get().currency, profit_table_data.buyPrice) : profit_table_data.buyPrice , profit_table_data.sellDate, jpClient ? format_money_jp(TUser.get().currency, profit_table_data.sellPrice) : profit_table_data.sellPrice , jpClient ? format_money_jp(TUser.get().currency, profit_table_data.pl) : profit_table_data.pl , ''];
         var $row = Table.createFlexTableRow(data, cols, "data");
 
         $row.children(".buy-date").addClass("pre");

src/javascript/binary/websocket_pages/user/account/statement/statement.ui.js

@@ -17,7 +17,9 @@ var StatementUI = (function(){
             Content.localize().textDetails
         ];
 
-        header[6] = header[6] + (TUser.get().currency ? " (" + TUser.get().currency + ")" : "");
+        var jpClient = japanese_client();
+
+        header[6] = header[6] + (jpClient ? "" : (TUser.get().currency ? " (" + TUser.get().currency + ")" : ""));
 
         var metadata = {
             id: tableID,
@@ -43,7 +45,10 @@ var StatementUI = (function(){
         allData.push(statement_data);
         var creditDebitType = (parseFloat(statement_data.amount) >= 0) ? "profit" : "loss";
 
-        var $statementRow = Table.createFlexTableRow([statement_data.date, '<span' + showTooltip(statement_data.app_id, oauth_apps[statement_data.app_id]) + '>' + statement_data.ref + '</span>', isNaN(statement_data.payout) ? '-' : statement_data.payout, text.localize(statement_data.action), '', statement_data.amount, statement_data.balance, ''], columns, "data");
+        var jpClient = japanese_client();
+
+        var $statementRow = Table.createFlexTableRow([statement_data.date, '<span' + showTooltip(statement_data.app_id, oauth_apps[statement_data.app_id]) + '>' + statement_data.ref + '</span>', isNaN(statement_data.payout) ? '-' : (jpClient ? format_money_jp(TUser.get().currency, statement_data.payout) : statement_data.payout ), text.localize(statement_data.action), '', jpClient ? format_money_jp(TUser.get().currency, statement_data.amount) : statement_data.amount, jpClient ? format_money_jp(TUser.get().currency, statement_data.balance) : statement_data.balance, ''], columns, "data");
+        
         $statementRow.children(".credit").addClass(creditDebitType);
         $statementRow.children(".date").addClass("pre");
         $statementRow.children(".desc").html(statement_data.desc + "<br>");

src/sass/language_base.scss

@@ -60,6 +60,11 @@ body.JA {
     #header #menu-top li {
         white-space: nowrap;
     }
+    #profit-table, #statement-table {
+        .buy-price, .sell-price, .payout, .pl.loss, .act {
+            white-space: nowrap;
+        }
+    }
 }
 /*Vietnamese Language */
 body.VI {