Marion Muszynski
|
563b9059de
|
Merge branch 'ticket-9260' into develop
|
2016-08-30 13:56:13 +02:00 |
|
Marion Muszynski
|
0dde6b5611
|
fix for old sales
|
2016-08-30 13:55:47 +02:00 |
|
Marion Muszynski
|
e2c867f5ed
|
Merge branch 'ticket-9260' into develop
|
2016-08-30 13:48:00 +02:00 |
|
Marion Muszynski
|
a96b0018c0
|
upload vp miniature in adminCategory
|
2016-08-30 13:47:42 +02:00 |
|
Marion Muszynski
|
93e464c78b
|
Merge branch 'ticket_9890' into develop
|
2016-08-26 17:16:42 +02:00 |
|
Marion Muszynski
|
0f85417eaf
|
modif css
|
2016-08-26 17:16:18 +02:00 |
|
Marion Muszynski
|
c45e018298
|
Merge branch 'ticket_9890' into develop
|
2016-08-26 17:08:53 +02:00 |
|
Marion Muszynski
|
bab94ab68b
|
fix and modif css
|
2016-08-26 17:08:28 +02:00 |
|
Marion Muszynski
|
cf8f32d6c1
|
Merge branch 'ticket-9895' into develop
|
2016-08-25 12:48:36 +02:00 |
|
Marion Muszynski
|
b963f91154
|
Merge branch 'evo-10581'
|
2016-08-23 15:22:25 +02:00 |
|
Marion Muszynski
|
343fc553aa
|
modif for prod
|
2016-08-23 15:21:43 +02:00 |
|
Marion Muszynski
|
cafdba6107
|
Merge branch 'ticket-8039'
|
2016-08-23 14:53:45 +02:00 |
|
Marion Muszynski
|
01e7bedfe9
|
small fix
|
2016-08-23 14:53:24 +02:00 |
|
Marion Muszynski
|
e5dbd10cef
|
Merge branch 'ticket-8039'
|
2016-08-23 14:50:53 +02:00 |
|
Marion Muszynski
|
52e59458d5
|
petit fix
|
2016-08-23 14:50:30 +02:00 |
|
Marion Muszynski
|
e02097858b
|
fix css conflicts
|
2016-08-23 12:31:28 +02:00 |
|
Marion Muszynski
|
41845cd98d
|
Merge branch 'ticket-8039'
|
2016-08-23 11:12:04 +02:00 |
|
Marion Muszynski
|
fe434095da
|
modif for prod
|
2016-08-23 11:11:28 +02:00 |
|
Rodney Figaro
|
2a2949882d
|
display informations on sizes in product details
|
2016-08-23 10:33:48 +02:00 |
|
Marion Muszynski
|
2a82114fa9
|
fix conflict
|
2016-08-22 17:10:12 +02:00 |
|
root
|
880d16d5b0
|
updateprod
|
2016-08-18 15:56:46 +02:00 |
|
Marion Muszynski
|
8053859bf4
|
fix
|
2016-07-29 13:32:38 +02:00 |
|
Marion Muszynski
|
9d3083eb23
|
update carrier name when es
|
2016-07-29 13:31:12 +02:00 |
|
Marion Muszynski
|
2ab551f44a
|
fix conflict
|
2016-07-27 16:31:59 +02:00 |
|
Marion Muszynski
|
6711926ac3
|
fix conflicts
|
2016-07-25 15:26:26 +02:00 |
|
Marion Muszynski
|
0ccf7667a6
|
Merge branch 'ticket-deliveryDelay_cart' into develop
|
2016-07-25 12:20:03 +02:00 |
|
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 |
|