jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better management of shipping and basket summary display

Browse Source
This commit is contained in:
ludo
2023-12-03 00:40:47 +01:00
parent 4bcfc7bc6d
commit ec509df665
26 changed files with 317 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
resources/views/Shop/Orders/order.blade.php
View File

@@ -54,15 +54,6 @@
$('#personal_data').collapse('show');
});
$('#delivery_mode .delivery_mode').click(function() {
var test = $(this).hasClass('at_house');
if ($(this).hasClass('at_house')) {
$('#delivery_addresses').closest('.card').removeClass('d-none');
} else {
$('#delivery_addresses').closest('.card').addClass('d-none');
}
});
function refreshBasketTotal(deliveryId, deliveryTypeId) {
options = deliveryId + '/' + deliveryTypeId;
$.get("{{ Route('Shop.Basket.getBasketTotal') }}/" + options, function(data) {

6
resources/views/Shop/Orders/partials/addresses.blade.php
View File

@@ -3,10 +3,10 @@
<div class="row mb-3">
<div class="col-1">
@include('components.form.radios.icheck', [
'name' => 'address_id',
'name' => $prefix . '_address_id',
'val' => $address['id'],
'id' => 'address_' . $address['id'],
'value' => count($addresses) === 1 ? $address['id'] : false,
'id' => $prefix . '_address_' . $address['id'],
'value' => $address['priority'] || count($addresses) === 1 ? $address['id'] : false,
])
</div>
<div class="col-11">

23
resources/views/Shop/Orders/partials/deliveries.blade.php
View File

@@ -24,12 +24,21 @@ ci-contre
@push('js')
<script>
$('.delivery_mode').click(function() {
var deliveryTypeId = $(this).val();
var deliveryId = $('input[name=delivery_id]').val()
console.log(deliveryId);
console.log(deliveryTypeId);
refreshBasketTotal(deliveryId, deliveryTypeId)
});
function handleDeliveries() {
$('#delivery_mode input.delivery_mode').change(function() {
if ($(this).hasClass('at_house')) {
$('#delivery_addresses').closest('.card').removeClass('d-none');
var deliveryTypeId = $('input[name=delivery_type_id]:checked').val()
} else {
$('#delivery_addresses').closest('.card').addClass('d-none');
}
var deliveryId = $(this).val();
console.log(deliveryId);
console.log(deliveryTypeId);
refreshBasketTotal(deliveryId, deliveryTypeId);
});
}
handleDeliveries();
</script>
@endpush

2
resources/views/Shop/Orders/partials/registered.blade.php
View File

@@ -2,6 +2,7 @@
<x-layout.collapse id="invoice_addresses" title="Adresse de facturation" class="rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.addresses', [
'addresses' => $customer['invoice_addresses'] ?? false,
'prefix' => 'invoice',
])
</x-layout.collapse>
@@ -13,6 +14,7 @@
uncollapsed=true>
@include('Shop.Orders.partials.addresses', [
'addresses' => $customer['delivery_addresses'] ?? false,
'prefix' => 'delivery',
])
@include('Shop.Orders.partials.shipping')
</x-layout.collapse>

17
resources/views/Shop/Orders/partials/shipping.blade.php
View File

@@ -30,12 +30,15 @@
@push('js')
<script>
$('.delivery_type').click(function() {
var deliveryId = $(this).val();
var deliveryTypeId = $('input[name=delivery_type_id]').val()
console.log(deliveryId);
console.log(deliveryTypeId);
refreshBasketTotal(deliveryId, deliveryTypeId);
});
function handleDeliveryTypes() {
$('input.delivery_type').change(function() {
var deliveryTypeId = $(this).val();
var deliveryId = $('input[name=delivery_id]').val()
console.log(deliveryId);
console.log(deliveryTypeId);
refreshBasketTotal(deliveryId, deliveryTypeId);
});
}
handleDeliveryTypes();
</script>
@endpush