Merge 456db60 into 4320926

ledger/payments/bpay/facade.py

@@ -88,6 +88,7 @@ def record_txn(row,_file):
         type = row[1],
         cheque_num = row[3],
         crn = row[4],
+        original_crn = row[4],
         txn_ref = row[5],
         service_code = row[6],
         p_instruction_code = row[7],

ledger/payments/bpay/migrations/0012_bpaytransaction_original_crn.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.8 on 2017-11-07 00:49
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bpay', '0011_parkstay_rebase'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='bpaytransaction',
+            name='original_crn',
+            field=models.CharField(blank=True, help_text=b'Customer Referencer Number', max_length=20, null=True),
+        ),
+    ]

ledger/payments/bpay/models.py

@@ -94,6 +94,7 @@ class BpayTransaction(models.Model):
     type = models.CharField(max_length=3,choices=TRANSACTION_TYPE, help_text='Indicates whether it is a credit or debit item',validators=[MinLengthValidator(3)],)
     cheque_num = models.IntegerField(default=0, help_text='Number of cheques in deposit')
     crn = models.CharField(max_length=20,help_text='Customer Referencer Number')
+    original_crn = models.CharField(null=True,blank=True,max_length=20,help_text='Customer Referencer Number')
     txn_ref = models.CharField(max_length=21, help_text='Transaction Reference Number',validators=[MinLengthValidator(12)])
     service_code = models.CharField(max_length=7, help_text='Unique identification for a service provider realting to a bill.', validators=[MinLengthValidator(1)])
     p_instruction_code = models.CharField(max_length=2,choices=PAYMENT_INSTRUCTION_CODES, help_text='Payment instruction method.',validators=[MinLengthValidator(2)])

ledger/payments/bpoint/facade.py

@@ -100,6 +100,7 @@ def _create_txn(self,action,crn1,amount,amount_original,amount_surcharge,
             txn = BpointTransaction.objects.create(
                 action=action,
                 crn1=crn1,
+                original_crn1=crn1,
                 amount=self.convert_amount(amount),
                 amount_original=self.convert_amount(amount_original),
                 amount_surcharge=self.convert_amount(amount_surcharge),

ledger/payments/bpoint/migrations/0012_bpointtransaction_original_crn1.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.8 on 2017-11-07 00:49
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bpoint', '0011_auto_20171026_1630'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='bpointtransaction',
+            name='original_crn1',
+            field=models.CharField(blank=True, help_text='Reference for the order that the transaction was made for', max_length=50, null=True),
+        ),
+    ]

ledger/payments/bpoint/models.py

@@ -46,6 +46,7 @@ class BpointTransaction(models.Model):
     amount_surcharge = models.DecimalField(default=0,decimal_places=2,max_digits=12)
     cardtype = models.CharField(max_length=2, choices=CARD_TYPES, blank=True, null=True)
     crn1 = models.CharField(max_length=50, help_text='Reference for the order that the transaction was made for')
+    original_crn1 = models.CharField(null=True,blank=True,max_length=50, help_text='Reference for the order that the transaction was made for')
     response_code = models.CharField(max_length=50)
     response_txt = models.CharField(max_length=128)
     receipt_number = models.CharField(max_length=50)

parkstay/api.py

@@ -93,6 +93,7 @@
                                     AccountsAddressSerializer,
                                     ParkEntryRateSerializer,
                                     ReportSerializer,
+                                    BookingSettlementReportSerializer,
                                     UserSerializer,
                                     UserAddressSerializer,
                                     ContactSerializer as UserContactSerializer,
@@ -780,7 +781,7 @@ def stay_history(self, request, format='json', pk=None):
                 queryset = CampgroundStayHistory.objects.filter(range_end__range = (start,end), range_start__range=(start,end) ).order_by("range_start")[:5]
                 serializer = CampgroundStayHistorySerializer(queryset,many=True,context={'request':request},method='get')
             else:
-                serializer = CampgroundStayHistorySerializer(self.get_object().stay_history,many=True,context={'request':request},method='get')
+                serializer = CampgroundStayHistorySerializer(self.get_object().stay_history.all().order_by('-range_start'),many=True,context={'request':request},method='get')
             res = serializer.data
 
             return Response(res,status=http_status)
