Marion Muszynski
|
25075ae187
|
small modif
|
2016-07-28 10:50:05 +02:00 |
|
Marion Muszynski
|
cc08a0f084
|
Merge branch 'ticket-criteo'
|
2016-07-27 20:33:12 +02:00 |
|
Marion Muszynski
|
bf18b4925e
|
fix
|
2016-07-27 20:32:27 +02:00 |
|
Marion Muszynski
|
5097cb50ad
|
Merge branch 'ticket-criteo'
|
2016-07-27 20:25:55 +02:00 |
|
Marion Muszynski
|
5c90af9bee
|
little fix
|
2016-07-27 20:25:04 +02:00 |
|
Marion Muszynski
|
9f2d22164b
|
Merge branch 'ticket-criteo'
|
2016-07-27 20:15:06 +02:00 |
|
Marion Muszynski
|
b481e60b11
|
fix site version
|
2016-07-27 20:10:25 +02:00 |
|
Marion Muszynski
|
0571982b45
|
ajust js tag
|
2016-07-27 19:52:24 +02:00 |
|
Marion Muszynski
|
dea3180ba6
|
Merge branch 'ticket-criteo'
|
2016-07-27 19:33:17 +02:00 |
|
Marion Muszynski
|
dd941581b7
|
fix url
|
2016-07-27 19:32:15 +02:00 |
|
Marion Muszynski
|
36352f9187
|
Merge branch 'ticket-criteo'
|
2016-07-27 19:29:58 +02:00 |
|
Marion Muszynski
|
c7f9b261c3
|
modif url in cron
|
2016-07-27 19:29:09 +02:00 |
|
Marion Muszynski
|
94ac58ae4b
|
Merge branch 'ticket-criteo'
|
2016-07-27 17:50:16 +02:00 |
|
Marion Muszynski
|
9fabb9b7af
|
fix
|
2016-07-27 17:49:29 +02:00 |
|
Marion Muszynski
|
32d3923948
|
Merge branch 'ticket-criteo'
|
2016-07-27 17:47:48 +02:00 |
|
Marion Muszynski
|
d2452448fc
|
fix label in config module
|
2016-07-27 17:45:44 +02:00 |
|
Marion Muszynski
|
fbd9dafcac
|
modif url product
|
2016-07-27 17:42:44 +02:00 |
|
Marion Muszynski
|
69731d8590
|
Merge branch 'ticket-criteo'
|
2016-07-27 17:06:02 +02:00 |
|
Marion Muszynski
|
492f14f02c
|
Merge remote-tracking branch 'origin/ticket-blockOrderSummary'
|
2016-07-27 16:35:50 +02:00 |
|
Marion Muszynski
|
fe32da2f12
|
add module criteo_bbb
|
2016-07-25 16:40:22 +02:00 |
|
Marion Muszynski
|
6711926ac3
|
fix conflicts
|
2016-07-25 15:26:26 +02:00 |
|
Marion Muszynski
|
1694bf54d1
|
standardization date estimation part 2
|
2016-07-25 14:31:22 +02:00 |
|
Marion Muszynski
|
bb0cd59d0b
|
adjusting date delivery
|
2016-07-25 12:22:50 +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
|
4734f5dabb
|
Merge branch 'ticket-blockOrderSummary'
|
2016-07-25 11:23:55 +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
|
67314cbf25
|
hide bestsellers at payment step
|
2016-07-13 15:09:33 +02:00 |
|
Marion Muszynski
|
2b9fd29308
|
Merge branch 'ticket-invoiceOrderBy'
|
2016-07-13 10:59:09 +02:00 |
|
Marion Muszynski
|
4acaacaaa8
|
other modif
|
2016-07-12 17:59:18 +02:00 |
|
Marion Muszynski
|
c0117d7819
|
good modif
|
2016-07-12 17:35:38 +02:00 |
|
Marion Muszynski
|
fd51d7f449
|
small update
|
2016-07-12 16:59:11 +02:00 |
|
Marion Muszynski
|
5303ef1b06
|
update BDC sale state
|
2016-07-12 16:23:23 +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
|
df1e423c9c
|
modif order way
|
2016-07-11 17:06:11 +02:00 |
|
Marion Muszynski
|
ebd46063eb
|
small mod
|
2016-07-11 16:15:04 +02:00 |
|
Marion Muszynski
|
fce857f676
|
update order way M2
|
2016-07-11 16:13:21 +02:00 |
|
Marion Muszynski
|
d1c984cb76
|
update sort invoice
|
2016-07-11 14:44:19 +02:00 |
|
Marion Muszynski
|
7faebc96f0
|
small js update in adminlogisticpending
|
2016-07-11 12:35:41 +02:00 |
|
Marion Muszynski
|
d2ec1e1de8
|
adding module blockordersummary
|
2016-07-08 17:51:48 +02:00 |
|
Marion Muszynski
|
91fc9ee7dc
|
update order invoice
|
2016-07-08 16:03:19 +02:00 |
|
Srv Bebeboutik
|
4a93e29747
|
modif prod, remove log email sending to us
|
2016-07-08 15:52:31 +02:00 |
|
Marion Muszynski
|
e489a60c90
|
Merge branch 'ticket-simplemulti_invoice'
|
2016-07-08 10:52:17 +02:00 |
|
Marion Muszynski
|
d7f6930236
|
Merge branch 'ticket-simplemulti_bdc'
|
2016-07-08 10:47:49 +02:00 |
|