From 4b9f390069ea536bf09269b84380254f82743894 Mon Sep 17 00:00:00 2001 From: Noah Lancien Date: Thu, 24 Apr 2025 10:31:14 +0200 Subject: [PATCH 1/6] feat: add jobs and failed_jobs migrations --- .../2025_04_24_101303_create_jobs_table.php | 36 +++++++++++++++++++ ..._04_24_101453_create_failed_jobs_table.php | 36 +++++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 database/migrations/2025_04_24_101303_create_jobs_table.php create mode 100644 database/migrations/2025_04_24_101453_create_failed_jobs_table.php diff --git a/database/migrations/2025_04_24_101303_create_jobs_table.php b/database/migrations/2025_04_24_101303_create_jobs_table.php new file mode 100644 index 0000000..1be9e8a --- /dev/null +++ b/database/migrations/2025_04_24_101303_create_jobs_table.php @@ -0,0 +1,36 @@ +bigIncrements('id'); + $table->string('queue')->index(); + $table->longText('payload'); + $table->unsignedTinyInteger('attempts'); + $table->unsignedInteger('reserved_at')->nullable(); + $table->unsignedInteger('available_at'); + $table->unsignedInteger('created_at'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('jobs'); + } +} diff --git a/database/migrations/2025_04_24_101453_create_failed_jobs_table.php b/database/migrations/2025_04_24_101453_create_failed_jobs_table.php new file mode 100644 index 0000000..6aa6d74 --- /dev/null +++ b/database/migrations/2025_04_24_101453_create_failed_jobs_table.php @@ -0,0 +1,36 @@ +id(); + $table->string('uuid')->unique(); + $table->text('connection'); + $table->text('queue'); + $table->longText('payload'); + $table->longText('exception'); + $table->timestamp('failed_at')->useCurrent(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('failed_jobs'); + } +} From 9838f48c368d85c1e8c3e29d66e9307ee718c986 Mon Sep 17 00:00:00 2001 From: Vincent BRIDIER Date: Wed, 7 May 2025 09:57:30 +0200 Subject: [PATCH 2/6] feat: hotfix - Update Panier BR generation, replace contact_ref by contact_id after db cleaning --- app/Traits/GenerateBR.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/Traits/GenerateBR.php b/app/Traits/GenerateBR.php index ffbd6ac..32d7d93 100644 --- a/app/Traits/GenerateBR.php +++ b/app/Traits/GenerateBR.php @@ -361,15 +361,11 @@ trait GenerateBR imagecopy($mask, $test, 60, 250, 0, 0, imagesx($test), imagesy($test)); } else { - $codeBarre = $coupon->coupon_code . strtoupper($contact->contact_ref); + $codeBarre = $coupon->coupon_code . strval($contact->contact_id); $codeBarrePrint = $codeBarre; - if (strpos($contact->contact_ref, "@") !== false) { - $codeBarre = $coupon->coupon_code . strtolower($contact->contact_ref); - $codeBarrePrint = $coupon->coupon_code . ".@."; - } - $generator = new \Picqer\Barcode\BarcodeGeneratorPNG(); - $base64 = $generator->getBarcode($codeBarrePrint, $generator::TYPE_CODE_128_A, 2, 46); - $barcodeImage = imagecreatefromstring($base64); + $generator = new \Picqer\Barcode\BarcodeGeneratorPNG(); + $base64 = $generator->getBarcode($codeBarrePrint, $generator::TYPE_CODE_128_A, 2, 46); + $barcodeImage = imagecreatefromstring($base64); imagecopy($mask, $barcodeImage, 52, 342, 0, 0, imagesx($barcodeImage), imagesy($barcodeImage)); $ImageFond = imagecreate(380, 15); $white = imagecolorallocate($ImageFond, 255, 255, 255); From f4333b0e59a924b61c046549dc8e65c5d8bc9f97 Mon Sep 17 00:00:00 2001 From: Noah Lancien Date: Wed, 30 Jul 2025 12:44:02 +0200 Subject: [PATCH 3/6] feat: Add validity_text in CouponResource for API return --- app/Http/Resources/CouponsResource.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Resources/CouponsResource.php b/app/Http/Resources/CouponsResource.php index b95e737..ede0c41 100644 --- a/app/Http/Resources/CouponsResource.php +++ b/app/Http/Resources/CouponsResource.php @@ -22,7 +22,8 @@ class CouponsResource extends JsonResource 'desktop_image_available' => $this->returnUrl($this->coupon_thumbnail1), 'desktop_image_unavailable' => $this->returnUrl($this->coupon_thumbnail2), 'mobile_image_available' => $this->returnUrl($this->coupon_thumbnail3), - 'mobile_image_unavailable' => $this->returnUrl($this->coupon_thumbnail4) + 'mobile_image_unavailable' => $this->returnUrl($this->coupon_thumbnail4), + 'validity_text' => $this->coupon_validity_text ]; } From fd9849321e02e8cd26f16d91f9b772f6ff777729 Mon Sep 17 00:00:00 2001 From: Noah Lancien Date: Thu, 9 Oct 2025 10:34:11 +0200 Subject: [PATCH 4/6] hotfix: increase MailjetCampaings message_deferred_count column size --- ...mailjet_campaigns_message_queued_count.php | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 database/migrations/2025_09_16_142554_increase_mailjet_campaigns_message_queued_count.php diff --git a/database/migrations/2025_09_16_142554_increase_mailjet_campaigns_message_queued_count.php b/database/migrations/2025_09_16_142554_increase_mailjet_campaigns_message_queued_count.php new file mode 100644 index 0000000..64f05fc --- /dev/null +++ b/database/migrations/2025_09_16_142554_increase_mailjet_campaigns_message_queued_count.php @@ -0,0 +1,26 @@ +mediumInteger('message_deferred_count')->change(); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + // Reverting this migration could crash with existing datas. + } +}; From b952401a41eef5faaf2ff33779a841aadbf70d32 Mon Sep 17 00:00:00 2001 From: Noah Lancien Date: Thu, 9 Oct 2025 10:38:58 +0200 Subject: [PATCH 5/6] revert shitty commit --- ...mailjet_campaigns_message_queued_count.php | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 database/migrations/2025_09_16_142554_increase_mailjet_campaigns_message_queued_count.php diff --git a/database/migrations/2025_09_16_142554_increase_mailjet_campaigns_message_queued_count.php b/database/migrations/2025_09_16_142554_increase_mailjet_campaigns_message_queued_count.php deleted file mode 100644 index 64f05fc..0000000 --- a/database/migrations/2025_09_16_142554_increase_mailjet_campaigns_message_queued_count.php +++ /dev/null @@ -1,26 +0,0 @@ -mediumInteger('message_deferred_count')->change(); - }); - } - - /** - * Reverse the migrations. - */ - public function down(): void - { - // Reverting this migration could crash with existing datas. - } -}; From f32389270528e47358bca3edea93909b88fd4f14 Mon Sep 17 00:00:00 2001 From: Noah Lancien Date: Thu, 9 Oct 2025 10:42:22 +0200 Subject: [PATCH 6/6] hotfix: add unique constraint on coupon_code in coupon controller --- app/Http/Controllers/CouponController.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/CouponController.php b/app/Http/Controllers/CouponController.php index 1eb0b1a..4e99278 100644 --- a/app/Http/Controllers/CouponController.php +++ b/app/Http/Controllers/CouponController.php @@ -38,7 +38,7 @@ class CouponController extends Controller $coupon->coupon_quantity = $this->getFullQuantity($coupon); // ---- Calcul de la quantité restante toutes campagnes comprises grace aux fonctions dans CouponTrait.php $coupon->coupon_left = 0; -// $coupon->coupon_quantity - $this->getUsedQuantity($coupon); + // $coupon->coupon_quantity - $this->getUsedQuantity($coupon); } return view('coupon.index', ['coupons' => $coupons, 'camps' => $campIds]); @@ -69,6 +69,7 @@ class CouponController extends Controller $data = $request->all(); $v = Validator::make($data, [ + 'coupon_code' => 'required|unique:coupon,coupon_code', 'coupon_validity_text' => 'required', 'coupon_legal_mentions' => 'required', 'coupon_decoration_image' => 'required|image|mimes:jpeg,png', @@ -82,7 +83,7 @@ class CouponController extends Controller }); if ($v->fails()) { - return redirect('bo/coupon/' . $coupon->coupon_id . '/edit') + return redirect()->back() ->withErrors($v) ->withInput(); } @@ -279,7 +280,7 @@ class CouponController extends Controller return redirect()->route('coupon.edit', ['coupon' => $coupon]); } else { return view('holder'); - }//end if + } //end if return redirect()->route('coupon.edit', ['coupon' => $coupon]); }