From 7240c5e35df867fa730b1b2b22ee92bc89510698 Mon Sep 17 00:00:00 2001 From: Noah Lancien Date: Wed, 29 Oct 2025 12:42:18 +0100 Subject: [PATCH] fix: review feedback --- .../Controllers/Fo/CustomerController.php | 1 - .../Controllers/Fo/DiscountController.php | 3 +- .../Controllers/Fo/ParticipateController.php | 1 - .../Requests/Fo/MesBr/PrintCouponsRequest.php | 30 ------------------- app/Lib/vendor/LDCWEB/MesBr.php | 15 +++++----- app/Providers/MesBrApiServiceProvider.php | 3 +- resources/ts/pages/prizes.ts | 14 --------- 7 files changed, 10 insertions(+), 57 deletions(-) delete mode 100644 app/Http/Requests/Fo/MesBr/PrintCouponsRequest.php delete mode 100644 resources/ts/pages/prizes.ts diff --git a/app/Http/Controllers/Fo/CustomerController.php b/app/Http/Controllers/Fo/CustomerController.php index 420fa93..95336df 100644 --- a/app/Http/Controllers/Fo/CustomerController.php +++ b/app/Http/Controllers/Fo/CustomerController.php @@ -136,7 +136,6 @@ class CustomerController extends Controller ->with(['instantWin'])->where(function (Builder $q) { $q->whereHas('instantWin'); })->get(); - $coupons = []; return view('theme::pages.participation.winning-participations', compact('winningList', 'canPrint')); } diff --git a/app/Http/Controllers/Fo/DiscountController.php b/app/Http/Controllers/Fo/DiscountController.php index 8e6dd74..231e4f9 100644 --- a/app/Http/Controllers/Fo/DiscountController.php +++ b/app/Http/Controllers/Fo/DiscountController.php @@ -12,10 +12,9 @@ class DiscountController extends Controller /** * Fetch PDF BR. * - * @param \App\Http\Requests\Club\MesBr\PrintCouponsRequest $request * @return \Symfony\Component\HttpFoundation\StreamedResponse */ - public function fetchBrPdf(PrintCouponsRequest $request): \Symfony\Component\HttpFoundation\StreamedResponse + public function fetchBrPdf(): \Symfony\Component\HttpFoundation\StreamedResponse { /** @var \App\Models\Customer $customer */ $customer = auth('frontend')->user(); diff --git a/app/Http/Controllers/Fo/ParticipateController.php b/app/Http/Controllers/Fo/ParticipateController.php index 78c3672..8a45bf1 100644 --- a/app/Http/Controllers/Fo/ParticipateController.php +++ b/app/Http/Controllers/Fo/ParticipateController.php @@ -220,7 +220,6 @@ class ParticipateController extends Controller // * Maj Panier $result = $mesBr->updateBasket( $crmUser, - $settings->discounts_site, strval($discount->web_coupon_identifiant) ); diff --git a/app/Http/Requests/Fo/MesBr/PrintCouponsRequest.php b/app/Http/Requests/Fo/MesBr/PrintCouponsRequest.php deleted file mode 100644 index 4a5dc79..0000000 --- a/app/Http/Requests/Fo/MesBr/PrintCouponsRequest.php +++ /dev/null @@ -1,30 +0,0 @@ -check(); - } - - /** - * Get the validation rules that apply to the request. - * - * @return array|string> - */ - public function rules(): array - { - return [ - // 'hashcode' => 'required|string|exists:customers,hashcode', - ]; - } -} diff --git a/app/Lib/vendor/LDCWEB/MesBr.php b/app/Lib/vendor/LDCWEB/MesBr.php index a115baa..6143257 100644 --- a/app/Lib/vendor/LDCWEB/MesBr.php +++ b/app/Lib/vendor/LDCWEB/MesBr.php @@ -11,10 +11,13 @@ class MesBr private $refCamp; - public function __construct($endpoint, $refCamp) + private $refSite; + + public function __construct($endpoint, $refCamp, $refSite) { $this->endpoint = $endpoint; $this->refCamp = $refCamp; + $this->refSite = $refSite; } public function createCustomer(string $hashcode, string $email, string $country) @@ -146,25 +149,21 @@ class MesBr * Update basket * * @param \LDC\LDCCRM\Models\Customer $crm_customer - * @param string $ref_site * @param string $coupon_id * @param integer $quantity * @return array * 'status' => 'OK', - * 'link' => URL, - * 'verif' => URL, - * 'basketId' => 'ID' + * 'ref' => 'Basket REF' */ public function updateBasket( Customer $crm_customer, - string $ref_site, string $coupon_id, int $quantity = 1 ): array { $res = $this->callAPI("GET", "/customer/basket/update", [ - 'refsite' => $ref_site, + 'refsite' => $this->refSite, 'refcamp' => $this->refCamp, - 'refadherent' => $crm_customer->hashcode, + 'customer_hashcode' => $crm_customer->hashcode, 'panier' => "({$quantity}){$coupon_id}" ]); diff --git a/app/Providers/MesBrApiServiceProvider.php b/app/Providers/MesBrApiServiceProvider.php index e72c1d5..dd50e24 100644 --- a/app/Providers/MesBrApiServiceProvider.php +++ b/app/Providers/MesBrApiServiceProvider.php @@ -22,7 +22,8 @@ class MesBrApiServiceProvider extends ServiceProvider return new MesBr( config('mesbr.endpoint'), - $settings->discounts_campaign + $settings->discounts_campaign, + $settings->discounts_site ); }); } diff --git a/resources/ts/pages/prizes.ts b/resources/ts/pages/prizes.ts deleted file mode 100644 index 149424c..0000000 --- a/resources/ts/pages/prizes.ts +++ /dev/null @@ -1,14 +0,0 @@ -document.addEventListener("DOMContentLoaded", function () { - if (!document.querySelector("main.prizes-page")) { - // * We are not on settings page - return; - } - - let btnBrs = document.getElementsByClassName('btn-br'); - - for (let btnBr of btnBrs) { - btnBr.addEventListener('click', function () { - - }) - } -});