new: add persistence of default address selection

app/Http/Controllers/Shop/CustomerController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Shop;
 use App\Repositories\Shop\CustomerAddresses;
 use App\Repositories\Shop\Customers;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Validator;
 
 class CustomerController extends Controller
 {
@@ -56,10 +57,89 @@ class CustomerController extends Controller
         return redirect()->route('Shop.Customers.edit');
     }
 
+    public function storeAddress(Request $request)
+    {
+        if (Customers::isNotConnected()) {
+            return response()->json(['message' => __('Authentification requise.')], 403);
+        }
+
+        $prefix = $request->input('prefix');
+        $types = ['deliveries' => 1, 'invoices' => 2];
+
+        if (! array_key_exists($prefix, $types)) {
+            return response()->json(['message' => __('Type d\'adresse inconnu.')], 422);
+        }
+
+        $addressData = $request->input($prefix, []);
+
+        $validator = Validator::make($addressData, [
+            'name' => ['nullable', 'string', 'max:150'],
+            'address' => ['required', 'string', 'max:255'],
+            'address2' => ['nullable', 'string', 'max:255'],
+            'zipcode' => ['required', 'string', 'max:30'],
+            'city' => ['required', 'string', 'max:255'],
+        ], [
+            'address.required' => __('Merci de renseigner l\'adresse.'),
+            'zipcode.required' => __('Merci de renseigner le code postal.'),
+            'city.required' => __('Merci de renseigner la ville.'),
+        ]);
+
+        if ($validator->fails()) {
+            return response()->json([
+                'message' => __('Merci de vérifier les informations saisies.'),
+                'errors' => $validator->errors(),
+            ], 422);
+        }
+
+        $data = $validator->validated();
+        $customerId = Customers::getId();
+        $data['customer_id'] = $customerId;
+        $data['type'] = $types[$prefix];
+
+        if (empty($data['name'])) {
+            $data['name'] = Customers::getName($customerId);
+        }
+
+        $address = CustomerAddresses::store($data);
+        CustomerAddresses::setDefault($customerId, $address->id, $types[$prefix]);
+
+        $html = view('Shop.Customers.partials.address_item', [
+            'address' => $address->toArray(),
+            'prefix' => $prefix,
+            'with_name' => true,
+            'selected' => $address->id,
+        ])->render();
+
+        return response()->json([
+            'success' => true,
+            'html' => $html,
+            'message' => __('Adresse enregistrée.'),
+            'id' => $address->id,
+        ]);
+    }
+
     public function delete_address($id)
     {
-        $ret = CustomerAddresses::destroy($id);
+        $address = CustomerAddresses::get($id);
 
-        return redirect()->route('Shop.Customers.edit');
+        if (! $address || (int) $address->customer_id !== (int) Customers::getId()) {
+            abort(404);
+        }
+
+        $remaining = CustomerAddresses::getModel()
+            ->byCustomer($address->customer_id)
+            ->byType($address->type)
+            ->count();
+
+        if ($remaining <= 1) {
+            return redirect()->route('Shop.Customers.edit')
+                ->with('growl', [__('Vous devez conserver au moins une adresse par type.'), 'warning']);
+        }
+
+        CustomerAddresses::destroy($id);
+        CustomerAddresses::ensureDefault($address->customer_id, $address->type);
+
+        return redirect()->route('Shop.Customers.edit')
+            ->with('growl', [__('Adresse supprimée.'), 'success']);
     }
 }

app/Repositories/Shop/CustomerAddresses.php

