Marion Muszynski
|
691c5ac4a3
|
fix conflicts
|
2017-04-20 09:48:17 +02:00 |
|
Marion Muszynski
|
32e7d65395
|
fix block filter on scroll category
|
2017-04-20 09:47:13 +02:00 |
|
Marion Muszynski
|
fa68124dab
|
Merge branch 'ticket-12801-CarrierCleaning' into develop
|
2017-04-19 12:37:00 +02:00 |
|
Marion Muszynski
|
2bbc6d5fa6
|
addition of carrier filter for active ones
|
2017-04-19 12:36:41 +02:00 |
|
Marion Muszynski
|
ecf606391e
|
Merge branch 'ticket-13032' into develop
|
2017-04-18 17:01:16 +02:00 |
|
Marion Muszynski
|
7ef211bbf7
|
addition of another if statement to match eans with first 0
|
2017-04-18 17:01:00 +02:00 |
|
Marion Muszynski
|
f2273997dd
|
Merge branch 'ticket-13023-MultilangThumbCat' into develop
|
2017-04-18 12:48:57 +02:00 |
|
Marion Muszynski
|
90dd61b5bb
|
add multilang on category img thumbs
|
2017-04-18 12:48:42 +02:00 |
|
Marion Muszynski
|
5880295281
|
Merge branch 'ticket-13016-Labelgenerate' into develop
|
2017-04-13 14:11:15 +02:00 |
|
Marion Muszynski
|
32822dbe49
|
fix when order is not valid
|
2017-04-13 14:10:43 +02:00 |
|
Marion Muszynski
|
ada530274e
|
fix
|
2017-04-13 13:58:57 +02:00 |
|
Marion Muszynski
|
03fc3679d6
|
Merge branch 'ticket-13015-modifAdminSale' into develop
|
2017-04-13 13:51:40 +02:00 |
|
Marion Muszynski
|
e89abbaee2
|
fix flag language
|
2017-04-13 13:51:04 +02:00 |
|
Marion Muszynski
|
c97bb8a413
|
Merge branch 'ticket-13015-modifAdminSale' into develop
|
2017-04-13 12:55:25 +02:00 |
|
Marion Muszynski
|
841b995299
|
clean admin ps
|
2017-04-13 12:55:09 +02:00 |
|
Marion Muszynski
|
35e33703b7
|
fix conflicts
|
2017-04-13 12:32:44 +02:00 |
|
Marion Muszynski
|
43bb64da79
|
Merge branch 'ticket-12487-HTTPS3'
|
2017-04-12 17:06:18 +02:00 |
|
Marion Muszynski
|
aad99bcea4
|
remove utm
|
2017-04-12 17:05:56 +02:00 |
|
Marion Muszynski
|
8d8c46d7b6
|
fix adminPrivateSaleSales
|
2017-04-12 09:52:43 +02:00 |
|
Marion Muszynski
|
01a8d528e2
|
fix sortable
|
2017-04-11 15:27:46 +02:00 |
|
Marion Muszynski
|
65ea663f75
|
fix conflict
|
2017-04-11 13:06:48 +02:00 |
|
Marion Muszynski
|
83599a72e6
|
fix
|
2017-04-11 12:32:58 +02:00 |
|
Marion Muszynski
|
8f62586369
|
fix conflict
|
2017-04-11 12:08:19 +02:00 |
|
Marion Muszynski
|
d6e3e16a51
|
modif rss flux catalogue
|
2017-04-10 16:33:42 +02:00 |
|
Marion Muszynski
|
400feb54e1
|
modification flux catalogue to https
|
2017-04-10 16:31:20 +02:00 |
|
Marion Muszynski
|
9c9b9cc2ff
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-04-07 12:21:56 +02:00 |
|
Marion Muszynski
|
c7facde1f8
|
fix
|
2017-04-07 12:21:21 +02:00 |
|
Marion Muszynski
|
d15c0d2ffb
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-04-07 11:48:05 +02:00 |
|
Marion Muszynski
|
7d9b3dfcd7
|
fix for https
|
2017-04-07 11:47:42 +02:00 |
|
Marion Muszynski
|
6e1bbf4d95
|
Merge branch 'ticket-12452-SAVMessHistory' into develop
|
2017-04-06 16:10:42 +02:00 |
|
Marion Muszynski
|
20a07e3273
|
Merge branch 'ticket-12754-MailAlert'
|
2017-04-03 14:22:24 +02:00 |
|
Marion Muszynski
|
028fb3b087
|
http to https for newsletter
|
2017-04-03 12:52:49 +02:00 |
|
Marion Muszynski
|
bf242e592b
|
Merge branch 'ticket-12754-MailAlert' into develop
|
2017-04-03 10:43:57 +02:00 |
|
Marion Muszynski
|
b7f52f26ef
|
addition of mail sending to contact@bebeboutik.com
|
2017-04-03 10:43:38 +02:00 |
|
Marion Muszynski
|
80a4945e20
|
Merge branch 'ticket-12754-MailAlert' into develop
|
2017-03-31 10:06:10 +02:00 |
|
Marion Muszynski
|
aefba6f752
|
fix mail sending when no discount added
|
2017-03-31 10:05:50 +02:00 |
|
Marion Muszynski
|
bd54b64402
|
Merge branch 'ticket-12754-MailAlert' into develop
|
2017-03-30 12:10:49 +02:00 |
|
Marion Muszynski
|
21ca232a11
|
addition of order status option in mail alert module
|
2017-03-30 12:10:32 +02:00 |
|
Marion Muszynski
|
dc9ec01fce
|
Merge branch 'fix-bestSellerCache'
|
2017-03-29 11:01:56 +02:00 |
|
Marion Muszynski
|
7174dc2f25
|
Merge branch 'fix-bestSellerCache' into develop
|
2017-03-29 10:56:13 +02:00 |
|
Marion Muszynski
|
82a396a094
|
remove presta cache system for bestseller
|
2017-03-29 10:55:52 +02:00 |
|
Marion Muszynski
|
bc8a76bb3d
|
Merge branch 'ticket-12574-RemoveProductFromBlockcart'
|
2017-03-29 10:22:01 +02:00 |
|
Marion Muszynski
|
53372852bf
|
Merge branch 'fix-bestSellerCache' into develop
|
2017-03-29 10:08:15 +02:00 |
|
Marion Muszynski
|
85ca91ccfc
|
remove presta cache system for similar products
|
2017-03-29 10:07:59 +02:00 |
|
Marion Muszynski
|
bcf9fe9792
|
Merge branch 'ticket-12574-RemoveProductFromBlockcart' into develop
|
2017-03-28 10:29:14 +02:00 |
|
Marion Muszynski
|
d9f183aacb
|
fix add to cart combination id
|
2017-03-28 10:28:57 +02:00 |
|
Marion Muszynski
|
35f047278f
|
Merge branch 'ticket-12574-RemoveProductFromBlockcart' into develop
|
2017-03-28 10:10:07 +02:00 |
|
Marion Muszynski
|
dafc4e16f0
|
fix remove from block cart
|
2017-03-28 10:09:35 +02:00 |
|
Marion Muszynski
|
8fd14dbaeb
|
Merge branch 'ticket-12742-AntCreationCat' into develop
|
2017-03-27 18:10:27 +02:00 |
|
Marion Muszynski
|
f886f5c02e
|
fix
|
2017-03-27 18:10:05 +02:00 |
|
Marion Muszynski
|
75fe225844
|
Merge branch 'ticket-12742-AntCreationCat' into develop
|
2017-03-27 18:03:47 +02:00 |
|
Marion Muszynski
|
36147fbf40
|
change to add , in category names
|
2017-03-27 18:03:30 +02:00 |
|
Marion Muszynski
|
11fc4769b6
|
fix fatal
|
2017-03-27 16:05:55 +02:00 |
|
Marion Muszynski
|
b649aa1435
|
Merge branch 'ticket-12828-cleanMenuCache' into develop
|
2017-03-27 13:24:23 +02:00 |
|
Marion Muszynski
|
49cc2ef838
|
addition clean menu on category creation and updating
|
2017-03-27 13:24:03 +02:00 |
|
Marion Muszynski
|
96fbc506d7
|
Merge branch 'ticket-12828-cleanMenuCache' into develop
|
2017-03-27 13:13:03 +02:00 |
|
Marion Muszynski
|
4e96e4abe9
|
addition of clean menu when ps is created/updated/deleted
|
2017-03-27 13:12:47 +02:00 |
|
Marion Muszynski
|
396444b912
|
Merge branch 'ticket-12487-HTTPS'
|
2017-03-27 11:28:22 +02:00 |
|
Marion Muszynski
|
e7ef07618b
|
Merge branch 'ticket-12643-OpenLoyaltyEs' into develop
|
2017-03-23 15:03:09 +01:00 |
|
Marion Muszynski
|
dde5791b86
|
fix opening on order status updating
|
2017-03-23 15:02:55 +01:00 |
|
Marion Muszynski
|
45e607b627
|
Merge branch 'ticket-12643-OpenLoyaltyEs' into develop
|
2017-03-22 17:00:55 +01:00 |
|
Marion Muszynski
|
53946880d9
|
opening to es version
|
2017-03-22 17:00:37 +01:00 |
|
Marion Muszynski
|
bb4e4c8249
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 15:46:02 +01:00 |
|
Marion Muszynski
|
647a917f7d
|
fix js id_category change
|
2017-03-21 15:45:45 +01:00 |
|
Marion Muszynski
|
62794cd4bc
|
fix conflicts
|
2017-03-21 15:17:25 +01:00 |
|
Marion Muszynski
|
c919001821
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:57:41 +01:00 |
|
Marion Muszynski
|
24d1d1fb33
|
fix 2
|
2017-03-21 14:57:26 +01:00 |
|
Marion Muszynski
|
f0850ce461
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:54:27 +01:00 |
|
Marion Muszynski
|
b58b5a4f39
|
fix font-size
|
2017-03-21 14:54:06 +01:00 |
|
Marion Muszynski
|
bb9c991c2d
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:45:00 +01:00 |
|
Marion Muszynski
|
ac57693101
|
fix css
|
2017-03-21 14:44:39 +01:00 |
|
Marion Muszynski
|
2e3d56135e
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:40:02 +01:00 |
|
Marion Muszynski
|
8d08040017
|
addition of delay in sale list
|
2017-03-21 14:39:43 +01:00 |
|
Marion Muszynski
|
0aef5e434f
|
fix conflicts
|
2017-03-21 13:29:38 +01:00 |
|
Marion Muszynski
|
e5a329fc18
|
modif flag and fix update position
|
2017-03-21 13:07:20 +01:00 |
|
Marion Muszynski
|
8fe32a145b
|
Merge branch 'ticket-12804-CacheFooter' into develop
|
2017-03-21 10:50:11 +01:00 |
|
Marion Muszynski
|
b7e014f924
|
fix https
|
2017-03-21 10:49:56 +01:00 |
|
Marion Muszynski
|
b23f1a0fa0
|
Merge branch 'ticket-12804-CacheFooter' into develop
|
2017-03-21 10:47:13 +01:00 |
|
Marion Muszynski
|
5aae2a217f
|
moving from ps cache to saved data in txt
|
2017-03-21 10:46:54 +01:00 |
|
Marion Muszynski
|
0cd71bde80
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 15:11:41 +01:00 |
|
Marion Muszynski
|
b343fc4666
|
fix ps_url paiement.php paybox
|
2017-03-09 15:11:22 +01:00 |
|
Marion Muszynski
|
06e546dfae
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 12:35:16 +01:00 |
|
Marion Muszynski
|
0b969badd1
|
fix protocol in paybox module
|
2017-03-09 12:35:04 +01:00 |
|
Marion Muszynski
|
b28f3dbd7e
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 12:17:21 +01:00 |
|
Marion Muszynski
|
fefd5442ac
|
fix protocol in soflexibilite module
|
2017-03-09 12:17:04 +01:00 |
|
Marion Muszynski
|
61ec78cab3
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 11:54:39 +01:00 |
|
Marion Muszynski
|
85b5bb049d
|
fix console log
|
2017-03-09 11:53:55 +01:00 |
|
Marion Muszynski
|
e87b0ce97b
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 11:45:02 +01:00 |
|
Marion Muszynski
|
c73143d5b5
|
fix https in skinStatic module
|
2017-03-09 11:44:41 +01:00 |
|
Marion Muszynski
|
4823dd518b
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 11:07:29 +01:00 |
|
Marion Muszynski
|
52a3477a1e
|
fix //static
|
2017-03-09 11:07:11 +01:00 |
|
Marion Muszynski
|
ba2adf4ec8
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 11:00:36 +01:00 |
|
Marion Muszynski
|
1bd2edfe4d
|
other fix getpagelink
|
2017-03-09 11:00:20 +01:00 |
|
Marion Muszynski
|
e9b9f368a1
|
Merge branch 'ticket-12659-PrintEan'
|
2017-03-09 10:36:14 +01:00 |
|
Marion Muszynski
|
bac4ebbbc2
|
modif with addition of product name and attribute name
|
2017-03-09 10:35:56 +01:00 |
|
Marion Muszynski
|
17c6ac82b6
|
fix bugs
|
2017-03-08 16:11:36 +01:00 |
|
Marion Muszynski
|
2e6e1d23ec
|
start of changement to full https
|
2017-03-08 16:10:35 +01:00 |
|
Marion Muszynski
|
8fabe0bfa7
|
Merge branch 'ticket-12591-MarketingModifications'
|
2017-03-07 15:54:28 +01:00 |
|
Marion Muszynski
|
95088f2d38
|
Merge branch 'ticket-12591-MarketingModifications' into develop
|
2017-03-07 14:41:02 +01:00 |
|
Marion Muszynski
|
179f73f171
|
fix
|
2017-03-07 14:40:09 +01:00 |
|
Marion Muszynski
|
8bd907d1bd
|
Merge branch 'ticket-12591-MarketingModifications' into develop
|
2017-03-07 13:26:08 +01:00 |
|
Marion Muszynski
|
ee271d98c8
|
continuation of updating of market data with addition of remove from cart to GA and addition of name of sale when product is sent to GA
|
2017-03-07 13:25:46 +01:00 |
|
Marion Muszynski
|
28241acf6b
|
add ref and name for print ean management in product BO
|
2017-03-06 17:05:28 +01:00 |
|
Marion Muszynski
|
601e396791
|
Merge branch 'ticket-12692-LabelGenerate'
|
2017-03-06 12:57:59 +01:00 |
|
Marion Muszynski
|
eae3fc73a4
|
last fix for label size
|
2017-03-06 12:57:45 +01:00 |
|
Marion Muszynski
|
b2b75a6fca
|
addition of MR and title/alias fix
|
2017-03-06 12:54:14 +01:00 |
|
Marion Muszynski
|
a6fe73118a
|
Merge branch 'ticket-12591-MarketingModifications' into develop
|
2017-03-03 13:21:23 +01:00 |
|
Marion Muszynski
|
aba69ee44f
|
move id category after name in file name
|
2017-03-03 12:04:35 +01:00 |
|
Marion Muszynski
|
051b3b965b
|
fix name of sale export file with adding id category
|
2017-03-03 11:52:10 +01:00 |
|
Marion Muszynski
|
a213779459
|
fix size
|
2017-03-02 17:09:58 +01:00 |
|
Marion Muszynski
|
3d3d01f32a
|
Merge branch 'ticket-12692-LabelGenerate' into develop
|
2017-03-02 10:33:05 +01:00 |
|
Marion Muszynski
|
e2aff37345
|
bigger font size for ref and product name
|
2017-03-02 10:32:48 +01:00 |
|
Marion Muszynski
|
0da43afb39
|
Merge branch 'ticket-12574-RemoveProductFromBlockcart' into develop
|
2017-03-01 17:24:04 +01:00 |
|
Marion Muszynski
|
1aca7305b8
|
addition possibility to up/down or remove from blockcart list
|
2017-03-01 17:23:45 +01:00 |
|
Marion Muszynski
|
5bcad477aa
|
Merge branch 'ticket-12643-ExportLoyalty'
|
2017-02-28 16:04:10 +01:00 |
|
Marion Muszynski
|
66cce58d00
|
update message info
|
2017-02-28 16:03:58 +01:00 |
|
Marion Muszynski
|
f5ee58457d
|
Merge branch 'ticket-12643-ExportLoyalty'
|
2017-02-28 15:56:45 +01:00 |
|
Marion Muszynski
|
d606bae3c0
|
Merge branch 'ticket-12643-ExportLoyalty' into develop
|
2017-02-28 15:55:11 +01:00 |
|
Marion Muszynski
|
180bccea8d
|
fix request
|
2017-02-28 15:54:54 +01:00 |
|
Marion Muszynski
|
c476007dc6
|
Merge branch 'ticket-12643-ExportLoyalty' into develop
|
2017-02-28 12:55:54 +01:00 |
|
Marion Muszynski
|
642a447760
|
addition of export loyalty details
|
2017-02-28 12:55:32 +01:00 |
|
Marion Muszynski
|
c17728cdfe
|
Merge branch 'ticket-12563-TrustedBadge'
|
2017-02-27 16:46:39 +01:00 |
|
Marion Muszynski
|
db9a22da22
|
Merge branch 'ticket-12563-TrustedBadge' into develop
|
2017-02-27 16:45:17 +01:00 |
|
Marion Muszynski
|
43eb7d308d
|
add observe for new added element
|
2017-02-27 16:45:02 +01:00 |
|
Marion Muszynski
|
28f9cd9dc6
|
Merge branch 'ticket-12563-TrustedBadge' into develop
|
2017-02-27 15:48:53 +01:00 |
|
Marion Muszynski
|
f8333322d0
|
fix width of badge
|
2017-02-27 15:48:34 +01:00 |
|
Marion Muszynski
|
357fc1b724
|
Merge branch 'ticket-12563-TrustedBadge' into develop
|
2017-02-27 13:21:02 +01:00 |
|
Marion Muszynski
|
1613aa288f
|
fix margin
|
2017-02-27 13:20:46 +01:00 |
|
Marion Muszynski
|
a1334bc901
|
Merge branch 'ticket-12658-fixBug' into develop
|
2017-02-27 11:16:11 +01:00 |
|
Marion Muszynski
|
54b5d4b4ba
|
remove var dump
|
2017-02-27 11:15:59 +01:00 |
|
Marion Muszynski
|
61d71ff5ae
|
fix customs process
|
2017-02-27 11:15:12 +01:00 |
|
Marion Muszynski
|
e016c0057a
|
fix conflicts
|
2017-02-27 11:03:20 +01:00 |
|
Marion Muszynski
|
108e87e6eb
|
fix bug custom update
|
2017-02-27 11:01:21 +01:00 |
|
Marion Muszynski
|
197f48052c
|
Merge branch 'ticket-12563-TrustedBadge' into develop
|
2017-02-24 18:08:12 +01:00 |
|
Marion Muszynski
|
456c33e769
|
fix badge to have comment
|
2017-02-24 18:07:55 +01:00 |
|
Marion Muszynski
|
f995c3620a
|
Merge branch 'ticket-12563-TrustedBadge' into develop
|
2017-02-24 17:34:46 +01:00 |
|
Marion Muszynski
|
90a8112c07
|
fix js
|
2017-02-24 17:34:30 +01:00 |
|
Marion Muszynski
|
cac2e4099a
|
Merge branch 'ticket-12563-TrustedBadge' into develop
|
2017-02-24 17:28:35 +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
|
77a9057df1
|
Merge branch 'ticket-12379-updateLabelgenerateEan' into develop
|
2017-02-24 16:10:39 +01:00 |
|
Marion Muszynski
|
1392d4f75c
|
fix size label
|
2017-02-24 16:10:23 +01:00 |
|
Marion Muszynski
|
f56c80a0ae
|
add of new menu for export of loyalties
|
2017-02-24 16:01:38 +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
|
7a0d101e51
|
Merge branch 'ticket-12391-DiscountForNoneOrder_part2' into develop
|
2017-02-23 13:33:04 +01:00 |
|
Marion Muszynski
|
43ac843d88
|
fix date for export to limit result rows
|
2017-02-23 13:32:42 +01:00 |
|
Marion Muszynski
|
f8e4622179
|
Merge branch 'ticket-12391-DiscountForNoneOrder_part2' into develop
|
2017-02-23 12:59:33 +01:00 |
|
Marion Muszynski
|
4ebf0aece0
|
fix export
|
2017-02-23 12:59:16 +01:00 |
|
Marion Muszynski
|
8191e443ff
|
fix conflicts
|
2017-02-23 12:46:49 +01:00 |
|
Marion Muszynski
|
47baf3e7dd
|
addition of export for analysis
|
2017-02-23 12:45:38 +01:00 |
|
Marion Muszynski
|
54f955f882
|
fix conflicts
|
2017-02-22 16:28:25 +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
|
0e1db8cc03
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-02-22 11:42:39 +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
|
84560c0ea8
|
Merge branch 'ticket-12487-httpToHttps' into develop
|
2017-02-20 14:33:45 +01:00 |
|
Marion Muszynski
|
d44e614c61
|
fix https in sponsor redirection to authentication
|
2017-02-20 14:33:28 +01:00 |
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
eeac92d0ef
|
fix conflicts
|
2017-02-07 16:35:59 +01:00 |
|