From fab6d5b18f97ab53acccf18763acbdd354d2dac5 Mon Sep 17 00:00:00 2001
From: zhangshine <zhangshine0125@gmail.com>
Date: Sat, 6 Jun 2015 17:17:57 +0800
Subject: [PATCH] format datetime

---
 pyinvoice/templates.py | 35 ++++++++++++++++++++++++++---------
 test.py                |  5 ++++-
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/pyinvoice/templates.py b/pyinvoice/templates.py
index fb41298..a0f5577 100644
--- a/pyinvoice/templates.py
+++ b/pyinvoice/templates.py
@@ -51,17 +51,21 @@ class SimpleInvoice(SimpleDocTemplate):
             self._transactions.append(t)
 
     @staticmethod
-    def __attribute_to_table_data(instance, attribute_verbose_name_list):
+    def __format_value(value):
+        if isinstance(value, datetime):
+            value = value.strftime('%Y-%m-%d %H:%M')
+        elif isinstance(value, date):
+            value = value.strftime('%Y-%m-%d')
+        return value
+
+    def __attribute_to_table_data(self, instance, attribute_verbose_name_list):
         data = []
 
-        for p, v in attribute_verbose_name_list:
-            attr = getattr(instance, p)
-            if attr is not None:
-                if isinstance(attr, datetime):
-                    attr = attr.strftime('%Y-%m-%d %H:%M')
-                elif isinstance(attr, date):
-                    attr = attr.strftime('%Y-%m-%d')
-                data.append(['{0}:'.format(v), attr])
+        for property_name, verbose_name in attribute_verbose_name_list:
+            attr = getattr(instance, property_name)
+            if attr:
+                attr = self.__format_value(attr)
+                data.append(['{0}:'.format(verbose_name), attr])
 
         return data
 
@@ -84,11 +88,13 @@ class SimpleInvoice(SimpleDocTemplate):
                 SimpleTable(self.__attribute_to_table_data(self.service_provider_info, props), horizontal_align='RIGHT')
             )
 
+        # ClientInfo
         if isinstance(self.client_info, ClientInfo):
             props = [('name', 'Name'), ('street', 'Street'), ('city', 'City'), ('state', 'State'),
                      ('country', 'Country'), ('post_code', 'Post code'), ('email', 'Email'), ('client_id', 'Client id')]
             story.append(SimpleTable(self.__attribute_to_table_data(self.client_info, props), horizontal_align='LEFT'))
 
+        # Items
         item_table_paragraph_style = ParagraphStyle(
             'ItemTableParagraph',
             parent=getSampleStyleSheet()['Normal'],
@@ -107,4 +113,15 @@ class SimpleInvoice(SimpleDocTemplate):
             item_data.insert(0, ('Item id', 'Name', 'Description', 'Units', 'Unit Price', 'Subtotal'))
             story.append(TableWithHeader(item_data, horizontal_align='LEFT'))
 
+        # Transaction
+        transaction_table_data = [(
+            t.transaction_id,
+            t.gateway,
+            self.__format_value(t.transaction_datetime),
+            t.amount
+        ) for t in self._transactions if isinstance(t, Transaction)]
+        if transaction_table_data:
+            transaction_table_data.insert(0, ('Transaction id', 'Gateway', 'Transaction date', 'Amount'))
+            story.append(TableWithHeader(transaction_table_data, horizontal_align='LEFT'))
+
         self.build(story, onFirstPage=PaidStamp(7*inch, 5.8*inch) if self.is_paid else None)
\ No newline at end of file
diff --git a/test.py b/test.py
index 18ef7c8..34c4ad2 100644
--- a/test.py
+++ b/test.py
@@ -1,6 +1,6 @@
 from datetime import datetime
 from decimal import Decimal
-from pyinvoice.models import InvoiceInfo, ServiceProviderInfo, ClientInfo, Item
+from pyinvoice.models import InvoiceInfo, ServiceProviderInfo, ClientInfo, Item, Transaction
 from pyinvoice.templates import SimpleInvoice
 
 doc = SimpleInvoice('test.pdf')
@@ -33,4 +33,7 @@ doc.add_item(Item('0000', 'Item 0000', 'Item Description 1 Long-----------------
 doc.add_item(Item('1111', 'Item 1111', 'Item Description 2', 2, Decimal('2.2')))
 doc.add_item(Item('2222', 'Item 2222', 'Item Description 3', 3, Decimal('3.3')))
 
+doc.add_transaction(Transaction('Paypal', 111, datetime.now(), 1))
+doc.add_transaction(Transaction('Strip', 222, datetime.now(), 2))
+
 doc.finish()
\ No newline at end of file