492 Commits

Author SHA1 Message Date
Rodney Figaro
8058a1f21d suppress delivery price specific to product with a weight inferior than 350g 2016-09-23 17:50:59 +02:00
Rodney Figaro
101d67192c change delivery prices 2016-09-23 17:46:06 +02:00
ToutPratique
dd1d33a324 returnxml 2016-09-23 16:09:39 +02:00
ToutPratique
f13608d7ba retire image homeslider 2016-09-23 16:08:25 +02:00
ToutPratique
10f84c1d79 trad 2016-09-23 16:07:57 +02:00
ToutPratique
d0ae2a96fc exclude glsexport 2016-09-23 16:07:24 +02:00
ToutPratique
843ff149e2 Merge branch 'fix-mondialrelay' 2016-09-07 11:58:59 +02:00
ToutPratique
8f4834353b Merge branch 'master' of gitlab.antadis.net:dev-antadis/toutpratique 2016-09-07 11:58:49 +02:00
ToutPratique
033d3875e9 push prod 2016-09-07 11:58:15 +02:00
Rodney Figaro
ea51d7168e add warning if no delivery choiced and remove default selection 2016-09-07 10:53:31 +02:00
Rodney Figaro
750b91e6bb fix loading delivery option message on wrong option 2016-09-06 17:29:31 +02:00
Rodney Figaro
792a0095c1 fix changing delivery address 2016-09-06 16:57:51 +02:00
Rodney Figaro
3a2f9a2fe6 display google map popup info on changing delivery adress 2016-09-02 18:22:58 +02:00
Rodney Figaro
168b837f21 fix display delivery choice in order validation (front) 2016-09-01 18:05:44 +02:00
ToutPratique
b5752bf1f8 envoimoinscher 2016-08-29 16:58:25 +02:00
ToutPratique
9e3d2b2d3f fix bug product-list sur la page cms 2016-08-10 14:48:12 +02:00
ToutPratique
7730dd9698 Merge branch 'master' of gitlab.antadis.net:dev-antadis/toutpratique 2016-08-09 16:40:34 +02:00
Romuald
ed73323b56 trad 2016-08-09 16:01:39 +02:00
Romuald
ad1c65c8e2 cookieinfo 2016-08-09 15:52:19 +02:00
ToutPratique
64bc00a940 Merge branch 'master' of gitlab.antadis.net:dev-antadis/toutpratique 2016-08-09 15:17:33 +02:00
ToutPratique
b980531603 fix css 2016-08-09 15:12:58 +02:00
ToutPratique
459feef2b9 fix checkbox 2016-08-05 10:35:11 +02:00
ToutPratique
81c7a802d5 fix css 2016-08-05 10:09:07 +02:00
ToutPratique
d08e2ca262 Merge branch 'master' of gitlab.antadis.net:dev-antadis/toutpratique 2016-08-05 09:58:41 +02:00
ToutPratique
6c1bb727fb atos 2016-08-05 09:56:43 +02:00
Romuald
a1571da316 cleanage de l'affichage 2016-08-05 09:55:05 +02:00
Romuald
2dd79ea1f3 Merge branch 'product_sauv_stack' 2016-08-05 09:46:07 +02:00
Romuald
fc5da8e291 fix add to cart manquant du panier 2016-08-04 10:14:04 +02:00
Nolwenn
3437d3c3cd fix container 2016-08-03 13:13:45 +02:00
Nolwenn
facf0f41ef fix prod qui sauv stacké 2016-08-03 12:26:39 +02:00
Nolwenn
70eb4d798f branch pro stack 2016-08-03 12:13:14 +02:00
ToutPratique
ccdabad1e3 Merge branch 'master' of gitlab.antadis.fr:dev-antadis/toutpratique 2016-08-03 11:38:34 +02:00
ToutPratique
94cf980014 gitignore 2016-08-03 10:30:27 +02:00
ToutPratique
bf654351e6 gitignore paypal result 2016-08-03 10:29:28 +02:00
ToutPratique
665968f178 gls dans le gitignore 2016-08-03 10:28:24 +02:00
ToutPratique
e03f45136e push prod 2016-08-02 10:22:32 +02:00
ToutPratique
6f14682a50 Merge branch 'master' of gitlab.antadis.fr:dev-antadis/toutpratique 2016-07-20 12:12:36 +02:00
ToutPratique
83c4baae0e :q
Merge branch 'master' of gitlab.antadis.fr:dev-antadis/toutpratique
2016-07-20 12:10:16 +02:00
Romuald
0b0836f802 correction ajax-cart 2016-07-20 12:08:56 +02:00
ToutPratique
f89176570d modif prod 2016-07-20 12:07:50 +02:00
Romuald
d8ffd30f2a conflict encore 2016-07-20 11:23:44 +02:00
Romuald
259d98f972 conflict 2016-07-20 11:20:33 +02:00
ToutPratique
8ea468bcea correction productaccessories 2016-07-20 11:14:56 +02:00
ToutPratique
95fa1dcd26 fix conflict 2016-07-20 10:22:33 +02:00
Romuald
6ca84bd2e0 fix isset 2016-07-20 10:14:12 +02:00
Thibault UBUNTU
38b030cf62 fix 2016-07-13 10:18:58 +02:00
Thibault UBUNTU
8da17832ae fix 2016-07-13 10:08:39 +02:00
Thibault UBUNTU
11801fa521 fix 2016-07-13 10:05:49 +02:00
Thibault UBUNTU
ed30614aac fix 2016-07-13 09:59:38 +02:00
Thibault UBUNTU
3b57d66ffb Merge branch 'master' of gitlab.antadis.fr:dev-antadis/toutpratique 2016-07-13 09:53:27 +02:00