332 Commits

Author SHA1 Message Date
Rodney Figaro
276877e5bc 13142 - force product description as html paragraph in extraTab 2017-05-05 15:16:58 +02:00
Rodney Figaro
f32b41fd89 13217 - change newsletter customer support hours 2017-05-05 11:21:55 +02:00
Rodney Figaro
c0021b31b2 13123 - unsub customer to newsletter when deleting but kept in DB 2017-04-25 15:57:28 +02:00
Rodney Figaro
72c761ce34 13123 - mailjet unsubscribing : now unsub in all mailjet lists 2017-04-25 15:45:52 +02:00
Rodney Figaro
469ea3d800 13046 - mailjet module - get email from exclusion list 2017-04-24 15:20:52 +02:00
Rodney Figaro
33966ce954 13046 - remove mailjet blocked event 2017-04-24 11:38:21 +02:00
Rodney Figaro
f9cd6e42a1 13046 - add event "block" in mailjet event controller to receive block notification for a customer 2017-04-21 17:08:25 +02:00
Rodney Figaro
8b30b30c6e 13046 - change "excluded_mailjet" to "blocked_newsletter" in customer object 2017-04-21 16:51:56 +02:00
Rodney Figaro
f456d5e117 add new attribute "excluded_mailjet" in Customer object, new column "bloqué NL" in customers admin list 2017-04-21 16:45:48 +02:00
Rodney Figaro
a2a378d2fd fix - remove limitation to display the shipping minimum amount box in shopping cart 2017-04-19 09:32:11 +02:00
Rodney Figaro
fe9943a9c2 13013 - let product gift in cart when product belongs to a closed sale 2017-04-18 15:44:54 +02:00
Rodney Figaro
5eb9da95b9 Merge branch 'ticket/r13013-bug-regle-panier' 2017-04-13 18:05:46 +02:00
Rodney Figaro
78358b8f94 13013 - fix minimum amount calculation with free shipping cart rules containing voucher code 2017-04-13 17:43:23 +02:00
Rodney Figaro
3c3d2b8f7f Merge branch 'ticket/r13013-bug-regle-panier' 2017-04-13 17:26:27 +02:00
Rodney Figaro
ff2fe882ef 13013 - fix minimum_amount in other related files 2017-04-13 17:26:16 +02:00
Rodney Figaro
a2919cc3ca Merge branch 'ticket/r12869-mes-newsletters' 2017-04-13 17:08:08 +02:00
Rodney Figaro
7cfd4d5665 13013 - fix minimum amount calculation in cart summary js 2017-04-13 17:07:38 +02:00
Rodney Figaro
103907910b 12853 - add UNSUB_LINK_FR in HTML commentary to conform to Mailjet requirement 2017-04-13 15:48:20 +02:00
Rodney Figaro
82b1e756ec 12853 - Add link "change frequency" in footer in all newsletter" 2017-04-13 15:29:35 +02:00
Rodney Figaro
a031ee4ba5 Merge branch 'ticket/r12851-newsletter-html' 2017-04-13 15:21:44 +02:00
Rodney Figaro
4cc8a95de1 12851 - move the unsubscribe/change frequency link in newsletter into another ticket, restore the unsubscribe link 2017-04-13 15:20:43 +02:00
Rodney Figaro
d2680247ef 12851 - hide unsubscribe link in newsletter 2017-04-12 17:28:59 +02:00
Rodney Figaro
89fa88a81b 12851 - unsubscribe link in lighter grey 2017-04-12 16:56:41 +02:00
Rodney Figaro
eb494d7ae3 12851 - re-enable unsubscribe link in newsletter 2017-04-12 16:38:15 +02:00
Rodney Figaro
21133395a6 12885 - in BO > product form : display warning when the product had no weight and show error msg when no weight is defined 2017-04-12 15:11:52 +02:00
Rodney Figaro
48e68ccc5b 12851 - replace link unsubscribe with a link to change newsletter frequency and unsubscribing 2017-04-12 13:02:06 +02:00
Rodney Figaro
db414ac2e6 12853 - remove all unecessary codes added for this ticket in ant_nw_frequences 2017-04-12 12:52:48 +02:00
Rodney Figaro
45160160a6 12853 - enable frequency changing from a link in VP newsletters 2017-04-12 12:35:55 +02:00
Rodney Figaro
1bbcd4a07f 12851 - fix padding in two column templateon one export 2017-04-11 15:07:45 +02:00
Rodney Figaro
28da320494 12851 - fix invalid html attributes 2017-04-11 14:39:34 +02:00
Rodney Figaro
f2da619ced 12851 - Change all VP newsletters from HTML5 to XHTML1.0 transitional 2017-04-11 13:00:21 +02:00
Rodney Figaro
c4d135c08a 12792 - revert to previous code in order confirmation email 2017-04-11 09:57:20 +02:00
Rodney Figaro
2c86dbc3c7 12792 - display delivery dates stored in db in order confirmation emails 2017-04-10 18:12:30 +02:00
Rodney Figaro
f6472b9c6e 12792 - display delivery dates stored in db in order history 2017-04-10 18:10:50 +02:00
Rodney Figaro
9d303e282b 12792 - store delivery dates in a new table linked to orders 2017-04-10 18:09:03 +02:00
Rodney Figaro
fd2496f44e Merge branch 'ticket/r12798-tickets-inte' 2017-04-10 11:56:23 +02:00
Rodney Figaro
cb944f1d86 Merge branch 'ticket/r12798-tickets-inte' of gitlab.antadis.net:dev-antadis/privilegedemarque into ticket/r12798-tickets-inte 2017-04-10 11:20:17 +02:00
Rodney Figaro
98557f3e9a 12794 - add required subject in order details message thread, update subject in thread 2017-04-10 11:19:51 +02:00
Nolwenn
868bc5ebd3 fix bold vente prive title 2017-04-10 11:06:52 +02:00
Rodney Figaro
7c5526faba 12794 - align middle the text in contact block 2017-04-10 10:09:10 +02:00
Rodney Figaro
40562535d4 12796 - Make only "ventes privées" in bold in the top baseline 2017-04-10 09:44:33 +02:00
Rodney Figaro
922265effe 12794 - remove round block "service clients" in the contact bloc 2017-04-10 09:32:47 +02:00
Rodney Figaro
01a7908afb 12906 - fix uninitialized variable 2017-04-07 16:45:07 +02:00
Nolwenn
2f29086d11 ajouts inté 2017-04-07 15:12:15 +02:00
Nolwenn
f2a394f533 ticket pdm 2017-04-07 14:57:37 +02:00
Rodney Figaro
dd5eaec440 12906 - add ordering by default in customer cart rules sorted by priority 2017-04-03 18:09:47 +02:00
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
95fc898e6a 12895 - change all adm/filemanager from another prestashop 1.6 to fix auto sizing images issue 2017-04-03 10:49:12 +02:00
Rodney Figaro
0c386225e2 12792 - change delivery text in order carrier step 2017-03-31 09:41:45 +02:00