Commit Graph

128 Commits

Author SHA1 Message Date
dMetzger caccf77b10 // Shop URI case insensitive
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17057 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-28 14:48:56 +00:00
aKorczak 2c504d45bc [-] WS : Fix id_shop behavior when use WS or script
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17025 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-27 15:27:18 +00:00
lLefevre 5c4e749522 [*] FO : Optimization - don't redirect and allow WS and other script to work
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17021 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-27 15:06:00 +00:00
dMetzger 21e32ce611 [-] BO : super admins are now added to all shops #PSCFV-3561
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16991 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-24 09:10:30 +00:00
dMetzger 6cdc8aa6da [*] BO : Changed the default list view for products and categories when multistore is activated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16972 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-23 14:36:52 +00:00
dMetzger 9ab66d1e47 // Multishop optimizations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16952 b9a71923-0436-4b27-9f14-aed3839534dd
2012-08-22 16:17:13 +00:00
lLefevre c7fe97d5d3 [-] BO : fix #PSCFV-3102
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16402 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-13 08:23:39 +00:00
rGaillard f39226c85e // Fix some bug on advanced stock management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16353 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-11 15:46:39 +00:00
dMetzger 744a221075 // Changed the way the multistore associations are loaded, far from perfect, but still better and overridable
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16295 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-10 07:11:16 +00:00
vChabot 7c160a8073 [-] BO : BugFix : #PSCFV-2965 : Localization : updating default currency does not change currency on BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16289 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-09 14:18:12 +00:00
mDeflotte 5eb6a331cd [-] FO : #PSCFV-2981 - Fix bug with url rewrite and subdomain "www"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16191 b9a71923-0436-4b27-9f14-aed3839534dd
2012-07-03 11:54:22 +00:00
rGaillard b37c0dc297 // Cookies subdomain & bug fix on stocks
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16110 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-21 16:11:30 +00:00
rGaillard 5e0505cf05 [-] MO: Blocktopmenu add links to shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16101 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-20 15:38:08 +00:00
vChabot 021272870f [-] BO : BugFix : #PSCFV-2798 : Multistore : BUG on the "modify products page" with another shop device
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16010 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-13 13:23:52 +00:00
rMalie 2239cfe7ae // Fix redirection in Shop::initialize()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16000 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-12 15:58:27 +00:00
rGaillard 2bce691ae8 // Improve performance and bug fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15882 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 16:22:48 +00:00
rMalie 86ee04e6d7 // category_lang are always duplicated on shop creation #PSCFV-2648
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15842 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-05 08:48:48 +00:00
rMalie 649fec49df // Some performance improvement #PSCFV-2658
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15824 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 12:58:52 +00:00
vChabot e3722a71e0 // little fix Shop class condition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15815 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 09:43:25 +00:00
rMalie e01aa221ff // Fix SSL with multishop #PSCFV-2646
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15806 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 08:59:10 +00:00
rMalie 0857f92f7a // Norm and doc for Shop class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15756 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-30 09:50:10 +00:00
rMalie e59a4da65d // Automatically duplicate some shop data if the primary data is checked (E.g. export carriers langs if carrier is checked) #PSCFV-2616
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15748 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-30 08:06:57 +00:00
rMalie 855f72be70 // Fix Shop::isFeatureActive() #PSCFV-2609
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15732 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-29 12:05:13 +00:00
rGaillard 4980999ef5 [*] MO: Improve performance with smarty cache on blocktopmenu
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15725 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-29 09:28:53 +00:00
rGaillard b953186dbd [-] BO: Fix multishop employee restriction on cart and catalog price rules PSCFV-2505
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15700 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 17:12:55 +00:00
rMalie 34d80f945a // Improve multishop code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15691 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 13:37:43 +00:00
tDidierjean 59e29fad75 // cleanup
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15608 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 10:10:08 +00:00
tDidierjean 8398c73e12 // fix redirection
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15604 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 09:46:26 +00:00
tDidierjean c3bdc25d32 // fix url redirection with multishop secondary urls
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15601 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 09:33:24 +00:00
rMalie 5bc76bbd14 // Fix share customer on shops
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15589 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 22:03:34 +00:00
rMalie f969e341c0 // Fix context in multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15585 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 19:33:02 +00:00
rMalie cb4527a95b // Fix multishop in objectModel (langs were not correctly generated when an employee has not all auths on shops)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15582 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 19:12:35 +00:00
rMalie 233caca6e6 // Fix default context in shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15576 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:57:51 +00:00
aNiassy e5e53d54bb [-] BO : Fixed a bug which did not permitted to found a customer in the creation of order in the back office
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15572 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:34:36 +00:00
rMalie 9291b9ad1f // Fix list of customers in multishop #PSCFV-2499
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15562 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:44:38 +00:00
vChabot 529460cfa9 [-] BO : BugFix : #PSCFV-2465 : When creating a shop without importing categories, I can still see the default category from other shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15474 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 08:20:19 +00:00
rMalie a37dbc1e44 // Fix lot of multishop bugs (updateAssoShop reworked, remove multishop property for country / zone / currency / carrier, getList())
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15386 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 14:54:37 +00:00
tDidierjean 054ed013ee [-] BO : fix #PSCFV-2322 - cannot deactivate multishop with only one shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15374 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 14:04:03 +00:00
tDidierjean 65dc076142 [-] Classes : fix bug #PSCFV-2309 - Unable to override Shop::asso_tables
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15247 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-14 08:09:12 +00:00
rMalie 14e44efe75 // Improve Shop::getTotalShops()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15147 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-10 08:59:07 +00:00
rMalie ccfef659c9 // Multishop interface reworked
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15121 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-09 15:05:39 +00:00
rMalie c90474318a // Fix bug on _DB_PREFIX_ call in class Shop #PSCFV-1243
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14897 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-26 09:28:31 +00:00
rMalie 728fb6d651 // Fix problem on configuration context for mono-shop mode #PSTEST-1231
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14867 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 09:54:28 +00:00
rMalie 64b83ee40e // Add hooks for shop duplication, fix homeslider duplication #PSTEST-1173
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14864 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-25 09:04:38 +00:00
rMalie b9fe1bb36b // Add a multishop restriction on address in BO #PSTEST-1035
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14820 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 14:27:08 +00:00
rMalie 60a140c91f // Fix bug on auths for sub employees #PSFV-849
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14804 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-23 09:38:24 +00:00
rMalie ba4c5dbb18 // Some optimization #PI-121
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14723 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-18 09:57:19 +00:00
rMalie eeeb925420 // Shop::$asso_table is now public (for modules) #PSFV-551
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14712 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-18 08:38:30 +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