Merge pull request #822 from xzzy/master

Change ledger invoice header

ledger/accounts/models.py

@@ -320,17 +320,20 @@ def clean(self):
         post_clean.send(sender=self.__class__, instance=self)
 
     def save(self, *args, **kwargs):
+        print ("SAVE")
         if not self.email:
             self.email = self.get_dummy_email()
         elif in_dbca_domain(self):
             # checks and updates department user details from address book after every login
             user_details = get_department_user_compact(self.email)
+            print ("DBCA")
             if user_details:
                 self.phone_number = user_details.get('telephone')
                 self.mobile_number = user_details.get('mobile_phone')
                 self.title = user_details.get('title')
                 self.fax_number = user_details.get('org_unit__location__fax')
                 self.is_staff = True
+                print ("TT")
         self.email = self.email.lower()            
         super(EmailUser, self).save(*args, **kwargs)
 

ledger/payments/bpoint/migrations/0013_bpointtransaction_integrity_check.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.8 on 2020-09-25 03:27
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bpoint', '0012_bpointtransaction_original_crn1'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='bpointtransaction',
+            name='integrity_check',
+            field=models.BooleanField(default=False),
+        ),
+    ]

ledger/payments/bpoint/models.py

@@ -62,7 +62,8 @@ class BpointTransaction(models.Model):
     dvtoken = models.CharField(max_length=128,null=True,blank=True,help_text='Stored card dv token')
     last_digits = models.CharField(max_length=4,blank=True,null=True,help_text='Last four digits of card used during checkout')
     is_test = models.BooleanField(default=False,help_text='Transaction is in test mode')
-
+    integrity_check = models.BooleanField(default=False)
+
     class Meta:
         ordering = ('-created',)
         db_table = 'payments_bpointtransaction'

ledger/payments/pdf.py

@@ -194,7 +194,7 @@ def _create_header(canvas, doc, draw_page_number=True):
     canvas.drawImage(dpaw_header_logo, PAGE_WIDTH / 3, current_y - (dpaw_header_logo_size[1]/2),width=dpaw_header_logo_size[0]/2, height=dpaw_header_logo_size[1]/2, mask='auto')
 
     current_y -= 70
-    canvas.drawCentredString(PAGE_WIDTH / 2, current_y - LARGE_FONTSIZE, 'TAX INVOICE')
+    canvas.drawCentredString(PAGE_WIDTH / 2, current_y - LARGE_FONTSIZE, 'TAX INVOICE / RECEIPT')
 
     current_y -= 20
     canvas.drawCentredString(PAGE_WIDTH / 2, current_y - LARGE_FONTSIZE, 'ABN: 38 052 249 024')

ledger/payments/utils.py

@@ -14,6 +14,8 @@
 from six.moves.urllib.parse import urlparse
 #
 from ledger.payments.models import OracleParser, OracleParserInvoice, Invoice, OracleInterface, OracleInterfaceSystem, BpointTransaction, BpayTransaction, OracleAccountCode, OracleOpenPeriod, OracleInterfaceDeduction
+from oscar.apps.order.models import Order
+from ledger.basket.models import Basket
 from oscar.core.loading import get_class
 from confy import env
 from decimal import Decimal
@@ -786,3 +788,37 @@ def update_payments_allocation(invoice_reference):
             print(traceback.print_exc())
             raise
 
+
+def bpoint_integrity_checks(system,days,rowlimit):
+    rows = []
+    if rowlimit is None:
+        rowlimit = 10
+    if days is None:
+        days = 5
+    fromdays = datetime.datetime.today() - datetime.timedelta(days=days)
+
+    bt = BpointTransaction.objects.filter(crn1__istartswith=system, integrity_check=False, created__gt=fromdays).order_by('-id')[:rowlimit]
+    for b in bt:
+        i = Invoice.objects.filter(reference=b.crn1)
+        if i.count() > 0:
+            o = Order.objects.filter(number=i[0].order_number)
+            if o.count() > 0:
+                if o[0].basket:
+                    if o[0].basket.booking_reference is not None:
+                        if len(o[0].basket.booking_reference) > 0:
+                             rows.append({'bpoint_id': b.id ,'reference': b.crn1, 'order_number': i[0].order_number, 'basket': o[0].basket.id, 'booking_reference': o[0].basket.booking_reference})
+
+    return rows
+
+def bpoint_integrity_checks_completed(bpoint_id,crn1):
+    try:  
+       bpt = BpointTransaction.objects.filter(id=bpoint_id,crn1=crn1)
+       if bpt.count() > 0:
+           for b in bpt:
+               b.integrity_check = True
+               b.save()
+               return True
+       return False
+    except:
+        return False
+