@@ -1569,7 +1570,10 @@ def list(self, request, *args, **kwargs):
                 bk['amount_paid'] = booking.amount_paid
                 bk['vehicle_payment_status'] = booking.vehicle_payment_status
                 bk['refund_status'] = booking.refund_status
-                bk['cancellation_reason'] = booking.cancellation_reason
+                bk['is_canceled'] = 'Yes' if booking.is_canceled else 'No'
+                bk['cancelation_reason'] = booking.cancellation_reason
+                bk['canceled_by'] = booking.canceled_by.get_full_name() if booking.canceled_by else ''
+                bk['cancelation_time'] = booking.cancelation_time.strftime('%d/%m/%Y %H:M:%S') if booking.cancelation_time else ''
                 bk['paid'] = booking.paid
                 bk['invoices'] = [ i.invoice_reference for i in booking.invoices.all()]
                 bk['active_invoices'] = [ i.invoice_reference for i in booking.invoices.all() if i.active]
@@ -1723,7 +1727,7 @@ def destroy(self, request, *args, **kwargs):
             if not reason:
                 raise serializers.ValidationError('A reason is needed before canceling a booking');
             booking  = self.get_object()
-            booking.cancelBooking(reason)
+            booking.cancelBooking(reason,user=request.user)
             emails.send_booking_cancelation(booking,request)
             serializer = self.get_serializer(booking)
             return Response(serializer.data,status=status.HTTP_200_OK)
@@ -2062,6 +2066,60 @@ def get(self,request,format=None):
         except Exception as e:
             traceback.print_exc()
 
+class BookingSettlementReportView(views.APIView):
+    renderer_classes = (JSONRenderer,)
+
+    def get(self,request,format=None):
+        try:
+            http_status = status.HTTP_200_OK
+            #parse and validate data
+            report = None
+            data = {
+                "date":request.GET.get('date'),
+            }
+            serializer = BookingSettlementReportSerializer(data=data)
+            serializer.is_valid(raise_exception=True)
+            filename = 'Booking Settlement Report-{}'.format(str(serializer.validated_data['date']))
+            # Generate Report
+            report = reports.booking_bpoint_settlement_report(serializer.validated_data['date'])
+            if report:
+                response = HttpResponse(FileWrapper(report), content_type='text/csv')
+                response['Content-Disposition'] = 'attachment; filename="{}.csv"'.format(filename)
+                return response
+            else:
+                raise serializers.ValidationError('No report was generated.')
+        except serializers.ValidationError:
+            raise
+        except Exception as e:
+            traceback.print_exc()
+
+class BookingReportView(views.APIView):
+    renderer_classes = (JSONRenderer,)
+
+    def get(self,request,format=None):
+        try:
+            http_status = status.HTTP_200_OK
+            #parse and validate data
+            report = None
+            data = {
+                "date":request.GET.get('date'),
+            }
+            serializer = BookingSettlementReportSerializer(data=data)
+            serializer.is_valid(raise_exception=True)
+            filename = 'Booking Report-{}'.format(str(serializer.validated_data['date']))
+            # Generate Report
+            report = reports.bookings_report(serializer.validated_data['date'])
+            if report:
+                response = HttpResponse(FileWrapper(report), content_type='text/csv')
+                response['Content-Disposition'] = 'attachment; filename="{}.csv"'.format(filename)
+                return response
+            else:
+                raise serializers.ValidationError('No report was generated.')
+        except serializers.ValidationError:
+            raise
+        except Exception as e:
+            traceback.print_exc()
+
 class GetProfile(views.APIView):
     renderer_classes = [JSONRenderer,]
     permission_classes = []

parkstay/frontend/parkstay/src/components/booking/dashboard.vue

