Commit graph

625 commits

Author SHA1 Message Date
Noah Lancien
4f5be11730 Merge branch 'develop' into trunk 2026-02-05 17:17:33 +01:00
noah.lancien
3feaa4cddf Merge branch 'issue-88' into 'develop'
fix: 🐛 set blade directives function in public #88

See merge request ldc-web/projets/boutique-cnc-sable!78
2026-02-05 16:14:18 +00:00
Alexis Gousseau
e7db2d4523 fix: 🐛 set blade directives function in public #88 2026-02-05 16:45:01 +01:00
Noah Lancien
2cf1a2761a Merge branch 'develop' into trunk 2026-02-04 12:11:46 +01:00
noah.lancien
0048fcf0ab Merge branch 'issue-87' into 'develop'
feat: 🗃 add new field to show slide only for connected customers #87

See merge request ldc-web/projets/boutique-cnc-sable!77
2026-02-04 11:10:30 +00:00
Alexis Gousseau
fcd0a79251 feat: 🗃 add new field to show slide only for connected customers #87 2026-02-04 10:56:10 +01:00
Noah Lancien
7661bba6ca Merge branch 'develop' into trunk 2026-02-03 09:36:54 +01:00
Noah Lancien
d84914974d ci: added staging-resources.yaml + define pod resources + limit cronjobs 2026-02-03 09:36:35 +01:00
Noah Lancien
9a8d7b400a Merge branch 'develop' into trunk 2026-02-03 09:25:27 +01:00
Noah Lancien
0ac773f523 ci: added staging-resources.yaml + define pod resources + limit cronjobs 2026-02-03 09:25:11 +01:00
Noah Lancien
2c0961dcc3 Merge branch 'develop' into trunk 2026-02-03 09:21:26 +01:00
noah.lancien
319e3f9706 Merge branch 'issue-76' into 'develop'
fix: 🐛 use blade directives helper to prevent blade files from being cached #76 #77

See merge request ldc-web/projets/boutique-cnc-sable!76
2026-02-03 08:13:33 +00:00
noah.lancien
ec4e0ef178 Merge branch '80-add-brands' into 'develop'
feat: ✨ adding multiple brands

See merge request ldc-web/projets/boutique-cnc-sable!74
2026-02-03 08:13:15 +00:00
noah.lancien
159a21658f Merge branch '81-mail' into 'develop'
feat: ✨ send an order reminder email

See merge request ldc-web/projets/boutique-cnc-sable!75
2026-02-03 08:12:46 +00:00
Alexis Gousseau
ae54ee559b fix: 🐛 use blade directives helper to prevent blade files from being cached #76 #77 2026-02-02 15:47:55 +01:00
Corentin Huet
b3d4d6945e feat: ✨ send an order reminder email 2026-01-30 11:43:10 +01:00
Corentin Huet
79b9b9b808 feat: ✨ adding multiple brands 2026-01-29 17:56:51 +01:00
Noah Lancien
38771721ea Merge branch 'develop' into trunk 2025-11-12 17:21:59 +01:00
noah.lancien
dc49a08128 Merge branch '71-price-display' into 'develop'
fix: reset view cache when updating settings

See merge request ldc-web/projets/boutique-cnc-sable!73
2025-11-12 16:14:30 +00:00
Noah Lancien
f1bb958609 fix: reset view cache when updating settings 2025-11-05 13:02:08 +01:00
Noah Lancien
5758a1d40c Merge branch 'develop' into trunk 2025-07-08 16:44:51 +02:00
noah.lancien
4485340355 Merge branch 'issue-67-export' into 'develop'
feat: export file optimization

See merge request ldc-web/projets/boutique-cnc-sable!72
2025-07-08 14:42:03 +00:00
Corentin Huet
e83b77d985 feat: export file optimization 2025-07-08 15:36:23 +02:00
Vincent BRIDIER
ae9ab52f4d Merge branch 'issue-66' into 'develop'
fix: 🐛 error on removeFromCart

