Merge branch '39-belgium-issues' into 'master'

Resolve "Retour récla export - problème sur la soumission des informations complémentaires"

See merge request ldc-web/projets/gen-game-web!43

app/Http/Controllers/Bo/CodeController.php

@@ -27,7 +27,7 @@ class CodeController extends Controller
         $this->authorize('generate', Code::class);
         /** @var \App\Models\Settings */
         $settings                = app(Settings::class);
-        $nbCodeBase              = Code::query()->count();
+        $nbCodeBase              = Code::query()->max('id');
         $nbCodeUsed              = Code::query()->whereHas(
             'participations',
             operator: '>',
@@ -126,7 +126,7 @@ class CodeController extends Controller
         $used_counter = null;
         if ($code) {
             $used_counter = Participation::query()
-                ->whereHas('code', fn (Builder $q) => $q->where('id', $code->id))
+                ->whereHas('code', fn(Builder $q) => $q->where('id', $code->id))
                 ->count();
         }
 

app/Http/Requests/Fo/Customers/CreateAccountRequest.php

@@ -50,12 +50,9 @@ class CreateAccountRequest extends FormRequest
         $authUser    = auth('frontend')->user();
         $countryCode = null;
 
-        if (request()->isMethod('get') && $authUser) {
-            $countryCode = (new CrmRepository())->fetchCrmCustomer($authUser)->country->value;
-        }
-        if (request()->isMethod('post') || request()->isMethod('put')) {
-            $countryCode = $this->integer('country');
-        }
+        $countryCode  = $this->integer('country') != 0 ?
+            $this->integer('country') : ($authUser ?
+                (new CrmRepository())->fetchCrmCustomer($authUser)->country->value : 0);
         $countryRules = match ($countryCode) {
             Country::belgium()->value => [
                 'phone' => 'phone:BE',

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "uwil/gen-game-web",
-    "version": "2.4.8",
+    "version": "2.4.9",
     "type": "project",
     "description": "Game generator",
     "support": {