Code

Accounts and settlements#1596

Code

Open

kyungmin wants to merge 89 commits intobalanced:masterbalanced/balanced-dashboard:masterfrom kyungmin:accountsAndSettlements2kyungmin/balanced-dashboard:accountsAndSettlements2Copy head branch name to clipboard

+3,686-1,750

Commits

Commits on Dec 23, 2014

• Add accounts and settlements models

  kyungmin

  committed
  8afc6fe

Commits on Dec 24, 2014

• Add payable account page

  kyungmin

  committed
  a93e510

Commits on Dec 26, 2014

• Upadte settlement summary section

  kyungmin

  committed
  d75b715

Commits on Dec 27, 2014

• Rename files

  kyungmin

  committed
  bfa55b0

Commits on Dec 29, 2014

• Display settlement table

  kyungmin

  committed
  9f05f99

Commits on Dec 30, 2014

• Group transactions by settlement and order

  kyungmin

  committed
  7af062d

• Merge branch 'master' of https://github.com/balanced/balanced-dashboard into accountsAndSettlements2

  kyungmin

  committed
  5ab79ee

• Filter out settled transactions in the unsettled transactions table

  kyungmin

  committed
  54e6beb

Commits on Jan 6, 2015

• Adjust the table column widths

  kyungmin

  committed
  c92ed75

• Populate settled transaction IDs (incomplte)

  kyungmin

  committed
  a9b44e4

• Fix table columns

  kyungmin

  committed
  476c973

• Merge branch 'master' of https://github.com/balanced/balanced-dashboard into accountsAndSettlements2

  Show description for 4b9d7e8
  kyungmin

  committed
  4b9d7e8

• Filter unsettled credits

  kyungmin

  committed
  947e7b5

Commits on Jan 8, 2015

• Group transactions by order by settlement

  kyungmin

  committed
  3ce3959

• Beautify

  kyungmin

  committed
  13cd4b4

• Add tabs in the customer page

  kyungmin

  committed
  d1b3d6e

• Add tabs in the customer page

  kyungmin

  committed
  87d0e2f

• Display payable account balance in the customer page

  kyungmin

  committed
  b1d3233

• Update search to include settlements

  kyungmin

  committed
  3a3b010

• Update transactions grouped by order table

  kyungmin

  committed
  ffd40fb

Commits on Jan 9, 2015

• Polish accounts and settlements pages

  kyungmin

  committed
  a434c70

• Fix tables in the order page

  kyungmin

  committed
  1003a93

• Increase the order icon size and fix alignments

  kyungmin

  committed
  202206e

Commits on Jan 12, 2015

• Merge branch 'master' of https://github.com/balanced/balanced-dashboard into accountsAndSettlements2

  Show description for 5fdfada
  kyungmin

  committed
  5fdfada

Commits on Jan 13, 2015

• Update balanced addon model version

  kyungmin

  committed
  056b6df

• Update accounts and settlements tables

  kyungmin

  committed
  e5cb42a

Commits on Jan 14, 2015

• Add regular settlement model

  kyungmin

  committed
  0995ac2

• Fix accounts/settlements results table by adding regular models

  kyungmin

  committed
  767ccc0

• Add accounts to creditable funding instruments

  kyungmin

  committed
  a798d86

• Display internal accounts table on settings page

  kyungmin

  committed
  66ca248

• Merge branch 'master' of https://github.com/balanced/balanced-dashboard into accountsAndSettlements2

  Show description for 575a2b7
  kyungmin

  committed
  575a2b7

• Update balanced addon model version

  kyungmin

  committed
  63d1ac1

Commits on Jan 15, 2015

• Combine orders and transactions tab

  kyungmin

  committed
  d5c1487

• Simplify payment method text in the transactions table

  kyungmin

  committed
  4af6f83

Commits on Jan 16, 2015

• Display payment source and destination for all tables

  kyungmin

  committed
  be250bd

• Display settlment payment methods

  kyungmin

  committed
  7c1ed2e

Commits on Jan 17, 2015

• Refactor grouped transaction tables and update tests

  kyungmin

  committed
  7a1fb84

Commits on Jan 20, 2015

• Update tests

  kyungmin

  committed
  106c753

• Display payable account balance in order summary section

  kyungmin

  committed
  9579cb0

• Display correct payment icons in settlment summary section

  kyungmin

  committed
  e43d9a8

• Display merchant link in settlment summary section

  kyungmin

  committed
  ce97c5d

• Replace old loading and delete icons

  kyungmin

  committed
  18c3a47

