Commit Graph

117 Commits

Author SHA1 Message Date
vChabot
42b3e483b7 // little fix sql categories and product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15307 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-15 09:46:04 +00:00
mDeflotte
a4ed3d0092 [-] FO : #PSCFV-1792 - Fix bug with attribute check_access of the method Category::getProducts()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15218 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 12:10:22 +00:00
vChabot
be7522cbbc [-] BO : BugFix : #PSCFV-2300 : Bug on categories position
// When multishop is not enabled in the BO, you can't change the position of your categories
// When multishop is enabled in the BO, you can change the positions of your categories in the BO, but the positions of the categories on the front do not change.

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15209 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-11 09:33:08 +00:00
rMalie
21037010d2 // Fix multishop bug on product_attribute list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14847 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-24 13:48:23 +00:00
rMalie
04a7580a98 // Fix join between product_attribute and product_attribute_shop on getproducts methods
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14700 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 16:10:51 +00:00
rMalie
0c2dd0cd2f // MERGE product_multistore branch : product fields are now editable per shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 13:32:12 +00:00
fGaillard
c26a57e977 [-] MO : #PSFV-620 : Added cast and bug fix for multi shops categories
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14329 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-28 12:43:39 +00:00
vChabot
427d139207 // category import improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14298 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-27 13:41:34 +00:00
vChabot
695cff5a56 // little fix when add category
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14196 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-15 13:54:35 +00:00
vChabot
d50bf1537e // little fix about adding a category (associated groups)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14188 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-15 10:09:01 +00:00
rMalie
409f0f24d1 // Little refacto
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14170 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-14 16:40:25 +00:00
vChabot
ba91c597c7 [-] BO : BugFix : #PSFV-664 : Category import handles multishop now
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14167 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-14 16:21:03 +00:00
tDidierjean
921b688fea // FO Optimization : remove useless Category instantiations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14155 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-14 14:17:46 +00:00
vChabot
8a42a9a74a // category treeview in "all" context shop fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13728 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-29 10:15:23 +00:00
vChabot
cb87b22f4f [-] BO : BugFix : #PSTEST-788 : Treeview is now handled with shop context in admin category controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13707 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-28 17:16:47 +00:00
vChabot
c866259793 [-] BO : BugFix : #PSFV-585 : New Customer Groups can't see the root categories
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13689 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-28 14:27:08 +00:00
dMetzger
f6b91055d5 [+] BO : added a new option for the products : do they appear in the catalog, in the search, both or neither
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13638 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 15:55:40 +00:00
vChabot
02d98b237e // id_category_default is now for multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13624 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 13:53:52 +00:00
rMalie
d821d474e0 // Fix multishop on Category->getChildren()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13621 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 13:15:02 +00:00
rMalie
4ee2698992 // Replace shop->addSqlAssociation() by static call
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13620 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 13:07:51 +00:00
rMalie
c2cef61a5a // Replace shop->addSqlRestriction() and shop->addSqlRestrictionOnLang() by static versions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13618 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-27 12:15:30 +00:00
rGaillard
8596c81daf // Fix sql request
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13595 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-24 10:07:38 +00:00
rGaillard
2408b4ac5f [+] Core : products and carriers tax rules are associated to shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13586 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-24 09:26:18 +00:00
rMalie
7b62fef1ee // Fix shop context call
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13578 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-24 08:51:52 +00:00
rMalie
2454cd7863 // Welcome 2012²
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13573 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 16:33:10 +00:00
rMalie
53e7fe3230 // Improve multishop API
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13568 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 15:54:10 +00:00
rMalie
b24dcffc9c // Improve multishop API
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13566 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 15:39:44 +00:00
dMetzger
a056a78177 // A few dozens queries less on every pages...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13197 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-09 17:15:05 +00:00
vChabot
57a5260700 // replace $_POST by Tools::getValue
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12956 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-03 09:32:12 +00:00
vChabot
182a7ba786 // update category multishop works fine
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12942 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-02 17:10:54 +00:00
vChabot
8c45f904a0 [*] BO : you can set positions to categories using multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12856 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 15:11:27 +00:00
rMalie
c994c25fe1 // Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12680 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-25 14:40:12 +00:00
vChabot
988dd73596 // categories multishop improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12638 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-24 09:30:32 +00:00
mDeflotte
e9c14379af // Removing products of root-categories
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12628 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-24 08:28:24 +00:00
rMalie
a4d97911b1 [*] Classes : Db::autoExecute() call are now replaced by Db::insert() or Db::update()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12624 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-23 17:41:02 +00:00
vChabot
e646dbcce8 // categories multishop improvements (BO breadcrumb + category tree root removed)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12607 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-23 14:50:47 +00:00
vChabot
6c09d18d61 // little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12577 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-20 10:35:17 +00:00
vChabot
6806cdeab3 [*] BO : categories multishop improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12557 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-19 14:03:33 +00:00
rMalie
6887541bdd [-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12552 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-19 10:14:10 +00:00
mDeflotte
9059708533 [-] BO : #PSTEST-369 - Durring the category removing, allow to not delete the products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12339 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-11 10:05:53 +00:00
vChabot
b8de333b30 // errors translations + some improvements
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12326 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-10 17:20:00 +00:00
vChabot
201c193dd4 // little fix about categories with multishop and Helper::renderAdminCategorieTree
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12301 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-10 10:29:53 +00:00
vChabot
168c5c2015 // little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12274 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-09 15:51:57 +00:00
vChabot
ae0f06946c // little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12272 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-09 15:31:38 +00:00
vChabot
87fd511314 [*] BO : Adding category management with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12270 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-09 15:13:46 +00:00
rMalie
494205d52e // Fix PrestaShopException typo
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12128 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 13:53:19 +00:00
rMalie
07207496d7 // Rename correctly all hooks
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12006 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 15:52:40 +00:00
vChabot
a089131884 // removing categories assocation with shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11509 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:18:24 +00:00
vChabot
e5d53567ae // removing categories shop association
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11504 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:05:42 +00:00
vChabot
23aa8049c6 // adding categories with shop association
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11455 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 09:46:38 +00:00