Commit Graph

2975 Commits

Author SHA1 Message Date
vAugagneur 640ec6d006 [-] BO : fixed bug #PSCFV-4701 - Module onclickOption is not called 2012-12-06 12:16:37 +01:00
vAugagneur 12f47a1b9b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 11:32:24 +01:00
vAugagneur d71970d5ff [-] BO : fixed bug #PSCFV-4699 - Module uninstall confirmation message is missing 2012-12-06 11:32:19 +01:00
Milow 82c7f03119 Fix typo 2012-12-05 21:27:37 -06:00
Milow 55e55689a6 Fix mail error
This changes two things in the mail class.

1. If the html template was missing, it would tell you the txt template
was missing. It now tells you that the html template is missing.

2. If the type is set to only text or html, don't fail if the other
template is missing. Example, if set to only use text templates, don't
fail if the html template does not exist. If the type is set to both,
or if the specific type of template is missing, it will still complain.
2012-12-05 21:26:07 -06:00
vAugagneur 2c095c11a1 [-] FO : fixed bug #PSCFV-5826 #PSCFV-4697 Live edit only works for home page && Live edit can't load module 2012-12-04 18:29:10 +01:00
Rémi Gaillard 4e9c534f1b [-] Core: Locales should be setted anywhere #PSCFV-5953 2012-12-04 15:40:17 +01:00
Rémi Gaillard a1e91bcfa9 [-] Core: Fix #PSCFV-5948 id_warehouse was sometime set to null on validateorder with stock management disabled 2012-12-04 15:32:06 +01:00
Rémi Gaillard b414bd06a4 [-] Core: Fix #PSCFV-5966 the tax rate applied to shipping cost for the visitors was the product tax rate 2012-12-04 15:09:41 +01:00
Rémi Gaillard e70069bdfa [-] WS: #PSCFV-5982 logo email/invoices/mail don't return standard logo if not exists 2012-12-04 11:56:17 +01:00
Rémi Gaillard aac0500c72 [-] WS: Fix #PSCFV-5981 logo path 2012-12-04 11:52:04 +01:00
Rémi Gaillard f8365220e2 [-] Core: Fix isDate validator 2012-12-03 16:52:22 +01:00
Rémi Gaillard a3c28f3ace [-] Core: Fix date validator #PSCFV-5797 2012-12-03 16:12:08 +01:00
vAugagneur c769a2599c [-] BO : fixed bug when toggle status on product listing, redirect_type was not good 2012-12-03 15:23:25 +01:00
vAugagneur c2f31109e4 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-03 14:14:54 +01:00
vAugagneur 2195f9bdcb [+] CORE : now you can choose the redirect option when your product is disable 2012-12-03 14:13:50 +01:00
Rémi Gaillard 4a94d54f6d [-] BO: Fix #PSCFV-5332 wrong rights on folder after uploading image 2012-12-03 12:26:27 +01:00
Rémi Gaillard c73be7904a [-] BO: Fix category association in global context #PSCFV-5551 2012-12-03 11:25:59 +01:00
vAugagneur 0de7579f58 //remove debug 2012-12-02 20:05:39 +01:00
vAugagneur 49e1a536e3 [*] FO : improve SEO and http error code 2012-12-02 19:46:09 +01:00
Vincent Augagneur 7c04885560 Merge pull request #55 from PrestaEdit/mobile_logo
[+] FO: Mobile logo
2012-11-30 02:06:19 -08:00
vAugagneur f1b36279cf //small cookie expire fix 2012-11-30 09:35:42 +01:00
PrestaEdit 68c3f18f16 Merge pull request #1 from PrestaEdit/mobile
[-] FO : show mobile theme if you have click "Broswe the mobile site" on...
2012-11-29 13:01:22 -08:00
PrestaEdit 291431fc49 [*] FO: use initLogoAndFavicon() function 2012-11-29 21:57:04 +01:00
PrestaEdit b433db02b1 [*] FO: add initLogoAndFavicon() 2012-11-29 21:56:03 +01:00
vAugagneur ab66251968 //wrong define unsing _MAIL_DIR_ instead of _PS_MAIL_DIR_ 2012-11-29 18:44:51 +01:00
vAugagneur f563e12912 [-] BO : fixed bug #PSCFV-5501 - Can't edit Guest AccountAddress in Custumer -> Addresses 2012-11-29 18:16:56 +01:00
vAugagneur f6c8af26cc //small fix in Context::getMobileDevice() 2012-11-29 17:20:18 +01:00
Vincent Augagneur 5199b81b50 Merge pull request #54 from PrestaEdit/mobile
[-] FO : show mobile theme if you have click "Broswe the mobile site"
2012-11-29 07:13:29 -08:00
Vincent Augagneur cb4bf6251f Merge pull request #57 from oleacorner/patch-1
[*] PDF : Update /PDFGenerator::render()
2012-11-29 05:46:38 -08:00
oleacorner 81931f40a0 Update classes/pdf/PDFGenerator.php 2012-11-29 13:05:05 +01:00
Vincent Augagneur 0c0e3ab9ce Merge pull request #41 from jessylenne/patch-1
[-] CORE : lang.php inclusion path correction in classes/Mail.php
2012-11-29 03:08:24 -08:00
oleacorner 6d0d0bab1f Update classes/pdf/PDFGenerator.php
Proposal to enhance the $display parameter.

