diff --git a/digitalglarus/mixins.py b/digitalglarus/mixins.py index 7c214e14..d4962129 100644 --- a/digitalglarus/mixins.py +++ b/digitalglarus/mixins.py @@ -48,6 +48,7 @@ class Ordereable(models.Model): @classmethod def create(cls, data): stripe_charge = data.pop('stripe_charge', None) + del(data['status']) instance = cls.objects.create(**data) if not stripe_charge: return instance diff --git a/digitalglarus/templates/digitalglarus/booking.html b/digitalglarus/templates/digitalglarus/booking.html index 85b15fd2..f8b2bc6a 100644 --- a/digitalglarus/templates/digitalglarus/booking.html +++ b/digitalglarus/templates/digitalglarus/booking.html @@ -11,8 +11,12 @@ <div class="signup-box"> <span class="glyphicon glyphicon-plus"></span> <h2 class="section-heading">Booking</h2> - <h2 class="signup-lead">Start coworking at Digital Glarus! <br> Membership costs only - <strong>35CHF</strong> per month.<br> 2 free working days included!</h2> + <h2 class="signup-lead"> + + When do you want to cowork? <br> + All members have 2 free days per month! <br> + Additional days cost <strong>15CHF</strong>. <br> + Work more, get more days free! <hr class="primary"> <div class="signup-form form-group row"> <div class="col-md-12"> diff --git a/digitalglarus/templates/digitalglarus/booking_orders_detail.html b/digitalglarus/templates/digitalglarus/booking_orders_detail.html index 725e58d7..8163b7cb 100644 --- a/digitalglarus/templates/digitalglarus/booking_orders_detail.html +++ b/digitalglarus/templates/digitalglarus/booking_orders_detail.html @@ -87,9 +87,11 @@ </div> <div class="modal-body"> <p>Do you want to cancel your booking?</p> + {% if booking_required %} <p> Your booking is within 7 days. You may cancel your booking but the fees will not be refunded. Your booking can be only cancelled freely until 7 days before the booked date. </p> + {% endif %} </div> <div class="modal-footer text-center"> <button type="button" class="btn btn-primary btn-grey" data-dismiss="modal">No</button> diff --git a/digitalglarus/templates/digitalglarus/booking_payment.html b/digitalglarus/templates/digitalglarus/booking_payment.html index acf459b2..df9bfa69 100644 --- a/digitalglarus/templates/digitalglarus/booking_payment.html +++ b/digitalglarus/templates/digitalglarus/booking_payment.html @@ -56,7 +56,7 @@ <hr class="greyline-long"> <br/> - <h2 class="billing-head">Your Booking is TOTALLY FREE</h2> + <h2 class="billing-head">Your booking is FREE of charge! You can change or cancel the booking freely 7 days before the booking date.</h2> <br/><br/> {% else %} <h2 class="billing-head">Billing Adress</h2> diff --git a/digitalglarus/views.py b/digitalglarus/views.py index b47fdf0a..f862ff24 100644 --- a/digitalglarus/views.py +++ b/digitalglarus/views.py @@ -718,6 +718,7 @@ class OrdersBookingDetailView(LoginRequiredMixin, UpdateView): 'free_days': free_days, 'start_date': start_date.strftime('%m/%d/%Y'), 'end_date': end_date.strftime('%m/%d/%Y'), + 'booking_required': bookig_order.refund_required(), }) return context