UI-1248: Fixed credit/debit transactions to properly display

Conflicts: apps/myaccount/submodules/transactions/transactions.css apps/myaccount/submodules/transactions/transactions.js apps/myaccount/views/transactions-list.html
2600hz · Mar 13, 2015 · aa1035a · aa1035a
1 parent 13294df
commit aa1035a
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 30 deletions.
diff --git a/apps/myaccount/i18n/en-US.json b/apps/myaccount/i18n/en-US.json
@@ -208,6 +208,7 @@
 
 		"__comment": "UI-1248: Work on transactions to fix the way they're displayed",
 		"__version": "3.19",
+		"refundText": "(Refund)",
 		"codes": {
 			"1001": "Per Minute Call",
 			"1002": "Sub-Account Per Minute Call",
@@ -225,11 +226,13 @@
 			"5000": "Recurring",
 			"5001": "Monthly Recurring",
 			"5002": "Monthly Recurring (Pro-rated)",
-			"9999": "Unknown"
+			"9999": "Unknown Refund",
+			"0": "Unknown"
 		},
 		"errorStatuses": {
 			"voided": "Voided",
-			"declined": "Declined"
+			"declined": "Declined",
+			"processor_declined": "Declined"
 		}
 	}
 }
diff --git a/apps/myaccount/submodules/transactions/transactions.css b/apps/myaccount/submodules/transactions/transactions.css
@@ -40,6 +40,10 @@
 	margin-bottom: 15px;
 }
 
+.transactions-content-wrapper .list-transactions .transaction.refund {
+	color: #22A5FF;
+}
+
 .transactions-content-wrapper .list-transactions .transaction > *:not(.expandable) {
 	line-height: 65px;
 	height: 65px;

diff --git a/apps/myaccount/submodules/transactions/transactions.js b/apps/myaccount/submodules/transactions/transactions.js
@@ -89,9 +89,9 @@ define(function(require){
 
 					parent.find('.expandable').hide();
 
-					parent.find('.start-date .value').html(data.billingStartDate);
-					parent.find('.end-date .value').html(data.billingEndDate);
-					parent.find('.total-amount .value').html(self.i18n.active().currencyUsed + data.amount);
+					parent.find('.billing-date.start').html(data.billingStartDate);
+					parent.find('.billing-date.end').html(data.billingEndDate);
+					parent.find('.total-amount').html(self.i18n.active().currencyUsed + data.amount);
 				});
 			});
 		},
@@ -133,7 +133,13 @@ define(function(require){
 									arrayCharges.push(v);
 
 									if(v.approved) {
-										defaults.amount += parseFloat(v.amount);
+										// All the codes that are in the 5xx and above are refunds
+										if(v.code % 1000 > 500) {
+											defaults.amount -= parseFloat(v.amount);
+										}
+										else {
+											defaults.amount += parseFloat(v.amount);
+										}
 									}
 								}
 							});
@@ -154,25 +160,6 @@ define(function(require){
 			);
 		},
 
-		transactionsGetMonthly: function(from, to, success, error) {
-			var self = this;
-
-			monster.request({
-				resource: 'myaccount.transactions.getMonthly',
-				data: {
-					accountId: self.accountId,
-					from: from,
-					to: to
-				},
-				success: function(data, status) {
-					success && success(data, status);
-				},
-				error: function(data, status) {
-					error && error(data, status);
-				}
-			});
-		},
-
 		transactionsGetCharges: function(from, to, success, error) {
 			var self = this;
 

diff --git a/apps/myaccount/views/transactions-list.html b/apps/myaccount/views/transactions-list.html
@@ -1,6 +1,5 @@
 {{#each listTransactions}}
-	<div class="box-top-blue transaction">
-		{{debug this}}
+	<div class="box-top-blue transaction{{#if this.isARefund}} refund{{/if}}">
 		{{#compare this.type '===' 'charges'}}
 				<div class="expand-box">
 				</div>
@@ -30,13 +29,12 @@
 						{{/unless}}
 
 						{{ this.friendlyName }}
-
 						{{#unless this.approved}}
 							&nbsp;({{ this.errorMessage }})
 						{{/unless}}
 					</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 class="expandable">
 					<div class="table-content">

diff --git a/js/lib/monster.util.js b/js/lib/monster.util.js
@@ -320,6 +320,8 @@ define(function(require){
 		// Not Intended to be used by most developers for now, we need to use it to have a standard transaction formatter.
 		// The input needed is an object from the array of transaction returned by the /transactions API.
 		formatTransaction: function(transaction, app) {
+			transaction.isARefund = false;
+
 			// If transaction has accounts/discounts and if at least one of these properties is not empty, run this code
 			if(transaction.hasOwnProperty('metadata') && transaction.metadata.hasOwnProperty('add_ons') && transaction.metadata.hasOwnProperty('discounts') 
 				&& !(transaction.metadata.add_ons.length === 0 && transaction.metadata.discounts.length === 0)) {
@@ -366,7 +368,13 @@ define(function(require){
 			transaction.amount = parseFloat(transaction.amount).toFixed(2);
 
 			if(transaction.hasOwnProperty('code')) {
-				transaction.friendlyName = app.i18n.active().transactions.codes[transaction.code];
+				if(transaction.code === 9999 || 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 status is missing or among the following list, the transaction is approved