Commits on Jan 21, 2015

• Update search results tab

  kyungmin

  committed
  ebfc235

Commits on Jan 22, 2015

• Add filters to order transactions table

  kyungmin

  committed
  1e139bc

• Add empty orders page

  kyungmin

  committed
  df54635

• Add empty orders page

  kyungmin

  committed
  d20f887

• Improve the empty states

  kyungmin

  committed
  63adaa3

• Add new icon to the settlement tab

  kyungmin

  committed
  49c121b

• Add empty settlement page

  kyungmin

  committed
  6e2ad54

Commits on Jan 23, 2015

• Fixes balanced#1631: Creating a debit automatically creates customers and order

  kyungmin

  committed
  d7e4105

• Associate refunds and reversals to orders

  kyungmin

  committed
  533f66e

• Display merchant's orders table in the customer page

  kyungmin

  committed
  4f4d411

• Use consistent description format

  kyungmin

  committed
  9057b3d

• Merge branch 'master' of https://github.com/balanced/balanced-dashboard into accountsAndSettlements2

  Show description for 01427a7
  kyungmin

  committed
  01427a7

Commits on Jan 24, 2015

• Update customer activity labels

  kyungmin

  committed
  8b4a1c9

Commits on Jan 26, 2015

• Fixes balanced#1631: Make debit this customer create orders automatically

  kyungmin

  committed
  2a72a27

• Fixes balanced#1631: Always credit from orders

  kyungmin

  committed
  48842de

Commits on Jan 27, 2015

• Breakdown customer activity based on buyer and merchant role

  kyungmin

  committed
  715f6aa

• Fix broken redirect routes

  kyungmin

  committed
  53f18f3

Commits on Jan 28, 2015

• Allow one off credit without orders

  kyungmin

  committed
  999e447

• Refactor grouped transaction tables

  kyungmin

  committed
  37e0d75

• Porting summary sections to using individual templates

  cohitre

  committed
  00ca405

• Removing unused files

  cohitre

  committed
  78a5a18

Commits on Jan 29, 2015

• Display settlement in order and txn details page

  kyungmin

  committed
  ed8db90

• Don't require order for credit bank account

  kyungmin

  committed
  2e2f16a

• fixing tests and readding edit description modal trigger

  cohitre

  committed
  420cef2

• Changelog

  cohitre

  committed
  af6d075

• Fix some tests

  kyungmin

  committed
  9abece1

• Merge remote-tracking branch 'kk/accountsAndSettlements2' into accountsAndSettlements2

  Show description for ccf5ee2
  cohitre

  committed
  ccf5ee2

• Making order use funding instrument view for displaying account

  cohitre

  committed
  a7f8583

• Add debit into this order modal

  kyungmin

  committed
  c8c0f09

• Merge pull request #17 from cohitre/accountsAndSettlements2

  Show description for cff37ff
  kyungmin

  committed
  cff37ff

• Fix add funds modal

  kyungmin

  committed
  cb00c6e

• Merge branch 'accountsAndSettlements2' of https://github.com/kyungmin/balanced-dashboard into accountsAndSettlements2

  kyungmin

  committed
  3335f46

• Update summary section values

  kyungmin

  committed
  3f27552

• Add maximum credit amount validation and clean up form section labels

  kyungmin

  committed
  1de34bf

Commits on Jan 30, 2015

• Fixes balanced#1634 & fixes balanced#1572: Update 'on statement as' field

  kyungmin

  committed
  b3fceaa

• Update payment method display in transactions table

  kyungmin

  committed
  ed80d70

• Fix some testsg

  kyungmin

  committed
  b0949bf

• Update order status

  kyungmin

  committed
  521e860

• Change order icon into status icon

  kyungmin

  committed
  854a1aa

• Update order status description

  kyungmin

  committed
  5adf61c

• Merge branch 'master' of https://github.com/balanced/balanced-dashboard into accountsAndSettlements2

  Show description for ef0e0fb
  kyungmin

  committed
  ef0e0fb

Commits on Jan 31, 2015

• Fix card modals

  kyungmin

  committed
  8249f72

• Fix some tests

  kyungmin

  committed
  623f532

• Fix some tests

  kyungmin

  committed
  81bb867

• Shorten the cvv fields and fix tests

  kyungmin

  committed
  775a133

Commits on Feb 2, 2015

• Fix bank account test

  kyungmin

  committed
  a5ebef9

Commits on Feb 17, 2015

• Fix more tests

  kyungmin

  committed
  edc17bc