Marion Muszynski
|
bdc241572a
|
Merge branch 'ticket-13560-BannerMobile' into develop
|
2017-06-28 12:18:17 +02:00 |
|
Marion Muszynski
|
cd390c8fb9
|
add promo banner for ps
|
2017-06-28 12:18:03 +02:00 |
|
Marion Muszynski
|
7ef886ba82
|
Merge branch 'ticket-13560-BannerMobile' into develop
|
2017-06-27 18:22:46 +02:00 |
|
Marion Muszynski
|
b87d25038f
|
addition of module ant_promobanner
|
2017-06-27 18:22:24 +02:00 |
|
Marion Muszynski
|
db8e0ffcce
|
addition of selection by ean
|
2017-06-27 10:12:22 +02:00 |
|
Marion Muszynski
|
45fbaac030
|
Merge branch 'ticket-13166-RetourProcess_3' into develop
|
2017-06-26 11:53:16 +02:00 |
|
Marion Muszynski
|
a2a0385822
|
upgrading of return process
|
2017-06-26 11:52:56 +02:00 |
|
Marion Muszynski
|
2a5e3d861b
|
fix label
|
2017-06-23 12:27:50 +02:00 |
|
Marion Muszynski
|
d1ef2e6fe7
|
Merge branch 'ticket-13166-upgradeReturnPart2' into develop
|
2017-06-23 12:25:12 +02:00 |
|
Marion Muszynski
|
5f28f49b51
|
modification reason,instruction and comment
|
2017-06-23 12:24:55 +02:00 |
|
Marion Muszynski
|
fe9de26a25
|
Merge branch 'ticket-13550-FixPayboxDirect' into develop
|
2017-06-23 10:11:24 +02:00 |
|
Marion Muszynski
|
2b858963a3
|
add comment
|
2017-06-23 10:11:06 +02:00 |
|
Marion Muszynski
|
4572379dfc
|
fix multi paiement and css
|
2017-06-22 16:53:29 +02:00 |
|
Marion Muszynski
|
9f25935902
|
Merge branch 'ticket-13389-3Dsecure'
|
2017-06-22 15:15:04 +02:00 |
|
Marion Muszynski
|
d8dc176d53
|
Merge branch 'ticket-13389-3Dsecure' into develop
|
2017-06-21 16:48:01 +02:00 |
|
Marion Muszynski
|
d3e5dc18d0
|
test
|
2017-06-21 16:47:43 +02:00 |
|
Marion Muszynski
|
cf1b1eb2fc
|
Merge branch 'ticket-13389-3Dsecure' into develop
|
2017-06-21 16:39:12 +02:00 |
|
Marion Muszynski
|
a3dc8fa981
|
add 3Dsecure
|
2017-06-21 16:37:50 +02:00 |
|
Marion Muszynski
|
3cc85eb363
|
Merge branch 'ticket-13166-UpgradeReturnManager' into develop
|
2017-06-21 15:54:48 +02:00 |
|
Marion Muszynski
|
03c6b2c8bd
|
modif
|
2017-06-21 15:54:34 +02:00 |
|
Marion Muszynski
|
d1f1199517
|
Merge branch 'ticket-13166-UpgradeReturnManager' into develop
|
2017-06-21 14:44:30 +02:00 |
|
Marion Muszynski
|
805d225840
|
ergo changement and cleaning cron
|
2017-06-21 14:44:10 +02:00 |
|
Marion Muszynski
|
12e744b313
|
Merge branch 'ticket-9103-UrlMetaCategory'
|
2017-06-20 09:51:32 +02:00 |
|
Marion Muszynski
|
5e88037ef6
|
Merge branch 'ticket-13516-removeCategoryAddButton' into develop
|
2017-06-19 12:18:42 +02:00 |
|
Marion Muszynski
|
fec2e5ba19
|
remove add buttom
|
2017-06-19 12:18:25 +02:00 |
|
Marion Muszynski
|
77f3034f5f
|
Merge branch 'ticket-13324-pixelFB' into develop
|
2017-06-19 11:06:04 +02:00 |
|
Marion Muszynski
|
8d98b4f8e1
|
Merge branch 'ticket11985-invoiceMR' into develop
|
2017-06-16 17:51:35 +02:00 |
|
Marion Muszynski
|
dadf16f8fb
|
separate la poste invoices and mr invoices
|
2017-06-16 17:51:19 +02:00 |
|
Marion Muszynski
|
86f576af74
|
remove philea part
|
2017-06-16 14:52:50 +02:00 |
|
Marion Muszynski
|
2bee96172e
|
Merge branch 'ticket-11985-statLogMR' into develop
|
2017-06-16 14:20:55 +02:00 |
|
Marion Muszynski
|
45d7d61848
|
add philea and futur MR expe to logistic stats
|
2017-06-16 14:20:34 +02:00 |
|
Marion Muszynski
|
b02d84d2f7
|
optimization query categories
|
2017-06-16 11:09:15 +02:00 |
|
Marion Muszynski
|
27b1222817
|
add mutiple invoice generation for one csv
|
2017-06-16 10:59:02 +02:00 |
|
Marion Muszynski
|
6bdea321da
|
fix footer
|
2017-06-15 16:42:13 +02:00 |
|
Marion Muszynski
|
3f775a0fec
|
Merge branch 'ticket-paypalError' into develop
|
2017-06-15 16:19:42 +02:00 |
|
Marion Muszynski
|
9e79b4dfc4
|
fix error when amount is 0
|
2017-06-15 16:19:26 +02:00 |
|
Marion Muszynski
|
06daeaf29e
|
Merge branch 'ticket-13024-UpdBDC' into develop
|
2017-06-14 17:03:46 +02:00 |
|
Marion Muszynski
|
62e0b6a8f1
|
upgrade adminlog for bdc
|
2017-06-14 17:03:25 +02:00 |
|
Marion Muszynski
|
a4b3b52b27
|
Merge branch 'ticket-13473-IVAForEs' into develop
|
2017-06-14 10:58:42 +02:00 |
|
Marion Muszynski
|
904f9865e7
|
fix price tax on product page add to cart box
|
2017-06-14 10:58:27 +02:00 |
|
Marion Muszynski
|
660c2c51be
|
change discount conditions
|
2017-06-13 16:12:10 +02:00 |
|
Marion Muszynski
|
3137429e67
|
Merge branch 'ticket-9103-UrlMetaCategory' into develop
|
2017-06-12 14:42:13 +02:00 |
|
Marion Muszynski
|
3a33250608
|
translate link rewrite category/product
|
2017-06-12 14:41:59 +02:00 |
|
Marion Muszynski
|
5f4f10355e
|
Merge branch 'ticket-13222-PhileaStock'
|
2017-06-12 12:15:35 +02:00 |
|
Marion Muszynski
|
eba11aa018
|
fix script to expected stock and add report view to adminPhilea
|
2017-06-12 12:15:15 +02:00 |
|
Marion Muszynski
|
dd909798c3
|
Merge branch 'ticket-13222-PhileaStock'
|
2017-06-12 10:31:23 +02:00 |
|
Marion Muszynski
|
765f5195dd
|
received CRR
|
2017-06-12 10:30:57 +02:00 |
|
Marion Muszynski
|
15edfc59ec
|
fix inte
|
2017-06-09 10:43:57 +02:00 |
|
Marion Muszynski
|
234769d2bf
|
fix refund query for paypal
|
2017-06-09 10:16:53 +02:00 |
|
Marion Muszynski
|
1c1acd47f6
|
fix refund array
|
2017-06-08 17:14:44 +02:00 |
|