@@ -449,7 +449,7 @@ export default {
                 var json2csv = require('json2csv');
                 var fields = [...vm.dtHeaders];
                 fields.splice(vm.dtHeaders.length-1,1);
-                fields = [...fields,"Adults","Concession","Children","Infants","Regos"]
+                fields = [...fields,"Adults","Concession","Children","Infants","Regos","Canceled","Cancelation Reason","Cancelation Date","Canceled By"]
                 fields.splice(3,0,"Email");
                 fields.splice(4,0,"Phone");
                 fields.splice(8,0,'Amount Due')
@@ -528,6 +528,18 @@ export default {
                                     });
                                 }).join(" | ");
                             break;
+                            case 17:
+                                bk[field] = booking.is_canceled;
+                            break;
+                            case 18:
+                                bk[field] = booking.cancelation_reason;
+                            break;
+                            case 19:
+                                bk[field] = booking.cancelation_time;
+                            break;
+                            case 20:
+                                bk[field] = booking.canceled_by;
+                            break;
 
                         }
                     });

parkstay/frontend/parkstay/src/components/reports/reports.vue

@@ -135,6 +135,52 @@
                 </div>
             </div>
         </form>
+            <div class="well well-sm">
+                <div class="row">
+                    <div class="col-lg-12">
+                        <div class="row">
+                            <div class="col-sm-12">
+                                <div class="row">
+                                    <div class="col-sm-6">
+                                        <form ref="booking_settlements_form">
+                                            <h3 style="margin-bottom:20px;">Settlement Report</h3>
+                                            <div class="form-group">
+                                              <label for="">Date</label>
+                                              <div class="input-group date" ref="bookingSettlementsDatePicker">
+                                                  <input type="text" class="form-control" name="booking_settlement_date"  placeholder="DD/MM/YYYY" required>
+                                                  <span class="input-group-addon">
+                                                      <span class="glyphicon glyphicon-calendar"></span>
+                                                  </span>
+                                              </div>
+                                            </div>
+                                            <div class="form-group">
+                                                <button @click.prevent="getBookingSettlementsReport()" class="btn btn-primary pull-left" >Generate Settlement Report</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                    <div class="col-sm-6">
+                                        <form ref="bookings_form">
+                                            <h3 style="margin-bottom:20px;">Bookings Report</h3>
+                                            <div class="form-group">
+                                              <label for="">Date</label>
+                                              <div class="input-group date" ref="bookingsDatePicker">
+                                                  <input type="text" class="form-control" name="bookings_date"  placeholder="DD/MM/YYYY" required>
+                                                  <span class="input-group-addon">
+                                                      <span class="glyphicon glyphicon-calendar"></span>
+                                                  </span>
+                                              </div>
+                                            </div>
+                                            <div class="form-group">
+                                                <button @click.prevent="getBookingsReport()" class="btn btn-primary pull-left" >Generate Bookings Report</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
         <form ref="oracle_form">
             <div class="well well-sm">
                 <div class="row">
