377 Commits

Author SHA1 Message Date
Rodney Figaro
d8cf353fce 12317 - add number to dates labels in privatesales pref 2017-05-18 16:37:03 +02:00
Rodney Figaro
9eb27f0c5d 12317 - limit private slides between dates 2017-05-18 16:33:10 +02:00
Rodney Figaro
6bafe82030 12317 - add dates in privatesales slider 2017-05-18 13:09:07 +02:00
Rodney Figaro
898e4a4041 13280 - change mailjet method delete email from all lists processing 2017-05-17 15:47:00 +02:00
Rodney Figaro
8acf967aa8 13244 - fix previous changes : blocked emails are only unsubscribed from their list (not removed) and not added to "desabonnes" 2017-05-17 12:49:11 +02:00
Rodney Figaro
cdcd449ab0 13244 - keep blocked emails in DESABONNE list 2017-05-17 12:40:49 +02:00
Rodney Figaro
45823d245a Merge branch 'ticket/r13244-cron-mailjet-cleanup' 2017-05-17 12:02:05 +02:00
Rodney Figaro
466041d15d 13244 - mailjet api : get emails from a given list, remove all emails in a given list 2017-05-17 12:01:34 +02:00
Rodney Figaro
ed966a8743 13280 - remove blocked contact from all lists 2017-05-16 18:16:59 +02:00
Rodney Figaro
7013a30cb3 13280 - does not add to "DESABONNE" when account deleted 2017-05-16 17:15:52 +02:00
Rodney Figaro
89ef13dbba 13244 - change "opener" to trihebdo 2017-05-15 16:49:32 +02:00
Rodney Figaro
efff5b133f 13244 - update mailjet lists through events and unsubscribing 2017-05-15 15:08:16 +02:00
Rodney Figaro
dbc6b8e762 fix bug in header with variables delivery_dates_* 2017-05-09 14:34:10 +02:00
Rodney Figaro
e0d7546ffc fix warnings from pm_advancedshearch 2017-05-09 13:14:10 +02:00
Rodney Figaro
819f320ff5 13142 - fix extratab paragraph tag filtering 2017-05-09 11:20:07 +02:00
Rodney Figaro
d9a0b58810 fix extratabs bug 2017-05-09 10:00:56 +02:00
Rodney Figaro
1afede1e91 fix SaleCore bug 2017-05-09 09:56:39 +02:00
Rodney Figaro
ddabe84c3d Merge branch 'ticket/r13142-import-csv-description' into dev 2017-05-05 15:17:28 +02:00
Rodney Figaro
276877e5bc 13142 - force product description as html paragraph in extraTab 2017-05-05 15:16:58 +02:00
Rodney Figaro
a9ed8da631 Merge branch 'ticket/r13217-texte-horaires-newsletter' into dev 2017-05-05 11:22:06 +02:00
Rodney Figaro
f32b41fd89 13217 - change newsletter customer support hours 2017-05-05 11:21:55 +02:00
Rodney Figaro
b679a8dfee Merge branch 'ticket/r13123-mailjet-remove-contact-all-list' into dev 2017-04-25 15:57:36 +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
2079e08831 Merge branch 'ticket/r13123-mailjet-remove-contact-all-list' into dev 2017-04-25 15:46:04 +02:00
Rodney Figaro
72c761ce34 13123 - mailjet unsubscribing : now unsub in all mailjet lists 2017-04-25 15:45:52 +02:00
Rodney Figaro
bef0a64c7e Merge branch 'ticket/r13046-column-blocked-mailjet-2' into dev 2017-04-24 15:21:07 +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
515f773955 Merge branch 'ticket/r13046-column-blocked-mailjet' into dev 2017-04-21 17:08:47 +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
c5ec660be4 Merge branch 'fix_redbox' into dev 2017-04-19 09:34:33 +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
2595d1a9a9 Merge branch 'ticket/r13013-bug-regle-cadeau' into dev 2017-04-18 15:45:20 +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
f2b54edc9d Merge branch 'ticket/r13013-bug-regle-panier' into dev 2017-04-13 17:43:36 +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
a354f234e4 Merge branch 'ticket/r13013-bug-regle-panier' into dev 2017-04-13 17:26:44 +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
c21cd2dc8e Merge branch 'ticket/r12853-newlstter-change-frequency' into dev 2017-04-13 15:48:29 +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
b45ef620f4 Merge branch 'ticket/r12853-newlstter-change-frequency' into dev 2017-04-13 15:29:55 +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
baf6f5209f Merge branch 'ticket/r12851-newsletter-html' into dev 2017-04-13 15:21:13 +02:00