Changeset 12498

Timestamp:

20 Jan 2015, 06:53:55 (10 years ago)

Author:

uli

Message:

Fix tests and bugs revealed by tests.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/payments

Files:

• paypal.py (modified) (4 diffs)
• tests/test_paypal.py (modified) (4 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/payments/paypal.py

@@ -1147 +1147 @@
     title = _(u'Credit Card (PayPal)')
 
-    def get_credit_card(self, payer_id):
-        """Get an ICreditCard for `payer_id`.
+    def get_credit_card(self, customer_id):
+        """Get an ICreditCard for `customer_id`.
 
         `None` if the payer has (yet) no credit card stored with ikoba.
@@ -1157 +1157 @@
         if not 'creditcards' in site:
             return None
-        return site['creditcards'].get(payer_id, None)
+        return site['creditcards'].get(customer_id, None)
 
     def store_credit_card(self, paypal_credit_card):
@@ -1182 +1182 @@
             raise IOError(pp_credit_card.error)
         result = CreditCardToken(
-            pp_credit_card.id, pp_credit_card.payer_id,
+            pp_credit_card.id, pp_credit_card.external_customer_id,
             pp_credit_card.number, pp_credit_card.type,
             pp_credit_card.expire_month, pp_credit_card.expire_year
             )
-        site['creditcards'][pp_credit_card.payer_id] = result
+        site['creditcards'][pp_credit_card.external_customer_id] = result
         return result
 
     def create_payment(self, payer, payment_item,  payee=None):
         """Create a creditcard payment.
-
-        XXX: payer_id is deprecated by paypal: use
-        XXX: external_customer_id instead (also when creating credit cards).
-        XXX: This is a Good Thing(tm) because `payer_id` is already used in
-        XXX: some parts of the API for PayPal-assigned values.
         """
         if not IPayer.providedBy(payer):
@@ -1214 +1209 @@
                     "credit_card_token": {
                         "credit_card_id": credit_card.credit_card_id,
-                        "payer_id": payer.payer_id,
                         }}]},
             "transactions": [

main/waeup.ikoba/trunk/src/waeup/ikoba/payments/tests/test_paypal.py

@@ -1105 +1105 @@
         credit_card = CreditCard(
             credit_card_type=u"visa",
-            payer_id=u"PAYER_0123456789012345678901",
+            external_customer_id=u"PAYER_0123456789012345678901",
             number=u"4417119669820331",
             expire_month=11,
@@ -1168 +1168 @@
         assert 'creditcards' in site
         assert ICreditCardToken.providedBy(result)
-        assert result.payer_id in site['creditcards']
-        assert site['creditcards'][result.payer_id] == result
+        assert result.external_customer_id in site['creditcards']
+        assert site['creditcards'][result.external_customer_id] == result
 
     @external_paypal_test
@@ -1206 +1206 @@
         credit_card = self.get_credit_card()
         result = service.store_credit_card(credit_card)
-        payer_id = result.payer_id
         payer = FakePayer()
-        payer.payer_id = result.payer_id
+        payer.payer_id = result.external_customer_id
         payment_item = FakePaymentItem()
         payment = service.create_payment(
@@ -1214 +1213 @@
         result = payment.create()
         assert result is True
-        
-        ###
-        ### hier gehts weiter