Skip to content

Commit e2f2993

Browse files
committed
Edit name of sweep account to payable_account
1 parent 7e093cd commit e2f2993

File tree

2 files changed

+35
-31
lines changed

2 files changed

+35
-31
lines changed

balanced/resources.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,10 @@ class Customer(Resource):
505505
def create_order(self, **kwargs):
506506
return Order(href=self.orders.href, **kwargs).save()
507507

508+
@property
509+
def payable_account(self):
510+
return self.accounts.filter(type="payable").first()
511+
508512

509513
class Order(Resource):
510514
"""
@@ -618,4 +622,4 @@ class Settlement(Transaction):
618622

619623
type = 'settlements'
620624

621-
uri_gen = wac.URIGen('/settlementss', '{settlements}')
625+
uri_gen = wac.URIGen('/settlements', '{settlements}')

tests/test_suite.py

+30-30
Original file line numberDiff line numberDiff line change
@@ -511,69 +511,69 @@ def test_accounts_transfer(self):
511511
card = balanced.Card(**INTERNATIONAL_CARD).save()
512512

513513
order.debit_from(source=card, amount=1234)
514-
sweep_account = merchant.sweep_account
515-
self.assertEqual(sweep_account.balance, 0)
516-
account_credit = sweep_account.credit(amount=1234, order=order.href,
514+
payable_account = merchant.payable_account
515+
self.assertEqual(payable_account.balance, 0)
516+
account_credit = payable_account.credit(amount=1234, order=order.href,
517517
appears_on_statement_as='Payout')
518518
self.assertEqual(account_credit.status, 'succeeded')
519-
self.assertEqual(sweep_account.balance, 1234)
519+
self.assertEqual(payable_account.balance, 1234)
520520
self.assertEqual(account_credit.account_credit, 'Payout')
521521

522522
def test_accounts_transfer_from_multiple_orders(self):
523523
merchant = balanced.Customer().save()
524524
card = balanced.Card(**INTERNATIONAL_CARD).save()
525-
sweep_account = merchant.sweep_account
526-
self.assertEqual(sweep_account.balance, 0)
525+
payable_account = merchant.payable_account
526+
self.assertEqual(payable_account.balance, 0)
527527
amount = 1234
528528

529529
order_one = merchant.create_order()
530530
order_one.debit_from(source=card, amount=amount)
531-
account_credit_one = sweep_account.credit(amount=amount,
531+
account_credit_one = payable_account.credit(amount=amount,
532532
order=order_one.href)
533-
self.assertEqual(sweep_account.balance, amount)
533+
self.assertEqual(payable_account.balance, amount)
534534
order_two = merchant.create_order()
535535
order_two.debit_from(source=card, amount=amount)
536-
account_credit_two = sweep_account.credit(amount=amount,
536+
account_credit_two = payable_account.credit(amount=amount,
537537
order=order_two.href)
538-
self.assertEqual(sweep_account.balance, amount*2)
538+
self.assertEqual(payable_account.balance, amount*2)
539539

540540
def test_settlement(self):
541541
merchant = balanced.Customer().save()
542542
order = merchant.create_order()
543543
card = balanced.Card(**INTERNATIONAL_CARD).save()
544544

545545
order.debit_from(source=card, amount=1234)
546-
sweep_account = merchant.sweep_account
547-
account_credit = sweep_account.credit(amount=1234, order=order.href,
546+
payable_account = merchant.payable_account
547+
account_credit = payable_account.credit(amount=1234, order=order.href,
548548
appears_on_statement_as='Payout')
549-
self.assertEqual(sweep_account.balance, 1234)
549+
self.assertEqual(payable_account.balance, 1234)
550550
bank_account = balanced.BankAccount(
551551
account_number='1234567890',
552552
routing_number='321174851',
553553
name='Someone',
554554
).save()
555555
bank_account.associate_to_customer(merchant)
556556

557-
settlement = sweep_account.settle(
557+
settlement = payable_account.settle(
558558
funding_instrument=bank_account.href,
559559
appears_on_statement_as="Settlement Oct",
560560
description="Settlement for payouts from October")
561561
self.assertEqual(settlement.amount, 1234)
562562
self.assertEqual(settlement.appears_on_statement_as, "Settlement Oct")
563563
self.assertEqual(settlement.description,
564564
"Settlement for payouts from October")
565-
self.assertEqual(sweep_account.balance, 0)
565+
self.assertEqual(payable_account.balance, 0)
566566

567567
def test_reverse_settlement(self):
568568
merchant = balanced.Customer().save()
569569
order = merchant.create_order()
570570
card = balanced.Card(**INTERNATIONAL_CARD).save()
571571

572572
order.debit_from(source=card, amount=1234)
573-
sweep_account = merchant.sweep_account
574-
account_credit = sweep_account.credit(amount=1234, order=order.href,
573+
payable_account = merchant.payable_account
574+
account_credit = payable_account.credit(amount=1234, order=order.href,
575575
appears_on_statement_as='Payout')
576-
self.assertEqual(sweep_account.balance, 1234)
576+
self.assertEqual(payable_account.balance, 1234)
577577

578578
bank_account = balanced.BankAccount(
579579
account_number='1234567890',
@@ -582,26 +582,26 @@ def test_reverse_settlement(self):
582582
).save()
583583
bank_account.associate_to_customer(merchant)
584584

585-
settlement = sweep_account.settle(
585+
settlement = payable_account.settle(
586586
funding_instrument=bank_account.href,
587587
appears_on_statement_as="Settlement Oct",
588588
description="Settlement for payouts from October")
589-
self.assertEqual(sweep_account.balance, 0)
589+
self.assertEqual(payable_account.balance, 0)
590590

591-
credit_from_escrow = sweep_account.credit(amount=1234)
592-
self.assertEqual(sweep_account.balance, 1234)
591+
credit_from_escrow = payable_account.credit(amount=1234)
592+
self.assertEqual(payable_account.balance, 1234)
593593

594594
account_credit.reverse(amount=1234)
595-
self.assertEqual(sweep_account.balance, 0)
595+
self.assertEqual(payable_account.balance, 0)
596596

597597
def test_reverse_settlement_with_negative_account_balance(self):
598598
merchant = balanced.Customer().save()
599599
order = merchant.create_order()
600600
card = balanced.Card(**INTERNATIONAL_CARD).save()
601601

602602
order.debit_from(source=card, amount=1234)
603-
sweep_account = merchant.sweep_account
604-
account_credit = sweep_account.credit(amount=1234, order=order.href,
603+
payable_account = merchant.payable_account
604+
account_credit = payable_account.credit(amount=1234, order=order.href,
605605
appears_on_statement_as='Payout')
606606
bank_account = balanced.BankAccount(
607607
account_number='1234567890',
@@ -610,20 +610,20 @@ def test_reverse_settlement_with_negative_account_balance(self):
610610
).save()
611611
bank_account.associate_to_customer(merchant)
612612

613-
settlement = sweep_account.settle(
613+
settlement = payable_account.settle(
614614
funding_instrument=bank_account.href,
615615
appears_on_statement_as="Settlement Oct",
616616
description="Settlement for payouts from October")
617-
self.assertEqual(sweep_account.balance, 0)
617+
self.assertEqual(payable_account.balance, 0)
618618

619619
account_credit.reverse(amount=1234)
620-
self.assertEqual(sweep_account.balance, -1234)
620+
self.assertEqual(payable_account.balance, -1234)
621621

622-
settlement = sweep_account.settle(
622+
settlement = payable_account.settle(
623623
funding_instrument=bank_account.href,
624624
appears_on_statement_as="Settlement Oct",
625625
description="Settlement for payouts from October")
626-
self.assertEqual(sweep_account.balance, 0)
626+
self.assertEqual(payable_account.balance, 0)
627627

628628

629629
class Rev0URIBasicUseCases(unittest.TestCase):

0 commit comments

Comments
 (0)