Commit Graph

263 Commits

Author SHA1 Message Date
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
b188a70d9a Merge branch 'master' of gitlab.antadis.net:dev-antadis/privilegedemarque 2017-03-14 17:10:12 +01:00
Srv Privilege de marque
2483e89b78 save last banner changes 2017-03-14 17:07:41 +01:00
Srv Privilege de marque
e5a9a84c2d save email templates changes 2017-03-14 17:00:16 +01:00
Srv Privilege de marque
5ddeb8d69d save modified themes mails and others 2017-03-14 16:15:03 +01:00
Rodney Figaro
5501668868 12725 - add error_log in mailjet deleteContact() 2017-03-10 16:46:44 +01:00
Srv Privilege de marque
700d70397a 12704 - update theme translations with new price for delivery 2017-03-10 13:09:13 +01:00
Rodney Figaro
657aed4e4f 12704 - change minimum delivery price in product page 2017-03-10 12:10:08 +01:00
Rodney Figaro
6e338c5b8c change the price and sentence related to the free delivery in front header 2017-03-10 11:23:33 +01:00
Srv Privilege de marque
460cffe7ca save translations changes 2017-03-10 11:04:53 +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
Srv Privilege de marque
7cdb41edbd 12630 - change top menu item selection, version without url parameter, far more complex. 2017-02-28 12:41:18 +01:00
Srv Privilege de marque
3272832fd9 12630 - fix current selected menu item with param in url 2017-02-28 10:08:34 +01:00
Srv Privilege de marque
f9eb8a9ac0 12667 - neolys, change xml encoding exporter from ISO-8859-1 to UTF-8 2017-02-28 09:24:51 +01:00
Srv Privilege de marque
1d063277db remove fix front top menu - was fixing partially only the issue 2017-02-28 09:06:21 +01:00
Srv Privilege de marque
efa4787709 12360 - fix front top menu active item 2017-02-27 18:38:44 +01:00
Rodney Figaro
e8d5ddbb00 Merge branch 'master' of gitlab.antadis.net:dev-antadis/privilegedemarque 2017-02-27 12:48:25 +01:00
Rodney Figaro
e4e250bacc fix undefined variables, wrong objects in tpls 2017-02-24 16:04:42 +01:00
Rodney Figaro
5c40834db0 fix unchecked variable astf_secure_key in sendtoafriend-extra.tpl 2017-02-24 15:20:59 +01:00
Rodney Figaro
3882a42da1 fix getCategoryLink with no argument in blockcart 2017-02-24 15:14:13 +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
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
Srv Privilege de marque
7101ff803b fix css 2017-02-24 12:17:20 +01:00
Srv Privilege de marque
8eca0ec3b1 Merge branch 'ticket/r12630-menu' 2017-02-24 11:46:45 +01:00
Srv Privilege de marque
311860f51c css 2017-02-24 11:45:54 +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