Changeset 12779 for main

Timestamp:

17 Mar 2015, 18:41:43 (10 years ago)

Author:

Henrik Bettermann

Message:

Add payment_items to IPayment.

Export attributes too.

Location:

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

Files:

• export.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• payment.py (modified) (1 diff)
• tests/test_export.py (modified) (2 diffs)

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

@@ -38 +38 @@
     @property
     def fields(self):
-        return tuple(sorted(iface_names(self.iface)))
+        return tuple(sorted(iface_names(self.iface, exclude_attribs=False)))
 
     def mangle_value(self, value, name, context=None):

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

@@ -358 +358 @@
         )
 
+    payment_items = Attribute("Tuple of payment items")
+
     amount = Attribute("Sum of amounts of items contained")
 

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

@@ -257 +257 @@
         self.amount = amount
 
+    def to_string(self):
+        """A string representation that can be used in exports.
+
+        Returned is a unicode string of format ``(u'<TITLE>',u'<FEE>',u'<CURR>')``.
+        """
+        string = u"(u'%s', u'%s', u'%s')" % (self.item_id, self.title, self.amount)
+        string = string.replace("u'None'", "None")
+        return string
+
 
 @attrs_to_fields

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

@@ -105 +105 @@
         self.assertTrue(
             'creation_date,currency,gateway_service,payable_id,payee_id,'
-            'payer_id,payment_date,payment_id,state,title\r\n'
+            'payer_id,payment_date,payment_id,payment_items,state,title\r\n'
             in result)
         self.assertMatches(
             '...2015-03-16 16:07:33.273297#,EUR,demo_creditcard,CON1,'
-            ',K1000000,,%s,64,My Contract...' % self.payment.payment_id,
+            ',K1000000,,%s,"[(u\'0\', u\'Any product option\', u\'88.8\')]",'
+            '64,My Contract...' % self.payment.payment_id,
             result
             )
@@ -121 +122 @@
         self.assertTrue(
             'creation_date,currency,gateway_service,payable_id,payee_id,'
-            'payer_id,payment_date,payment_id,state,title\r\n'
+            'payer_id,payment_date,payment_id,payment_items,state,title\r\n'
             in result)
         self.assertMatches(
             '...2015-03-16 16:07:33.273297#,EUR,demo_creditcard,CON1,'
-            ',K1000000,,%s,64,My Contract...' % self.payment.payment_id,
+            ',K1000000,,%s,"[(u\'0\', u\'Any product option\', u\'88.8\')]",'
+            '64,My Contract...' % self.payment.payment_id,
             result
             )