Commit graph

333 commits

Author SHA1 Message Date
Noah Lancien
f7c028fd1b Merge branch 'trunk' 2026-06-22 10:31:55 +02:00
Noah Lancien
8a230d897b Merge branch 'develop' into trunk 2026-06-22 10:31:40 +02:00
Noix
8280ee5458 Merge branch '16-add-hours-to-basket-printed-file' into 'develop'
fix: 🐛 Added hours-min-sec to printed file in basket

See merge request ldc-web/projets/mesbr!17
2026-06-22 08:31:22 +00:00
Noah Lancien
0d6fb4b999 fix: 🐛 Added hours-min-sec to printed file in basket to prevent file overwrite 2026-06-22 10:25:10 +02:00
K Muller
9e2fe9cc73 Merge branch 'trunk' 2026-06-18 09:51:03 +02:00
K Muller
d9dffadb1f Merge branch 'develop' into trunk 2026-06-18 09:50:48 +02:00
karl.muller
0b0ce21efd Merge branch '11-datetime-calendar' into 'develop'
feat: ✨ Added hours to calendar date input

See merge request ldc-web/projets/mesbr!16
2026-06-18 07:30:41 +00:00
Noah Lancien
f2423adbc0 refactor: ♻️ use betweenIncluded from Carbon instead of double condition 2026-06-11 17:13:15 +02:00
Noah Lancien
f15a272093 fix: use carbon and fix check for calendars dates 2026-06-11 16:51:49 +02:00
Noah Lancien
7d4381de19 revert: 5e41e3668e 2026-06-11 12:56:10 +02:00
Noah Lancien
5e41e3668e feat: ✨ Added hours to calendar date input 2026-06-11 12:18:01 +02:00
Vincent BRIDIER
b7f111123f Merge branch 'trunk' 2025-12-09 15:06:32 +01:00
Vincent BRIDIER
58eca4167a Merge branch 'develop' into trunk 2025-12-09 15:06:23 +01:00
Vincent BRIDIER
40f90c6422 feat: Add DL format for Wall printing 2025-12-09 15:06:15 +01:00
Vincent BRIDIER
967edc9f07 Merge branch 'trunk' 2025-11-25 11:34:16 +01:00
Vincent BRIDIER
a077d5e89a Merge branch 'develop' into trunk 2025-11-25 11:34:06 +01:00
Vincent BRIDIER
c0a33ef2ab feat: Update claim command, unit tests OK 2025-11-25 11:33:58 +01:00
Vincent BRIDIER
f542100fca feat: Add unit test to basket v1 api call + refactor basket update + handle empty basket return 2025-11-18 18:56:19 +01:00
Vincent BRIDIER
e9fa15d0f8 Merge branch 'develop' of lab.s-web.fr:ldc-web/projets/mesbr into develop 2025-11-18 18:49:53 +01:00
Vincent BRIDIER
0bed498489 Merge branch 'migration-coupon' into 'develop'
fix: update coupon_limitquantity and createdate default

See merge request ldc-web/projets/mesbr!15
2025-11-14 08:53:53 +00:00
Noah Lancien
2485d0aa97 fix: make coupon_limitperiod nullable 2025-11-14 09:54:33 +01:00
Noah Lancien
c08c0e8fcd fix: update coupon_limitquantity and createdate default 2025-11-13 17:44:54 +01:00
Vincent BRIDIER
634423322d update clean 2025-11-13 12:59:13 +01:00
Vincent BRIDIER
cb343969c4 update clean 2025-11-13 12:58:28 +01:00
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