Merge 4eb70ef into 9d32e9b

dbca-wa · Oct 27, 2017 · ef29b8e · ef29b8e
2 parents 9d32e9b + 4eb70ef
commit ef29b8e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git a/ledger/payments/api.py b/ledger/payments/api.py
@@ -557,6 +557,7 @@ class Meta:
         fields = (
             'id',
             'owner',
+            'voided',
             'order_number',
             'num_items',
             'amount',

diff --git a/ledger/payments/static/payments/js/payment.js b/ledger/payments/static/payments/js/payment.js
@@ -258,7 +258,7 @@ $(function(){
         receivedPaymentsTable.ajax.reload();
     }
     function showRecordPayment(){
-        if (invoice_obj.payment_status != 'paid' && invoice_obj.payment_status != 'over_paid'){
+        if (invoice_obj.payment_status != 'paid' && invoice_obj.payment_status != 'over_paid' && !invoice_obj.voided){
             if ($other_form.hasClass('hide')){
                 $other_form.removeClass('hide');
             }

diff --git a/ledger/payments/templates/dpaw_payments/invoice/payment.html b/ledger/payments/templates/dpaw_payments/invoice/payment.html
@@ -212,7 +212,7 @@
                         <div class="tabs-panel" id="other">
                             <div class="row">
                                 <div class="columns large-12">
-                                    <form id="other_form" class="{% if invoices.0.payment_status == 'paid' or invoices.0.payment_status == 'over_paid' %}hide{% endif %}">
+                                    <form id="other_form" class="{% if invoices.0.payment_status == 'paid' or invoices.0.payment_status == 'over_paid' or invoices.0.voided %}hide{% endif %}">
                                         <h3> Record Payment</h3>
                                         <label>
                                                 Amount

diff --git a/parkstay/cron.py b/parkstay/cron.py
@@ -10,7 +10,7 @@
 from parkstay.utils import oracle_integration
 
 class UnpaidBookingsReportCronJob(CronJobBase):
-    RUN_AT_TIMES = ['05:30']
+    RUN_AT_TIMES = ['01:00']
 
     schedule = Schedule(run_at_times=RUN_AT_TIMES)
     code = 'parkstay.unpaid_bookings_report'

diff --git a/parkstay/frontend/parkstay/src/components/booking/dashboard.vue b/parkstay/frontend/parkstay/src/components/booking/dashboard.vue
@@ -116,6 +116,7 @@ export default {
                 responsive: true,
                 serverSide:true,
                 processing:true,
+                searchDelay: 800,
                 ajax: {
                     "url": api_endpoints.bookings,
                     "dataSrc": 'results',

diff --git a/parkstay/frontend/parkstay/src/components/reports/reports.vue b/parkstay/frontend/parkstay/src/components/reports/reports.vue
@@ -295,10 +295,10 @@ export default {
             if(vm.form.valid()){
                 var values = {
                     "system":"S019",
-                    "start":(vm.region) ? vm.flatDateStartPicker.data("DateTimePicker").date().set({hour:0,minute:0,second:0,millisecond:0}).format('YYYY-MM-DD H:mm:ss'):vm.accountsDateStartPicker.data("DateTimePicker").date().set({hour:0,minute:0,second:0,millisecond:0}).format('YYYY-MM-DD H:mm:ss'),
-                    "end":(vm.region) ? vm.flatDateEndPicker.data("DateTimePicker").date().set({hour:0,minute:0,second:0,millisecond:0}).format('YYYY-MM-DD H:mm:ss'):vm.accountsDateEndPicker.data("DateTimePicker").date().set({hour:0,minute:0,second:0,millisecond:0}).format('YYYY-MM-DD H:mm:ss'),
-                    "banked_start":vm.flatDateStartPicker.data("DateTimePicker").date().set({hour:0,minute:0,second:0,millisecond:0}).format('YYYY-MM-DD H:mm:ss'),
-                    "banked_end":vm.flatDateEndPicker.data("DateTimePicker").date().set({hour:0,minute:0,second:0,millisecond:0}).format('YYYY-MM-DD H:mm:ss'),
+                    "start":(vm.region) ? vm.flatDateStartPicker.data("DateTimePicker").date().set({hour:23,minute:59,second:59,millisecond:0}).format('YYYY-MM-DD H:mm:ss'):vm.accountsDateStartPicker.data("DateTimePicker").date().set({hour:23,minute:59,second:59,millisecond:0}).format('YYYY-MM-DD H:mm:ss'),
+                    "end":(vm.region) ? vm.flatDateEndPicker.data("DateTimePicker").date().set({hour:23,minute:59,second:59,millisecond:0}).format('YYYY-MM-DD H:mm:ss'):vm.accountsDateEndPicker.data("DateTimePicker").date().set({hour:23,minute:59,second:59,millisecond:0}).format('YYYY-MM-DD H:mm:ss'),
+                    "banked_start":vm.flatDateStartPicker.data("DateTimePicker").date().set({hour:23,minute:59,second:59,millisecond:0}).format('YYYY-MM-DD H:mm:ss'),
+                    "banked_end":vm.flatDateEndPicker.data("DateTimePicker").date().set({hour:23,minute:59,second:59,millisecond:0}).format('YYYY-MM-DD H:mm:ss'),
                 };
                 if(vm.region){
                     values.region = vm.region;

diff --git a/parkstay/static/parkstay/js/parkstay.js b/parkstay/static/parkstay/js/parkstay.js