dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,386 Commits 9 Branches 19 Tags
9b0086777ebddfe6cfcce18bf94de732b8081b83
Commit Graph

105 Commits

Author SHA1 Message Date
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
e01a890c01 // Use protected instead of private for classes we can override #PSCFV-1976 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14895 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-26 08:55:55 +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
rMalie
099c6a7080 // Fix id_shop in URL for BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14670 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 08:26:31 +00:00
rMalie
41f137e82b // Fix id_shop in URL 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14650 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-16 09:45:19 +00:00
rMalie
3971ab65fa // Fix id_shop in URL 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14644 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-16 09:07:24 +00:00
lLefevre
d9ff501e9c [-] BO : remove sprintf() which are unnecessary 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14355 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-29 08:31:28 +00:00
lLefevre
dbfaa930d8 [-] BO : remove sprintf() which are unnecessary 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14340 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-28 14:57:38 +00:00
rMalie
b79c1f1aa1 // Fix default state for shops #PSTEST-1013 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14168 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-14 16:31:54 +00:00
rMalie
91ac5e0685 // Fix minor bug on shop urls #PSTEST-911 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13897 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-06 15:17:05 +00:00
rGaillard
27d177bd9c // Fix carriers and product tax rules group import on shop creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13876 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-06 10:38:31 +00:00
rGaillard
2da79de4b7 // Fix stock on shop import 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13734 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-29 10:45:22 +00:00
bMancone
63281c1f61 // Fixed #PSTEST-804 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13699 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 15:35:37 +00:00
rMalie
07c674da0a // Add support of UTF-8 in multishop virtual uri 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13688 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 14:26:19 +00:00
vAugagneur
47c42de03f [-] BO : fixed Duplicate entry for key 'full_shop_url' when added new shop url 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13687 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 14:19:31 +00:00
rMalie
ac890a4fb1 // Fix auth issues for multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13647 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 17:03:58 +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
rMalie
1c2f174bdb // Improve multishop_context in AdminController and rename shop->getListOfID() by Shop::getContextListShopID() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13615 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 09:49:19 +00:00
rMalie
69e2cf95d6 // Restore shop context in shop list and can filter shop pages per group shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13579 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-24 08:58:21 +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
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
rMalie
c8e9f1f029 // Change RIGHT to LEFT join in shop association 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13543 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-23 08:34:46 +00:00
fGaillard
f4e9c87cc6 [-] BO : #PSFV-492 : BugFix CMS pages & categories 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13540 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-22 16:57:51 +00:00
rMalie
4e6628cbfd // Remove $display_multishop_toolbar and add instead $multishop_context to manage shop context per admin controller 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13530 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-22 14:25:28 +00:00
mDeflotte
49450cdf05 [-] Project : #PSCFI-4737 - Add no-cache to header when there are 301 to avoid caching 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13487 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 09:16:27 +00:00
rMalie
3c79768737 [*] Classes : table prefix is no longer required in Db::getInstance()->delete() method 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13396 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 14:54:52 +00:00
rMalie
b2ad614fd9 // Remove shop url when a shop is deleted #PSTEST-747 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13304 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 13:50:04 +00:00
rMalie
cecc3721d4 // Improve multishop ergonomy with a link to missing url on shop list 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13303 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 13:20:17 +00:00
rGaillard
d16b4bcf1e // Debug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13135 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 14:55:47 +00:00
rGaillard
8a5f37be1b // Fix operator priority bug on class Shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13130 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 14:26:14 +00:00
mDeflotte
cca93f2c6d // Fix Bug with function ShopUrl::getMainShopDomainSSL 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12925 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-02 10:40:20 +00:00
vChabot
781e4ec0e5 // norm fix 
// rename Shop::has_dependency() in Shop::hasDependency()

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12864 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 15:28:43 +00:00
vChabot
34d6f4b9cb // norm fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12859 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 15:15:01 +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
2159489ad2 // Add more informations on deprecated data 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12716 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-26 14:10:31 +00:00
rMalie
a03464ada9 // Fix multishop when an URL is not found in shop_url 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12632 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-24 09:12:19 +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