Booking pre-payment
This commit is contained in:
parent
e3616ee7f8
commit
dad4c5f5a3
23
apps/booking/migrations/0003_auto_20191025_1613.py
Normal file
23
apps/booking/migrations/0003_auto_20191025_1613.py
Normal file
|
|
@ -0,0 +1,23 @@
|
||||||
|
# Generated by Django 2.2.4 on 2019-10-25 16:13
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('booking', '0002_auto_20191003_1601'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='booking',
|
||||||
|
name='amount',
|
||||||
|
field=models.CharField(default=None, max_length=30, null=True, verbose_name='prepayment price'),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='booking',
|
||||||
|
name='stripe_key',
|
||||||
|
field=models.TextField(default=None, null=True, verbose_name='stripe service payment key'),
|
||||||
|
),
|
||||||
|
]
|
||||||
18
apps/booking/migrations/0004_booking_stripe_token.py
Normal file
18
apps/booking/migrations/0004_booking_stripe_token.py
Normal file
|
|
@ -0,0 +1,18 @@
|
||||||
|
# Generated by Django 2.2.4 on 2019-10-25 16:50
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('booking', '0003_auto_20191025_1613'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='booking',
|
||||||
|
name='stripe_token',
|
||||||
|
field=models.TextField(default=None, null=True, verbose_name='stripe service pre-payed booking toking'),
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
@ -24,6 +24,9 @@ class Booking(ProjectBaseMixin):
|
||||||
pending_booking_id = models.TextField(verbose_name=_('external service pending booking'), default=None)
|
pending_booking_id = models.TextField(verbose_name=_('external service pending booking'), default=None)
|
||||||
booking_id = models.TextField(verbose_name=_('external service booking id'), default=None, null=True,
|
booking_id = models.TextField(verbose_name=_('external service booking id'), default=None, null=True,
|
||||||
db_index=True, )
|
db_index=True, )
|
||||||
|
stripe_key = models.TextField(null=True, default=None, verbose_name=_('stripe service payment key'))
|
||||||
|
stripe_token = models.TextField(null=True, default=None, verbose_name=_('stripe service pre-payed booking toking'))
|
||||||
|
amount = models.CharField(null=True, default=None, verbose_name=_('prepayment price'), max_length=30)
|
||||||
user = models.ForeignKey(
|
user = models.ForeignKey(
|
||||||
'account.User', verbose_name=_('booking owner'), null=True,
|
'account.User', verbose_name=_('booking owner'), null=True,
|
||||||
related_name='bookings',
|
related_name='bookings',
|
||||||
|
|
|
||||||
|
|
@ -79,9 +79,10 @@ class GuestonlineService(AbstractBookingService):
|
||||||
self.response = response
|
self.response = response
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def commit_booking(self, payload):
|
def commit_booking(self, payload, stripe_token = None):
|
||||||
url = f'{self.url}v1/pending_bookings/{payload}/commit'
|
url = f'{self.url}v1/pending_bookings/{payload}/commit'
|
||||||
r = requests.put(url, headers=self.get_common_headers())
|
r = requests.put(url, headers=self.get_common_headers(),
|
||||||
|
data=json.dumps({'stripe_token': stripe_token} if stripe_token else None))
|
||||||
self.response = json.loads(r.content)
|
self.response = json.loads(r.content)
|
||||||
if status.is_success(r.status_code) and self.response is None:
|
if status.is_success(r.status_code) and self.response is None:
|
||||||
raise serializers.ValidationError(detail='Booking already committed.')
|
raise serializers.ValidationError(detail='Booking already committed.')
|
||||||
|
|
@ -95,6 +96,8 @@ class GuestonlineService(AbstractBookingService):
|
||||||
payload['mobile_phone'] = payload.pop('phone')
|
payload['mobile_phone'] = payload.pop('phone')
|
||||||
headers = self.get_common_headers()
|
headers = self.get_common_headers()
|
||||||
r = requests.put(url, headers=headers, data=json.dumps({'contact_info': payload}))
|
r = requests.put(url, headers=headers, data=json.dumps({'contact_info': payload}))
|
||||||
|
response = r.json()
|
||||||
|
self.response = response.get('prepayment')
|
||||||
return status.is_success(r.status_code)
|
return status.is_success(r.status_code)
|
||||||
|
|
||||||
def create_booking(self, payload):
|
def create_booking(self, payload):
|
||||||
|
|
|
||||||
|
|
@ -42,13 +42,29 @@ class PendingBookingSerializer(serializers.ModelSerializer):
|
||||||
'user',
|
'user',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
class CommitBookingSerializer(serializers.ModelSerializer):
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = models.Booking
|
||||||
|
fields = (
|
||||||
|
'stripe_token',
|
||||||
|
)
|
||||||
|
|
||||||
|
def update(self, instance, validated_data):
|
||||||
|
"""Override update method"""
|
||||||
|
# Update user password from instance
|
||||||
|
service = instance.get_service_by_type(instance.type)
|
||||||
|
service.commit_booking(instance.pending_booking_id, validated_data.get('stripe_token'))
|
||||||
|
instance.stripe_token = validated_data.get('stripe_token')
|
||||||
|
instance.save()
|
||||||
|
return instance
|
||||||
|
|
||||||
class UpdateBookingSerializer(serializers.ModelSerializer):
|
class UpdateBookingSerializer(serializers.ModelSerializer):
|
||||||
id = serializers.ReadOnlyField()
|
id = serializers.ReadOnlyField()
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = models.Booking
|
model = models.Booking
|
||||||
fields = ('booking_id', 'id')
|
fields = ('booking_id', 'id', 'stripe_key', 'amount')
|
||||||
|
|
||||||
|
|
||||||
class GetBookingSerializer(serializers.ModelSerializer):
|
class GetBookingSerializer(serializers.ModelSerializer):
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ urlpatterns = [
|
||||||
path('<int:establishment_id>/check/', views.CheckWhetherBookingAvailable.as_view(), name='booking-check'),
|
path('<int:establishment_id>/check/', views.CheckWhetherBookingAvailable.as_view(), name='booking-check'),
|
||||||
path('<int:establishment_id>/create/', views.CreatePendingBooking.as_view(), name='create-pending-booking'),
|
path('<int:establishment_id>/create/', views.CreatePendingBooking.as_view(), name='create-pending-booking'),
|
||||||
path('<int:pk>/', views.UpdatePendingBooking.as_view(), name='update-pending-booking'),
|
path('<int:pk>/', views.UpdatePendingBooking.as_view(), name='update-pending-booking'),
|
||||||
|
path('<int:pk>/commit/', views.CommitPendingBooking.as_view(), name='update-pending-booking'),
|
||||||
path('<int:pk>/cancel/', views.CancelBooking.as_view(), name='cancel-existing-booking'),
|
path('<int:pk>/cancel/', views.CancelBooking.as_view(), name='cancel-existing-booking'),
|
||||||
path('last/', views.LastBooking.as_view(), name='last_booking-for-authorizer-user'),
|
path('last/', views.LastBooking.as_view(), name='last_booking-for-authorizer-user'),
|
||||||
path('retrieve/<int:pk>/', views.GetBookingById.as_view(), name='retrieves-booking-by-id'),
|
path('retrieve/<int:pk>/', views.GetBookingById.as_view(), name='retrieves-booking-by-id'),
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
from rest_framework import generics, permissions, status, serializers
|
|
||||||
|
|
||||||
from django.shortcuts import get_object_or_404
|
from django.shortcuts import get_object_or_404
|
||||||
from establishment.models import Establishment
|
from rest_framework import generics, permissions, status, serializers
|
||||||
from booking.models.models import Booking, GuestonlineService, LastableService
|
|
||||||
from rest_framework.response import Response
|
from rest_framework.response import Response
|
||||||
from booking.serializers.web import (PendingBookingSerializer,
|
|
||||||
UpdateBookingSerializer, GetBookingSerializer, CheckBookingSerializer)
|
from booking.models.models import Booking, GuestonlineService, LastableService
|
||||||
|
from booking.serializers.web import (PendingBookingSerializer, UpdateBookingSerializer, GetBookingSerializer,
|
||||||
|
CheckBookingSerializer, CommitBookingSerializer)
|
||||||
|
from establishment.models import Establishment
|
||||||
|
|
||||||
|
|
||||||
class CheckWhetherBookingAvailable(generics.GenericAPIView):
|
class CheckWhetherBookingAvailable(generics.GenericAPIView):
|
||||||
|
|
@ -70,6 +70,13 @@ class CreatePendingBooking(generics.CreateAPIView):
|
||||||
return Response(status=status.HTTP_201_CREATED, data=serializer.data)
|
return Response(status=status.HTTP_201_CREATED, data=serializer.data)
|
||||||
|
|
||||||
|
|
||||||
|
class CommitPendingBooking(generics.UpdateAPIView):
|
||||||
|
""" Commit pending booking """
|
||||||
|
queryset = Booking.objects.all()
|
||||||
|
permission_classes = (permissions.AllowAny,)
|
||||||
|
serializer_class = CommitBookingSerializer
|
||||||
|
|
||||||
|
|
||||||
class UpdatePendingBooking(generics.UpdateAPIView):
|
class UpdatePendingBooking(generics.UpdateAPIView):
|
||||||
""" Update pending booking with contacts """
|
""" Update pending booking with contacts """
|
||||||
queryset = Booking.objects.all()
|
queryset = Booking.objects.all()
|
||||||
|
|
@ -84,6 +91,19 @@ class UpdatePendingBooking(generics.UpdateAPIView):
|
||||||
service.update_booking(service.get_certain_keys(data, {
|
service.update_booking(service.get_certain_keys(data, {
|
||||||
'email', 'phone', 'last_name', 'first_name', 'country_code', 'pending_booking_id',
|
'email', 'phone', 'last_name', 'first_name', 'country_code', 'pending_booking_id',
|
||||||
}))
|
}))
|
||||||
|
if service.response:
|
||||||
|
# если есть предоплата, возвращаем фронту страйп-ключ для совершения оплаты и цену
|
||||||
|
amount = service.response.get('amount')
|
||||||
|
stripe_key = service.response.get('stripe_key')
|
||||||
|
data = {
|
||||||
|
'id': instance.pk,
|
||||||
|
'amount': amount,
|
||||||
|
'stripe_key': stripe_key,
|
||||||
|
}
|
||||||
|
serializer = self.get_serializer(data=data)
|
||||||
|
serializer.is_valid(raise_exception=True)
|
||||||
|
serializer.update(instance, data)
|
||||||
|
return Response(status=status.HTTP_200_OK, data=data)
|
||||||
service.commit_booking(data['pending_booking_id'])
|
service.commit_booking(data['pending_booking_id'])
|
||||||
data = {
|
data = {
|
||||||
'booking_id': service.response.get('id'),
|
'booking_id': service.response.get('id'),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user