@@ -12,17 +12,35 @@ class CustomerAddresses
     public static function storeByCustomer($customer, $data)
     {
         $deliveries = $data['deliveries'] ?? false;
-        if ($deliveries && $deliveries['zipcode'] && $deliveries['city']) {
+        if ($deliveries) {
-            $deliveries['customer_id'] = $customer->id;
+            if (! empty($deliveries['address_id'])) {
-            $deliveries['type'] = 1;
+                self::setDefault($customer->id, (int) $deliveries['address_id'], 1);
-            self::store($deliveries);
+            }
+
+            if (! empty($deliveries['zipcode']) && ! empty($deliveries['city'])) {
+                $payload = $deliveries;
+                unset($payload['address_id']);
+                $payload['customer_id'] = $customer->id;
+                $payload['type'] = 1;
+                $newAddress = self::store($payload);
+                self::setDefault($customer->id, $newAddress->id, 1);
+            }
         }
 
         $invoices = $data['invoices'] ?? false;
-        if ($invoices && $invoices['zipcode'] && $invoices['city']) {
+        if ($invoices) {
-            $invoices['customer_id'] = $customer->id;
+            if (! empty($invoices['address_id'])) {
-            $invoices['type'] = 2;
+                self::setDefault($customer->id, (int) $invoices['address_id'], 2);
-            self::store($invoices);
+            }
+
+            if (! empty($invoices['zipcode']) && ! empty($invoices['city'])) {
+                $payload = $invoices;
+                unset($payload['address_id']);
+                $payload['customer_id'] = $customer->id;
+                $payload['type'] = 2;
+                $newAddress = self::store($payload);
+                self::setDefault($customer->id, $newAddress->id, 2);
+            }
         }
     }
 
@@ -70,14 +88,24 @@ class CustomerAddresses
 
     public static function getInvoiceAddress($customerId)
     {
-        $addresses = CustomerAddress::byCustomer($customerId)->byInvoicing()->get();
+        $address = CustomerAddress::byCustomer($customerId)
-        return count($addresses) ? $addresses->first() : self::getByCustomer($customerId);
+            ->byInvoicing()
+            ->orderByDesc('priority')
+            ->orderBy('id')
+            ->first();
+
+        return $address ?? self::getByCustomer($customerId);
     }
 
     public static function getDeliveryAddress($customerId)
     {
-        $addresses = CustomerAddress::byCustomer($customerId)->byDelivery()->get();
+        $address = CustomerAddress::byCustomer($customerId)
-        return count($addresses) ? $addresses->first() : self::getByCustomer($customerId);
+            ->byDelivery()
+            ->orderByDesc('priority')
+            ->orderBy('id')
+            ->first();
+
+        return $address ?? self::getByCustomer($customerId);
     }
 
     public static function getByCustomer($customerId = false)
@@ -92,6 +120,40 @@ class CustomerAddresses
         return ((int) $type === 1) ? '<i class="fa fa-fw fa-truck"></i>' : '<i class="fa fa-fw fa-file-invoice"></i>';
     }
 
+    public static function setDefault($customerId, $addressId, $type)
+    {
+        if (! $addressId) {
+            return;
+        }
+
+        $address = self::get($addressId);
+
+        if (! $address || (int) $address->customer_id !== (int) $customerId || (int) $address->type !== (int) $type) {
+            return;
+        }
+
+        self::getModel()->byCustomer($customerId)->byType($type)->update(['priority' => null]);
+
+        $address->priority = 1;
+        $address->save();
+    }
+
+    public static function ensureDefault($customerId, $type)
+    {
+        $hasDefault = self::getModel()->byCustomer($customerId)->byType($type)->where('priority', 1)->exists();
+
+        if ($hasDefault) {
+            return;
+        }
+
+        $address = self::getModel()->byCustomer($customerId)->byType($type)->orderBy('id')->first();
+
+        if ($address) {
+            $address->priority = 1;
+            $address->save();
+        }
+    }
+
     public static function toggleActive($id, $active)
     {
         return self::update(['active' => $active], $id);

app/Repositories/Shop/Customers.php

@@ -6,6 +6,7 @@ use App\Datatables\Shop\CustomerInvoicesDataTable;
 use App\Datatables\Shop\CustomerOrdersDataTable;
 use App\Models\Shop\Customer;
 use App\Traits\Model\Basic;
+use App\Repositories\Shop\CustomerAddresses;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
 
@@ -95,6 +96,16 @@ class Customers
         $data = $customer->toArray();
         $data['sale_channels'] = $customer->sale_channels->pluck('id')->toArray();
         $data['deliveries'] = Deliveries::getBySaleChannels($data['sale_channels'])->toArray();
+        $data['delivery_address_id'] = optional(CustomerAddresses::getDeliveryAddress($id))->id;
+        $data['invoice_address_id'] = optional(CustomerAddresses::getInvoiceAddress($id))->id;
+
+        if (! $data['delivery_address_id'] && ! empty($data['delivery_addresses'])) {
+            $data['delivery_address_id'] = $data['delivery_addresses'][0]['id'] ?? null;
+        }
+
+        if (! $data['invoice_address_id'] && ! empty($data['invoice_addresses'])) {
+            $data['invoice_address_id'] = $data['invoice_addresses'][0]['id'] ?? null;
+        }
 
         return $data;
     }
@@ -102,8 +113,8 @@ class Customers
     public static function storeFull($data)
     {
         $data2 = $data;
-        if ($data['sale_channels'] ?? false) {
+        $saleChannels = array_key_exists('sale_channels', $data) ? $data['sale_channels'] : null;
-            $saleChannels = $data['sale_channels'] ?? false;
+        if ($saleChannels !== null) {
             unset($data['sale_channels']);
         }
         if ($data['deliveries'] ?? false) {
@@ -113,7 +124,9 @@ class Customers
             unset($data['invoices']);
         }
         $customer = self::store($data);
-        $customer->sale_channels()->sync($saleChannels);
+        if ($saleChannels !== null) {
+            $customer->sale_channels()->sync($saleChannels);
+        }
         CustomerAddresses::storeByCustomer($customer, $data2);
 
         return $customer->id;

resources/shop/js/site.js

@@ -1,8 +1,34 @@
+// Simple notification helper used by blade templates (fallback to Bootstrap alerts)
+window.growl = function(message, type) {
+	var alertTypes = {
+		success: 'alert-success',
+		error: 'alert-danger',
+		warning: 'alert-warning',
+		info: 'alert-info'
+	};
+	var cssClass = alertTypes[type] || alertTypes.info;
+	var $container = $('#growl-container');
+
+	if (!$container.length) {
+		$container = $('<div id="growl-container" class="growl-container position-fixed w-100" style="top: 1rem; left: 0; z-index: 1080; pointer-events: none;"></div>');
+		$('body').append($container);
+	}
+
+	var $alert = $('<div class="alert ' + cssClass + ' alert-dismissible fade show mx-auto shadow" role="alert" style="max-width: 420px; pointer-events: all;"></div>');
+	$alert.append($('<span></span>').text(message));
+	$alert.append('<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>');
+	$container.append($alert);
+
+	setTimeout(function() {
+		$alert.alert('close');
+	}, 4000);
+};
+
 // Prevent closing from click inside dropdown
 $(document).on('click', '.dropdown-menu', function (e) {
 	e.stopPropagation();
 });
-  
+
 // make it as accordion for smaller screens
 if ($(window).width() < 992) {
 	$('.dropdown-menu a').click(function(e) {

resources/views/Shop/Customers/edit.blade.php

@@ -24,6 +24,7 @@
                     'prefix' => 'deliveries',
                     'addresses' => $customer['delivery_addresses'],
                     'with_name' => true,
+                    'selected' => $customer['delivery_address_id'] ?? null,
                 ])
             </x-card>
 
@@ -32,6 +33,7 @@
                     'prefix' => 'invoices',
                     'addresses' => $customer['invoice_addresses'],
                     'with_name' => true,
+                    'selected' => $customer['invoice_address_id'] ?? null,
                 ])
             </x-card>
 

resources/views/Shop/Customers/partials/address_item.blade.php

@@ -0,0 +1,25 @@
+<div class="row mt-3 address-row" data-address-id="{{ $address['id'] }}">
+    <div class="col-1">
+        @php
+            $inputName = isset($prefix) && $prefix ? $prefix.'[address_id]' : 'address_id';
+            $currentValue = $selected ?? null;
+        @endphp
+        <x-form.radios.icheck name="{{ $inputName }}" val="{{ $address['id'] }}"
+            :value="$currentValue" id="address_{{ $address['id'] }}" />
+    </div>
+    <div class="col-10">
+        @if ($with_name ?? false)
+            {{ $address['name'] ?? '' }}<br />
+        @endif
+        {{ $address['address'] }}<br />
+        @if (! empty($address['address2']))
+            {{ $address['address2'] }}<br />
+        @endif
+        {{ $address['zipcode'] }} {{ $address['city'] }}
+    </div>
+    <div class="col-1 text-right">
+        <a class="text-danger" href="{{ route('Shop.Customers.delete_address', ['id' => $address['id']]) }}">
+            <i class="fa fa-trash" data-id="{{ $address['id'] }}"></i>
+        </a>
+    </div>
+</div>

resources/views/Shop/Customers/partials/addresses.blade.php

@@ -1,26 +1,13 @@
-@foreach ($addresses ?? [] as $address)
+<div id="addresses_list_{{ $prefix }}" class="addresses-list">
-    <div class="row mt-3">
+    @foreach ($addresses ?? [] as $address)
-        <div class="col-1">
+        @include('Shop.Customers.partials.address_item', [
-            <x-form.radios.icheck name="@if ($prefix ?? false) {{ $prefix }} . '[]' @endif address_id"
+            'address' => $address,
-                val="{{ $address['id'] }}" id="address_{{ $address['id'] }}" />
+            'prefix' => $prefix ?? null,
-        </div>
+            'with_name' => $with_name ?? false,
-        <div class="col-10">
+            'selected' => $selected ?? null,
-            @if ($with_name ?? false)
+        ])
-                {{ $address['name'] }}<br />
+    @endforeach
-            @endif
+</div>
-            {{ $address['address'] }}<br />
-            @if ($address['address2'])
-                {{ $address['address2'] }}<br />
-            @endif
-            {{ $address['zipcode'] }} {{ $address['city'] }}
-        </div>
-        <div class="col-1">
-            <a href="{{ route('Shop.Customers.delete_address') }}/{{ $address['id'] }}">
-                <i class="fa fa-trash" class="delete" data-id="{{ $address['id'] }}"></i>
-            </a>
-        </div>
-    </div>
-@endforeach
 
 <div id="add_address_container_{{ $prefix }}" class="green-dark d-none mb-3 mt-3">
     <x-card classBody="bg-green-dark yellow" title="Nouvelle adresse" classTitle="h4">
@@ -31,6 +18,18 @@
             'label' => 'Adresse',
             'customer' => [],
         ])