The proposal supports the true/false value, but also the 'D', 'I' and 'S' of fpdf.

The behavior of the true value is changed to 'D' instead of 'I'.
So, in fornt or back office, while cliking on a button to retrieve a PDF, the download windows is proposed instead of displaying the PDF inside the navigator.
2012-11-28 13:55:08 +01:00
vAugagneur 358c0c168f [-] BO : fixed bug #PSCFV-5610 Credit slip reference is too short
[*] BO : added prefix on credit slip reference
2012-11-28 10:56:43 +01:00
PrestaEdit 06ca6d2576 [+] FO: modifiy width and height smarty vars for the mobile logo 2012-11-28 01:31:43 +01:00
PrestaEdit d6cf7278cf [+] BO: modifiy smarty var $logo_url to have the mobile logo image if mobile version 2012-11-28 01:23:24 +01:00
PrestaEdit d16cd5a3bf [-] FO : show mobile theme if you have click "Broswe the mobile site" on a PC 2012-11-27 22:55:57 +01:00
Vincent Augagneur eb80e9fcf5 Merge pull request #50 from PrestaEdit/PSCFV-5880
[-] CORE : fixed bug #PSCFV-5880: add Cart ID into $cache_id
2012-11-27 09:21:44 -08:00
vAugagneur 21fd4d5eaa [-] FO : fixed bug #PSCFV-5871 - URL rewrite with layered disabled 2012-11-27 17:07:59 +01:00
vAugagneur 23862593f1 [-] FO : fixed bug #PSCFV-5865 - Payment modules are not visible in the hookPayment for a foreigner country 2012-11-27 16:33:32 +01:00
Rémi Gaillard 93038e45f8 [-] FO: Fix cookie problem when accessing not accessing to the shop with the main url 2012-11-27 14:52:15 +01:00
François Gaillard 7ae88931f0 [-] Classes : Bug fix : Modules, check module instance 2012-11-27 11:58:25 +01:00
Vincent Augagneur b874e0a990 Merge pull request #51 from PrestaEdit/PSCFV-5872
[-] CORE : fixed bug #PSCFV-5872: Modify is_a() with instanceof
2012-11-27 01:32:07 -08:00
vAugagneur 2567034288 [-] BO : added Module::getInstanceByName brefore ->loadUpgradeVersionList 2012-11-27 10:10:00 +01:00
Jonathan Danse 45cafd3a23 // $module_name is a string, test not good 2012-11-27 09:30:04 +01:00
PrestaEdit 6d73004b70 // Modify is_a() with instanceof 2012-11-26 23:12:17 +01:00
PrestaEdit 9dd5989103 //add Cart ID into $cache_id 2012-11-26 22:51:37 +01:00
Rémi Gaillard 06177fea69 // small fix 2012-11-26 19:14:06 +01:00
Rémi Gaillard 809595becf // small fix some $ was missing :] 2012-11-26 19:12:53 +01:00
Rémi Gaillard 7e0a1b28c4 // small fix 2012-11-26 17:44:41 +01:00