See merge request ldc-web/projets/boutique-cnc-sable!71
2025-07-01 14:05:18 +00:00
Karl
dc8fa4da0b fix: 🐛 error on removeFromCart 2025-07-01 15:44:02 +02:00
Karl Muller
f984799a02 Merge branch 'develop' into trunk 2025-04-28 14:46:33 +00:00
karl.muller
3ede971217 Merge branch 'issue-60' into 'develop'
feat: ✨ re-add the stat before the date result on the dashbaord

See merge request ldc-web/projets/boutique-cnc-sable!69
2025-04-28 14:46:07 +00:00
Karl Muller
8118d5a3f9 feat: ✨ re-add the stat before the date result on the dashbaord 2025-04-28 13:03:22 +00:00
Karl Muller
a94589fb13 Merge branch 'develop' into trunk 2025-04-02 08:34:54 +00:00
karl.muller
268ce12f07 Merge branch 'issue-62-division-by-zero' into 'develop'
fix: prevent division by zero in membership rate calculation

See merge request ldc-web/projets/boutique-cnc-sable!68
2025-04-02 08:34:26 +00:00
karl.muller
3656e33e64 Merge branch 'issue-57-laravel-secure' into 'develop'
feat: added admin secure #57

See merge request ldc-web/projets/boutique-cnc-sable!67
2025-04-02 08:34:05 +00:00
Noah Lancien
2bd16742dd clean: rewrite condition to prevent division by zero 2025-04-01 09:43:01 +02:00
Noah Lancien
f27ed8f354 fix: prevent division by zero in membership rate calculation 2025-03-31 16:14:40 +02:00
Corentin Huet
fa3b38ac98 feat: added admin secure 2025-03-31 15:44:32 +02:00
Noah Lancien
24cfb976f6 Merge branch 'develop' into trunk 2025-02-24 15:31:41 +01:00
noah.lancien
7d1f60cfae Merge branch 'issue-52-dashboard-stats' into 'develop'
fix: Display the correct count of employee in the dashboard

See merge request ldc-web/projets/boutique-cnc-sable!66
2025-02-24 14:29:22 +00:00
Noah Lancien
c07ff0dd57 fix: Display the correct count of employee in the dashboard 2025-02-24 15:22:14 +01:00
Noah Lancien
931a79444b Merge branch 'develop' into trunk 2025-02-14 16:20:47 +01:00
Noah Lancien
de4b49495a style: fix z-index in order page 2025-02-14 16:20:28 +01:00
Noah Lancien
c287334426 Merge branch 'develop' into trunk 2025-02-13 15:07:20 +01:00
Noah Lancien
5c91bb5c0f chore: composer update to fix CVE 2025-02-13 15:07:13 +01:00
Noah Lancien
7547491e46 Merge branch 'develop' into trunk 2025-02-13 15:02:00 +01:00
noah.lancien
49ab623187 Merge branch 'issue-51-feedback' into 'develop'
fix: feedback on user basket

See merge request ldc-web/projets/boutique-cnc-sable!65
2025-02-13 14:01:40 +00:00
Noah Lancien
a3b4a4bbca fix: feedback on user basket 2025-02-13 12:46:34 +01:00
Karl Muller
79d9061bc9 fix: 🐛 user->id null on SalarieExportJob + add public holiday with cron + condition on public holiday's calendar 2025-02-12 10:29:03 +00:00
Karl Muller
b14f3ec15e Merge branch 'trunk' 2025-02-06 10:28:17 +00:00
Karl Muller
fa6d969673 Merge branch 'develop' into trunk 2025-02-06 10:27:54 +00:00
Karl Muller
898104d041 fix: 🐛 delete ldcweb:statuschecker from the kernel 2025-02-06 10:26:31 +00:00
Noah Lancien
d3a74682aa Merge branch 'trunk' 2025-02-04 15:32:15 +01:00
Noah Lancien
daa998d721 Merge branch 'develop' into trunk 2025-02-04 15:32:04 +01:00