Accounts and settlements

Brocfile.js

@@ -35,7 +35,7 @@ var fonts = pickFiles('bower_components/strapped/static/fonts', {
 
 var images = pickFiles('bower_components/strapped/static/images', {
 	srcDir: '/',
-	files: ['**/*.png', '**/*.gif'],
+	files: ['**/*.png'],
 	destDir: '/images'
 });
 

CHANGELOG.md

@@ -1,8 +1,9 @@
 # Balanced Dashboard Changelog
 
-
 ### master
 
+* Refactoring how model sidebars are displayed
+* Turning off marketplace application process temporarily
 * Fixing restart verification button not showing after the wait period is over
 
 ### 1.2.1

Gruntfile.js

@@ -201,7 +201,7 @@ module.exports = function(grunt) {
 	/*
 		grunt task commands
 	*/
-	grunt.registerTask('default', ['clean', 'bower', 'copy', 'exec:ember_server']);
+	grunt.registerTask('default', ['clean', 'copy', 'exec:ember_server']);
 	grunt.registerTask('test', ['bower:install', 'exec:ember_test']);
 	grunt.registerTask('build', ['bower:install', 'exec:ember_build_production']);
 	grunt.registerTask('deploy', ['admin:uninstall', 'build', 's3:productionCached', 's3:productionUncached']);

app/controllers/marketplace.js

@@ -29,18 +29,15 @@ var MarketplaceController = Ember.ObjectController.extend({
 		return this.get("auth.signedIn") && this.get("model");
 	}.property("auth.signedIn", "model"),
 
-	transactionSelected: isSelected('marketplace.transactions', 'credits', 'debits', 'holds', 'refunds', 'reversals'),
-	orderSelected: isSelected('marketplace.orders', 'orders'),
-	customerSelected: isSelected('marketplace.customers', 'customer'),
-	fundingInstrumentSelected: isSelected('marketplace.funding_instruments', 'bank_accounts', 'cards'),
+	orderSelected: isSelected('marketplace.orders', 'orders', 'credits', 'debits', 'holds', 'refunds', 'reversals'),
+	settlementSelected: isSelected('marketplace.settlements', 'settlement'),
 	disputeSelected: isSelected('marketplace.disputes', 'dispute'),
+	customerSelected: isSelected('marketplace.customers', 'customer'),
+	fundingInstrumentSelected: isSelected('marketplace.funding_instruments', 'bank_accounts', 'cards', 'account'),
 	logSelected: isSelected('marketplace.logs', 'log'),
 	invoiceSelected: isSelected('marketplace.invoices', 'invoice'),
 	settingSelected: isSelected('marketplace.settings'),
 
-	// Note: need this since bind-attr only works for a single property
-	paymentSelected: Ember.computed.or('transactionSelected', 'orderSelected'),
-
 	disputesResultsLoader: function() {
 		if (this.get("model")) {
 			return this.get('model').getDisputesLoader({

app/controllers/marketplace/import-payouts.js

@@ -51,7 +51,7 @@ var MarketplaceImportPayoutsController = Ember.Controller.extend(Ember.Evented,
 				callback();
 			}
 			var count = collection.filterBy('isSaved').get('length');
-			self.transitionToRoute('marketplace.transactions');
+			self.transitionToRoute('marketplace.orders');
 
 			self.refresh('');
 			var message = '%@ payouts were successfully submitted. Payouts might take a couple seconds to appear in the transactions list.'.fmt(count);

app/controllers/marketplace/settings.js

@@ -10,6 +10,16 @@ var MarketplaceSettingsController = Ember.ObjectController.extend(actionsMixin,
 
 	ownerCustomer: Ember.computed.oneWay("marketplace.owner_customer"),
 
+	accountsResultsLoader: function() {
+		if (this.get("owner_customer")) {
+			return this.get("owner_customer").getAccountsLoader({
+				limit: 10
+			});
+		} else {
+			return this.get("container").lookup("results-loader:base");
+		}
+	}.property("owner_customer"),
+
 	fundingInstrumentsResultsLoader: function() {
 		if (this.get("owner_customer")) {
 			return this.get("owner_customer").getFundingInstrumentsLoader({

app/controllers/marketplace/settlements.js

@@ -0,0 +1,16 @@
+import Ember from "ember";
+
+var MarketplaceSettlementsController = Ember.ObjectController.extend({
+	needs: ['marketplace'],
+	resultsLoader: Ember.computed.oneWay("model"),
+	actions: {
+		changeDateFilter: function(startTime, endTime) {
+			this.get("resultsLoader").setProperties({
+				endTime: endTime,
+				startTime: startTime
+			});
+		},
+	}
+});
+
+export default MarketplaceSettlementsController;

app/initializers/legacy-routes-initializer.coffee

@@ -7,18 +7,15 @@ LegacyRoutesInitializer =
 			klass = createRedirectRoute(createArgs...)
 			container.register("route:#{name}", klass)
 
-		defineRoute("account", "customer", "account")
-		defineRoute("accounts", "marketplace.customer")
-		defineRoute("accounts.index", 'marketplace.customers', "accounts")
-
 		defineRoute("bank-account.index", 'activity.funding_instruments')
 		defineRoute("cards.index", "activity.funding_instruments")
 
-		defineRoute("marketplace-redirect-activity-transactions", "marketplace.transactions")
-		defineRoute("marketplace-redirect-activity-orders", "activity.orders")
-		defineRoute("marketplace-redirect-activity-customers", "marketplace.customers")
-		defineRoute("marketplace-redirect-activity-funding-instruments", "marketplace.funding-instruments")
-		defineRoute("marketplace-redirect-activity-disputes", "marketplace.disputes")
-		defineRoute("marketplace-redirect-invoices", "marketplace.invoices")
+		defineRoute("marketplace.redirect-activity-transactions", "marketplace.orders")
+		defineRoute("marketplace.redirect-transactions", "marketplace.orders")
+		defineRoute("marketplace.redirect-activity-orders", "marketplace.orders")
+		defineRoute("marketplace.redirect-activity-customers", "marketplace.customers")
+		defineRoute("marketplace.redirect-activity-funding-instruments", "marketplace.funding-instruments")
+		defineRoute("marketplace.redirect-activity-disputes", "marketplace.disputes")
+		defineRoute("marketplace.redirect-invoices", "marketplace.invoices")
 
 `export default LegacyRoutesInitializer`

app/initializers/result-loaders-initializer.coffee

@@ -12,6 +12,7 @@ LOADER_NAMES = [
 	"marketplace-search"
 	"orders"
 	"transactions"
+	"unsettled-transactions"
 ]
 
 ResultLoadersInitializer =

app/initializers/type-mappings-initializer.coffee

@@ -9,6 +9,7 @@ TypeMappingsInitializer =
 			TypeMappings.addTypeMapping(key, klass)
 
 		registerMapping "api_key", "api-key"
+		registerMapping "account"
 		registerMapping "bank_account", "bank-account"
 		registerMapping "bank-account", "bank-account"
 		registerMapping "bank_account_verification", "verification"

app/lib/utils.js

@@ -239,53 +239,6 @@ var Utils = Ember.Namespace.create({
 		}
 	},
 
-	applyUriFilters: function(uri, params) {
-		if (!uri) {
-			return uri;
-		}
-
-		var transformedParams = ['limit', 'offset', 'sortField', 'sortOrder', 'minDate', 'maxDate', 'type', 'query'];
-
-		var filteringParams = {
-			limit: params.limit || 10,
-			offset: params.offset || 0
-		};
-
-		if (params.sortField && params.sortOrder && params.sortOrder !== 'none') {
-			filteringParams.sort = params.sortField + ',' + params.sortOrder;
-		}
-
-		if (params.minDate) {
-			filteringParams['created_at[>]'] = params.minDate.toISOString();
-		}
-		if (params.maxDate) {
-			filteringParams['created_at[<]'] = params.maxDate.toISOString();
-		}
-		if (params.type) {
-			switch (params.type) {
-				case 'search':
-					filteringParams['type[in]'] = Constants.SEARCH.SEARCH_TYPES.join(',');
-					break;
-				case 'transaction':
-					filteringParams['type[in]'] = Constants.SEARCH.TRANSACTION_TYPES.join(',');
-					break;
-				case 'funding_instrument':
-					filteringParams['type[in]'] = Constants.SEARCH.FUNDING_INSTRUMENT_TYPES.join(',');
-					break;
-				default:
-					filteringParams.type = params.type;
-			}
-		}
-		filteringParams.q = '';
-		if (params.query && params.query !== '%') {
-			filteringParams.q = params.query;
-		}
-
-		filteringParams = _.extend(filteringParams, _.omit(params, transformedParams));
-		filteringParams = Utils.sortDict(filteringParams);
-		return this.buildUri(uri, filteringParams);
-	},
-
 	buildUri: function(path, queryStringObject) {
 		var queryString = _.isString(queryStringObject) ?
 			queryStringObject :

app/models/account.coffee

@@ -0,0 +1,24 @@
+`import Ember from "ember";`
+`import Model from "./core/model";`
+`import Computed from "balanced-dashboard/utils/computed";`
+`import Constants from "balanced-dashboard/utils/constants";`
+
+Account = Model.extend(
+	routeName: "account"
+	route_name: "account"
+	isPayableAccount: Ember.computed.equal("type", "payable")
+	appears_on_statement_max_length: Constants.MAXLENGTH.APPEARS_ON_STATEMENT_BANK_ACCOUNT,
+
+	type_name: Ember.computed "type", ->
+		type = @get("type")
+
+		if type
+			"#{type.capitalize()} account"
+		else
+			"account"
+
+	description_with_type: Ember.computed "id", ->
+		"Payable account: #{@get("id")}"
+)
+
+`export default Account;`

app/models/bk/account.coffee

@@ -0,0 +1,20 @@
+`import Ember from "ember";`
+`import BkAccount from "balanced-addon-models/models/account";`
+`import Computed from "balanced-dashboard/utils/computed";`
+`import BkUtils from "balanced-dashboard/utils/bk-utils";`
+
+Account = BkAccount.extend(
+	routeName: "account",
+	route_name: "account",
+	isPayableAccount: Ember.computed.equal("type", "payable"),
+	type_name: (->
+		type = @get("type").capitalize()
+		"%@ account".fmt(type)
+	).property("type"),
+	description_with_type: Ember.computed("id", ->
+		"Payable account: #{@get("id")}"
+	),
+	toLegacyModel: BkUtils.generateToLegacyModelMethod("account")
+)
+
+`export default Account;`

app/models/bk/bank-account.coffee

@@ -1,7 +1,10 @@
 `import Ember from "ember";`
-`import BankAccount from "balanced-addon-models/models/bank-account";`
+`import BkBankAccount from "balanced-addon-models/models/bank-account";`
+`import BkUtils from "balanced-dashboard/utils/bk-utils";`
 
-BkBankAccount = BankAccount.extend(
+BankAccount = BkBankAccount.extend(
+    routeName: "bank_accounts"
+    toLegacyModel: BkUtils.generateToLegacyModelMethod("bank_account")
 )
 
-`export default BkBankAccount;`
+`export default BankAccount;`

app/models/bk/customer.coffee

@@ -2,7 +2,7 @@
 `import BkCustomer from "balanced-addon-models/models/customer";`
 
 Customer = BkCustomer.extend(
-	routeName: "customer"
+	routeName: "customer",
 )
 
 `export default Customer;`

app/models/bk/settlement.coffee

@@ -0,0 +1,13 @@
+`import Ember from "ember";`
+`import Utils from "balanced-dashboard/lib/utils";`
+`import BkSettlement from "balanced-addon-models/models/settlement";`
+
+Settlement = BkSettlement.extend(
+	routeName: "settlement",
+	type_name: "Settlement",
+	amountInDollars: (->
+		"$%@".fmt(Utils.centsToDollars(@get("amount")))
+	).property("amount")
+)
+
+`export default Settlement;`