Commit Graph

168 Commits

Author SHA1 Message Date
Marion Muszynski
6711926ac3 fix conflicts 2016-07-25 15:26:26 +02:00
Marion Muszynski
f4f144057d modif date calcul method to include we and check if the last day is a business day 2016-07-25 12:05:57 +02:00
Marion Muszynski
dd6a758e32 modif css 2016-07-25 11:17:40 +02:00
Marion Muszynski
b8a4934278 adding delivery date estimation 2016-07-15 12:26:58 +02:00
Marion Muszynski
6e14b286c2 update css 2016-07-15 10:21:24 +02:00
Marion Muszynski
02af220b58 showing delivery delay estimation on product tpl 2016-07-13 16:37:00 +02:00
Marion Muszynski
e33d2da73d adjusting for delivery delay part 2016-07-13 15:35:00 +02:00
Marion Muszynski
dee3c2ba2c ajusting css 2016-07-13 15:16:48 +02:00
Marion Muszynski
67314cbf25 hide bestsellers at payment step 2016-07-13 15:09:33 +02:00
Marion Muszynski
489b94cff5 suite block order summary 2016-07-12 14:50:52 +02:00
Marion Muszynski
0ee8479f3c remove grey border on shipping menu of product tpl 2016-07-06 11:18:06 +02:00
Marion Muszynski
ff715abd60 Merge branch 'modif-css' 2016-07-01 16:44:13 +02:00
Marion Muszynski
47335062aa Merge branch 'ticket-ecotax' 2016-07-01 12:27:13 +02:00
Marion Muszynski
6a87ea0460 modif add button 2016-07-01 11:29:00 +02:00
Marion Muszynski
e40768c734 modif img reduction on product list 2016-07-01 11:18:52 +02:00
Srv Bebeboutik
c48e673922 fix prod 2016-06-30 11:31:11 +02:00
Marion Muszynski
699a06db48 fix conflict 2016-06-30 11:15:14 +02:00
Marion Muszynski
f99cacd293 small update for mobile site 2016-06-30 10:47:46 +02:00
Marion Muszynski
760bd50c06 adding sentence according delivery delay 2016-06-29 15:52:03 +02:00
Marion Muszynski
20896d3bbf adding popup error for mobile 2016-06-29 09:59:03 +02:00
Marion Muszynski
dd9831daa5 Merge branch 'ticket-blockbestsellerProduct' 2016-06-28 15:55:39 +02:00
Marion Muszynski
f8af1f0a71 modif tpl trad 2016-06-28 15:19:31 +02:00
Marion Muszynski
8a0b80e15e pop error cart 2016-06-28 14:45:48 +02:00
Marion Muszynski
ced379c219 ecotax sentence 2016-06-24 14:34:15 +02:00
Marion Muszynski
43646dd4bd modif 2016-06-24 13:54:50 +02:00
Marion Muszynski
985bf52e83 update to add product with attribute to cart from bestsellers 2016-06-24 12:41:46 +02:00
Srv Bebeboutik
3b72e67b19 fix from prod 2016-06-24 10:09:27 +02:00
Marion Muszynski
03dd90bec5 update product tpl css 2016-06-23 10:16:07 +02:00
Marion Muszynski
3e65d4ed6d fix css 2016-06-22 15:50:00 +02:00
Marion Muszynski
77b9c22014 fix conflicts 2016-06-22 15:03:36 +02:00
Marion Muszynski
f5cb833c6e put description more over description short 2016-06-22 12:53:17 +02:00
Marion Muszynski
a11f4ad97e modif button color 2016-06-20 15:13:18 +02:00
Marion Muszynski
7945d0c0ad modif for ecotax style 2016-06-09 11:49:33 +02:00
Marion Muszynski
ba706ec6c9 Merge branch 'ticket-fidelite' 2016-06-08 16:33:40 +02:00
Marion Muszynski
d47310bc0a redirect for es version 2016-06-08 16:27:56 +02:00
Marion Muszynski
2b2ae3fa8a modif zoomdiv 2016-06-08 14:29:19 +02:00
Marion Muszynski
ab21f10643 Merge branch 'ticket-fidelite' 2016-06-08 12:53:58 +02:00
Marion Muszynski
dc85f8eca6 modif trad 2016-06-08 12:53:38 +02:00
Marion Muszynski
5c8e35adf2 Merge branch 'ticket-fidelite' 2016-06-08 12:16:37 +02:00
Marion Muszynski
83c4acc83d opti request 2016-06-08 11:44:13 +02:00
Marion Muszynski
30b39b5776 fix conflicts 2016-06-08 10:53:07 +02:00
Marion Muszynski
b9f7b26a59 modif css shopping cart 2016-06-08 10:37:37 +02:00
Srv Bebeboutik
f96c85f584 trad 2016-06-07 16:01:57 +02:00
Srv Bebeboutik
7025bce024 add phrase frais de port popup 2016-06-07 12:52:15 +02:00
Marion Muszynski
768c3dea8b petit fix 2016-06-06 15:56:25 +02:00
Marion Muszynski
cd3761a104 modif for site_mobile 2016-06-06 15:53:23 +02:00
Srv Bebeboutik
3ec698aa01 Merge branch 'master' of gitlab.antadis.fr:dev-antadis/bebeboutik 2016-06-06 12:03:14 +02:00
Srv Bebeboutik
1fab58c2d6 trad fr 2016-06-06 11:36:03 +02:00
Marion Muszynski
72545630a3 fix conflicts 2016-06-06 11:32:25 +02:00
Marion Muszynski
99b35ed57a adding delivery description field for product 2016-06-03 12:07:12 +02:00