ledger.checkout.utils: remove camelCase from session interface

ledger/checkout/serializers.py

@@ -64,11 +64,11 @@ class CheckoutSerializer(serializers.Serializer):
     fallback_url = serializers.URLField()
     return_preload_url = serializers.URLField(required=False, default=None)
     return_url = serializers.URLField()
-    associateInvoiceWithToken = serializers.BooleanField(default=False)
-    forceRedirect = serializers.BooleanField(default=False)
-    sendEmail = serializers.BooleanField(default=False)
+    associate_invoice_with_token = serializers.BooleanField(default=False)
+    force_redirect = serializers.BooleanField(default=False)
+    send_email = serializers.BooleanField(default=False)
     proxy = serializers.BooleanField(default=False)
-    checkoutWithToken = serializers.BooleanField(default=False)
+    checkout_token = serializers.BooleanField(default=False)
     bpay_format = serializers.ChoiceField(choices=['crn', 'icrn'], default='crn')
     icrn_format = serializers.ChoiceField(choices=['ICRNAMT', 'ICRNDATE', 'ICRNAMTDATE'], default='ICRNAMT')
     icrn_date = serializers.DateField(required=False, default=None)

ledger/checkout/utils.py

@@ -56,11 +56,6 @@ def create_basket_session(request, parameters):
 def create_checkout_session(request, parameters):
     serializer = serializers.CheckoutSerializer(data=parameters)
     serializer.is_valid(raise_exception=True)
-    # fields = [
-    #     'card_method', 'basket_owner', 'template', 'fallback_url', 'return_url', 
-    #     'return_preload_url', 'associateInvoiceWithToken', 'forceRedirect', 'sendEmail', 'proxy',
-    #     'checkoutWithToken', 'bpay_format', 'icrn_format', 'invoice_text', 'check_url'
-    # ]
 
     session_data = CheckoutSessionData(request) 
 
@@ -79,11 +74,11 @@ def create_checkout_session(request, parameters):
     # fallback url?
     session_data.return_to(serializer.validated_data['return_url'])
     session_data.return_preload_to(serializer.validated_data['return_preload_url'])
-    session_data.associate_invoice(serializer.validated_data['associateInvoiceWithToken'])
-    session_data.redirect_forcefully(serializer.validated_data['forceRedirect'])
-    session_data.return_email(serializer.validated_data['sendEmail'])
+    session_data.associate_invoice(serializer.validated_data['associate_invoice_with_token'])
+    session_data.redirect_forcefully(serializer.validated_data['force_redirect'])
+    session_data.return_email(serializer.validated_data['send_email'])
     session_data.is_proxy(serializer.validated_data['proxy'])
-    session_data.checkout_using_token(serializer.validated_data['checkoutWithToken'])
+    session_data.checkout_using_token(serializer.validated_data['checkout_token'])
 
     session_data.bpay_using(serializer.validated_data['bpay_format'])
     session_data.icrn_using(serializer.validated_data['icrn_format'])
@@ -183,7 +178,7 @@ def bpay_due(self):
     def checkout_using_token(self, token):
         self._set('ledger','checkout_token',token)
 
-    def checkoutWithToken(self):
+    def checkout_token(self):
         return self._get('ledger','checkout_token')
 
     # Associate token to invoice

ledger/checkout/views.py

@@ -194,7 +194,7 @@ def post(self, request, *args, **kwargs):
     def do_place_order(self, request):
         # Helper method to check that the hidden forms wasn't tinkered
         # with.
-        if not self.checkout_session.checkoutWithToken():
+        if not self.checkout_session.checkout_token():
             bankcard_form = forms.BankcardForm(request.POST)
             if not bankcard_form.is_valid():
                 messages.error(request, "Invalid submission")
@@ -203,7 +203,7 @@ def do_place_order(self, request):
         # Attempt to submit the order, passing the bankcard object so that it
         # gets passed back to the 'handle_payment' method below.
         submission = self.build_submission()
-        if not self.checkout_session.checkoutWithToken():
+        if not self.checkout_session.checkout_token():
             submission['payment_kwargs']['bankcard'] = bankcard_form.bankcard
         return self.submit(**submission)
 
@@ -282,9 +282,9 @@ def handle_payment(self, order_number, total, **kwargs):
                         # Get the payment action for bpoint
                         card_method = self.checkout_session.card_method()
                         # Check if the user is paying using a stored card
-                        if self.checkout_session.checkoutWithToken():
+                        if self.checkout_session.checkout_token():
                             try:
-                                token = BpointToken.objects.get(id=self.checkout_session.checkoutWithToken())
+                                token = BpointToken.objects.get(id=self.checkout_session.checkout_token())
                             except BpointToken.DoesNotExist:
                                 raise ValueError('This stored card does not exist.')
                             if self.checkout_session.invoice_association():

parkstay/utils.py

@@ -858,7 +858,7 @@ def checkout(request, booking, lines, invoice_text=None, vouchers=[], internal=F
         'fallback_url': request.build_absolute_uri('/'),
         'return_url': request.build_absolute_uri(reverse('public_booking_success')),
         'return_preload_url': request.build_absolute_uri(reverse('public_booking_success')),
-        'forceRedirect': True,
+        'force_redirect': True,
         'proxy': True if internal else False,
         'invoice_text': invoice_text,
     }

wildlifelicensing/apps/payments/views.py

@@ -54,11 +54,10 @@ def get(self, request, *args, **kwargs):
         checkout_params = {
             'system': PAYMENT_SYSTEM_ID,
             'basket_owner': user,
-            'associateInvoiceWithToken': True,
-            'checkoutWithToken': True,
+            'associate_invoice_with_token': True,
             'fallback_url': error_url,
             'return_url': success_url,
-            'forceRedirect': True,
+            'force_redirect': True,
             'template': 'wl/payment_information.html',
             'proxy': is_officer(request.user),
         }