Marion Muszynski
|
108e87e6eb
|
fix bug custom update
|
2017-02-27 11:01:21 +01:00 |
|
Marion Muszynski
|
a099f27ab0
|
comment paid option for mondial relay return to be enabled later
|
2017-02-27 10:31:48 +01:00 |
|
Marion Muszynski
|
456c33e769
|
fix badge to have comment
|
2017-02-24 18:07:55 +01:00 |
|
Marion Muszynski
|
90a8112c07
|
fix js
|
2017-02-24 17:34:30 +01:00 |
|
Marion Muszynski
|
1abc53a6e3
|
add bagde on left column
|
2017-02-24 17:28:19 +01:00 |
|
Marion Muszynski
|
a0b794df37
|
fix conflicts
|
2017-02-24 16:18:45 +01:00 |
|
Marion Muszynski
|
d7f3512dc5
|
fix conflicts
|
2017-02-24 16:12:51 +01:00 |
|
Marion Muszynski
|
1392d4f75c
|
fix size label
|
2017-02-24 16:10:23 +01:00 |
|
Marion Muszynski
|
8ffa5cfd12
|
Merge branch 'ticket-12643-ExportLoyalty'
|
2017-02-24 16:01:56 +01:00 |
|
Marion Muszynski
|
f56c80a0ae
|
add of new menu for export of loyalties
|
2017-02-24 16:01:38 +01:00 |
|
Marion Muszynski
|
f124cf0241
|
Merge branch 'ticket-12391-DiscountForNoneOrder_part2'
|
2017-02-24 14:22:26 +01:00 |
|
Marion Muszynski
|
4cef238c28
|
modification of discount value
|
2017-02-24 14:22:10 +01:00 |
|
Marion Muszynski
|
5b5e1933c4
|
changement position of badge
|
2017-02-24 14:20:53 +01:00 |
|
Marion Muszynski
|
71fbbda640
|
Merge branch 'ticket-12571-randomProduct'
|
2017-02-23 15:37:21 +01:00 |
|
Marion Muszynski
|
c4edb90c2b
|
fix js tooltips in product-list
|
2017-02-23 15:37:06 +01:00 |
|
Marion Muszynski
|
349eb7cbe4
|
Merge branch 'ticket-12571-randomProduct'
|
2017-02-23 15:22:01 +01:00 |
|
Marion Muszynski
|
3f23070f12
|
fix css tooltip
|
2017-02-23 15:21:42 +01:00 |
|
Marion Muszynski
|
21a1230a66
|
Merge branch 'ticket-12391-DiscountForNoneOrder_part2'
|
2017-02-23 13:33:28 +01:00 |
|
Marion Muszynski
|
43ac843d88
|
fix date for export to limit result rows
|
2017-02-23 13:32:42 +01:00 |
|
Marion Muszynski
|
b90eccce14
|
Merge branch 'ticket-12391-DiscountForNoneOrder_part2'
|
2017-02-23 13:00:02 +01:00 |
|
Marion Muszynski
|
4ebf0aece0
|
fix export
|
2017-02-23 12:59:16 +01:00 |
|
Marion Muszynski
|
f5ad2c5920
|
Merge branch 'ticket-12391-DiscountForNoneOrder_part2'
|
2017-02-23 12:47:48 +01:00 |
|
Marion Muszynski
|
47baf3e7dd
|
addition of export for analysis
|
2017-02-23 12:45:38 +01:00 |
|
Marion Muszynski
|
0b3787b14e
|
fix special char in sale export and some css updatings
|
2017-02-22 16:27:11 +01:00 |
|
Marion Muszynski
|
8f965e43ba
|
Merge branch 'ticket-12571-randomProduct'
|
2017-02-22 11:45:53 +01:00 |
|
Marion Muszynski
|
3876e9e439
|
adjusting for printing client
|
2017-02-22 11:42:15 +01:00 |
|
Marion Muszynski
|
055f7b5ba0
|
update style bulkupdate
|
2017-02-21 18:03:12 +01:00 |
|
Marion Muszynski
|
e3da63737c
|
addition of return mail
|
2017-02-21 14:46:14 +01:00 |
|
Marion Muszynski
|
17633b00f8
|
add picto in categoryscroll
|
2017-02-21 11:57:07 +01:00 |
|
Marion Muszynski
|
2837aea4a5
|
addition of picto for random product
|
2017-02-21 11:49:55 +01:00 |
|
Marion Muszynski
|
cf49b2e2b5
|
Merge branch 'ticket-12391-DiscountForNoneOrder'
|
2017-02-20 12:59:52 +01:00 |
|
Marion Muszynski
|
a4dc930c88
|
addition of cron for new customer discounts
|
2017-02-20 12:58:40 +01:00 |
|
Marion Muszynski
|
bcf44b4e77
|
fix label size
|
2017-02-17 15:23:58 +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
|
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
|
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
|
de7b739dbb
|
fix tsid es
|
2017-02-17 10:55:46 +01:00 |
|
Marion Muszynski
|
b64a84b5e7
|
fix when no order in one of country
|
2017-02-17 10:35:25 +01:00 |
|
Marion Muszynski
|
7ef48d6256
|
implementation of trsutedshop ES
|
2017-02-17 10:23:07 +01:00 |
|
Marion Muszynski
|
4a9082d25f
|
fix size
|
2017-02-16 18:04:08 +01:00 |
|
Marion Muszynski
|
7ee1ef8d6a
|
fix label size
|
2017-02-16 17:59:30 +01:00 |
|
Marion Muszynski
|
6b59c291b2
|
add test mondial reprint
|
2017-02-15 12:10:01 +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 |
|