Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mooring Fixes and Text Changes #374

Merged
merged 2 commits into from
Aug 15, 2018
Merged

Mooring Fixes and Text Changes #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98467ac
Mooring Fixes and Text Changes
Aug 10, 2018
bb6bdbc
Mooring Updates
Aug 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ledger/payments/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,8 @@ def addToInterface(date,oracle_codes,system,override):
status = 'NEW',
status_date = today
)
new_codes[k] = remainder_amount
new_codes[k] = v

if system.deduct_percentage and deduction_code.amount != 0:
deduction_code.save()
new_codes[deduction_code.activity_name] = deduction_code.amount
Expand Down
10 changes: 9 additions & 1 deletion mooring/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class MarinaAdmin(admin.GeoModelAdmin):
list_filter = ('district',)
search_fields = ('name',)
openlayers_url = 'https://cdnjs.cloudflare.com/ajax/libs/openlayers/2.13.1/OpenLayers.js'
exclude = ('ratis_id',)

@admin.register(models.MooringArea)
class MooringAreaAdmin(admin.GeoModelAdmin):
Expand Down Expand Up @@ -130,8 +131,15 @@ class Region(admin.GeoModelAdmin):
search_fields = ('name',)
# list_filter = ('mooring_type','site_type')
openlayers_url = 'https://cdnjs.cloudflare.com/ajax/libs/openlayers/2.13.1/OpenLayers.js'
exclude = ('ratis_id',)

@admin.register(models.District)
class District(admin.ModelAdmin):
list_display = ('name',)
ordering = ('name',)
exclude = ('ratis_id',)
search_fields = ('name',)
admin.site.register(models.Rate)
#admin.site.register(models.Region)
admin.site.register(models.District)
#admin.site.register(models.District)
admin.site.register(models.PromoArea)
8 changes: 4 additions & 4 deletions mooring/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1618,7 +1618,7 @@ def deletePrice(self, request, format='json', pk=None):
class BookingViewSet(viewsets.ModelViewSet):
queryset = Booking.objects.all()
serializer_class = BookingSerializer

def list(self, request, *args, **kwargs):
from django.db import connection, transaction
try:
Expand Down Expand Up @@ -1667,7 +1667,7 @@ def list(self, request, *args, **kwargs):
sqlParams['user'] = request.user.id

