Skip to content

Commit

Permalink
Merge pull request #77 from crab85193/dev_crab
Browse files Browse the repository at this point in the history
fix: デモ会向け修正
  • Loading branch information
crab85193 authored Dec 5, 2023
2 parents d4f54da + 477850a commit ff2f719
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions main_app/views/reservation.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ def form_valid(self, form):

obj_parent = ReservationParent.objects.create(
user = self.request.user,
shop_tel_number = "00000000000",
shop_name = "test",
shop_tel_number = "08042897797",
shop_name = "ガールズバー Macherie(マシェリ)",
reservation_datetime = data["reservation_datetime"],
num_people = data["num_people"],
representative_name = data["representative_name"],
Expand Down
4 changes: 2 additions & 2 deletions main_app/views/twilio.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def get(self, request, *args, **kwargs):
)

obj_parent.is_end = True
obj_parent.end_datetime = timezone.now
obj_parent.end_datetime = timezone.now()
obj_parent.save()

elif digit_pressed == "2":
Expand All @@ -130,7 +130,7 @@ def get(self, request, *args, **kwargs):
)

obj_parent.is_end = True
obj_parent.end_datetime = timezone.now
obj_parent.end_datetime = timezone.now()
obj_parent.save()

else:
Expand Down
2 changes: 1 addition & 1 deletion templates/main_app/reservation/reservation_done.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h5 class="card-title text-center pb-0 fs-4">予約が完了しました</h5>

<div class="row g-3 needs-validation justify-content-center">
<div class="col-8 d-flex flex-column align-items-center py-2">
<button class="btn btn-primary w-100" type="submit">予約状況を見る</button>
<a href="{% url 'main_app:reservation_list' %}" class="btn btn-primary w-100">予約状況を見る</a>
</div>
</div>

Expand Down

0 comments on commit ff2f719

Please sign in to comment.