Marion Muszynski
|
f7ad50aacd
|
modif bdc log
|
2017-01-17 15:07:07 +01:00 |
|
Marion Muszynski
|
5eb3e3376d
|
Merge branch 'ticket-12204-ImportEan' into develop
|
2017-01-17 13:28:59 +01:00 |
|
Marion Muszynski
|
5fe1eeadde
|
moving of block update ean
|
2017-01-17 13:28:43 +01:00 |
|
Marion Muszynski
|
1bd6618395
|
Merge branch 'ticket-12204-ImportEan' into develop
|
2017-01-17 13:25:53 +01:00 |
|
Marion Muszynski
|
41f3e18e89
|
addition of new update of ean
|
2017-01-17 13:25:37 +01:00 |
|
Marion Muszynski
|
3c4069254f
|
adjusting for bbb
|
2017-01-17 12:41:02 +01:00 |
|
Marion Muszynski
|
07603dfa84
|
Merge branch 'ticket-12197-NewDiscountAdminOrder' into develop
|
2017-01-17 10:06:49 +01:00 |
|
Marion Muszynski
|
41087356d8
|
return shipping cost enable when clicking on generateDiscount2
|
2017-01-17 10:06:26 +01:00 |
|
Marion Muszynski
|
a48649bacc
|
Merge branch 'ticket-11199-RebuildNewsletter'
|
2017-01-16 17:54:42 +01:00 |
|
Marion Muszynski
|
8b4a8d1e27
|
changement flux
|
2017-01-16 17:53:55 +01:00 |
|
Marion Muszynski
|
f3e3ea668c
|
Merge branch 'ticket-10580-LaPosteWSU_fixMobile'
|
2017-01-16 14:12:33 +01:00 |
|
Marion Muszynski
|
8e86fbe849
|
addition of mobile phone restriction for wsu la poste
|
2017-01-16 14:12:15 +01:00 |
|
Marion Muszynski
|
a2d47eec98
|
Merge branch 'ticket-12256-fixMobile'
|
2017-01-13 12:47:51 +01:00 |
|
Marion Muszynski
|
217c96b383
|
fix css 2
|
2017-01-13 12:47:30 +01:00 |
|
Marion Muszynski
|
360c802846
|
Merge branch 'ticket-12256-fixMobile'
|
2017-01-13 12:43:05 +01:00 |
|
Marion Muszynski
|
17bf597781
|
fix css
|
2017-01-13 12:42:49 +01:00 |
|
Marion Muszynski
|
5f40792fa8
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-12 14:33:17 +01:00 |
|
Marion Muszynski
|
c75ac311d8
|
fix paymentModule
|
2017-01-12 14:31:57 +01:00 |
|
Marion Muszynski
|
0347a73068
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-12 13:04:20 +01:00 |
|
Marion Muszynski
|
9b2f18c2ef
|
fix wsu laposte, addition in adminLogistics and ajax for MR
|
2017-01-12 13:03:48 +01:00 |
|
Marion Muszynski
|
2cf8ec1073
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-11 18:26:59 +01:00 |
|
Marion Muszynski
|
4716b247d9
|
fix
|
2017-01-11 18:26:36 +01:00 |
|
Marion Muszynski
|
4aca04400e
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-11 18:11:49 +01:00 |
|
Marion Muszynski
|
092a1b169b
|
fix
|
2017-01-11 18:11:29 +01:00 |
|
Marion Muszynski
|
39db1b8145
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-11 18:02:51 +01:00 |
|
Marion Muszynski
|
262cac694a
|
change message in mail order_conf
|
2017-01-11 18:02:31 +01:00 |
|
Marion Muszynski
|
654908b9bf
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-01-11 16:58:28 +01:00 |
|
Marion Muszynski
|
80e0bffe4f
|
fix for dev
|
2017-01-11 16:58:05 +01:00 |
|
Marion Muszynski
|
682d0b48f8
|
fix conflicts
|
2017-01-11 15:55:31 +01:00 |
|
Marion Muszynski
|
c4cbe24bb5
|
addition of crons and admin_order tpl for Mondial Relay
|
2017-01-11 15:53:24 +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
|
de28ff8d87
|
Merge branch 'ticket-11985-MondialRelay'
|
2017-01-11 10:55:10 +01:00 |
|
Marion Muszynski
|
4e1f497252
|
comment mr modif for philea
|
2017-01-11 10:54:50 +01:00 |
|
Marion Muszynski
|
c86bd93311
|
Merge branch 'ticket-12215-showDelay'
|
2017-01-10 18:08:07 +01:00 |
|
Marion Muszynski
|
6590718bcc
|
Merge branch 'ticket-12215-showDelay' into develop
|
2017-01-10 18:06:20 +01:00 |
|
Marion Muszynski
|
038dbec401
|
fix name
|
2017-01-10 18:06:01 +01:00 |
|
Marion Muszynski
|
4767a44021
|
Merge branch 'ticket-12215-showDelay' into develop
|
2017-01-10 17:49:41 +01:00 |
|
Marion Muszynski
|
f93d4446ca
|
showing delivery delay in vp list
|
2017-01-10 17:49:21 +01:00 |
|
Marion Muszynski
|
a19179fddc
|
Merge branch 'ticket-12199-PopupAddToCart'
|
2017-01-10 17:20:49 +01:00 |
|
Marion Muszynski
|
7c01bca020
|
Merge branch 'ticket-10393' into develop
|
2017-01-10 12:08:53 +01:00 |
|
Rodney Figaro
|
bf9c1e3ab2
|
fix last changes
|
2017-01-10 12:06:47 +01:00 |
|
Marion Muszynski
|
4df24497c7
|
Merge branch 'ticket-10393' into develop
|
2017-01-10 12:01:33 +01:00 |
|
Rodney Figaro
|
f44f955329
|
fix incompatible php code
|
2017-01-10 11:59:14 +01:00 |
|
Marion Muszynski
|
6e48dd3722
|
Merge branch 'ticket-10393' into develop
|
2017-01-10 11:22:30 +01:00 |
|
Marion Muszynski
|
7a2b74a9b6
|
Merge branch 'evo-configurations' into develop
|
2017-01-09 15:28:43 +01:00 |
|
Marion Muszynski
|
00b24f1454
|
Merge branch 'evo-configurations'
|
2017-01-09 15:27:33 +01:00 |
|
Marion Muszynski
|
c5359e3899
|
fix
|
2017-01-09 15:27:11 +01:00 |
|
Marion Muszynski
|
344c710c28
|
Merge branch 'evo-configurations'
|
2017-01-09 15:18:52 +01:00 |
|
Marion Muszynski
|
75d2269f9a
|
fix conflict
|
2017-01-09 15:04:04 +01:00 |
|
Marion Muszynski
|
22b9815c1c
|
changement ant_configuration to store carrier conf in db Configuration
|
2017-01-09 15:02:14 +01:00 |
|