Commit graph

387 commits

Author SHA1 Message Date
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
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
Alexis Gousseau
435a007ea2 fix fo/bo routes 2022-10-10 15:51:53 +02:00
Alexis Gousseau
4777c7a4d3 fix links header + fix js ranges page 2022-10-10 13:27:07 +02:00
Alexis Gousseau
e5fb7a0e36 get only tags where they are published 2022-10-10 12:15:33 +02:00
Alexis Gousseau
7033d4650e fix vue ranges, nutriscore's images 2022-10-10 11:59:20 +02:00
Alexis Gousseau
ba1405ba8a set availability of a product 2022-10-10 10:37:40 +02:00
Alexis Gousseau
4c04cd7d29 placeholder ranges, split routes fo/bo, delete QuickOrder, fix integration 2022-10-07 15:18:32 +02:00
Alexis Gousseau
696b80eb50 Merge branch 'blades-variables' into 'boutique-sable'
variables in blades : home, product, basket, sales/crecap,...

See merge request service-web-lab/boutique-cnc-sable!4
2022-10-07 07:36:32 +00:00
Olivier Legat
e0fbca33e8 variables in blades : home, product, basket, sales/crecap, partials/tunnel-actions, partials/tunnel-stepper, sales/pick-slot, sales/confirm, add to cart buttons 2022-10-06 22:34:45 +02:00
Alexis Gousseau
0414de8996 pagination on ranges page 2022-10-06 17:23:00 +02:00
Alexis Gousseau
5810db9111 ranges page 2022-10-05 16:41:09 +02:00
Alexis Gousseau
058b6e41d5 start ranges page 2022-10-05 09:14:21 +02:00
Alexis Gousseau
700961df23 Implementation integration 2022-10-04 11:28:53 +02:00
Olivier Legat
02f25638ad Merge branch 'boutique-cocotte' into 'develop'
Tying up loose ends, targeting incoming live deployment

See merge request service-web-lab/boutique-cnc-sable!3
2022-09-26 10:50:43 +00:00
Olivier Legat
d0e666929f
add site to salariesite enum 2022-09-23 10:58:41 +02:00
Olivier Legat
6b92d1b547
apply same changes as in branch remove_verrues_de_recette 2022-09-21 16:23:42 +02:00
Olivier Legat
121613a478
set collect point for each salarie, use this info to provide magasin in order tunnel 2022-09-21 16:12:03 +02:00
Olivier Legat
bc1252754e
fix salarie entry date db format 2022-09-20 16:57:35 +02:00
Olivier Legat
1375b6976f extract front end methods from bo controller, create appropriate conntroller, update routes accordingly 2022-09-20 16:39:55 +02:00
Olivier Legat
6f29fcf0e0
filename for order export : always '_001' => regate sablé 2022-09-19 13:13:59 +02:00