Commit Graph

227 Commits

Author SHA1 Message Date
Srv Privilege de marque
43fd369da3 #12268 - fix memory limit for generating pdf invoices 2017-02-20 10:36:10 +01:00
Rodney Figaro
6a92885b36 add more infos in flux xml configuration page 2017-02-17 09:28:39 +01:00
Rodney Figaro
f16d422f83 #11088 - add a configuration page for "flux catalogue" 2017-02-16 18:41:05 +01:00
Srv Privilege de marque
0a29d6c276 add tracking parameters in urls 2017-02-16 16:52:41 +01:00
Rodney Figaro
42733cba26 add customer "id" in the post sent to mailjet 2017-02-16 16:26:10 +01:00
Rodney Figaro
7d5715091a #12442 - fix images shown in "last day" bloc export v5 2017-02-14 13:04:08 +01:00
Rodney Figaro
b1db5ee597 #12442 - fix images shown in "today" bloc export v5 2017-02-14 13:01:57 +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
9ea77f2029 12442 - fix image banner issue in exports newsletter 2017-02-03 17:45:14 +01:00
Rodney Figaro
107034f0e4 12442 - hide sale description in export V5 newsletter 2017-02-03 15:18:47 +01:00
Srv Privilege de marque
3023601133 fix fatal error in ProductController 2017-02-03 14:31:31 +01:00
Srv Privilege de marque
d69f4a4776 12442 - put new V5 online, display sales title as they are, not lowercase 2017-02-03 12:53:10 +01:00
Rodney Figaro
44f6e48967 12442 - duplicate vp newsletter export V4 NL to V5 2017-02-03 12:39:15 +01:00
Rodney Figaro
331e946f23 add emailvalidation module + adapt js/css 2017-01-31 10:14:33 +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
c52dae4227 fix merge conflicts 2017-01-30 17:58:46 +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
Srv Privilege de marque
1f4f756b1c #12362 - remove validity check on order in MR new order method 2017-01-30 16:50:08 +01:00
Rodney Figaro
2aeca73e63 #12362 - add additionnal error_log to confirm no email to mondial relay is sent 2017-01-30 12:06:45 +01:00
Rodney Figaro
6407dc5158 #12363 - save atos orders with error payment codes 12 and 17 2017-01-30 10:03:29 +01:00
Rodney Figaro
7999a69a65 #12362 - check order validity before sending mondial relay email 2017-01-30 09:45:32 +01:00
Rodney Figaro
fd26597873 force french translation in followup module 2017-01-16 18:10:14 +01:00
Rodney Figaro
a0da97c552 #12164 - module followup : get rid of unused form fields and rewrite descriptions 2017-01-16 17:59:32 +01:00
Rodney Figaro
61646701c7 add GTM in Antmarketing landingpage 2017-01-16 17:06:18 +01:00
Srv Privilege de marque
e2756e0b09 increase time limit in generatePDF 2017-01-16 14:53:03 +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
Rodney Figaro
a0008aa8ea use the same layout for each product in "todays products" in Export part v4 as Export part light 2017-01-03 16:55:57 +01:00
Florent COLOMBIER
1369c8b1ff Merge branch 'master' of gitlab.antadis.net:dev-antadis/privilegedemarque 2017-01-02 16:57:57 +01:00
Srv Privilege de marque
a356e87a9d #12148 - ajout de log atos 2017-01-02 16:57:34 +01:00
Florent COLOMBIER
1460e723f0 #12148 - correctif atos afin qui met à jour la secure key du cart avant d envoyer afin d eviter la mauvaise redirection dans l order conf 2017-01-02 16:53:14 +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
b6eb40a22b save bandeau banner 2016-12-27 16:58:29 +01:00
root
6a1c7bb6d2 save last migration changes 2016-12-27 16:57:51 +01:00
root
78fefae535 changes for migration on new server and fix in product controller 2016-12-23 10:03:28 +01:00
PLESK5
08fbf95abc changes header and a label in Export Part Light 2016-12-21 17:28:24 +01:00
PLESK5
8710e43720 #12025 - add again custom_email in data layer 2016-12-16 15:21:17 +01:00
PLESK5
07ba6be829 fix unescaped product names in affilnet.tpl 2016-12-15 17:20:15 +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
PLESK5
700310ada0 tracking - optimisation de la requete 2016-12-14 10:42:33 +01:00
Rodney Figaro
520767e0be #12014 - in authentication page, inverse "pro/partic" and hidden input newsletter 2016-12-14 09:41:59 +01:00
PLESK5
39ab59f180 return back to the previous robots.txt with a light fix in one line about sitemap 2016-12-09 12:35:25 +01:00
Rodney Figaro
4ac27f49ff Merge branch 'master' into ticket/r11755-datalayer-gtm-2eme-partie 2016-12-08 16:45:21 +01:00
Rodney Figaro
6eaa771dab #11923 - hide footer links when registring from a sponsor url 2016-12-08 16:13:56 +01:00
Rodney Figaro
ae55992678 #11923 - Lock register popup when landing page displayed from a sponsored url 2016-12-08 15:14:46 +01:00
PLESK5
c34947dc56 #11964 - update robots.txt in order to unlock ads up campaign with google 2016-12-08 12:53:59 +01:00
PLESK5
629d21a507 make module cheque visible in front 2016-12-06 17:05:37 +01:00