diff --git a/ledger/order/admin.py b/ledger/order/admin.py index 1bcaf6ea23..7a99e5f7ca 100644 --- a/ledger/order/admin.py +++ b/ledger/order/admin.py @@ -1 +1,16 @@ +from django.contrib import admin from oscar.apps.order.admin import * # noqa +from oscar.core.loading import get_model + +Order = get_model('order', 'Order') + +admin.site.unregister(Order) +class OrderAdmin(OrderAdmin): + raw_id_fields = ['user', 'billing_address', 'shipping_address', 'basket'] + list_display = ('number', 'total_incl_tax', 'site', 'user', + 'billing_address', 'date_placed') + readonly_fields = ('number', 'total_incl_tax', 'total_excl_tax', + 'shipping_incl_tax', 'shipping_excl_tax',) + inlines = [LineInline] + +admin.site.register(Order, OrderAdmin) diff --git a/mooring/admin.py b/mooring/admin.py index bc6c7e1572..b35f8608d6 100644 --- a/mooring/admin.py +++ b/mooring/admin.py @@ -91,6 +91,11 @@ class MooringAreaAdmin(admin.GeoModelAdmin): class MooringAreaGroupAdmin(admin.ModelAdmin): filter_horizontal = ('members','moorings') + def formfield_for_manytomany(self, db_field, request, **kwargs): + if db_field.name == "members": + kwargs["queryset"] = EmailUser.objects.filter(is_staff=True) + return super(MooringAreaGroupAdmin, self).formfield_for_manytomany(db_field, request, **kwargs) + def get_queryset(self, request): """ Filter based on the mooring group of the user. """ qs = super(MooringAreaGroupAdmin, self).get_queryset(request) @@ -148,10 +153,12 @@ class CancelPricePeriodAdmin(admin.ModelAdmin): @admin.register(models.Booking) class BookingAdmin(admin.ModelAdmin): + raw_id_fields = ('customer','created_by','overridden_by','canceled_by','old_booking','admission_payment',) list_display = ('id','arrival','departure','booking_type','mooringarea','legacy_id','legacy_name','status','cost_total') ordering = ('-id',) search_fileds = ('arrival','departure') list_filter = ('id','arrival','departure','mooringarea') + readonly_fields=('created',) inlines = [BookingInvoiceInline,MooringsiteBookingInline] def has_add_permission(self, request, obj=None): @@ -393,7 +400,9 @@ class AdmissionLineInline(admin.TabularInline): @admin.register(models.AdmissionsBooking) class AdmissionBooking(admin.ModelAdmin): + raw_id_fields = ('customer',) list_display = ('confirmation_number', 'customer', 'totalCost') + readonly_fields=('created_by','canceled_by',) inlines = [AdmissionLineInline] diff --git a/mooring/frontend/availability2/src/availability.vue b/mooring/frontend/availability2/src/availability.vue index 64d3f80a66..ffd694797b 100644 --- a/mooring/frontend/availability2/src/availability.vue +++ b/mooring/frontend/availability2/src/availability.vue @@ -161,28 +161,28 @@
- +
- +
- +
- +
@@ -929,10 +929,10 @@ export default { success: function(data, stat, xhr) { vm.searchedRego = reg; if(data[0]){ - vm.vesselSize = Math.ceil(data[0].vessel_size); - vm.vesselWeight = Math.ceil(data[0].vessel_weight); - vm.vesselDraft = Math.ceil(data[0].vessel_draft); - vm.vesselBeam = Math.ceil(data[0].vessel_beam); + vm.vesselSize = parseFloat(data[0].vessel_size); + vm.vesselWeight = parseFloat(data[0].vessel_weight); + vm.vesselDraft = parseFloat(data[0].vessel_draft); + vm.vesselBeam = parseFloat(data[0].vessel_beam); } else { console.log("Registration was not found."); } @@ -1196,7 +1196,7 @@ export default { if (booking_period.length > 1) { vm.mooring_book_row[index] = false; } else { - if (booking_period[0].status == 'closed' || booking_period[0].status == 'selected' || booking_period[0].status == 'perday' || booking_period[0].status == 'maxstay') { + if (booking_period[0].status == 'closed' || booking_period[0].status == 'selected' || booking_period[0].status == 'perday' || booking_period[0].status == 'maxstay' || booking_period[0].status == 'toofar' || booking_period[0].status == 'maxstay') { // vm.mooring_book_row[index] = 'disabled'; vm.mooring_book_row_disabled[index] = true; } diff --git a/mooring/frontend/exploreparks/src/parkfinder.vue b/mooring/frontend/exploreparks/src/parkfinder.vue index 5d308f0120..7a0f3beedd 100644 --- a/mooring/frontend/exploreparks/src/parkfinder.vue +++ b/mooring/frontend/exploreparks/src/parkfinder.vue @@ -49,19 +49,19 @@
- +
- +
- +
- +
- +