Marion Muszynski
|
27f059e40f
|
Merge branch 'ticket-12391-DiscountForNoneOrder' into develop
|
2017-02-20 12:59:06 +01:00 |
|
Marion Muszynski
|
a4dc930c88
|
addition of cron for new customer discounts
|
2017-02-20 12:58:40 +01:00 |
|
Marion Muszynski
|
7a8d6e5355
|
Merge branch 'ticket-12379-updateLabelgenerateEan' into develop
|
2017-02-17 15:24:15 +01:00 |
|
Marion Muszynski
|
bcf44b4e77
|
fix label size
|
2017-02-17 15:23:58 +01:00 |
|
Marion Muszynski
|
1bcc5df644
|
Merge branch 'ticket-12563-TrustedBadge' into develop
|
2017-02-17 15:02:18 +01:00 |
|
Marion Muszynski
|
6b93efe4c5
|
addition of trusted badge
|
2017-02-17 15:02:02 +01:00 |
|
Marion Muszynski
|
dfda640f54
|
Merge branch 'ticket-12563-TrustedBadge'
|
2017-02-17 12:59:24 +01:00 |
|
Marion Muszynski
|
0a94b95ab1
|
Merge branch 'ticket-12563-TrustedBadge' into develop
|
2017-02-17 12:58:27 +01:00 |
|
Marion Muszynski
|
efed3b611e
|
fix json to xml response api
|
2017-02-17 12:58:11 +01:00 |
|
Marion Muszynski
|
4a0fded811
|
Merge branch 'ticket-12563-TrustedBadge'
|
2017-02-17 12:25:59 +01:00 |
|
Marion Muszynski
|
2567489a37
|
Merge branch 'ticket-12563-TrustedBadge' into develop
|
2017-02-17 12:24:47 +01:00 |
|
Marion Muszynski
|
ad26bde331
|
addition of rating
|
2017-02-17 12:24:30 +01:00 |
|
Marion Muszynski
|
7ff5979abc
|
Merge branch 'ticket-12562-trustedShopsES'
|
2017-02-17 11:02:41 +01:00 |
|
Marion Muszynski
|
abed9fd454
|
Merge branch 'ticket-12562-trustedShopsES' into develop
|
2017-02-17 10:56:03 +01:00 |
|
Marion Muszynski
|
de7b739dbb
|
fix tsid es
|
2017-02-17 10:55:46 +01:00 |
|
Marion Muszynski
|
0e34c5a5d8
|
Merge branch 'ticket-12562-trustedShopsES' into develop
|
2017-02-17 10:35:42 +01:00 |
|
Marion Muszynski
|
b64a84b5e7
|
fix when no order in one of country
|
2017-02-17 10:35:25 +01:00 |
|
Marion Muszynski
|
9a634c0d74
|
Merge branch 'ticket-12562-trustedShopsES' into develop
|
2017-02-17 10:23:28 +01:00 |
|
Marion Muszynski
|
7ef48d6256
|
implementation of trsutedshop ES
|
2017-02-17 10:23:07 +01:00 |
|
Marion Muszynski
|
bc37b6c906
|
Merge branch 'ticket-12379-updateLabelgenerateEan' into develop
|
2017-02-16 18:04:22 +01:00 |
|
Marion Muszynski
|
4a9082d25f
|
fix size
|
2017-02-16 18:04:08 +01:00 |
|
Marion Muszynski
|
de856a6c7a
|
Merge branch 'ticket-12379-updateLabelgenerateEan' into develop
|
2017-02-16 17:59:52 +01:00 |
|
Marion Muszynski
|
7ee1ef8d6a
|
fix label size
|
2017-02-16 17:59:30 +01:00 |
|
Marion Muszynski
|
b74733c1dd
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-02-15 12:10:20 +01:00 |
|
Marion Muszynski
|
6b59c291b2
|
add test mondial reprint
|
2017-02-15 12:10:01 +01:00 |
|
Marion Muszynski
|
8a61a09988
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-02-15 11:39:15 +01:00 |
|
Marion Muszynski
|
cacdcf5408
|
addition of cron for agencies and some fixes
|
2017-02-15 11:37:40 +01:00 |
|
Marion Muszynski
|
f367ef99a5
|
Merge branch 'ticket-9374-SaveEuroSign'
|
2017-02-13 11:54:37 +01:00 |
|
Marion Muszynski
|
f03bbe25d6
|
Merge branch 'ticket-12464-FixBelgiumAddress'
|
2017-02-13 11:10:48 +01:00 |
|
Marion Muszynski
|
e53e4262f2
|
modif sent address lines to wsu when expe country is Belgium
|
2017-02-13 11:10:34 +01:00 |
|
Marion Muszynski
|
1bab93e949
|
modif cab mondial relay
|
2017-02-13 11:04:44 +01:00 |
|
Marion Muszynski
|
eadaa6320a
|
Merge branch 'ticket-9374-SaveEuroSign' into develop
|
2017-02-09 10:06:20 +01:00 |
|
Marion Muszynski
|
5225e667ad
|
saving euro sign in adminImport
|
2017-02-09 10:06:06 +01:00 |
|
Marion Muszynski
|
c06219cbb6
|
Merge branch 'ticket-12379-addEanLogBDC'
|
2017-02-08 16:43:23 +01:00 |
|
Marion Muszynski
|
c64f8e7b32
|
change to number format
|
2017-02-08 16:43:09 +01:00 |
|
Marion Muszynski
|
f96aa77018
|
Merge branch 'ticket-12379-addEanLogBDC'
|
2017-02-08 15:27:58 +01:00 |
|
Marion Muszynski
|
926acb1681
|
update number format of ean column
|
2017-02-08 15:27:44 +01:00 |
|
Marion Muszynski
|
eb28219c18
|
Merge branch 'ticket-12379-addEanLogBDC'
|
2017-02-08 15:16:03 +01:00 |
|
Marion Muszynski
|
3c74370c97
|
update column dimension
|
2017-02-08 15:15:47 +01:00 |
|
Marion Muszynski
|
0bc72ecb87
|
Merge branch 'ticket-10393'
|
2017-02-08 14:49:31 +01:00 |
|
Marion Muszynski
|
9b26468a1a
|
Merge branch 'ticket-12379-addEanLogBDC'
|
2017-02-08 14:41:48 +01:00 |
|
Marion Muszynski
|
226ee73365
|
Merge branch 'ticket-12379-addEanLogBDC' into develop
|
2017-02-08 14:35:15 +01:00 |
|
Marion Muszynski
|
89759dfc68
|
moving ean column to the right place
|
2017-02-08 14:34:56 +01:00 |
|
Marion Muszynski
|
c0016367e6
|
Merge branch 'ticket-12379-addEanLogBDC' into develop
|
2017-02-08 13:12:10 +01:00 |
|
Marion Muszynski
|
dc7775ca89
|
addition of ean column in bdc log
|
2017-02-08 13:11:53 +01:00 |
|
Marion Muszynski
|
8203ea5774
|
Merge branch 'ticket-12379-updateLabelgenerateEan' into develop
|
2017-02-08 12:04:23 +01:00 |
|
Marion Muszynski
|
49d3d97d23
|
beginning of label adjusting
|
2017-02-08 12:04:06 +01:00 |
|
Marion Muszynski
|
275b18592f
|
Merge branch 'ticket-12450-updateFormSupport'
|
2017-02-07 16:40:36 +01:00 |
|
Marion Muszynski
|
eeac92d0ef
|
fix conflicts
|
2017-02-07 16:35:59 +01:00 |
|
Marion Muszynski
|
5159283a8a
|
making order choice required
|
2017-02-07 16:34:03 +01:00 |
|