Skip to content

Commit

Permalink
Merge 3ab5647 into 3ef7de0
Browse files Browse the repository at this point in the history
  • Loading branch information
@rayrayndwiga
rayrayndwiga committed Nov 14, 2017
2 parents 3ef7de0 + 3ab5647 commit 312e83b
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 29 deletions.
30 changes: 28 additions & 2 deletions parkstay/api.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,33 @@ def list(self, request, *args, **kwargs):
if scrubbed['gear_type'] == 'all':
ground_ids.update((x[0] for x in Campground.objects.filter(campsites__isnull=True).values_list('id')))

queryset = Campground.objects.filter(id__in=ground_ids).order_by('name')

# Filter out for the max period
today = date.today()
if scrubbed['arrival']:
start_date = scrubbed['arrival']
else:
start_date = today
if scrubbed['departure']:
end_date = scrubbed['departure']
else:
end_date = today + timedelta(days=1)

temp_queryset = Campground.objects.filter(id__in=ground_ids).order_by('name')
queryset = []
for q in temp_queryset:
# Get the current stay history
stay_history = CampgroundStayHistory.objects.filter(
Q(range_start__lte=start_date,range_end__gte=start_date)|# filter start date is within period
Q(range_start__lte=end_date,range_end__gte=end_date)|# filter end date is within period
Q(Q(range_start__gt=start_date,range_end__lt=end_date)&Q(range_end__gt=today)) #filter start date is before and end date after period
,campground=q)
if stay_history:
max_days = min([x.max_days for x in stay_history])
else:
max_days = settings.PS_MAX_BOOKING_LENGTH
if (end_date - start_date).days <= max_days:
queryset.append(q)

serializer = self.get_serializer(queryset, many=True)
return Response(serializer.data)
Expand Down Expand Up @@ -1479,7 +1505,7 @@ def list(self, request, *args, **kwargs):

sql = ''
http_status = status.HTTP_200_OK
sqlSelect = 'select distinct parkstay_booking.id as id,parkstay_booking.customer_id, parkstay_campground.name as campground_name,parkstay_region.name as campground_region,parkstay_booking.legacy_name,\
sqlSelect = 'select distinct parkstay_booking.id as id,parkstay_booking.created,parkstay_booking.customer_id, parkstay_campground.name as campground_name,parkstay_region.name as campground_region,parkstay_booking.legacy_name,\
parkstay_booking.legacy_id,parkstay_campground.site_type as campground_site_type,\
parkstay_booking.arrival as arrival, parkstay_booking.departure as departure,parkstay_campground.id as campground_id,coalesce(accounts_emailuser.first_name || \' \' || accounts_emailuser.last_name) as full_name'
sqlCount = 'select count(distinct parkstay_booking.id)'
Expand Down
47 changes: 26 additions & 21 deletions parkstay/frontend/parkstay/src/components/booking/dashboard.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,9 @@ export default {
var data = res.body.results;
var json2csv = require('json2csv');
var fields = [...vm.dtHeaders];
var fields = ['Created']
//var fields = [...vm.dtHeaders];
var fields = [...fields,...vm.dtHeaders];
fields.splice(vm.dtHeaders.length-1,1);
fields = [...fields,"Adults","Concession","Children","Infants","Regos","Canceled","Cancelation Reason","Cancelation Date","Canceled By"]
fields.splice(3,0,"Email");
Expand All @@ -461,54 +463,57 @@ export default {
$.each(fields,function (j,field) {
switch (j) {
case 0:
bk[field] = booking.campground_name;
bk[field] = Moment(booking.created).format("DD/MM/YYYY HH:MM:SS");
break;
case 1:
bk[field] = booking.campground_region;
bk[field] = booking.campground_name;
break;
case 2:
bk[field] = booking.firstname +" "+ booking.lastname;
bk[field] = booking.campground_region;
break;
case 3:
bk[field] = booking.email;
bk[field] = booking.firstname +" "+ booking.lastname;
break;
case 4:
bk[field] = booking.phone;
bk[field] = booking.email;
break;
case 5:
bk[field] = booking.id;
bk[field] = booking.phone;
break;
case 6:
bk[field] = booking.campground_site_type;
bk[field] = booking.id;
break;
case 7:
bk[field] = booking.status;
bk[field] = booking.campground_site_type;
break;
case 8:
bk[field] = booking.cost_total;
bk[field] = booking.status;
break;
case 9:
bk[field] = booking.amount_paid;
bk[field] = booking.cost_total;
break;
case 10:
bk[field] = Moment(booking.arrival).format("DD/MM/YYYY");
bk[field] = booking.amount_paid;
break;
case 11:
bk[field] = Moment(booking.departure).format("DD/MM/YYYY");
bk[field] = Moment(booking.arrival).format("DD/MM/YYYY");
break;
case 12:
bk[field] = booking.guests.adults;
bk[field] = Moment(booking.departure).format("DD/MM/YYYY");
break;
case 13:
bk[field] = booking.guests.concession;
bk[field] = booking.guests.adults;
break;
case 14:
bk[field] = booking.guests.children;
bk[field] = booking.guests.concession;
break;
case 15:
bk[field] = booking.guests.infants;
bk[field] = booking.guests.children;
break;
case 16:
bk[field] = booking.guests.infants;
break;
case 17:
bk[field] = booking.vehicle_payment_status.map(r =>{
return Object.keys(r).map(k =>{
if (k == 'Paid'){
Expand All @@ -528,16 +533,16 @@ export default {
});
}).join(" | ");
break;
case 17:
case 18:
bk[field] = booking.is_canceled;
break;
case 18:
case 19:
bk[field] = booking.cancelation_reason;
break;
case 19:
case 20:
bk[field] = booking.cancelation_time;
break;
case 20:
case 21:
bk[field] = booking.canceled_by;
break;
Expand Down
2 changes: 1 addition & 1 deletion parkstay/frontend/parkstay/src/components/utils/closureHistory/close.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</div>
</div>
</div>
<reason type="close" v-model="statusHistory.reason" ></reason>
<reason type="close" v-model="statusHistory.closure_reason" ></reason>
<div v-show="requireDetails" class="row">
<div class="form-group">
<div class="col-md-2">
Expand Down
2 changes: 1 addition & 1 deletion parkstay/static/parkstay/js/parkstay.js
View file

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions wildlifelicensing/apps/payments/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,14 @@ class ManualPaymentView(LoginRequiredMixin, RedirectView):
def get(self, request, *args, **kwargs):
application = get_object_or_404(Application, pk=args[0])

url = reverse('payments:invoice-payment', args=(application.invoice_reference,))

#url = reverse('payments:invoice-payment', args=(application.invoice_reference,))
url = '{}?invoice={}'.format(reverse('payments:invoice-payment'),application.invoice_reference)

params = {
'redirect_url': request.GET.get('redirect_url', reverse('wl_home'))
}

return redirect('{}?{}'.format(url, urlencode(params)))
return redirect('{}&{}'.format(url, urlencode(params)))


class PaymentsReportView(LoginRequiredMixin, View):
Expand Down

0 comments on commit 312e83b

Please sign in to comment.