Changeset 9467 for main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py

Timestamp:

30 Oct 2012, 17:31:43 (12 years ago)

Author:

Henrik Bettermann

Message:

We need to import old scratch card payments.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py

@@ -679 +679 @@
         # by Excel or Calc
         p_id = p_id.strip('#')
-        if not p_id.startswith('p'):
+        if len(p_id.split('-')) != 3 and not p_id.startswith('p'):
             # For data migration from old SRP only
             p_id = 'p' + p_id[7:] + '0'
@@ -699 +699 @@
         parent = self.getParent(row, site)
         p_id = row['p_id'].strip('#')
-        if not p_id.startswith('p'):
+        if len(p_id.split('-')) != 3 and not p_id.startswith('p'):
             # For data migration from old SRP
             obj.p_id = 'p' + p_id[7:] + '0'
@@ -736 +736 @@
                 errs.append(('p_id','invalid length'))
                 return errs, inv_errs, conv_dict
+        elif len(p_id.split('-')) == 3:
+            # The SRP used either pins as keys ...
+            if len(p_id.split('-')[2]) != 10:
+                errs.append(('p_id','invalid pin'))
+                return errs, inv_errs, conv_dict
         else:
+            # ... or order_ids.
             if not len(p_id) == 19:
                 errs.append(('p_id','invalid length'))