Merge d7ebc0e into a10d958

MANIFEST.in

@@ -0,0 +1,17 @@
+include LICENSE
+recursive-include ledger/address/fixtures *.json 
+recursive-include ledger/static/ledger/css *.css *.scss
+recursive-include ledger/payments/static/payments/js *.js
+recursive-include ledger/payments/cash/fixtures *.json
+recursive-include ledger/payments/templates/dpaw_payments *.html
+recursive-include ledger/payments/templates/dpaw_payments/emails *.html
+recursive-include ledger/payments/templates/dpaw_payments/invoice *.html
+recursive-include ledger/payments/templates/dpaw_payments/bpay *.html
+recursive-include ledger/payments/templates/dpaw_payments/bpoint *.html
+recursive-include ledger/accounts/templates/customers *.html
+recursive-include ledger/accounts/templates/ledger/accounts *.html
+recursive-include ledger/templates *.html
+recursive-include ledger/templates/basket/partials *.html
+recursive-include ledger/templates/partials *.html
+recursive-include ledger/templates/checkout *.html
+recursive-include ledger/templates/email *.html

ledger/basket/middleware.py

@@ -12,6 +12,12 @@
 from oscar.apps.basket.middleware import BasketMiddleware as CoreBasketMiddleware
 
 class BasketMiddleware(CoreBasketMiddleware):
