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 |
|
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
|
f3dd9f9ed3
|
Merge branch 'ticket/r12851-newsletter-html' into dev
|
2017-04-12 17:29:07 +02:00 |
|
Rodney Figaro
|
d2680247ef
|
12851 - hide unsubscribe link in newsletter
|
2017-04-12 17:28:59 +02:00 |
|
Rodney Figaro
|
47548189d5
|
Merge branch 'ticket/r12851-newsletter-html' into dev
|
2017-04-12 16:56:49 +02:00 |
|
Rodney Figaro
|
89fa88a81b
|
12851 - unsubscribe link in lighter grey
|
2017-04-12 16:56:41 +02:00 |
|
Rodney Figaro
|
c9522d0afc
|
Merge branch 'ticket/r12851-newsletter-html' into dev
|
2017-04-12 16:38:23 +02:00 |
|
Rodney Figaro
|
eb494d7ae3
|
12851 - re-enable unsubscribe link in newsletter
|
2017-04-12 16:38:15 +02:00 |
|
Rodney Figaro
|
a5e925f3d7
|
Merge branch 'ticket/r12885-required-product-weight' into dev
|
2017-04-12 15:14:09 +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
|
8b7d446872
|
Merge branch 'ticket/r12851-newsletter-html' into dev
|
2017-04-12 13:02:17 +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
|
90f875e312
|
Merge branch 'ticket/r12853-frequency-newsletter' into dev
|
2017-04-12 12:53:32 +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 |
|