[5.4] MSTR-340: Display manual adjustments at control center

src/apps/myaccount/i18n/de-DE.json

@@ -496,11 +496,17 @@
 				"amount": "Betrag",
 				"date": "Datum",
 				"description": "Beschreibung",
-				"usage": "Nutzung"
+				"usage": "Nutzung",
+				"agent": "Agent"
 			},
 			"ledgers": {
 				"mobile_data": "Mobile Daten",
-				"per-minute-voip": "Pro Minute"
+				"2600Hz-mobile": "Mobile Data",
+				"per-minute-voip": "Pro Minute",
+				"payments": "Payments",
+				"prorations": "Prorations",
+				"rollovers": "Rollovers",
+				"adjustments": "Adjustments"
 			}
 		},
 

src/apps/myaccount/i18n/fr-FR.json

@@ -308,7 +308,27 @@
 		"toColumn": "À",
 		"accountColumn": "Compte",
 
-		"disabledAddCreditTooltip": "Braintree est requis pour ajouter du crédit. Pour plus d'informations, veuillez contacter votre administrateur."
+		"disabledAddCreditTooltip": "Braintree est requis pour ajouter du crédit. Pour plus d'informations, veuillez contacter votre administrateur.",
+
+		"genericLedger": {
+			"columns": {
+				"account": "Account",
+				"amount": "Amount",
+				"date": "Date",
+				"description": "Description",
+				"usage": "Usage",
+				"agent": "Agent"
+			},
+			"ledgers": {
+				"mobile_data": "Mobile Data",
+				"2600Hz-mobile": "Mobile Data",
+				"per-minute-voip": "Per Minute",
+				"payments": "Payments",
+				"prorations": "Prorations",
+				"rollovers": "Rollovers",
+				"adjustments": "Adjustments"
+			}
+		}
 	},
 
 	"transactions": {

src/apps/myaccount/i18n/nl-NL.json

@@ -344,7 +344,27 @@
 		"fromColumn": "Van",
 		"toColumn": "Naar",
 		"directionColumn": " ",
-		"accountColumn": "Account"
+		"accountColumn": "Account",
+
+		"genericLedger": {
+			"columns": {
+				"account": "Account",
+				"amount": "Amount",
+				"date": "Date",
+				"description": "Description",
+				"usage": "Usage",
+				"agent": "Agent"
+			},
+			"ledgers": {
+				"mobile_data": "Mobile Data",
+				"2600Hz-mobile": "Mobile Data",
+				"per-minute-voip": "Per Minute",
+				"payments": "Payments",
+				"prorations": "Prorations",
+				"rollovers": "Rollovers",
+				"adjustments": "Adjustments"
+			}
+		}
 	},
 
 	"servicePlan": {

src/apps/myaccount/i18n/ru-RU.json

@@ -383,7 +383,27 @@
 		"accountColumn": "Клиент",
 		"__comment": "UI-1324: Adding the option to disable Braintree through a config flag",
 		"__version": "v3.20_s4",
-		"disabledAddCreditTooltip": "Для выполнения этой операции требуется подключение к Braintree"
+		"disabledAddCreditTooltip": "Для выполнения этой операции требуется подключение к Braintree",
+
+		"genericLedger": {
+			"columns": {
+				"account": "Account",
+				"amount": "Amount",
+				"date": "Date",
+				"description": "Description",
+				"usage": "Usage",
+				"agent": "Agent"
+			},
+			"ledgers": {
+				"mobile_data": "Mobile Data",
+				"2600Hz-mobile": "Mobile Data",
+				"per-minute-voip": "Per Minute",
+				"payments": "Payments",
+				"prorations": "Prorations",
+				"rollovers": "Rollovers",
+				"adjustments": "Adjustments"
+			}
+		}
 	},
 
 		"servicePlan": {

src/apps/myaccount/submodules/balance/balance.js

@@ -1,6 +1,7 @@
 define(function(require) {
 	var $ = require('jquery'),
 		_ = require('lodash'),
+		footable = require('footable'),
 		monster = require('monster');
 
 	var balance = {
@@ -31,6 +32,11 @@ define(function(require) {
 						format: 'balanceFormatMobileDataTable',
 						table: 'mobile-table',
 						rows: 'mobile-rows'
+					},
+					'adjustments': {
+						format: 'balanceFormatAdjustmentsDataTable',
+						table: 'adjustments-table',
+						rows: 'adjustments-rows'
 					}
 				},
 				digits: {
@@ -122,29 +128,83 @@ define(function(require) {
 					created_to: monster.util.dateToEndOfGregorianDay(toDate, 'UTC')
 				}, optFilters || {});
 
-			monster.parallel({
-				globalLedgers: function(callback) {
+			monster.waterfall([
+				function getGlobalLedgers(callback) {
 					var globalFilters = {
 						created_from: filters.created_from,
 						created_to: filters.created_to
 					};
 
 					self.balanceListFilteredLedgers(globalFilters, function(data) {
-						callback(null, data);
+						callback(null, {
+							globalLedgers: data
+						});
 					});
 				},
-				ledger: function(callback) {
-					self.balanceGetLedgerDocuments(ledgerName, filters, function(documents) {
-						callback(null, documents);
+				function getLedgerDocuments(data, callback) {
+					if (ledgerName !== 'adjustments') {
+						var filtersNotBookkeepingTool = _.assign({}, filters, {
+							'filter_not_metadata.manual_bookkeeping_tool': true
+						});
+
+						return self.balanceGetLedgerDocuments(ledgerName, filtersNotBookkeepingTool, function(documents) {
+							callback(null, _.assign(data, { ledger: documents }));
+						});
+					}
+
+					var filterNoPagination = _.assign({}, filters, {
+							paginate: false
+						}),
+						filterBookkeepingTool = _.assign({}, filterNoPagination, {
+							'filter_metadata.manual_bookkeeping_tool': true
+						});
+
+					return self.balanceGetMultipleLedgerDocuments({
+						filtersByLedgers: _.chain(data.globalLedgers)
+							.mapValues(function(_value, ledgerName) {
+								return ledgerName === 'adjustments'
+									? filterNoPagination
+									: filterBookkeepingTool;
+							})
+							.assign({
+								'per-minute-voip': filterBookkeepingTool
+							})
+							.value(),
+						callback: function(documents) {
+							callback(null, _.assign(data, { ledger: documents }));
+						}
 					});
 				}
-			}, function(err, results) {
+			], function(err, results) {
 				self.balanceUpdateStats(template, results, ledgerName);
 
 				callback && callback(results);
 			});
 		},
 
+		balanceGetMultipleLedgerDocuments: function(args) {
+			var self = this,
+				filtersByLedgers = args.filtersByLedgers,
+				callback = args.callback;
+
+			monster.parallel(
+				_.map(filtersByLedgers, function(ledgerFilters, ledgerName) {
+					return function(next) {
+						self.balanceGetLedgerDocuments(ledgerName, ledgerFilters, function(documents) {
+							next(null, documents);
+						});
+					};
+				}),
+				function(error, results) {
+					var data = _.reduce(results, function(accum, result) {
+						return _.concat(accum, result.data);
+					}, []);
+
+					callback({ data: data });
+				}
+			);
+		},
+
 		balanceUpdateStats: function(template, data, currentLedger) {
 			var self = this,
 				formattedData = self.balanceGetFormattedStats(data);
@@ -155,7 +215,15 @@ define(function(require) {
 
 			_.each(data.globalLedgers, function(ledger, ledgerName) {
 				if (template.find('.tab-type-ledger[data-type="' + ledgerName + '"]').length === 0) {
-					template.find('.ledger-tabs').append(self.getTemplate({ name: 'generic-tab-ledger', data: { ledgerName: ledgerName }, submodule: 'balance' }));
+					template
+						.find('.ledger-tabs .tab-type-ledger-separator')
+						.before(
+							self.getTemplate({
+								name: 'generic-tab-ledger',
+								data: { ledgerName: ledgerName },
+								submodule: 'balance'
+							})
+						);
 				}
 
 				template.find('.tab-type-ledger[data-type="' + ledgerName + '"]').show();
@@ -422,6 +490,35 @@ define(function(require) {
 				.value();
 		},
 
+		balanceFormatAdjustmentsDataTable: function(data) {
+			var self = this;
+			return _.map(data, function(value) {
+				var item = _.get(value, 'metadata.item');
+				var serviceName = !item
+					? ''
+					: item.name
+						? _.startCase(item.name)
+						: item.category && item.item
+							? _.startCase(item.category) + ' / ' + _.startCase(item.item)
+							: '';
+
+				return {
+					amount: {
+						value: value.amount,
+						digits: self.appFlags.balance.digits.genericTableAmount
+					},
+					description: value.description,
+					name: value.account.name,
+					serviceName: serviceName,
+					timestamp: _.get(
+						value,
+						'period.end',
+						_.get(value, 'period.start', undefined)
+					)
+				};
+			});
+		},
+
 		balanceDisplayGenericTable: function(ledgerName, parent, showCredits, afterRender) {
 			var self = this,
 				template = $(self.getTemplate({
@@ -443,7 +540,10 @@ define(function(require) {
 
 					self.balanceGenericGetRows(ledgerName, parent, filters, showCredits, callback);
 				},
-				backendPagination: {
+				backendPagination: ledgerName === 'adjustments' ? {
+					enabled: false,
+					allowLoadAll: false
+				} : {
 					enabled: true,
 					allowLoadAll: false
 				},
@@ -895,14 +995,22 @@ define(function(require) {
 
 		balanceDownloadActiveTable: function(template) {
 			var self = this,
-				from = template.find('input.filter-from').datepicker('getDate'),
-				to = template.find('input.filter-to').datepicker('getDate'),
-				dlFrom = monster.util.dateToBeginningOfGregorianDay(from, 'UTC'),
-				dlTo = monster.util.dateToEndOfGregorianDay(to, 'UTC'),
-				type = template.find('.tab-type-ledger.active').data('type'),
-				url = self.apiUrl + 'accounts/' + self.accountId + '/ledgers/' + type + '?created_from=' + dlFrom + '&created_to=' + dlTo + '&accept=csv&paginate=false&auth_token=' + self.getAuthToken();
-
-			window.open(url, '_blank');
+				type = template.find('.tab-type-ledger.active').data('type');
+
+			if (type === 'adjustments') {
+				var csvContent = footable.get('#transactions_grid').toCSV(false);
+				const dataUri = 'data:text/csv;charset=utf-8,' + csvContent;
+				const encodedUri = encodeURI(dataUri);
+				window.open(encodedUri);
+			} else {
+				var from = template.find('input.filter-from').datepicker('getDate'),
+					to = template.find('input.filter-to').datepicker('getDate'),
+					dlFrom = monster.util.dateToBeginningOfGregorianDay(from, 'UTC'),
+					dlTo = monster.util.dateToEndOfGregorianDay(to, 'UTC'),
+					url = self.apiUrl + 'accounts/' + self.accountId + '/ledgers/' + type + '?created_from=' + dlFrom + '&created_to=' + dlTo + '&accept=csv&paginate=false&auth_token=' + self.getAuthToken();
+
+				window.open(url, '_blank');
+			}
 		},
 
 		balanceRefreshActiveTable: function(template, showCredits, afterRender) {

src/apps/myaccount/submodules/balance/views/adjustments-rows.html

@@ -1,8 +1,21 @@
 {{#each transactions}}
 	<tr class="transaction-row">
-		<td data-sort-value="{{extra.date}}">{{toFriendlyDate extra.date}}</td>
-		<td>{{ account.name }}</td>
-		<td>{{ description }}</td>
-		<td>{{formatPrice amount }}</td>
+		<td data-sort-value="{{timestamp}}">
+			{{toFriendlyDate timestamp}}
+		</td>
+		<td>
+			{{name}}
+		</td>
+		<td>
+			{{description}}
+		</td>
+		<td>
+			{{serviceName}}
+		</td>
+	{{#if @root.showCredits}}
+		<td data-sort-value="{{amount.value}}">
+			{{formatPrice amount.value amount.digits}}
+		</td>
+	{{/if}}
 	</tr>
 {{/each}}

src/apps/myaccount/submodules/balance/views/adjustments-table.html

@@ -2,10 +2,23 @@
 	<table id="transactions_grid" class="monster-table footable">
 		<thead>
 			<tr>
-				<th data-breakpoints="xs">{{ i18n.balance.genericLedger.columns.date }}</th>
-				<th>{{ i18n.balance.genericLedger.columns.account }}</th>
-				<th>{{ i18n.balance.genericLedger.columns.description }}</th>
-				<th>{{ i18n.balance.genericLedger.columns.amount }}</th>
+				<th data-breakpoints="xs">
+					{{i18n.balance.genericLedger.columns.date}}
+				</th>
+				<th>
+					{{i18n.balance.genericLedger.columns.account}}
+				</th>
+				<th>
+					{{i18n.balance.genericLedger.columns.description}}
+				</th>
+				<th>
+					{{@root.i18n.servicePlan.serviceTitle}}
+				</th>
+			{{#if @root.showCredits}}
+				<th>
+					{{i18n.balance.genericLedger.columns.amount}}
+				</th>
+			{{/if}}
 			</tr>
 		</thead>
 		<tbody></tbody>

src/apps/myaccount/submodules/balance/views/layout.html

@@ -32,6 +32,8 @@
 
 	<ul class="nav nav-tabs ledger-tabs">
 		<li data-type="per-minute-voip" class="tab-type-ledger active"><a href="javascript:void(0);">{{ i18n.balance.genericLedger.ledgers.per-minute-voip }}</a></li>
+		<li class="tab-type-ledger-separator"></li>
+		<li data-type="adjustments" data-bookkeeping-tool="true" class="tab-type-ledger"><a href="javascript:void(0);">{{tryI18n i18n.balance.genericLedger.ledgers "adjustments"}}</a></li>
 	</ul>
 
 	<div class="monster-table-wrapper">