45 Commits

Author SHA1 Message Date
Rodney Figaro
a478dcad92 12906 - change free shipping business rules in eligibility checking (order, cart, cartrule) using cart rules priority 2017-04-03 18:05:01 +02:00
Rodney Figaro
02d2c3f4a2 save changes in cart rules 2017-04-03 17:42:52 +02:00
Rodney Figaro
2e69dd1b8d 12792 - fix ajax update delivery dates 2017-03-30 18:43:56 +02:00
Rodney Figaro
de71d55afd 12792 - add delivery dates in order confirmation emails (html and txt) 2017-03-30 17:56:54 +02:00
Rodney Figaro
1d71309ea7 12792 - fix other delay message in shopping cart 2017-03-30 13:27:11 +02:00
Rodney Figaro
8527f70c5b 12792 - change shopping cart with delivery dates at the bottom of the details and hide right block 2017-03-30 13:23:13 +02:00
Rodney Figaro
ff92e381b9 12792 - change orders history labels, order warning popup, display the correct "other delay" info 2017-03-30 12:03:07 +02:00
Rodney Figaro
9c31208f56 12792 - fix new delivery dates with other delay products in carts, update texts in popups 2017-03-27 18:06:24 +02:00
Rodney Figaro
02058f8dbd 12792 - replace payment column by delivery estimation in order history 2017-03-24 16:40:11 +01:00
Rodney Figaro
a2fba62891 12708 - show warning in admin product page when a product is in a currently opened sale 2017-03-23 18:26:59 +01:00
Srv Privilege de marque
ce5f1377bc 12583 - add query string with tracking in urls when redirecting category with 1 products 2017-03-02 17:17:19 +01:00
Rodney Figaro
e4e250bacc fix undefined variables, wrong objects in tpls 2017-02-24 16:04:42 +01:00
Rodney Figaro
dad5915429 check undefined minimum_amout variable in blockcart and cart controller 2017-02-24 14:56:40 +01:00
Rodney Figaro
abed1a9c03 fix undefined variable remaining_for_free_shipping in cart and order controllers 2017-02-24 14:51:21 +01:00
Rodney Figaro
44020ea202 12554 - add carrier column in BO orders list 2017-02-24 11:15:19 +01:00
Rodney Figaro
32a8aa8d88 #12453 - Make WELCOME and WELCOMEPDM cart rules not compatible with PRIVILEGE* cart rules 2017-02-07 10:04:17 +01:00
Srv Privilege de marque
3023601133 fix fatal error in ProductController 2017-02-03 14:31:31 +01:00
Rodney Figaro
b52d94e306 change override OrderHistory to hook update order status for mondial relay send email method 2017-01-31 09:31:12 +01:00
Rodney Figaro
55d60dd8e4 #12362 send MR email when changing order state only (except if states mean invalids orders) 2017-01-30 17:56:53 +01:00
Florent COLOMBIER
9a32fa2092 sleep dans le OrderConfirmationController afin d eviter le temps trop court entre le moment du paiement sur Atos et le retour sur Prestashop 2017-01-10 17:23:27 +01:00
Rodney Figaro
8764f61bff #12097 - fix lastname column + source 2017-01-05 12:55:43 +01:00
Rodney Figaro
3ffffb6e1f #12165 - add registering tracking for debugging (table ps_tracking_stats_trace) 2017-01-04 12:21:24 +01:00
Rodney Figaro
8ce739e3c4 show name of sponsor source rather than id 2017-01-03 17:23:50 +01:00
root
5fc69ca0f8 fix carrier price with cart rules in order carrier choice step 2016-12-28 09:12:14 +01:00
root
204e699b3f filter obsolete rules "paniers abandonnés" and "parrainage" in admin cart rules form 2016-12-27 16:59:22 +01:00
root
78fefae535 changes for migration on new server and fix in product controller 2016-12-23 10:03:28 +01:00
PLESK5
a90af5b493 skip carrier step when virtual cart and ask TOS to check in payment step 2016-12-15 17:10:00 +01:00
Rodney Figaro
f9af2a5dbb #11881 - add link to TOS in register popup 2016-12-05 10:16:20 +01:00
Rodney Figaro
05d0e29f70 #11755 - add event GTM "contact" for contact page 2016-12-01 16:31:08 +01:00
Rodney Figaro
385fe6d61c change some variables to adwords remarketing tag, events, fix prices 2016-11-28 11:36:17 +01:00
Rodney Figaro
4602bde6fa add product id/name and link in customer messages in BO 2016-10-28 16:49:39 +02:00
Christophe Latour
6f9bef2c8a webservice push lead 2016-10-04 15:17:02 +02:00
Christophe Latour
c86af9b0f4 fix 2016-09-30 11:58:40 +02:00
Christophe Latour
378aefae75 #10887
Affilnet tagging
2016-09-30 10:48:15 +02:00
Christophe Latour
b3a3231f24 #10762
Attente d'un visuel pour la popup.
Attente des règles à mettre en place.
2016-09-08 18:10:47 +02:00
Christophe Latour
75c00b4ec7 Avoid check user 2016-08-24 15:53:56 +02:00
PLESK5
b3cac46081 override 2016-08-16 14:32:14 +02:00
Boutique 37
838ed29ce3 #9440 2016-08-12 14:22:04 +02:00
lamenuit
7cd99a86bc commit from prod 2016-07-12 10:26:49 +02:00
lamenuit
b6397c5e9a update from prod 2016-07-07 15:33:38 +02:00
lamenuit
04dd66dce9 big commit from prod 2016-06-28 11:54:23 +02:00
Serveur preprod
73ba3dca8f commit from prod 2016-06-09 14:40:46 +02:00
Serveur preprod
381d5f1087 gros commit de la prod 2016-06-01 10:16:39 +02:00
Serveur preprod
ff338c7b34 gros commit de la prod 2016-05-10 13:04:43 +02:00
Serveur preprod
f0c0c48223 first push 2016-04-14 16:14:31 +02:00