diff --git a/resources/views/Shop/Orders/order.blade.php b/resources/views/Shop/Orders/order.blade.php
index 006d1f8f..ddddcb75 100644
--- a/resources/views/Shop/Orders/order.blade.php
+++ b/resources/views/Shop/Orders/order.blade.php
@@ -50,7 +50,7 @@
 
 @include('load.layout.chevron')
 
-@push('js')
+@prepend('js')
     <script>
         $('#customer').click(function() {
             $(".personal_data").addClass('d-none');
@@ -65,7 +65,9 @@
         });
 
         function refreshBasketTotal(deliveryId, deliveryTypeId) {
-            options = deliveryId + '/' + deliveryTypeId;
+            var safeDeliveryId = deliveryId !== undefined && deliveryId !== null ? deliveryId : '';
+            var safeDeliveryTypeId = deliveryTypeId !== undefined && deliveryTypeId !== null ? deliveryTypeId : '';
+            var options = safeDeliveryId + '/' + safeDeliveryTypeId;
             $.get("{{ Route('Shop.Basket.getBasketTotal') }}/" + options, function(data) {
                 $('#basketTotal').html(data);
             });
@@ -73,4 +75,4 @@
 
         initChevron();
     </script>
-@endpush
+@endprepend