+        <div class="row mt-3">
+            <div class="col-md-6 mb-2">
+                <x-form.button id="save_address_{{ $prefix }}" class="btn-success btn-sm btn-block"
+                    icon="fa-save" txt="Enregistrer cette adresse"
+                    :metadata="'data-prefix='.$prefix" />
+            </div>
+            <div class="col-md-6 mb-2">
+                <x-form.button id="cancel_address_{{ $prefix }}" class="btn-outline-light btn-sm btn-block"
+                    icon="fa-times" txt="Annuler"
+                    :metadata="'data-prefix='.$prefix" />
+            </div>
+        </div>
     </x-card>
 </div>
 
@@ -43,8 +42,63 @@
 
 @push('js')
     <script>
-        $('#add_address_{{ $prefix }}').click(function() {
+        (function() {
-            $('#add_address_container_{{ $prefix }}').toggleClass('d-none');
+            var prefix = '{{ $prefix }}';
-        })
+            var $formContainer = $('#add_address_container_{{ $prefix }}');
+            var $list = $('#addresses_list_{{ $prefix }}');
+            var storeUrl = '{{ route('Shop.Customers.address.store') }}';
+
+        $('#add_address_{{ $prefix }}').on('click', function() {
+            $formContainer.toggleClass('d-none');
+        });
+
+        $('#cancel_address_{{ $prefix }}').on('click', function() {
+            $formContainer.addClass('d-none');
+            $formContainer.find('input[type="text"]').val('');
+        });
+
+        $('#save_address_{{ $prefix }}').on('click', function() {
+            const data = $formContainer.find(':input').serialize();
+            $.ajax({
+                url: storeUrl,
+                method: 'POST',
+                data: data + '&prefix=' + prefix,
+                success: function(response) {
+                    if (response.html) {
+                        $list.append(response.html);
+                    }
+                    $formContainer.addClass('d-none');
+                    $formContainer.find('input[type="text"]').val('');
+                    if (response.id) {
+                        const $newRadio = $list.find('#address_' + response.id);
+                        $list.find('input[type="radio"]').not($newRadio).prop('checked', false);
+                        $newRadio.prop('checked', true);
+                    }
+                    if (typeof $.fn.iCheck === 'function') {
+                        $list.find('input[type="radio"]').iCheck('destroy');
+                        if (typeof initIcheck === 'function') {
+                            initIcheck('#addresses_list_{{ $prefix }} input[type="radio"]');
+                            if (response.id) {
+                                $list.find('#address_' + response.id).iCheck('check');
+                            }
+                        }
+                    }
+                    const message = response.message || '{{ __('Adresse enregistrée.') }}';
+                    if (typeof growl === 'function') {
+                        growl(message, 'success');
+                    }
+                },
+                error: function(xhr) {
+                    let message = '{{ __('Une erreur est survenue lors de l\'enregistrement de l\'adresse.') }}';
+                    if (xhr.responseJSON && xhr.responseJSON.message) {
+                        message = xhr.responseJSON.message;
+                    }
+                    if (typeof growl === 'function') {
+                        growl(message, 'error');
+                    }
+                }
+            });
+        });
+        })();
     </script>
 @endpush

routes/Shop/Customers.php

@@ -7,5 +7,6 @@ Route::prefix('Clients')->name('Customers.')->group(function () {
     Route::get('edit', 'CustomerController@edit')->name('edit');
     Route::post('storeProfileAjax', 'CustomerController@storeProfileAjax')->name('storeProfileAjax');
     Route::post('store', 'CustomerController@store')->name('store');
-    Route::get('delete_address/{$id?}', 'CustomerController@delete_address')->name('delete_address');
+    Route::post('address', 'CustomerController@storeAddress')->name('address.store');
+    Route::get('delete_address/{id}', 'CustomerController@delete_address')->name('delete_address');
 });