Commit graph

309 commits

Author SHA1 Message Date
Vincent BRIDIER
e5e6d2bee8 Merge branch 'trunk' 2025-11-13 10:05:52 +01:00
Vincent BRIDIER
656b9e3b3a Merge branch 'develop' into trunk 2025-11-13 10:05:43 +01:00
Vincent BRIDIER
d4fcdc8df0 Merge branch 'ajax-controller-save-stat-bug' into 'develop'
fix: use saveStat method from trait instead of creating a new Statistique in AjaxController

See merge request ldc-web/projets/mesbr!14
2025-11-13 09:03:53 +00:00
Vincent BRIDIER
1aa7c5eb59 fix: Fix Generate BR trait 2025-11-13 10:02:49 +01:00
Noah Lancien
0c5eeff0d4 fix: use saveStat method from trait instead of creating a new Statistique in AjaxController 2025-11-13 09:52:47 +01:00
Vincent BRIDIER
1fd8f3bd35 Merge branch 'trunk' 2025-11-13 09:36:15 +01:00
Vincent BRIDIER
0da72e56bf Merge branch 'develop' into trunk 2025-11-13 09:29:53 +01:00
Vincent BRIDIER
c6186b725a feat: Add BR Regen base image command 2025-11-13 09:29:44 +01:00
Vincent BRIDIER
f2f8c37069 Merge branch 'trunk' 2025-11-13 08:32:31 +01:00
Vincent BRIDIER
4cca7dea5e Merge branch 'develop' into trunk 2025-11-12 17:31:45 +01:00
Vincent BRIDIER
7b18169f0d Merge branch 'master' into develop 2025-11-12 17:31:31 +01:00
Vincent BRIDIER
15118238ea Merge branch 'develop' into trunk 2025-11-12 16:36:04 +01:00
Vincent BRIDIER
8347a12f68 feat: Add some unit tests + move models into Models folder 2025-11-12 16:35:16 +01:00
Noah Lancien
64118d03b0 Merge branch 'develop' into trunk 2025-11-07 12:37:17 +01:00
noah.lancien
b6dc00cba1 Merge branch 'update-mesbr' into 'develop'
Update mesbr

See merge request ldc-web/projets/mesbr!8
2025-11-07 11:34:34 +00:00
Noah Lancien
237ff2af03 Merge branch 'update-mesbr' of lab.s-web.fr:ldc-web/projets/mesbr into update-mesbr 2025-11-07 11:08:45 +01:00
Noah Lancien
dedb1cbd55 fix: remove useless and broken stat save + set stat date default to now 2025-11-07 11:08:03 +01:00
Noah Lancien
b3a7f6043f feat: added archive for stats 2025-11-07 11:08:03 +01:00
Noah Lancien
22bb989ed6 fix: renamed ref -> uuid when a new basket is created 2025-11-07 11:08:03 +01:00
Vincent BRIDIER
cfd7b828da cleeeeaaaaannnnnnnnnnn 2025-11-07 11:08:03 +01:00
Vincent BRIDIER
94a4e04b50 feat: Somes f***in changes, vivement qu'on sorte le legacy 2025-11-07 11:08:03 +01:00
Noah Lancien
db2da3543d fix: review feedback 2025-11-07 11:08:03 +01:00
Noah Lancien
62e0a471aa feat: update basket management 2025-11-07 11:08:03 +01:00
Noah Lancien
0f8c0e31ee feat: take all VB commits from old git repo 2025-11-07 11:08:02 +01:00
noah.lancien
e7211d40da Merge branch 'update-logs-system' into 'update-mesbr'
feat: added archive for stats

See merge request ldc-web/projets/mesbr!12
2025-11-07 09:59:16 +00:00
Noah Lancien
9a5d8aa4f7 fix: remove useless and broken stat save + set stat date default to now 2025-11-07 10:56:09 +01:00
Vincent BRIDIER
d90b83ec92 Merge branch 'update-mesbr' of lab.s-web.fr:ldc-web/projets/mesbr into update-mesbr 2025-11-06 16:17:36 +01:00
Vincent BRIDIER
6efafddeb1 cleeeeaaaaannnnnnnnnnn 2025-11-06 16:17:22 +01:00
Noah Lancien
9d711289d3 feat: added archive for stats 2025-11-06 16:15:16 +01:00
Noah Lancien
619a859677 fix: renamed ref -> uuid when a new basket is created 2025-11-06 10:18:44 +01:00
Vincent BRIDIER
0d5fbfccb6 feat: Somes f***in changes, vivement qu'on sorte le legacy 2025-11-05 21:09:05 +01:00
Noah Lancien
1430fc21ae fix: review feedback 2025-10-29 12:41:39 +01:00
Noah Lancien
a853cebf8a feat: update basket management 2025-10-27 16:14:47 +01:00
Noah Lancien
f323892705 hotfix: add unique constraint on coupon_code in coupon controller 2025-10-09 10:42:22 +02:00
Noah Lancien
b952401a41 revert shitty commit 2025-10-09 10:38:58 +02:00
Noah Lancien
639f24e1cc Merge branch 'master' of lab.s-web.fr:ldc-web/projets/mesbr 2025-10-09 10:34:31 +02:00
Noah Lancien
fd9849321e hotfix: increase MailjetCampaings message_deferred_count column size 2025-10-09 10:34:11 +02:00
Noah Lancien
0e64a0715a Merge branch 'develop' into trunk 2025-10-09 09:51:09 +02:00
Noah Lancien
a2d55c47db ci: added staging-resources.yaml 2025-10-09 09:49:46 +02:00
noah.lancien
054c049681 Merge branch 'issue-10' into 'develop'
fix: add unique constraint on coupon_code in coupon controller

See merge request ldc-web/projets/mesbr!11
2025-10-09 07:45:44 +00:00
Corentin Huet
b8568197be fix: add unique constraint on coupon_code in coupon controller 2025-09-09 10:54:11 +02:00
Vincent BRIDIER
cec74c9933
Merge branch 'develop' into trunk 2025-08-06 09:45:48 +02:00
Vincent BRIDIER
b7f42fc518
feat: Update docker image 2025-08-06 09:45:31 +02:00
Noah Lancien
0d648778ae feat: take all VB commits from old git repo 2025-08-05 14:47:02 +02:00
Noah Lancien
f4333b0e59 feat: Add validity_text in CouponResource for API return 2025-07-30 12:44:02 +02:00
Noah Lancien
da005cdf5c Merge branch 'develop' into trunk 2025-07-30 12:15:48 +02:00
Noah Lancien
4ebbd47982 feat: Add validity_text in CouponResource for API return 2025-07-30 12:02:13 +02:00
Vincent BRIDIER
9838f48c36
feat: hotfix - Update Panier BR generation, replace contact_ref by contact_id after db cleaning 2025-05-07 09:57:45 +02:00
Vincent BRIDIER
e3a51051f0
Merge branch 'develop' into trunk 2025-05-07 09:53:26 +02:00
Vincent BRIDIER
30d79ccccd
feat: Update Panier BR generation, replace contact_ref by contact_id after db cleaning 2025-05-07 09:51:38 +02:00