if campground :
sqlMooringArea = ' mooring_campground.id = %(campground)s'
sqlMooringArea = ' mooring_mooringarea.id = %(campground)s'
sql = sql + " and "+ sqlMooringArea
sqlCount = sqlCount + " and " +sqlMooringArea
sqlParams['campground'] = campground
Expand All @@ -1694,7 +1694,7 @@ def list(self, request, *args, **kwargs):
sql += ' and mooring_booking.booking_type <> 3'
sqlCount += ' and mooring_booking.booking_type <> 3'
if search:
sqlsearch = ' lower(mooring_campground.name) LIKE lower(%(wildSearch)s)\
sqlsearch = ' lower(mooring_mooringarea.name) LIKE lower(%(wildSearch)s)\
or lower(mooring_region.name) LIKE lower(%(wildSearch)s)\
or lower(mooring_booking.details->>\'first_name\') LIKE lower(%(wildSearch)s)\
or lower(mooring_booking.details->>\'last_name\') LIKE lower(%(wildSearch)s)\
Expand Down Expand Up @@ -1786,7 +1786,7 @@ def list(self, request, *args, **kwargs):
clean_data.append(bk)
else:
clean_data.append(bk)

print "EXIT"
return Response(OrderedDict([
('recordsTotal', recordsTotal),
('recordsFiltered',recordsFiltered),
Expand Down
8 changes: 4 additions & 4 deletions mooring/frontend/mooring/src/apps/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ module.exports = {
return process.env.PARKSTAY_URL + "/api/mooring-areas/" + id + "/stay_history.json?start="+start+"&end="+end;
},
campground_stay_history_detail: function(id){
return process.env.PARKSTAY_URL + "/api/campground_stay_history/"+ id +".json";
return process.env.PARKSTAY_URL + "/api/mooring_stay_history/"+ id +".json";
},
available_campsite_classes:function (id,start,end) {
return process.env.PARKSTAY_URL + "/api/mooring-areas/" + id + "/available_campsite_classes.json?arrival="+start+"&departure="+end;
},
campground_stay_history: process.env.PARKSTAY_URL + "/api/campground_stay_history.json",
campground_stay_history: process.env.PARKSTAY_URL + "/api/mooring_stay_history.json",
addPrice: function(id){
return process.env.PARKSTAY_URL + "/api/mooring-areas/"+ id +"/addPrice.json";
},
Expand All @@ -58,10 +58,10 @@ module.exports = {
return process.env.PARKSTAY_URL + "/api/mooring-areas/" + id + "/open_close.json"
},
deleteBookingRange: function (id) {
return process.env.PARKSTAY_URL + "/api/campground_booking_ranges/" + id + ".json"
return process.env.PARKSTAY_URL + "/api/mooring_booking_ranges/" + id + ".json"
},
campground_status_history_detail: function(id){
return process.env.PARKSTAY_URL + "/api/campground_booking_ranges/"+ id +".json?original=true";
return process.env.PARKSTAY_URL + "/api/mooring_booking_ranges/"+ id +".json?original=true";
},
delete_campground_price: function(id){
return process.env.PARKSTAY_URL + "/api/mooring-areas/" + id + "/deletePrice.json";
Expand Down
59 changes: 49 additions & 10 deletions mooring/frontend/mooring/src/components/booking/addbooking.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<img v-if="campground.images && campground.images.length>0" :src="campground.images[0].image" width="250" class="img-thumbnail img-responsive">
<img v-else src="https://placeholdit.imgix.net/~text?txtsize=33&txt=Campground&w=250&h=250" alt="campground" width="250" class="img-thumbnail img-responsive">
<p class="pricing" v-if="priceHistory">
<strong >${{priceHistory[0].rate.adult|formatMoney(2)}}</strong>
<strong >${{priceHistory[0].rate.mooring|formatMoney(2)}}</strong>
<br> <span class="text-muted">Per adult per night</span>
</p>
<p class="pricing" v-else>
Expand Down Expand Up @@ -77,11 +77,11 @@
</div>
</div>
</div>
<div class="row">
<div class="row">
<div class="col-lg-12">
<div class="well">
<div class="row">
<div class="col-lg-12">
<div class="col-lg-12" >
<h3 class="text-primary">Campsite Booking</h3>
<p>
Click <a target="_blank" :href="campground.campground_map">here</a> to open the map of the campground to help you select the preferred campsite
Expand Down Expand Up @@ -319,7 +319,8 @@ export default {
arrival:"",
departure:"",
guests:{
adult:2,
mooring: 1,
adult:0,
concession:0,
child:0,
infant:0
Expand All @@ -338,6 +339,7 @@ export default {
vehicles:0,
},
entryFees:{
vessel: 0,
vehicles : 0,
motorbike: 0,
concession:0,
Expand All @@ -350,10 +352,16 @@ export default {
campground:{},
guestsText:"",
guestsPicker:[
{
id:"mooring",
name:"Mooring",
amount:1,
description: ""
},
{
id:"adult",
name:"iiiiij Adults (no concession)",
amount:2,
name:"Adults (no concession)",
amount:0,
description: ""
},
{
Expand All @@ -377,6 +385,15 @@ export default {
},
],
parkEntryPicker:[
{
id:"vessel",
name:"Vessel",
amount:0,
price:0,
description: "Vessel Registration",
rego:"",
entry_fee: false
},
{
id:"vehicle",
name:"Vehicle",
Expand Down Expand Up @@ -476,7 +493,7 @@ export default {
if (vm.booking.arrival) {
$.each(vm.stayHistory,function (i,his) {
var range = Moment.range(Moment(his.range_start,"DD/MM/YYYY"),Moment(his.range_end,"DD/MM/YYYY"));
var arrival = Moment(vm.booking.arrival,"YYYY/MM/DD");
var arrival = Moment(vm.booking.arrival,"YYYY-MM-DD");
if (range.contains(arrival)) {
vm.departurePicker.data("DateTimePicker").maxDate(arrival.clone().add(his.max_days,'days'));
vm.departurePicker.data("DateTimePicker").date(null);
Expand All @@ -499,10 +516,15 @@ export default {
methods:{
fetchSites:function () {
let vm =this;
console.log("fetchSites");
console.log(vm.booking_type);
console.log(vm.booking_types.CAMPSITE);
if (vm.booking_type == vm.booking_types.CAMPSITE) {
vm.fetchCampsites();
console.log("fetchCampsites");
}
if (vm.booking_type == vm.booking_types.CLASS) {
console.log("fetchCampsiteClasses");
vm.fetchCampsiteClasses();
}
},
Expand Down Expand Up @@ -571,9 +593,17 @@ export default {
},
fetchCampsiteClasses:function () {
let vm = this;
console.log("---fetchCampsiteClasses");
if(vm.selected_arrival && vm.selected_departure){
console.log("---fetchCampsiteClasses1");
vm.loading.push('fetching campsite classes');
vm.$http.get(api_endpoints. available_campsite_classes(vm.booking.campground,vm.booking.arrival,vm.booking.departure)).then((response)=>{
vm.$http.get(api_endpoints. available_campsite_classes(
vm.booking.campground,
Moment(vm.booking.arrival, "YYYY-MM-DD").format("YYYY/MM/DD"),
Moment(vm.booking.departure, "YYYY-MM-DD").format("YYYY/MM/DD")
)).then((response)=>{
console.log("-fetchCampsiteClasses");
console.log(response.body);
vm.campsite_classes = response.body;
if (vm.campsite_classes.length >0) {
vm.selected_campsite =vm.campsite_classes[0].campsites[0];
Expand All @@ -591,6 +621,8 @@ export default {
vm.loading.push('fetching campground');
var cgId = vm.$route.params.cg;
vm.$http.get(api_endpoints.campground(cgId)).then((response)=>{
console.log("fetchCampground");
console.log(response.body);
vm.campground = response.body;
vm.booking.campground = vm.campground.id;
vm.booking_type = (vm.campground.site_type == 0) ? vm.booking_types.CAMPSITE : vm.booking_types.CLASS;
Expand Down Expand Up @@ -643,7 +675,7 @@ export default {
useCurrent: false,
});
vm.arrivalPicker.on('dp.change', function(e){
vm.booking.arrival = vm.arrivalPicker.data('DateTimePicker').date().format('YYYY/MM/DD');
vm.booking.arrival = vm.arrivalPicker.data('DateTimePicker').date().format('YYYY-MM-DD');
vm.selected_arrival = vm.booking.arrival;
vm.selected_departure = "";
vm.booking.departure = "";
Expand All @@ -656,7 +688,7 @@ export default {
});
vm.departurePicker.on('dp.change', function(e){
if (vm.departurePicker.data('DateTimePicker').date()) {
vm.booking.departure = vm.departurePicker.data('DateTimePicker').date().format('YYYY/MM/DD');
vm.booking.departure = vm.departurePicker.data('DateTimePicker').date().format('YYYY-MM-DD');
vm.selected_departure= vm.booking.departure;
}else{
vm.booking.departure = null;
Expand All @@ -682,6 +714,9 @@ export default {
let vm =this;
guest.amount += 1;
switch (guest.id) {
case 'mooring':
vm.booking.guests.adult = guest.mooring;
break;
case 'adult':
vm.booking.guests.adult = guest.amount;
break;
Expand All @@ -703,6 +738,9 @@ export default {
let vm =this;
guest.amount = (guest.amount > 0) ? guest.amount-1: 0;
switch (guest.id) {
case 'mooring':
vm.booking.guests.mooring = guest.amount;
break;
case 'adult':
vm.booking.guests.adult = guest.amount;
break;
Expand Down Expand Up @@ -1022,6 +1060,7 @@ export default {
mounted:function () {
let vm = this;
vm.bookingForm = document.forms.bookingForm;
console.log("Loading");
vm.fetchCampground();
vm.fetchCountries();
vm.addFormValidations();
Expand Down
34 changes: 29 additions & 5 deletions mooring/frontend/mooring/src/components/booking/changebooking2.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@
<div class="row form-horizontal">
<div class="col-md-12">
<div class="form-group">
<label for="vehicles" class="required col-md-4">Number of Vehicles</label>
<label style='display:none' for="vehicles" class="required col-md-4">Number of Vessels</label>
<div class="dropdown guests col-md-8">
<input type="number" min="1" max="1" name="vehicles" class="form-control dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" readonly="true" v-model="booking.parkEntry.vehicles">
<input type="number" min="1" max="1" name="vehicles" class="form-control dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" readonly="true" v-model="booking.parkEntry.vehicles" style='display:none'>
<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
<li v-for="park_entry in parkEntryPicker">
<div class="row">
Expand Down Expand Up @@ -246,7 +246,20 @@ export default {
description: "Ages 0-5"
},
],
parkEntryPicker: [{
parkEntryPicker: [

{
id: "vessel",
name: "Vessel",
amount: 0,
price: 0,
description: "Registration",
rego: "",
entry_fee: true
},


{
id: "vehicle",
name: "Vehicle",
amount: 0,
Expand Down Expand Up @@ -640,6 +653,9 @@ export default {
entry = JSON.parse(JSON.stringify(entry));
if (vm.parkPrices && entry.entry_fee) {
switch (entry.id) {
case 'vessel':
vm.booking.entryFees.entry_fee += parseInt(vm.parkPrices.vehicle);
break;
case 'vehicle':
vm.booking.entryFees.entry_fee += parseInt(vm.parkPrices.vehicle);
//vm.booking.entryFees.vehicle++;
Expand Down Expand Up @@ -669,13 +685,15 @@ export default {
if (resp.constructor != Array) {
vm.parkPrices = response.body;
} else {
vm.parkPrices.vessel = "0.00";
vm.parkPrices.vehicle = "0.00";
vm.parkPrices.motorbike = "0.00";
vm.parkPrices.concession = "0.00";
}
calcprices();
});
} else {
vm.parkPrices.vessel = "0.00";
vm.parkPrices.vehicle = "0.00";
vm.parkPrices.motorbike = "0.00";
vm.parkPrices.concession = "0.00";
Expand All @@ -690,7 +708,8 @@ export default {
if (vm.isFormValid()){
vm.loading.push('updating booking');
booking.entryFees = {
vehicle: 0,
vessel: 0,
// vehicle: 0,
motorbike: 0,
concession: 0,
regos: []
Expand All @@ -705,6 +724,9 @@ export default {
});
}
switch (entry.id) {
case 'vessel':
booking.entryFees.vessel++;
break;
case 'vehicle':
booking.entryFees.vehicle++;
break;
Expand Down Expand Up @@ -884,14 +906,16 @@ export default {
// Update Vehicles
vm.booking.parkEntry = { 'vehicles': 0};
vm.booking.entryFees = {
vehicle : 0,
//vehicle : 0,
vessel: 0,
motorbike: 0,
concession:0,
entry_fee: 0,
regos:[]
};
$.each(vm.booking.regos,(i,v) => {
vm.parkEntryPicker.map((vp) => {

if (vp.id == v.type) {
vp.rego = v.rego;
vp.entry_fee = v.entry_fee;
Expand Down
Loading