@@ -183,6 +229,10 @@ export default {
             refund_form:null,
             oracle_form: null,
             oracleDatePicker: null,
+            booking_settlements_form: null,
+            bookings_form: null,
+            bookingSettlementsDatePicker: null,
+            bookingsDatePicker: null,
             accountsDateStartPicker:null,
             accountsDateEndPicker:null,
             flatDateStartPicker:null,
@@ -226,13 +276,17 @@ export default {
             vm.form = $('#payments-form');
             vm.refund_form = $('#refund_form');
             vm.oracle_form = $(vm.$refs.oracle_form);
+            vm.booking_settlements_form = $(vm.$refs.booking_settlements_form);
+            vm.bookings_form = $(vm.$refs.bookings_form);
             vm.accountsDateStartPicker = $('#accountsDateStartPicker').datetimepicker(vm.datepickerOptions);
             vm.accountsDateEndPicker = $('#accountsDateEndPicker').datetimepicker(vm.datepickerOptions);
             vm.flatDateStartPicker = $('#flatDateStartPicker').datetimepicker(vm.datepickerOptions);
             vm.flatDateEndPicker = $('#flatDateEndPicker').datetimepicker(vm.datepickerOptions);
             vm.refundsStartPicker = $('#refundsStartPicker').datetimepicker(vm.datepickerOptions);
             vm.refundsEndPicker = $('#refundsEndPicker').datetimepicker(vm.datepickerOptions);
             vm.oracleDatePicker = $(vm.$refs.oracleDatePicker).datetimepicker(vm.datepickerOptions);
+            vm.bookingSettlementsDatePicker = $(vm.$refs.bookingSettlementsDatePicker).datetimepicker(vm.datepickerOptions);
+            vm.bookingsDatePicker = $(vm.$refs.bookingsDatePicker).datetimepicker(vm.datepickerOptions);
 
             vm.flatDateStartPicker.on('dp.hide',function (e) {
                 vm.flatDateEndPicker.data("DateTimePicker").date(null);
@@ -270,6 +324,40 @@ export default {
                 })
             }
         },
+        getBookingSettlementsReport(){
+            let vm = this;
+
+            if (vm.booking_settlements_form.valid()){
+                let data = vm.bookingSettlementsDatePicker.data("DateTimePicker").date().format('DD/MM/YYYY');
+                var url = '/api/reports/booking_settlements?date='+data; 
+                window.location.assign(url);
+                /*vm.$http.get(url).then((response) => {
+                },(error) => {
+                    swal({
+                        type: 'error',
+                        title: 'BPOINT Settlement Report Error', 
+                        text: helpers.apiVueResourceError(error), 
+                    })
+                })*/
+            }
+        },
+        getBookingsReport(){
+            let vm = this;
+
+            if (vm.bookings_form.valid()){
+                let data = vm.bookingsDatePicker.data("DateTimePicker").date().format('DD/MM/YYYY');
+                var url = '/api/reports/bookings?date='+data; 
+                window.location.assign(url);
+                /*vm.$http.get(url).then((response) => {
+                },(error) => {
+                    swal({
+                        type: 'error',
+                        title: 'BPOINT Settlement Report Error', 
+                        text: helpers.apiVueResourceError(error), 
+                    })
+                })*/
+            }
+        },
         fetchRegions:function () {
             let vm = this;
             $.get('/ledger/payments/api/regions?format=json',function (data) {
@@ -425,10 +513,68 @@ export default {
             });
             vm.oracle_form.validate({
                 rules: {
-                    date:'required', 
+                    oracle_date:'required', 
+                },
+                messages: {
+                    oracle_date: "Field is required",
+                },
+                showErrors:function(errorMap, errorList) {
+                    $.each(this.validElements(), function(index, element) {
+                        var $element = $(element);
+
+                        $element.attr("data-original-title", "").parents('.form-group').removeClass('has-error');
+                    });
+
+                    // destroy tooltips on valid elements
+                    $("." + this.settings.validClass).tooltip("destroy");
+
+                    // add or update tooltips
+                    for (var i = 0; i < errorList.length; i++) {
+                        var error = errorList[i];
+                        $(error.element)
+                            .tooltip({
+                                trigger: "focus"
+                            })
+                            .attr("data-original-title", error.message)
+                            .parents('.form-group').addClass('has-error');
+                    }
+                }
+            });
+            vm.booking_settlements_form.validate({
+                rules: {
+                    booking_settlement_date:'required', 
+                },
+                messages: {
+                    booking_settlement_date: "Field is required",
+                },
+                showErrors:function(errorMap, errorList) {
+                    $.each(this.validElements(), function(index, element) {
+                        var $element = $(element);
+
+                        $element.attr("data-original-title", "").parents('.form-group').removeClass('has-error');
+                    });
+
+                    // destroy tooltips on valid elements
+                    $("." + this.settings.validClass).tooltip("destroy");
+
+                    // add or update tooltips
+                    for (var i = 0; i < errorList.length; i++) {
+                        var error = errorList[i];
+                        $(error.element)
+                            .tooltip({
+                                trigger: "focus"
+                            })
+                            .attr("data-original-title", error.message)
+                            .parents('.form-group').addClass('has-error');
+                    }
+                }
+            });
+            vm.bookings_form.validate({
+                rules: {
+                    bookings_date:'required', 
                 },
                 messages: {
-                    date: "Field is required",
+                    bookings_date: "Field is required",
                 },
                 showErrors:function(errorMap, errorList) {
                     $.each(this.validElements(), function(index, element) {