+
+    # required for python 3
+    def __init__(self):
+        #response = self.get_response(request)
+        return None
+
     def get_cookie_basket(self, cookie_key, request, manager):
         """
         Looks for a basket which is referenced by a cookie.

mooring/admin.py

@@ -544,6 +544,6 @@ class AdmissionsLocation(admin.ModelAdmin):
 class RefundFailed(admin.ModelAdmin):
     list_display = ('booking', 'invoice_reference','refund_amount','status','created','completed_date','completed_by')
     search_fields = ('booking','invoice_reference','refund_amount')
-    list_filter = ('status','completed_by')
+    list_filter = ('status',)
     ordering = ('id',)
 

mooring/api.py

@@ -2940,7 +2940,7 @@ def list(self, request, *args, **kwargs):
             if arrival:
                  filter_query &= Q(departure__gt=arrival)
 
-            booking_query = Booking.objects.filter(filter_query)
+            booking_query = Booking.objects.filter(filter_query).order_by('-id')
             recordsTotal = Booking.objects.filter(Q(Q(booking_type=1) | Q(booking_type=4))).count()
             recordsFiltered = booking_query.count()
             # build predata
@@ -3140,7 +3140,7 @@ def list(self, request, *args, **kwargs):
                         bk['campground_site_type'] = ""
 
 
-                    msb_list.sort(key=lambda item: item[2])
+                    #msb_list.sort(key=lambda item: item[2])
                     bk_list['mooringsite_bookings'] = msb_list
 
                     booking_data.append(bk_list)
@@ -4320,7 +4320,7 @@ def get_current_booking(ongoing_booking, request):
          expiry = ongoing_booking.expiry_time.isoformat() if ongoing_booking else ''
      payments_officer_group = request.user.groups.filter(name__in=['Payments Officers']).exists()
 
-     ms_booking = MooringsiteBooking.objects.filter(booking=ongoing_booking)
+     ms_booking = MooringsiteBooking.objects.filter(booking=ongoing_booking).order_by('from_dt')
      cb = {'current_booking':[], 'total_price': '0.00'}
      current_booking = []
 #     total_price = Decimal('0.00')

mooring/emails.py

@@ -16,7 +16,8 @@
 from confy import env
 from django.template import Context
 from ledger.accounts.models import Document
-
+import datetime
+import hashlib
 
 default_from_email = settings.DEFAULT_FROM_EMAIL
 default_campground_email = settings.CAMPGROUNDS_EMAIL
@@ -34,6 +35,7 @@ def sendHtmlEmail(to,subject,context,template,cc,bcc,from_email,template_group,a
     override_email = env('OVERRIDE_EMAIL', None)
     context['default_url'] = env('DEFAULT_HOST', '')
     context['default_url_internal'] = env('DEFAULT_URL_INTERNAL', '')
+    log_hash = int(hashlib.sha1(str(datetime.datetime.now())).hexdigest(), 16) % (10 ** 8)
 
     if email_delivery != 'on':
         print ("EMAIL DELIVERY IS OFF NO EMAIL SENT -- email.py ")
@@ -95,7 +97,12 @@ def sendHtmlEmail(to,subject,context,template,cc,bcc,from_email,template_group,a
           #if attachment1:
           #    for a in attachment1:
           #        msg.attach(a)
-           msg.send()
+           try:
+                email_log(str(log_hash)+' '+subject) 
+                msg.send()
+                email_log(str(log_hash)+' Successfully sent to mail gateway')
+           except Exception as e:
+                email_log(str(log_hash)+' Error Sending - '+str(e)) 
     else:
           msg = EmailMultiAlternatives(subject, "Please open with a compatible html email client.", from_email=from_email, to=to, attachments=_attachments, cc=cc, bcc=bcc, reply_to=reply_to)
           msg.attach_alternative(main_template, 'text/html')
@@ -105,7 +112,14 @@ def sendHtmlEmail(to,subject,context,template,cc,bcc,from_email,template_group,a
           #if attachment1:
           #    for a in attachment1:
           #        msg.attach(a)
-          msg.send()
+          try:
+               email_log(str(log_hash)+' '+subject) 
+               msg.send()
+               email_log(str(log_hash)+' Successfully sent to mail gateway')
+          except Exception as e:
+               email_log(str(log_hash)+' Error Sending - '+str(e))
+
+
     return True
 
 
@@ -523,5 +537,10 @@ def send_registered_vessels_email(content):
     email_obj.send(emails, from_address=default_from_email, context=context)
 
 
+def email_log(line):
+     dt = datetime.datetime.now()
+     f= open(settings.BASE_DIR+"/logs/email.log","a+")
+     f.write(str(dt.strftime('%Y-%m-%d %H:%M:%S'))+': '+line+"\r\n")
+     f.close()  
 
 

mooring/models.py

@@ -1532,7 +1532,10 @@ def vehicle_payment_status(self):
             total_due = D('0.0')
             lines = []
             if not self.legacy_id:
-                lines = inv.order.lines.filter(oracle_code=self.mooringarea.park.oracle_code)
+                lines = []
+                if inv.order:
+                    lines = inv.order.lines.filter(oracle_code=self.mooringarea.park.oracle_code)
+
 
             price_dict = {}
             for line in lines:

mooring/templates/mooring/email/booking_confirmation.html

@@ -8,7 +8,7 @@
 
 <p>Print or save the attached confirmation for presentation on arrival and at any time during your stay.</p>
 
-<p>Terms: {{ context_processor.EXPLORE_PARKS_TERMS }}</p>
+<p><a href="{{ context_processor.EXPLORE_PARKS_TERMS }}">Terms & Conditions</a></p>
 
 {% if 'imnotusingthisuntilpvsstartstakingbookings' == 'disabled' %}
 <p>Contact us about your booking</p>

mooring/utils.py

@@ -491,8 +491,9 @@ def get_campsite_availability(campsites_qs, start_date, end_date, ongoing_bookin
                                if ongoing_booking.old_booking is None:
                                   pass
                                else:
-                                   if nowtime > start_dt:
-                                        booking_period[bp.pk] = 'closed'
+                                    if nowtime > start_dt:
+                                       pass
+                                       #booking_period[bp.pk] = 'closed'
                          else:
                               pass
                               #if nowtime > start_dt:

mooring/views.py

@@ -354,9 +354,6 @@ def post(self, request, *args, **kwargs):
 #        }
 #        create_checkout_session(request, checkout_params)
 #        # END PLACE IN UTILS
-#        print ('BASKET')
-#        print (basket)
-#        print basket.status
 #        order_response = place_order_submission(request)
 
         new_order = Order.objects.get(basket=basket)

setup.py

@@ -0,0 +1,33 @@
+from setuptools import setup
+
+setup(name='ledger',
+      version='1.5',
+      description='Ledger Payments App',
+      url='https://github.com/dbca-wa/ledger',
+      author='Department of Parks and Wildlife',
+      author_email='asi@dbca.wa.gov.au',
+      license='BSD',
+      packages=['ledger','ledger.accounts','ledger.accounts.management','ledger.accounts.management.commands','ledger.accounts.migrations','ledger.accounts.templates',
+                'ledger.address','ledger.address.fixtures','ledger.address.migrations',
+                'ledger.basket','ledger.basket.migrations',
+                'ledger.catalogue','ledger.catalogue.migrations',
+                'ledger.checkout',
+                'ledger.dashboard','ledger.dashboard.catalogue',
+                'ledger.emails',
+                'ledger.licence','ledger.licence.migrations',
+                'ledger.order','ledger.order.migrations',
+                'ledger.partner',
+                'ledger.payment','ledger.payment.migrations',
+                'ledger.payments','ledger.payments.bpay','ledger.payments.bpoint','ledger.payments.cash','ledger.payments.invoice','ledger.payments.management','ledger.payments.migrations','ledger.payments.static.payments','ledger.payments.templates.dpaw_payments','ledger.payments.templatetags',
+                'ledger.payments.bpay.dashboard','ledger.payments.bpay.management','ledger.payments.bpay.management.commands','ledger.payments.bpay.migrations',
+                'ledger.payments.bpoint.BPOINT','ledger.payments.bpoint.dashboard','ledger.payments.bpoint.management','ledger.payments.bpoint.management.commands','ledger.payments.bpoint.migrations',
+                'ledger.payments.cash.fixtures','ledger.payments.cash.migrations',
+                'ledger.payments.invoice.dashboard','ledger.payments.invoice.migrations',
+                'ledger.payments.static.payments.img','ledger.payments.static.payments.js',
+                'ledger.static.ledger','ledger.static.ledger.css','ledger.static.ledger.fonts','ledger.static.ledger.images',
+                'ledger.taxonomy',
+                'ledger.templates','ledger.templates.basket.partials','ledger.templates.checkout','ledger.templates.email','ledger.templates.partials',
+                ],
+      install_requires=[],
+      include_package_data=True,
+      zip_safe=False)