Marion Muszynski
|
e69073572e
|
modif date
|
2016-07-25 12:19:36 +02:00 |
|
Marion Muszynski
|
c809342939
|
Merge branch 'ticket-deliveryDelay_product' into develop
|
2016-07-25 12:06:23 +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
|
f1769755de
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-25 11:18:16 +02:00 |
|
Marion Muszynski
|
dd6a758e32
|
modif css
|
2016-07-25 11:17:40 +02:00 |
|
Marion Muszynski
|
a2e67137bf
|
Merge branch 'ticket-payboxAgreement' into develop
|
2016-07-18 11:45:49 +02:00 |
|
Marion Muszynski
|
fb51c877c4
|
suite save paybox info
|
2016-07-18 11:45:18 +02:00 |
|
Marion Muszynski
|
a21a7bbc0e
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-15 12:28:47 +02:00 |
|
Marion Muszynski
|
b8a4934278
|
adding delivery date estimation
|
2016-07-15 12:26:58 +02:00 |
|
Marion Muszynski
|
205a9c0aa2
|
Merge branch 'ticket-deliveryDelay_cart' into develop
|
2016-07-15 10:33:34 +02:00 |
|
Marion Muszynski
|
e07186fe27
|
modif css
|
2016-07-15 10:32:16 +02:00 |
|
Marion Muszynski
|
ba60aeacb9
|
Merge branch 'ticket-deliveryDelay_product' into develop
|
2016-07-15 10:21:51 +02:00 |
|
Marion Muszynski
|
6e14b286c2
|
update css
|
2016-07-15 10:21:24 +02:00 |
|
Marion Muszynski
|
64a8296a57
|
Merge branch 'ticket-deliveryDelay_cart' into develop
|
2016-07-13 17:41:53 +02:00 |
|
Marion Muszynski
|
a6ec43bb68
|
showing estimation delivery date in cart
|
2016-07-13 17:40:13 +02:00 |
|
Marion Muszynski
|
7fe43c37b0
|
fix conflict
|
2016-07-13 16:38:47 +02:00 |
|
Marion Muszynski
|
02af220b58
|
showing delivery delay estimation on product tpl
|
2016-07-13 16:37:00 +02:00 |
|
Marion Muszynski
|
370fb8dd18
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-13 15:39:52 +02:00 |
|
Marion Muszynski
|
e33d2da73d
|
adjusting for delivery delay part
|
2016-07-13 15:35:00 +02:00 |
|
Marion Muszynski
|
951ffd3e4b
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-13 15:17:13 +02:00 |
|
Marion Muszynski
|
dee3c2ba2c
|
ajusting css
|
2016-07-13 15:16:48 +02:00 |
|
Marion Muszynski
|
98b264471c
|
Merge branch 'ticket-blockOrderSummary' into develop
|
2016-07-13 15:10: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 |
|
Dylan Travers
|
c2d4fb13c9
|
Show only if product.quantity > 0
|
2016-07-08 15:37:30 +02:00 |
|
Marion Muszynski
|
281e562edf
|
Merge branch 'ticket-10377' into develop
|
2016-07-06 11:18:41 +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
|
1bb5ccc889
|
Merge branch 'modif-css' into develop
|
2016-07-01 11:29:20 +02:00 |
|
Marion Muszynski
|
6a87ea0460
|
modif add button
|
2016-07-01 11:29:00 +02:00 |
|
Marion Muszynski
|
c7aa42f883
|
fix conflict
|
2016-07-01 11:20:49 +02:00 |
|
Marion Muszynski
|
e40768c734
|
modif img reduction on product list
|
2016-07-01 11:18:52 +02:00 |
|
Marion Muszynski
|
155dd48cad
|
fix conflict
|
2016-07-01 11:02:09 +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
|
e7f0c678de
|
fix conflict
|
2016-06-29 15:53:34 +02:00 |
|
Marion Muszynski
|
760bd50c06
|
adding sentence according delivery delay
|
2016-06-29 15:52:03 +02:00 |
|
Marion Muszynski
|
dd9831daa5
|
Merge branch 'ticket-blockbestsellerProduct'
|
2016-06-28 15:55:39 +02:00 |
|
Marion Muszynski
|
7f2ebe23f4
|
Merge branch 'ticket-simplemulti_front' into develop
|
2016-06-28 15:19:53 +02:00 |
|
Marion Muszynski
|
f8af1f0a71
|
modif tpl trad
|
2016-06-28 15:19:31 +02:00 |
|
Marion Muszynski
|
757c557a07
|
fix conflict
|
2016-06-28 14:47:38 +02:00 |
|
Marion Muszynski
|
8a0b80e15e
|
pop error cart
|
2016-06-28 14:45:48 +02:00 |
|
Dylan Travers
|
c3f3e05427
|
Change pink color and modify comportement (Use All_quantities and not product_quantity
|
2016-06-27 12:25:22 +02:00 |
|
Marion Muszynski
|
fffeec4f63
|
Merge branch 'ticket-ecotax' into develop
|
2016-06-24 14:35:12 +02:00 |
|
Marion Muszynski
|
ced379c219
|
ecotax sentence
|
2016-06-24 14:34:15 +02:00 |
|
Marion Muszynski
|
a72fdf8da2
|
Merge branch 'ticket-blockbestsellerProduct' into develop
|
2016-06-24 14:03:16 +02:00 |
|
Marion Muszynski
|
43646dd4bd
|
modif
|
2016-06-24 13:54:50 +02:00 |
|
Marion Muszynski
|
f57b04dbde
|
fix conflict
|
2016-06-24 12:43:26 +02:00 |
|
Marion Muszynski
|
985bf52e83
|
update to add product with attribute to cart from bestsellers
|
2016-06-24 12:41:46 +02:00 |
|