Commit graph

406 commits

Author SHA1 Message Date
Alexis Gousseau
68859350ec ts-1417 - #6 - update available product 2023-03-30 15:34:57 +02:00
Vincent BRIDIER
59718fe784 update ci + add issue templates 2023-03-29 15:58:45 +00:00
Vincent BRIDIER
fc71244b87 Merge branch 'import-salaries-DPE' into 'develop'
add DPE service for salaries imports

See merge request service-web-lab/boutique-cnc-sable!14
2023-02-16 08:30:16 +00:00
Olivier Legat
5fb5a99a0f
add DPE service for salaries imports 2023-02-14 11:38:46 +01:00
Vincent BRIDIER
d56c0adea5 Merge branch 'ticket-1263' into 'develop'
Ticket 1263: fix count of products filtered

See merge request service-web-lab/boutique-cnc-sable!13
2023-02-02 08:59:51 +00:00
Vincent BRIDIER
a63477865c Merge branch 'ticket-1280' into 'develop'
Ticket 1280: fix search on mobile

See merge request service-web-lab/boutique-cnc-sable!12
2023-02-02 08:58:52 +00:00
Vincent BRIDIER
6b24f54a71 Merge branch 'import-salaries-dde-cpe' into 'develop'
enum and switch magasin for salaries

See merge request service-web-lab/boutique-cnc-sable!11
2023-02-02 08:56:07 +00:00
Vincent BRIDIER
47913773b8 Merge branch 'hotfix' into 'develop'
quickfix ticket 1301

See merge request service-web-lab/boutique-cnc-sable!10
2023-02-02 08:52:24 +00:00
Alexis Gousseau
daeb24d7a9 Ticket 1263: fix count of products filtered 2023-01-30 11:53:48 +01:00
Alexis Gousseau
88b62a8700 Ticket 1280: fix search on mobile 2023-01-30 11:51:16 +01:00
Olivier Legat
328862c8d9
enum and switch magasin for salaries 2023-01-16 16:38:08 +01:00
Olivier Legat
e093e2e713
quickfix ticket 1301 2022-12-23 09:59:06 +01:00
Olivier Legat
0ef2d27294 Merge branch 'trunk' 2022-11-07 16:42:35 +01:00
Olivier Legat
9cb11b29a1 Merge branch 'develop' into trunk 2022-11-07 16:41:13 +01:00
Olivier Legat
518c2d0d60 Merge branch 'hotfix' into develop 2022-11-04 18:53:07 +01:00
Olivier Legat
5e1e7bc9a4 Merge branch 'hotfix' 2022-11-04 18:52:32 +01:00
Vincent BRIDIER
b1aa59d7d4 Merge branch 'upgrade-sitemap-refresh' into 'develop'
Upgrade sitemap refresh

Closes #1

See merge request service-web-lab/boutique-cnc-sable!9
2022-11-04 17:46:26 +00:00
Olivier Legat
69a930ca8d
fix order detail bug, use proper variable to check if shop is set 2022-11-04 18:41:42 +01:00
Olivier Legat
aad0954d30 fix issue #1 2022-11-04 17:41:00 +01:00
Olivier Legat
113b984685 Merge branch 'hotfix' into develop 2022-11-03 11:31:50 +01:00
Olivier Legat
c504e41089 Merge branch 'hotfix' 2022-11-03 11:27:40 +01:00
Olivier Legat
d57c81be2c
resize logo to more convenient dimensions, fix maintenance page 2022-11-03 11:26:44 +01:00
Vincent BRIDIER
b106320f20
Merge branch 'trunk' 2022-11-02 14:44:31 +01:00
Vincent BRIDIER
d6b5ec3e37
Merge branch 'develop' into trunk 2022-11-02 14:43:08 +01:00
Vincent BRIDIER
780785d1d6
Merge remote-tracking branch 'origin/boutique-sable' into develop 2022-11-02 14:41:55 +01:00
Olivier Legat
b4f881583e boutique name 2022-11-02 14:26:30 +01:00
Olivier Legat
f04ea5fbf2
hide prix kg when necessary, minor texte changes RGPD 2022-11-02 14:08:29 +01:00
Olivier Legat
46eb70f8bd
fix card activation form basket button 2022-10-31 11:35:03 +01:00
Olivier Legat
0319b57e0a
Valider au lieu de Suivant à la derniere etape du tunnel 2022-10-31 11:14:09 +01:00
Olivier Legat
d6b85fca7d
site name in theme config 2022-10-28 17:08:38 +02:00
Olivier Legat
1d59ac4bb5
filtres conservé au refresh, liens de préfiltrage, refactor (light), Normalized exception handler, green card when in cart, mising rowid in cart handled 2022-10-28 16:59:45 +02:00
Alexis Gousseau
b58a8df2ec last modifications 2022-10-27 17:20:38 +02:00
Alexis Gousseau
11e8749bbb search 2022-10-27 14:12:45 +02:00
Alexis Gousseau
5f81653f03 infinite scroll 2022-10-27 12:41:41 +02:00
Alexis Gousseau
e4d407e7e8 retours 2022-10-26 10:49:16 +02:00
Alexis Gousseau
06e43fccf8 Merge branch 'changepassword_bugfix' into 'boutique-sable'
update changepassword method for crmclient version

See merge request service-web-lab/boutique-cnc-sable!8
2022-10-24 12:38:12 +00:00
Olivier Legat
07cbaa582a
update changepassword method for crmclient version 2022-10-24 13:44:04 +02:00
Alexis Gousseau
1f4455c950 quatrième retour 2022-10-21 10:35:34 +02:00
Olivier Legat
c39b2461e6 Merge branch 'develop' into trunk 2022-10-14 17:29:54 +02:00
Olivier Legat
6edb3026f5 Merge branch 'boutique-sable' into develop 2022-10-14 17:29:28 +02:00
Alexis Gousseau
0667b7c792 troisième retours 2022-10-14 17:26:36 +02:00
Olivier Legat
892e063e1e Merge branch 'develop' into trunk 2022-10-14 15:09:31 +02:00
Olivier Legat
aec8287d80 Merge branch 'boutique-sable' into develop 2022-10-14 15:08:59 +02:00
Alexis Gousseau
bdd86c0118 second retours 2022-10-14 15:03:46 +02:00
Alexis Gousseau
932c88b57b Merge branch 'csrf-header' into 'boutique-sable'
add axios csrf header for re7 and production servers

See merge request service-web-lab/boutique-cnc-sable!6
2022-10-12 13:31:23 +00:00
Olivier Legat
c34606e228
add axios csrf header for re7 and production servers 2022-10-12 15:03:44 +02:00
Olivier Legat
40e1008828 Merge branch 'develop' into trunk 2022-10-12 14:30:55 +02:00
Olivier Legat
40c013ff9f Merge branch 'boutique-sable' into 'develop'
variables in blades : home, product, basket, sales/crecap,...

See merge request service-web-lab/boutique-cnc-sable!5
2022-10-12 12:26:57 +00:00
Alexis Gousseau
0a5e5437d7 premiers retours 2022-10-12 14:19:21 +02:00
Alexis Gousseau
ccabc6216d clean/indent code 2022-10-11 17:26:02 +02:00