42 Commits

Author SHA1 Message Date
Marion Muszynski
053d3774df Merge branch 'ticket-12340-UpdateDeliveryPrice' into develop 2017-01-30 10:49:23 +01:00
Marion Muszynski
f453ffb161 fix address for ES and BE in order summary block for relay socol 2017-01-30 10:49:05 +01:00
Marion Muszynski
682d0b48f8 fix conflicts 2017-01-11 15:55:31 +01:00
Marion Muszynski
5192561bac update BlockOrderSummary, AdminPrivateSalesSale, ParentOrderController, AdminLogistic, logistic, OrderDetailController, order_detail tpl, mondial relay tpl for Mondial Relay 2017-01-11 15:33:44 +01:00
Marion Muszynski
e29e97e7bd Merge branch 'fix-tpl-delivery_date' into develop 2016-11-28 10:05:26 +01:00
Marion Muszynski
fc38b7d684 fix pre selection 2016-11-25 11:56:05 +01:00
Marion Muszynski
cc725c4d89 fix changement delivery address 2016-11-25 11:50:52 +01:00
Marion Muszynski
10f30ee3e7 fix conflicts 2016-11-25 11:41:38 +01:00
Marion Muszynski
afa5bc8d65 fix update shipping address 2016-11-25 11:39:44 +01:00
Marion Muszynski
3a630a0d93 Merge branch 'ticket-7768-UpdateSAV' into develop 2016-11-25 10:49:27 +01:00
Marion Muszynski
0e6992f29b changement delivery date estimation 2016-11-25 10:49:10 +01:00
Marion Muszynski
d8df8aa34b Merge branch 'ticket-7768-UpdateSAV' into develop 2016-11-24 16:34:33 +01:00
Marion Muszynski
f10191c8f3 addition of payment method 2016-11-24 16:34:12 +01:00
Marion Muszynski
d1874af03f Merge branch 'ticket-7768-UpdateSAV' into develop 2016-11-24 16:23:55 +01:00
Marion Muszynski
74f0ab876e fix 2016-11-24 16:23:28 +01:00
Marion Muszynski
3ecf54cfcc fix conflicts 2016-11-24 16:05:44 +01:00
Marion Muszynski
c17fb91c63 addition of orders selection and css modif 2016-11-24 16:04:13 +01:00
Marion Muszynski
4add8caca1 modif 2016-11-04 15:01:46 +01:00
Marion Muszynski
ed05b99b65 bug fixes 2016-11-04 14:56:33 +01:00
Marion Muszynski
537eb9f490 other fix 2016-11-04 13:08:00 +01:00
Marion Muszynski
576e99292e good fix this time 2016-11-04 13:05:25 +01:00
Marion Muszynski
21b2da29d6 fix for front 2016-11-04 13:03:15 +01:00
Marion Muszynski
306111c390 addition of address changement 2016-11-04 12:54:57 +01:00
Marion Muszynski
84ab26a49b fix and addition of address modification 2016-11-04 12:50:34 +01:00
Marion Muszynski
6eefb4a672 addition of order info 2016-10-26 16:54:52 +02:00
Marion Muszynski
1f7b49b9b9 modifications 2016-10-26 15:11:40 +02:00
Marion Muszynski
7aaf231422 integration product list in sav message 2016-10-25 12:03:06 +02:00
Marion Muszynski
bfbfd14bd6 addition of signals about price and nb product 2016-10-24 14:27:50 +02:00
Marion Muszynski
6e0cfd7635 modif 2016-10-17 17:29:37 +02:00
Marion Muszynski
27a62959a6 start refund sav page 2016-10-14 18:30:05 +02:00
Marion Muszynski
39fa6390f7 modif name in order summary 2016-07-29 13:41:55 +02:00
Marion Muszynski
bb0cd59d0b adjusting date delivery 2016-07-25 12:22:50 +02:00
Marion Muszynski
50ddbe95b3 comment date estimation, waiting for good calcul method 2016-07-25 11:23:29 +02:00
Marion Muszynski
dd6a758e32 modif css 2016-07-25 11:17:40 +02:00
Marion Muszynski
b1ecd00e3e modif for delivery delay 2016-07-25 10:51:39 +02:00
Marion Muszynski
5994e715e1 fix 2016-07-15 12:49:39 +02:00
Marion Muszynski
b8a4934278 adding delivery date estimation 2016-07-15 12:26:58 +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
489b94cff5 suite block order summary 2016-07-12 14:50:52 +02:00
Marion Muszynski
b03c5cf0b9 add logo 2016-07-11 17:43:10 +02:00
Marion Muszynski
d2ec1e1de8 adding module blockordersummary 2016-07-08 17:51:48 +02:00