Commit Graph

58 Commits

Author SHA1 Message Date
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
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
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
rMalie
1739b144c0 // Fix #PSFV-279
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12291 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-09 17:52:58 +00:00
vChabot
a9b4c401bb // little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12277 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-09 16:03:58 +00:00
vChabot
0de351e25d // little fix about multishop categories
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12275 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-09 16:01:03 +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
76bc20a9ab // Can access to administration without the good shop url #PSTEST-152
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12185 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-05 13:34:57 +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
mMarinetti
9ac97aac36 // better message for Theme edition + french translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11982 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 10:56:44 +00:00
fGaillard
9ff33d65cf [-] Classes : #PSTEST-214 : BugFix : TopMenu for shops and groups
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11973 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 10:15:49 +00:00
rGaillard
288e84cc64 // Improve backoffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11890 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-29 14:35:03 +00:00
rMalie
b335cb196f // Fix deprecated method Shop::getCurrentShop() #PSFV-279
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11878 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-29 08:49:09 +00:00
mMarinetti
0051788824 // add theme add/remove function
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11831 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-28 11:39:14 +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
mMarinetti
b74c003c39 // class Shop optimization in sql request
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11443 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 22:39:11 +00:00
vChabot
6ef2e2cc50 [*] BO : New category management with multi shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11437 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 17:36:08 +00:00
bMancone
8af781e449 // Webservice: Stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11390 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 18:34:31 +00:00
mMarinetti
1346ca3e46 // when upgrade process (INSTALL_VERSION defined), initialize return now an empty shop object (+ die2Exception)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11287 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 17:42:24 +00:00
rMalie
03bd438c7d // Format definitions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11173 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 13:41:54 +00:00
mBertholino
225c8523e9 // improve multishop code, id_shop has an id different than 0 even if share_customer or share_order is true
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11172 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 13:37:59 +00:00
mBertholino
5f4972701c // improve multishop code with id_shop = 0 when share_customer or share_order is true
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11169 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 11:59:41 +00:00
rMalie
fddf4fb89b [*] Classes: Remove $fieldsRequired, $fieldsSize and $fieldsValidate (and lang properties) properties, use $definition instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11155 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 18:10:38 +00:00
dSevere
a75ca6c40a // Update and fix some bugs on front and admin itnerfaces relative to available quantities functionnality
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10925 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 15:11:21 +00:00
rMalie
86683a963e // Remove $table and $identifier property from all classes, and add static $definition instead
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10912 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 13:56:03 +00:00
rGaillard
b7c28b8c48 // Fix shop import stock available
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10621 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 22:19:48 +00:00
rMalie
0f87f86203 // Fix some bug on multishop + improve display of shop pages
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10518 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:09:23 +00:00
rGaillard
ddcdcd571d // Warning is now displayed for shop without url
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10512 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 11:11:45 +00:00
rMalie
faa6dda362 // Multishop: redirect 301 to main URL with request uri when a non main URL is triggered
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10504 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 10:18:42 +00:00
lLefevre
4be94127c8 // fix norm and change asso_shop for shop call in initForm()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10205 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-17 12:27:07 +00:00
lLefevre
764ccc45a3 [*] BO #PSFV-94 : Added AdminFeatureController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10137 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-15 15:37:04 +00:00
bMancone
faef9495ea // Added two tables affected when deleting a shop : stock_available and warehouse_shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10119 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-14 17:45:44 +00:00
rMalie
d38bbc2ea5 // Fix during language install (now support table with uppercase prefix on windows)
// Add is_native to hook table in db.sql file

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9989 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-09 15:01:12 +00:00
lLefevre
fc8b5cda7c [*] BO #PSFV-94 : Added AdminImportController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9974 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-08 17:54:08 +00:00
vSchoener
66fa6c64af [+] BO : Add Accounting Management
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9961 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-08 14:20:24 +00:00
dMetzger
17a8dbc05b // Retro compatibility and updater improved for Discount/CartRules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9798 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-02 14:23:44 +00:00
hAitmansour
cff9554dda [+] MO : multi-shop allow the removal of a shop if it has no order and no customer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9722 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-28 14:19:13 +00:00
dSevere
e6dfc34e68 // stocks : debug and optimisations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9644 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-25 16:31:26 +00:00
hAitmansour
d8509b2829 [*] FO BO MO : rename function isMultiShopActivated by isFeatureActive
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9444 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 09:36:12 +00:00
rMalie
a7bc16dadd // Replace shop->sqlAsso(), shop->sqlLang() and shop->sqlRestriction() with shop->addSqlAssociation(), shop->addSqlRestrictionOnLang() and shop->addSqlRestriction()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9384 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 09:46:08 +00:00
rMalie
4d91a31031 // Add exceptions in db classes + normalize some files + split defines.inc file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9216 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 10:04:23 +00:00