Commit Graph

5386 Commits

Author SHA1 Message Date
lBrieu fce8c6a4e0 [*] FO : Hide the download link if the virtual product do not have files associated with it
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9062 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 14:27:30 +00:00
lBrieu 9eda5d4cdc [*] FO : get the product attribute id for download link
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9059 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 13:57:02 +00:00
lBrieu 3dc3144727 [*] FO : change the download link for files associated to product attributes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9057 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 13:54:56 +00:00
lBrieu fc8a13192c [+] FO : don't send email if there's no file associated to the virtual product
[*] FO : change the download link for files associated to product attributes

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9056 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 13:53:51 +00:00
lLefevre a1f4c147b9 //update adminStates.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9055 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 12:48:31 +00:00
lLefevre 3133e7ab27 //added AdminStatesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9054 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 12:42:52 +00:00
rMalie 0e33114d4d // Improve exception display
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9051 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 12:05:40 +00:00
vAugagneur a39871ee84 //fixed small bug on search category
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9049 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 09:39:13 +00:00
vAugagneur 2ea5c7d0ba //fixed small bug on search category
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9048 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 09:34:38 +00:00
lLefevre 06713441d5 //Added AdminAliasesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9047 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 09:34:10 +00:00
vAugagneur 053af8843f [+] Classes : Media::getJqueryPluginPath() - added new parameter $folder
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9045 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 09:01:19 +00:00
lLefevre 13607b185b //correct errors in norms
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9044 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 08:57:38 +00:00
lLefevre 018cd09251 //added array _listSkipDelete in AdminController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9043 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 08:30:00 +00:00
lLefevre 899c461853 // Added AdminGroupShopController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9042 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 08:18:44 +00:00
lLefevre 1c6dae34d1 //fixed bug update form
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9041 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 08:17:51 +00:00
lBrieu 22d2088e69 [-] Solve problem when trying to view a specific order on the history page (bad order id)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9040 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 07:55:21 +00:00
vAugagneur 99593ce1b5 //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9033 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 16:25:08 +00:00
rMalie 2a764cfd14 // Fix downloadable files in admin
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9031 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 16:10:05 +00:00
lLefevre e80543448a //replace password and secure_key by ****
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9030 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 16:03:24 +00:00
vAugagneur 9391324c8d //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9029 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 15:54:49 +00:00
jmCollin 7dba311ab1 // fix bug with combination
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9028 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 15:51:28 +00:00
lLefevre b3e47d5274 //Added bulk action in AdminShopUrlController and fixed norms
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9027 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 15:45:47 +00:00
vAugagneur 1bb02e3abf [+] Classes : Helper::renderAdminCategorieTree() have new params "$use_search" to add a input search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9026 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 15:42:56 +00:00
lLefevre 65e3e5b8de //fixed bug activeVisu in list_content.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9024 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 15:06:36 +00:00
lLefevre ab53862f87 //delete info() in HelperList
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9023 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 14:59:03 +00:00
lLefevre 4c720551a8 //assign var listSkipDelete in list_content.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9022 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 14:49:20 +00:00
lLefevre c1594d0a66 //added message errors and success, Norms
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9021 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 14:23:23 +00:00
vAugagneur 35280d155d //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9013 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 12:42:20 +00:00
mDeflotte 2da2b5c374 // Normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9011 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 12:04:19 +00:00
lLefevre a499af94bb //update property _listSkipDelete
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9010 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 12:01:55 +00:00
lLefevre e1d3f25007 //added property _listSkipDelete
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9008 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 11:56:02 +00:00
vAugagneur 9b4f965033 //remove folder
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9007 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 10:17:07 +00:00
rMalie d2a0cf76ee // Normalize adminRequestController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9006 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 08:08:43 +00:00
lLefevre 61d80451da //update of the method _displayEnableLink() call line 171
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9004 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 07:09:53 +00:00
lLefevre 723efe49f6 //update .tpl name AdminRequestSqlController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8995 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 16:45:27 +00:00
lLefevre e12b202e85 // Added AdminShopUrlController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8994 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 16:44:23 +00:00
vChabot 3e37164520 Initial import.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8989 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 16:00:06 +00:00
rMalie ae5fc92bf7 // Merge -> revision 8984
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8988 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 15:48:07 +00:00
lBrieu 79115b2572 [*] FO : Update filename if product has combinations (and files associated to them)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8987 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 15:39:06 +00:00
vAugagneur ad7cef7424 //use Tools::isSubmit() instead of array_key_exist('', $_POST);
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8986 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 15:18:18 +00:00
vAugagneur fffe36a72b //fixed small bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8985 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 14:40:40 +00:00
vChabot 2adb0ed5b7 // guest checkout works with the 2 registration process
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8983 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 14:35:43 +00:00
vAugagneur e3f67a1d82 //added missing icons
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8979 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 14:16:30 +00:00
vAugagneur af180672b1 //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8977 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 14:11:55 +00:00
aFolletete ae7f8eeada // Rename adminAddresses template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8971 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 13:19:57 +00:00
lBrieu 1193a572c1 [*] FO : Update filename if product has combinations (and files associated to them)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8968 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 13:05:08 +00:00
fBrignoli 0874edc9c3 // cache on getTaxCalculator()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8966 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 12:43:05 +00:00
lLefevre 3842184c8a //Added method bulkexport in AdminRequestSqlController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8959 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 09:30:03 +00:00
rMalie ef17d0b7da // Merge -> revision 8952
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8957 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 09:14:01 +00:00
vAugagneur f1e265fad4 //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8956 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 09:02:42 +00:00