Fix list behavior in invoice_template.py (fixes invoice-x#142)

Author: duskybomb

.gitignore

@@ -60,3 +60,7 @@ target/
 
 # PyCharm
 .idea/
+
+# PyTest
+.pytest_cache/
+

invoice2data/extract/invoice_template.py

@@ -168,8 +168,7 @@ def extract(self, optimized_str):
                             if sum_field:
                                 res_find += res_val
                             else:
-                                res_find = res_val
-                                break
+                                res_find.extend(res_val)
                 else:
                     res_find = re.findall(v, optimized_str)
                 if res_find:
@@ -188,7 +187,11 @@ def extract(self, optimized_str):
                         else:
                             output[k] = self.parse_number(res_find[0])
                     else:
-                        output[k] = res_find[0]
+                        res_find = list(set(res_find))
+                        if len(res_find) == 1:
+                            output[k] = res_find[0]
+                        else:
+                            output[k] = res_find
                 else:
                     logger.warning("regexp for field %s didn't match", k)
 

invoice2data/extract/templates/com/com.oyo.invoice.yml

@@ -3,6 +3,8 @@ fields:
   amount: GrandTotalRs(\d+)
   date: Date:(\d{1,2}\/\d{1,2}\/\d{1,4})
   invoice_number: ([A-Z0-9]+)CashatHotel
+  payment_method:
+    - \d+(\S*)atHotel
 keywords:
   - OYO
   - Oravel

invoice2data/test/compare/oyo.json

@@ -5,6 +5,7 @@
         "date": "31/12/2017",
         "desc": "Invoice IBZY2087 from OYO",
         "invoice_number": "IBZY2087",
-        "issuer": "OYO"
+        "issuer": "OYO",
+        "payment_method": "Cash"
     }
 ]