forge-joniko/ldc-jeusselin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'create-customer' into 'develop'

Browse source 
fix: 🐛 add missing fields when creating local customer when exists in CRM #30

See merge request ldc-web/projets/jeusselin!20
This commit is contained in:
Noix 2026-09-25 10:43:57 +00:00
commit 968ee32e8d
6 changed files with 36 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Auth/CrmUserProvider.php
View file

@ -129,7 +129,9 @@ class CrmUserProvider extends EloquentUserProvider implements UserProvider
{
/** @var \Illuminate\Database\Eloquent\Model $model */
$model = $this->usedModel::firstOrNew([
'email' => $crmCustomer->email
'email' => $crmCustomer->email,
'firstname' => $crmCustomer->firstname,
'lastname' => $crmCustomer->lastname,
]);
// @phpstan-ignore-next-line
$model->hashcode = $crmCustomer->hashcode;

6
app/Http/Controllers/Fo/Auth/LoginController.php
View file

@ -115,7 +115,11 @@ class LoginController extends Controller
}
/** @var \App\Models\Customer $customerModel */
$customerModel = new Customer(Arr::only($crmCustomer->jsonSerialize(), ['email']));
$customerModel = new Customer(Arr::only($crmCustomer->jsonSerialize(), [
'firstname',
'lastname',
'email',
]));
$customerModel->hashcode = $crmCustomer->hashcode;
if (!$customerModel->saveOrFail()) {

20
app/Http/Controllers/Fo/Auth/RegisterController.php
View file

@ -158,17 +158,17 @@ class RegisterController extends Controller
return \array_intersect_key(
$data,
[
'firstname' => '',
'lastname' => '',
'firstname' => '',
'lastname' => '',
'birth_date' => '',
'address' => '',
'postcode' => '',
'country' => '',
'city' => '',
'phone' => '',
'email' => '',
'password' => '',
'opt_in' => '',
'address' => '',
'postcode' => '',
'country' => '',
'city' => '',
'phone' => '',
'email' => '',
'password' => '',
'opt_in' => '',
]
);
}

3
app/Http/Controllers/Fo/Auth/ResetPasswordController.php
View file

@ -65,9 +65,6 @@ class ResetPasswordController extends Controller
*/
protected function resetPassword($customer, $password)
{
/** @var \App\Models\Customer\Customer $user */
/** @var string $password */
/** @var \LDC\LDCCRM\CrmApiV4 */
$crm = app('crmAPI');

16
app/Http/Resources/CustomerCrmResource.php
View file

@ -31,16 +31,16 @@ class CustomerCrmResource extends JsonResource
/** @var \LDC\LDCCRM\Models\Customer */
$crmCustomer = $this->customer->api_data;
return [
'hashcode' => $this->customer->hashcode,
'hashcode' => $this->customer->hashcode,
'firstname' => $crmCustomer->firstname,
'lastname' => $crmCustomer->lastname,
'opt_in' => $crmCustomer->opt_in,
'lastname' => $crmCustomer->lastname,
'opt_in' => $crmCustomer->opt_in,
'birthdate' => $crmCustomer->birth_date,
'phone' => $crmCustomer->phone,
'address' => $crmCustomer->address,
'address2' => $crmCustomer->address2,
'city' => $crmCustomer->city,
'postcode' => $crmCustomer->postcode
'phone' => $crmCustomer->phone,
'address' => $crmCustomer->address,
'address2' => $crmCustomer->address2,
'city' => $crmCustomer->city,
'postcode' => $crmCustomer->postcode
];
}
}

20
app/Models/Customer.php
View file

@ -284,17 +284,17 @@ class Customer extends Authenticatable implements MustVerifyEmail, CanResetPassw
parent::toArray(),
(array)$this->apiData
))->intersectByKeys([
'email' => '',
'firstname' => '',
'lastname' => '',
'address' => '',
'address2' => '',
'postcode' => '',
'email' => '',
'firstname' => '',
'lastname' => '',
'address' => '',
'address2' => '',
'postcode' => '',
'birth_date' => '',
'city' => '',
'country' => '',
'opt_in' => '',
'phone' => ''
'city' => '',
'country' => '',
'opt_in' => '',
'phone' => '',
])->toArray();
} else {
return parent::toArray();