Changeset 12728

Timestamp:

11 Mar 2015, 10:16:58 (10 years ago)

Author:

uli

Message:

Remove obsolete func.

Location:

main/waeup.ikoba/branches/uli-payments/src/waeup/ikoba/customers

Files:

• contracts.py (modified) (1 diff)
• tests/test_contract.py (modified) (2 diffs)

main/waeup.ikoba/branches/uli-payments/src/waeup/ikoba/customers/contracts.py

@@ -61 +61 @@
 
 
-def payment_items_from_contract(contract):
-    """Turn contract product options into payment items.
-    """
-    result = []
-    for num, option in enumerate(contract.product_options):
-        item = PaymentItem()
-        item.item_id = u'%s' % num
-        item.title = option.title
-        item.amount = option.fee
-        result.append(item)
-    return result
-
-
 class ContractPayer(grok.Adapter):
     """Adapter to turn contracts into IPayers.

main/waeup.ikoba/branches/uli-payments/src/waeup/ikoba/customers/tests/test_contract.py

@@ -28 +28 @@
     IContractsContainer, IContract)
 from waeup.ikoba.customers.contracts import (
-    ContractsContainer, SampleContract, payment_items_from_contract,
-    ContractPayer, ContractFinder, PayableContract,
+    ContractsContainer, SampleContract, ContractPayer, ContractFinder,
+    PayableContract,
     )
 from waeup.ikoba.app import Company
@@ -105 +105 @@
     layer = FunctionalLayer
 
-    def test_payment_items_from_contract(self):
-        # we can turn contracts into lists of payment items
-        contract = SampleContract()
-        option1 = ProductOption(u"Fee 1", decimal.Decimal("31.10"), "USD")
-        option2 = ProductOption(u"Fee 2", decimal.Decimal("12.12"), "USD")
-        contract.product_options = [option1, option2]
-        payment_items = payment_items_from_contract(contract)
-        assert len(payment_items) == 2
-        item1, item2 = payment_items
-        assert IPaymentItem.providedBy(item1)
-        assert IPaymentItem.providedBy(item2)
-        assert item1.item_id == "0"
-        assert item2.item_id == "1"
-        assert item1.title == u'Fee 1'
-        assert item2.title == u'Fee 2'
-        assert item1.amount == decimal.Decimal("31.10")
-        assert item2.amount == decimal.Decimal("12.12")
-
-    def test_payment_item_from_contract_no_options(self):
-        # we cope with empty contracts
-        contract = SampleContract()
-        payment_items = payment_items_from_contract(contract)
-        assert payment_items == []
-
     def test_payer_adapter(self):
         # we can adapt IContract to IPayer (i.e. create a payer)