UI-1248: Unknown refund should properly be displayed negatively

2600hz · Mar 13, 2015 · 531d5a5 · 531d5a5
1 parent aa1035a
commit 531d5a5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/apps/myaccount/views/transactions-list.html b/apps/myaccount/views/transactions-list.html
@@ -14,7 +14,7 @@
 						{{/if}}
 					</div>
 					<div class="date">{{ this.friendlyCreated }}</div>
-					<div class="price">{{ ../../i18n.currencyUsed }}{{ this.amount }}</div>
+					<div class="price">{{ ../../i18n.currencyUsed }}{{#if this.isARefund}}-{{/if}}{{ this.amount }}</div>
 				</div>
 			</div>
 		{{else}}

diff --git a/js/lib/monster.util.js b/js/lib/monster.util.js
@@ -368,12 +368,18 @@ define(function(require){
 			transaction.amount = parseFloat(transaction.amount).toFixed(2);
 
 			if(transaction.hasOwnProperty('code')) {
-				if(transaction.code === 9999 || transaction.code % 1000 < 500) {
+				if(transaction.code % 1000 < 500) {
 					transaction.friendlyName = app.i18n.active().transactions.codes[transaction.code];
 				}
 				else {
 					transaction.isARefund = true;
-					transaction.friendlyName = app.i18n.active().transactions.codes[transaction.code - 500] + ' ' + app.i18n.active().transactions.refundText;
+
+					if(transaction.code === 9999) {
+						transaction.friendlyName = app.i18n.active().transactions.codes[transaction.code];
+					}
+					else {
+						transaction.friendlyName = app.i18n.active().transactions.codes[transaction.code - 500] + ' ' + app.i18n.active().transactions.refundText;
+					}
 				}
 			}