PhpMadman
6ee2852fa5
[-] MO : Mailalert was not using order reference
2013-11-08 12:48:49 +01:00
PhpMadman
2556a7bb68
[-] MO : Mailalert was not using order reference
2013-11-05 20:46:10 +01:00
Jerome Nadaud
d2e475dd3a
// Removed line from merge
2013-10-29 10:30:59 +01:00
Jerome Nadaud
1d90218e0d
// Update mailalert module version
2013-10-29 10:00:57 +01:00
Jerome Nadaud
9660cef0aa
[-] MO : mailalert - Fix deprecated warning on displayDate
2013-10-29 09:58:42 +01:00
Fabio Chelly
2989538ce1
[*] BO Module mailalerts: send e-mail to merchand when product is out of stock
2013-10-22 15:53:20 +02:00
Fabio Chelly
7133e74c17
[-] MO mailalerts: module mailalerts shows all messages regarding the order
...
PNM-1632 - MailAlert does not show Paypal error message if order has comments
2013-10-18 17:49:00 +02:00
gRoussac
45e9040606
[-] Bo : Could not update mailarler 2.5 with id_mlang
2013-10-11 15:51:02 +02:00
Fabio Chelly
91ae972655
[-] MO mailalert : products alerts can be registered for multiple guests
...
#PNM-1669
2013-09-20 10:46:56 +02:00
gRoussac
3870388e1c
Merge branch 'mailalerts_real_multishop' of https://github.com/axome/PrestaShop into axome-mailalerts_real_multishop
...
Conflicts:
modules/mailalerts/mailalerts.php
2013-09-12 10:09:25 +02:00
Daniel
614e56283a
Update mailalerts.php
...
Fixes issue where customization data is not included in new order email.
2013-09-11 10:49:34 +08:00
Nicolas Sorosac
f30a088848
[*] MO : MailAlerts : Add SQL update script for v2.5
2013-09-10 11:01:11 +02:00
Nicolas Sorosac
c4681c1fb1
[*] MO : MailAlerts : multishop/multilang full compatibility
...
Customers will receive alerts based on the real context of the moment they subscribed to the alert (sho, theme & language)
SQL update table : `ps_mailalert_customer_oos`
=========================================
ALTER TABLE `ps_mailalert_customer_oos`
ADD `id_lang` INT( 10 ) UNSIGNED NOT NULL ,
DROP PRIMARY KEY ,
ADD PRIMARY KEY ( `id_customer` , `customer_email` , `id_product` , `id_product_attribute` , `id_shop` ) ;
2013-09-10 10:24:40 +02:00
Jerome Nadaud
40c64b54e2
[+] MO : Mailalerts - Add Total tax paid to order confirmation
2013-08-29 17:13:48 +02:00
Damien Metzger
ad2702e609
// Config files were translated in french
2013-08-20 17:49:05 +02:00
Vincent Augagneur
fcc1867a94
//merge
2013-07-30 18:02:30 +02:00
gRoussac
bff2844adf
[*] MO : Added customer and product object to hook sending email
2013-07-25 14:50:35 +02:00
Fabio Chelly
5825dda836
[-] MO mailalerts : infinite coverage (-1) is taken into account when sending coverage e-mails
...
#PNM-1563
#PNM-1597
2013-07-19 17:36:51 +02:00
Vincent Augagneur
0c2aa996a2
//oups 😋
2013-07-01 16:48:25 +02:00
Vincent Augagneur
a519f4a7cb
//small fix
2013-07-01 16:40:08 +02:00
Vincent Augagneur
dfc7456980
//replace some escape:'html' by addslashes in .tpl with javascript
2013-06-28 11:06:08 +02:00
gRoussac
4f1e246c71
// remove deprecated
2013-06-24 15:52:56 +02:00
Damien Metzger
ca64179950
// W3C
2013-06-06 15:27:29 +02:00
gRoussac
beab13e966
// revert from Merge pull request #458 from runningz https://github.com/runningz/PrestaShop/commit/040ff3396ac32a1cc35d4d2464e8d36486cac418
2013-06-06 11:24:21 +02:00
gRoussac
3b23558ebb
[-] MO : Report of #PNM-1413 when alert already set on default combination
2013-06-06 10:25:41 +02:00
gRoussac
81e8d76d31
// revert
2013-06-06 10:15:40 +02:00
gRoussac
896658633e
[*] MO : Followup https://github.com/runningz/PrestaShop/commit/040ff3396ac32a1cc35d4d2464e8d36486cac418
2013-06-06 10:07:48 +02:00
Vincent Augagneur
5ec36dac88
[-] MO - fixed bug #PSCFV-9111 - Mailalert emails do not follow the new {color}
2013-06-04 16:14:34 +02:00
runningz
040ff3396a
[-] MO : Remove link "Notify me when available" when in stock
2013-05-28 23:06:05 +03:00
vAugagneur
92da1ffa83
//Merged pull request 124 - thanks to @rynge
2013-05-23 15:24:25 +02:00
Grégoire Bélorgey
83088a1905
[*] Mails : delete a hard-coded pink background
2013-04-29 10:21:53 +02:00
Grégoire Bélorgey
4b52f6da2e
Replacing the default pinkish background with a grey one, and put the text in {color}
2013-04-28 11:13:46 +02:00
vAugagneur
2d2b9f76e0
Merge Pull Request #53 - Thanks @Caleydon
2013-04-23 11:40:08 +02:00
vAugagneur
0786cf617f
//change the default color (#db3484)
2013-04-11 17:51:28 +02:00
Rémi Gaillard
36e7eee76b
// delete also module emails
2013-03-25 18:08:34 +01:00
Francois Gaillard
6d7ea35e97
// Ignore list updated + fr translations updated
2013-03-25 14:59:01 +01:00
Rémi Gaillard
f3dfbda02a
[-] Core: delete lang files
2013-03-21 14:15:55 +01:00
Damien Metzger
46b4570e14
[-] MO : fixed phone number in mailalert #PSCFV-6667
2013-01-15 20:08:37 +01:00
Francois Gaillard
8baf87eef5
// Welcome 2013
2013-01-04 11:19:03 +01:00
vAugagneur
321eaa191b
//added translation
2012-12-28 09:27:12 +01:00
vAugagneur
bfff958b1f
Merge pull request #75 from @sebastienhouzet
2012-12-12 11:24:56 +01:00
Rémi Gaillard
4061c67c5b
[-] MO: Mailalert should send alert for new order independently of the stock management
2012-12-11 18:04:33 +01:00
vAugagneur
4fa7eb6a3d
//revert all config.xml
2012-12-06 11:41:52 +01:00
Sarah Lorenzini
2b10fcd712
// change h4, h5
2012-12-04 17:15:49 +01:00
Rémi Gaillard
0e4bf800c6
[-] Module: Mailalert should not send email to employee if stock management is disabled #PSCFV-5841
2012-11-29 16:28:18 +01:00
vAugagneur
be946319be
//remove svn keyword @version Release: $
2012-11-22 11:57:40 +01:00
sLorenzini
a9c88681eb
[-] FO : fixed bug #PSCFV-4783
2012-11-16 09:22:39 +00:00
lLefevre
4e9f015ead
[-] BO : fix #PSCFV-4848
2012-10-10 09:14:02 +00:00
lLefevre
c21676fc50
[-] BO : fix #PSCFV-3600
2012-10-03 12:34:30 +00:00
rGaillard
b91c7a1306
// Fix #PSCFV-4466
2012-10-01 15:32:49 +00:00