Rodney Figaro
a241cdd54c
fix undefined variable remaining_for_free_shipping in blockcart php
2017-02-24 14:44:46 +01:00
Rodney Figaro
f53c2e94c8
remove ill-defined variable minimum_amount, never used in tpls
2017-02-24 14:38:54 +01:00
Rodney Figaro
838902605d
check for undefined variables in header.tpl
2017-02-24 14:27:33 +01:00
Rodney Figaro
9b396b4d26
fix undefined GET variables in footer.tpl
2017-02-24 12:25:33 +01:00
Rodney Figaro
44020ea202
12554 - add carrier column in BO orders list
2017-02-24 11:15:19 +01:00
Srv Privilege de marque
eb46071a1c
save changes in theme fr translations
2017-02-24 11:09:03 +01:00
Srv Privilege de marque
7d684b3624
12567 - add script to update id of subscribers in Mailjet list
...
- add 2 scripts (1 to add the id, the second to fix unsubscriptions if any)
- get rid of a long commented sql query in the original script
- add methods in mailjet library to get the return status of the batch performed in the 2 scripts
2017-02-23 16:49:19 +01:00
Srv Privilege de marque
9651273022
#12268 - max of 31 days to generate invoices
2017-02-20 11:31:30 +01:00
Srv Privilege de marque
dcc597ee61
#12268 - explicit the maximum of 32 days interval to generate invoices rather than 1 month
2017-02-20 11:28:20 +01:00
Srv Privilege de marque
d12018d4d8
#12268 - limit to 6 minutes / 512Mo to generate the PDF invoices
2017-02-20 11:01:28 +01:00
Srv Privilege de marque
600d822be6
#12268 - fix a limit to one month when generating PDF invoices
2017-02-20 10:59:30 +01:00
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
