Skip to content
This repository was archived by the owner on Apr 29, 2022. It is now read-only.

Commit 9e8379e

Browse files
committed
Start to disable the code for the hotel and the sim card (just if 0: in the code)
1 parent bd2e4f8 commit 9e8379e

File tree

5 files changed

+626
-611
lines changed

5 files changed

+626
-611
lines changed

p3/admin.py

Lines changed: 75 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -374,87 +374,89 @@ def _name(self, o):
374374

375375
admin.site.register(models.Donation, DonationAdmin)
376376

377-
class HotelBookingAdmin(admin.ModelAdmin):
378-
list_display = ('conference', 'booking_start', 'booking_end', 'minimum_night')
379-
380-
admin.site.register(models.HotelBooking, HotelBookingAdmin)
381-
382-
class HotelRoomAdmin(admin.ModelAdmin):
383-
list_display = ('_conference', 'room_type', 'quantity', 'amount',)
384-
list_editable = ('quantity', 'amount',)
385-
list_filter = ('booking__conference',)
386-
list_select_related = True
387-
388-
def _conference(self, o):
389-
return o.booking.conference_id
390-
391-
def get_urls(self):
392-
urls = super(HotelRoomAdmin, self).get_urls()
393-
my_urls = patterns('',
394-
url(r'^tickets/$', self.admin_site.admin_view(self.ticket_list), name='p3-hotelrooms-tickets-data'),
395-
)
396-
return my_urls + urls
397-
398-
def ticket_list(self, request):
399-
from common.jsonify import json_dumps
400-
day_ix = int(request.GET['day'])
401-
room_type = request.GET['type']
402-
rdays = models.TicketRoom.objects.reserved_days()
403-
day = rdays[day_ix]
404-
405-
qs = models.TicketRoom.objects.valid_tickets()\
406-
.filter(room_type__room_type=room_type, checkin__lte=day, checkout__gte=day)\
407-
.select_related('ticket__user', 'ticket__orderitem__order')\
408-
.order_by('ticket__orderitem__order__created')
409-
410-
output = []
411-
for row in qs:
412-
user = row.ticket.user
413-
order = row.ticket.orderitem.order
414-
name = u'{0} {1}'.format(user.first_name, user.last_name)
415-
if row.ticket.name and row.ticket.name != name:
416-
name = u'{0} ({1})'.format(row.ticket.name, name)
417-
output.append({
418-
'user': {
419-
'id': user.id,
420-
'name': name,
421-
},
422-
'order': {
423-
'id': order.id,
424-
'code': order.code,
425-
'method': order.method,
426-
'complete': order._complete,
427-
},
428-
'period': (row.checkin, row.checkout, row.checkout == day),
429-
})
430-
return http.HttpResponse(json_dumps(output), 'text/javascript')
377+
if 0: # FIXME: remove hotels and sim
378+
class HotelBookingAdmin(admin.ModelAdmin):
379+
list_display = ('conference', 'booking_start', 'booking_end', 'minimum_night')
380+
381+
admin.site.register(models.HotelBooking, HotelBookingAdmin)
382+
383+
384+
class HotelRoomAdmin(admin.ModelAdmin):
385+
list_display = ('_conference', 'room_type', 'quantity', 'amount',)
386+
list_editable = ('quantity', 'amount',)
387+
list_filter = ('booking__conference',)
388+
list_select_related = True
389+
390+
def _conference(self, o):
391+
return o.booking.conference_id
392+
393+
def get_urls(self):
394+
urls = super(HotelRoomAdmin, self).get_urls()
395+
my_urls = patterns('',
396+
url(r'^tickets/$', self.admin_site.admin_view(self.ticket_list), name='p3-hotelrooms-tickets-data'),
397+
)
398+
return my_urls + urls
399+
400+
def ticket_list(self, request):
401+
from common.jsonify import json_dumps
402+
day_ix = int(request.GET['day'])
403+
room_type = request.GET['type']
404+
rdays = models.TicketRoom.objects.reserved_days()
405+
day = rdays[day_ix]
406+
407+
qs = models.TicketRoom.objects.valid_tickets()\
408+
.filter(room_type__room_type=room_type, checkin__lte=day, checkout__gte=day)\
409+
.select_related('ticket__user', 'ticket__orderitem__order')\
410+
.order_by('ticket__orderitem__order__created')
411+
412+
output = []
413+
for row in qs:
414+
user = row.ticket.user
415+
order = row.ticket.orderitem.order
416+
name = u'{0} {1}'.format(user.first_name, user.last_name)
417+
if row.ticket.name and row.ticket.name != name:
418+
name = u'{0} ({1})'.format(row.ticket.name, name)
419+
output.append({
420+
'user': {
421+
'id': user.id,
422+
'name': name,
423+
},
424+
'order': {
425+
'id': order.id,
426+
'code': order.code,
427+
'method': order.method,
428+
'complete': order._complete,
429+
},
430+
'period': (row.checkin, row.checkout, row.checkout == day),
431+
})
432+
return http.HttpResponse(json_dumps(output), 'text/javascript')
431433

432-
admin.site.register(models.HotelRoom, HotelRoomAdmin)
434+
admin.site.register(models.HotelRoom, HotelRoomAdmin)
433435

434-
class TicketRoomAdmin(admin.ModelAdmin):
435-
list_display = ('_user', '_room_type', 'ticket_type', 'checkin', 'checkout', '_order_code', '_order_date', '_order_confirmed')
436-
list_select_related = True
437-
search_fields = ('ticket__user__first_name', 'ticket__user__last_name', 'ticket__user__email', 'ticket__orderitem__order__code')
438-
raw_id_fields = ('ticket', )
439-
list_filter = ('room_type__room_type',)
436+
class TicketRoomAdmin(admin.ModelAdmin):
437+
list_display = ('_user', '_room_type', 'ticket_type', 'checkin', 'checkout', '_order_code', '_order_date', '_order_confirmed')
438+
list_select_related = True
439+
search_fields = ('ticket__user__first_name', 'ticket__user__last_name', 'ticket__user__email', 'ticket__orderitem__order__code')
440+
raw_id_fields = ('ticket', )
441+
list_filter = ('room_type__room_type',)
440442

441-
def _user(self, o):
442-
return o.ticket.user
443+
def _user(self, o):
444+
return o.ticket.user
443445

444-
def _room_type(self, o):
445-
return o.room_type.get_room_type_display()
446+
def _room_type(self, o):
447+
return o.room_type.get_room_type_display()
446448

447-
def _order_code(self, o):
448-
return o.ticket.orderitem.order.code
449+
def _order_code(self, o):
450+
return o.ticket.orderitem.order.code
449451

450-
def _order_date(self, o):
451-
return o.ticket.orderitem.order.created
452+
def _order_date(self, o):
453+
return o.ticket.orderitem.order.created
452454

453-
def _order_confirmed(self, o):
454-
return o.ticket.orderitem.order._complete
455-
_order_confirmed.boolean = True
455+
def _order_confirmed(self, o):
456+
return o.ticket.orderitem.order._complete
457+
_order_confirmed.boolean = True
456458

457-
admin.site.register(models.TicketRoom, TicketRoomAdmin)
459+
admin.site.register(models.TicketRoom, TicketRoomAdmin)
458460

459461

460462
class InvoiceAdmin(aadmin.InvoiceAdmin):

0 commit comments

Comments
 (0)