dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,638 Commits 9 Branches 19 Tags
2a28e476500cd854d9e80d4bb0ded5da170e0615
Commit Graph

64 Commits

Author SHA1 Message Date
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
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
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
gRoussac
4f1e246c71 // remove deprecated 2013-06-24 15:52:56 +02:00
gRoussac
81e8d76d31 // revert 2013-06-06 10:15:40 +02:00
gRoussac
896658633e [*] MO : Followup 040ff3396a 2013-06-06 10:07:48 +02:00
vAugagneur
92da1ffa83 //Merged pull request 124 - thanks to @rynge 2013-05-23 15:24:25 +02:00
vAugagneur
0786cf617f //change the default color (#db3484) 2013-04-11 17:51:28 +02: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
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
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
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
rGaillard
8ea00f8f3b // Fix #PSCFV-4467 2012-10-01 15:19:22 +00:00
rGaillard
b3243a3815 // Fix PSCFV-3933 2012-09-06 15:43:45 +00:00
lLefevre
48b42fb398 [*] TR : update English translations key for Modules 2012-07-12 10:08:13 +00:00
mDeflotte
558745794e [-] MO : #PSCFV-2868 - Fix addslashes 2012-06-25 12:26:07 +00:00
lLefevre
3ccc4c5013 // Fix translations mails errors for each languages 
// Now, Subject for reply_msg.html is translated
// Now use sprintf() in subject mails
 2012-05-24 09:57:48 +00:00
bLeveque
f6414739c7 [-] INSTALLER : Fixed a missing "echo" at Step 3 in the SMTP configuration 
[-] BO : Fixed a French hardcoded page (Favorites Views)
[-] BO : Fixed a typo ("Informations" => "Information")
[*] BO : Improved the UI of the Combinations generator and added some explanations - #PSCFV-770
[*] MO : Added a # before the order number in the e-mail sent to the merchant when an order is placed
 2012-05-19 20:55:05 +00:00
lLefevre
53504c37a3 [-] FO : #PSCFV-2150 : Translations of modules are connected width sprintf() 2012-05-15 08:54:24 +00:00
vAugagneur
edcc0d4e87 [-] MO : fixed bug #PSCFV-2278 - Function hookActionProductUpdate() is deprecated in mailalert module 2012-05-10 07:57:00 +00:00
lLefevre
9642598b6f [*] MO : change calls method Tools::displayError() by $name_module->l() && Translations 2012-05-09 10:06:23 +00:00
Francois Gaillard
8c9a98c698 [-] MO : #PNM-88 : Subject now translated 2012-03-26 15:23:56 +00:00
Francois Gaillard
3a5a2c9bbe [-] MO : #PNM-73 : Mail alerts redirect url on logout corrected 2012-03-26 15:13:01 +00:00
rMalie
50a44277db // Normalize 2012-03-09 09:19:30 +00:00
bMancone
c8b5169eb3 // fixed mailalerts 2012-03-06 14:45:08 +00:00
bMancone
3807de403c // Added hook actionProductCoverage in mailalerts module and updated StockManager 2012-03-05 18:52:25 +00:00
bMancone
9744f1cb46 // hook updateProduct is now deprecated 2012-03-01 14:29:10 +00:00
bMancone
d3ae49c6ad // Updated mailalerts module 2012-03-01 13:32:16 +00:00
rMalie
1dc629a949 // Welcome 2012² 2012-02-23 16:33:10 +00:00
mMarinetti
677a4e485c // Welcome 2012 2012-02-22 09:28:22 +00:00
Francois Gaillard
accafe14cb [-] MO : MailAlerts module upgraded for PrestaShop 1.5 2012-01-25 16:04:31 +00:00
rMalie
443092c811 // Normalize + use $this->smarty instead of $this->context->smarty in modules 2011-12-30 14:59:57 +00:00
lLefevre
0900e2eb1a [-] BO & FO & MO : #PSCFI-4237 : adding id_lang in method l() of class Mail() 2011-12-05 17:22:47 +00:00
dSevere
c2d0e5c822 // Update and fix some bugs on front and admin itnerfaces relative to available quantities functionnality 2011-12-05 15:11:21 +00:00
dSevere
6fddfce5e7 // StockManager : bugs fix + improvement of StockManager utilisation in fucntion of global configuration 2011-12-02 15:23:01 +00:00
rGaillard
052f9ba5af // Replacement of AdminTab by AdminController on modules 2011-11-21 11:06:35 +00:00
dMetzger
4fbb25168e // Retro compatibility and updater improved for Discount/CartRules 2011-11-02 14:23:44 +00:00
dSevere
7c24222885 // stocks : debug and optimisations 2011-10-25 16:31:26 +00:00
rMalie
e6f45e54a6 // Replace shop->sqlAsso(), shop->sqlLang() and shop->sqlRestriction() with shop->addSqlAssociation(), shop->addSqlRestrictionOnLang() and shop->addSqlRestriction() 2011-10-17 09:46:08 +00:00
mDeflotte
3105fc5ddc // Add stock avaibility 2011-10-13 15:58:29 +00:00
rMalie
9510337b1d // Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names 2011-10-10 12:18:56 +00:00
rMalie
2180359342 // Merge -> revision 8720 2011-09-22 15:45:10 +00:00
aFolletete
230bebc7c7 [+] Project : adding Features detachables in order to improve performance 
// clean code
 2011-09-03 17:21:32 +00:00
tDidierjean
3d733ae6e2 // Context part 31 2011-08-17 10:07:12 +00:00
rMalie
d0dbb5c185 // Merge -> revision 8014 2011-08-11 12:00:05 +00:00