99 Commits

Author SHA1 Message Date
Rodney Figaro
5c40834db0 fix unchecked variable astf_secure_key in sendtoafriend-extra.tpl 2017-02-24 15:20:59 +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
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
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
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
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
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
55d60dd8e4 #12362 send MR email when changing order state only (except if states mean invalids orders) 2017-01-30 17:56:53 +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
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
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
700310ada0 tracking - optimisation de la requete 2016-12-14 10:42:33 +01:00
Rodney Figaro
a4b4de1b1b in privates sales BO, add version in images url to force images to be reloaded by browser 2016-11-23 17:04:26 +01:00
Rodney Figaro
4f2d2194ac #11088 - replace slogan content with subtitle, add tags sous_titre and description in xml catalog 2016-11-02 10:28:11 +01:00
PLESK5
9bd09f9647 fix site url in xml export of fluxcatalog 2016-10-27 15:25:56 +02:00
PLESK5
6eeb127e64 update .gitignore and add changes on modules cartsguru and mailjet + 2 png in theme 2016-10-25 11:52:01 +02:00
Christophe Latour
8390f10e64 flux tomorow 2016-10-14 15:10:45 +02:00
Christophe Latour
9a64d7d000 flux catalog 2016-10-13 12:32:49 +02:00
Christophe Latour
6f9bef2c8a webservice push lead 2016-10-04 15:17:02 +02:00
Christophe Latour
378aefae75 #10887
Affilnet tagging
2016-09-30 10:48:15 +02:00
Christophe Latour
9b18adb563 fix 2016-09-15 17:10:25 +02:00
Christophe Latour
9b72c15121 Merge branch 'ticket/10847' into devel 2016-09-15 16:40:27 +02:00
Christophe Latour
52fbfc73d1 #10847
fix
2016-09-15 16:39:57 +02:00
Christophe Latour
788f2e5b3c #10847
Tag order-confimation
2016-09-15 16:28:35 +02:00
Christophe Latour
3ea54d089a adding logo to the affilnet module 2016-09-13 15:13:42 +02:00
Christophe Latour
36cfdac5d7 #10847 Tag affilnet (INSCRIPTION) 2016-09-13 15:10:50 +02:00
Christophe Latour
1e06e853d9 changing color bis 2016-09-13 11:52:56 +02:00
Christophe Latour
084b1c4edc #10762
https://tickets.antadis.net/issues/10762#note-4
Change color
2016-09-13 11:45: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
71aaf1f7b0 changing header 2016-09-08 15:46:56 +02:00
Christophe Latour
a2e9dabb54 Merge branch 'master' of gitlab.antadis.net:dev-antadis/privilegedemarque 2016-09-08 15:08:32 +02:00