Commit Graph

2981 Commits

Author SHA1 Message Date
vAugagneur 7bc49194b7 [-] FO : fixed bug #PSCFV-5849 now customer addresses can't be edited if country is not enable in this shop excepte if group shop is shared order 2012-12-07 16:23:52 +01:00
Rémi Gaillard 1c1fd827da // small fix for urls 2012-12-07 11:46:50 +01:00
vAugagneur f40369ef6a [-] CORE : fixed sql bug in PaymentModuleCore::getInstalledPaymentModules() - now get only active payment modules 2012-12-06 17:05:19 +01:00
vAugagneur adc1197320 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 16:53:37 +01:00
vAugagneur 048f3cce14 [-] CORE : small fix in Dispatcher::createURL() when friendly URL is disabled 2012-12-06 16:53:29 +01:00
Rémi Gaillard 56819e3573 [-] FO: Fix some tax_display_method value for not default customer group 2012-12-06 16:38:31 +01:00
vAugagneur 61c23c7e75 [-] BO : fixed bug #PSCFV-4701 - Module onclickOption is not called 2012-12-06 12:16:37 +01:00
vAugagneur e809f6bfdb Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-06 11:32:24 +01:00
vAugagneur 6f37326675 [-] BO : fixed bug #PSCFV-4699 - Module uninstall confirmation message is missing 2012-12-06 11:32:19 +01:00
Milow cf7aebd029 Fix typo 2012-12-05 21:27:37 -06:00
Milow c87fb469fd 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 712f0c3d6d [-] 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 da5c5fb4a0 [-] Core: Locales should be setted anywhere #PSCFV-5953 2012-12-04 15:40:17 +01:00
Rémi Gaillard 2d93064fb9 [-] 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 0071850981 [-] 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 e568e0992d [-] 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 b80bc2a6ba [-] WS: Fix #PSCFV-5981 logo path 2012-12-04 11:52:04 +01:00
Rémi Gaillard 6ddd3a03bb [-] Core: Fix isDate validator 2012-12-03 16:52:22 +01:00
Rémi Gaillard 0f3bbaf65c [-] Core: Fix date validator #PSCFV-5797 2012-12-03 16:12:08 +01:00
vAugagneur f6b1e86449 [-] BO : fixed bug when toggle status on product listing, redirect_type was not good 2012-12-03 15:23:25 +01:00
vAugagneur 13ebd3afef Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-03 14:14:54 +01:00
vAugagneur ed3e0e1a58 [+] CORE : now you can choose the redirect option when your product is disable 2012-12-03 14:13:50 +01:00
Rémi Gaillard 428c1fa99b [-] BO: Fix #PSCFV-5332 wrong rights on folder after uploading image 2012-12-03 12:26:27 +01:00
Rémi Gaillard 4a106e51bb [-] BO: Fix category association in global context #PSCFV-5551 2012-12-03 11:25:59 +01:00
vAugagneur 12cb5316ee //remove debug 2012-12-02 20:05:39 +01:00
vAugagneur 2d30a966c3 [*] FO : improve SEO and http error code 2012-12-02 19:46:09 +01:00
Vincent Augagneur 539011c057 Merge pull request #55 from PrestaEdit/mobile_logo
[+] FO: Mobile logo
2012-11-30 02:06:19 -08:00
vAugagneur b8e93d8c44 //small cookie expire fix 2012-11-30 09:35:42 +01:00
PrestaEdit 1286cd3a89 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 99b97d9bb7 [*] FO: use initLogoAndFavicon() function 2012-11-29 21:57:04 +01:00
PrestaEdit f7b40b24b9 [*] FO: add initLogoAndFavicon() 2012-11-29 21:56:03 +01:00
vAugagneur dbda08099a //wrong define unsing _MAIL_DIR_ instead of _PS_MAIL_DIR_ 2012-11-29 18:44:51 +01:00
vAugagneur c8d63a7819 [-] BO : fixed bug #PSCFV-5501 - Can't edit Guest AccountAddress in Custumer -> Addresses 2012-11-29 18:16:56 +01:00
vAugagneur 2bddec6089 //small fix in Context::getMobileDevice() 2012-11-29 17:20:18 +01:00
Vincent Augagneur ce58891b02 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 12971aa769 Merge pull request #57 from oleacorner/patch-1
[*] PDF : Update /PDFGenerator::render()
2012-11-29 05:46:38 -08:00
oleacorner 25ff95741b Update classes/pdf/PDFGenerator.php 2012-11-29 13:05:05 +01:00
Vincent Augagneur 5f8b5c1527 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 7834f1e274 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 8d6433f48f [-] 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 36851aaa58 [+] FO: modifiy width and height smarty vars for the mobile logo 2012-11-28 01:31:43 +01:00
PrestaEdit 59035bd99a [+] BO: modifiy smarty var $logo_url to have the mobile logo image if mobile version 2012-11-28 01:23:24 +01:00
PrestaEdit 19e14c976a [-] 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 1d45d66370 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 4a05ddd0a2 [-] FO : fixed bug #PSCFV-5871 - URL rewrite with layered disabled 2012-11-27 17:07:59 +01:00
vAugagneur 0993d57862 [-] 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 37ddd943ed [-] FO: Fix cookie problem when accessing not accessing to the shop with the main url 2012-11-27 14:52:15 +01:00
Francois Gaillard 545e37a57f [-] Classes : Bug fix : Modules, check module instance 2012-11-27 11:58:25 +01:00
Vincent Augagneur 91d53843d9 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 9e0ad934f8 [-] BO : added Module::getInstanceByName brefore ->loadUpgradeVersionList 2012-11-27 10:10:00 +01:00