dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,009 Commits 9 Branches 19 Tags
398f3aa8ecbfca21cb89d4e9aef80ff2bef4e65f
Commit Graph

1663 Commits

Author SHA1 Message Date
mMarinetti
66bb55a360 [+] classes : New method ->attachProduct($id_product) 
// Fix #PSTEST-699
// now new attachment are automatically linked to the current product

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13489 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 10:03:32 +00:00
mDeflotte
30cdc8b277 // Don't preselect delivery options 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13488 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-21 10:02:56 +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
dMetzger
609a45f25b [*] BO : you can now choose the combination of the free product of a cart rule 
[*] FO : the free product is now removed from the cart along with the cart rule (where applicable)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13479 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 17:04:41 +00:00
mDeflotte
712ce8a688 [-] FO : #PSCFI-4762 - When cart contains virtuals products and physicals products, use only physicals to calculate shipping cost 
// Product virtuals added before upgrading need to have the column ps_product.is_virtual at 1

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13477 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 16:40:22 +00:00
bMancone
d105569cec // Improvement #PSFV-550 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13470 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 15:37:04 +00:00
vChabot
2335b53cdd // select associated categories on a shop creation (with the root category shown when you are not in a shop context) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13466 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 14:36:57 +00:00
tDidierjean
52d9b4c277 // fix redirection on edit page if errors are present 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13463 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 14:14:39 +00:00
bMancone
8fc5329fe9 // Fixed #PSFV-521 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13461 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 13:58:19 +00:00
rGaillard
49f8d51561 // Improve and debug backoffice order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13457 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 13:25:55 +00:00
bMancone
2145cd543b // Fixed missing parameters when calling Currency::exists 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13450 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 09:22:15 +00:00
dMetzger
2c7720ab08 // You shall not DIE! 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13448 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 09:14:01 +00:00
rGaillard
cd20b82227 // Fix bugs on Admin Orders 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13446 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 17:37:04 +00:00
mDeflotte
5f9b81c3a2 // Remove unuseful lines 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13445 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 16:26:29 +00:00
mDeflotte
caf5a6afc3 // Shippping calculation on multishipping did not use package address delivery but the cart address delivery 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13442 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 15:57:37 +00:00
mMarinetti
166d540dbd // die2exception 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13441 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 15:49:27 +00:00
tDidierjean
3ddcf5cfe0 // replace all uses of "combinaison" by "combination" 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13437 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 15:03:56 +00:00
tDidierjean
a0857d3573 // Deprecate function 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13436 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 14:54:32 +00:00
tDidierjean
403db40a7f [*] BO : #PSTEST-784 - selected attribute is now visible 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13434 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 14:50:01 +00:00
fBrignoli
07e1787cdd [-] BO : Bug Fixed #PSTESTS-672 An error has occured during currency creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13433 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 14:49:49 +00:00
mDeflotte
c9bcaec32b [-] BO : BugFix : #PSTEST-807 : stay on the form when an error occured 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13423 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 12:00:12 +00:00
rMalie
5cce9a9d22 // Fix "you edit field for" multishop #PSTEST-796 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13422 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 10:32:45 +00:00
rMalie
748f3647ee // Fix group shop filter association in getList() and improve assoshop with Group: text 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13421 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 10:06:00 +00:00
rMalie
b0d24b3ae4 // Fix shop association in admin on attributes page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13412 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 17:11:49 +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
mDeflotte
83053fa035 // [-] BO : #PSTEST-769 - Use context instead of the Configuration::get() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13394 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 14:23:07 +00:00
mDeflotte
5b942b7993 [-] BO : #PSTEST-769 - The default country must be pre-selected on address list 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13393 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 14:13:04 +00:00
rMalie
b0590e342e // Fix default shop associations in helper shop #PSTEST-770 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13392 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 14:10:30 +00:00
mDeflotte
a17726f8ea [-] BO : #PSFV-503 - Fix bug with image generation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13368 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 17:31:39 +00:00
rMalie
b1a1d78533 // Fix default shop associations in helper shop #PSTEST-746 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13367 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 16:43:32 +00:00
fSerny
da7ff75852 [+] BO : New hooks added (helpers + order history) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13349 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 13:54:50 +00:00
fGaillard
f0e4ba651d [*] MO : BlockCMS module 1.5 compliant + translations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13347 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 13:50:25 +00:00
rMalie
97c7e11df0 // Improve multishop ergonomy (new toolbar) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13333 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 10:04:05 +00:00
tDidierjean
8897f81335 // Fix bulk deletion of attributes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13327 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 17:34:08 +00:00
tDidierjean
2e0d20d9f1 [-] BO : fix bug #PSFV-421 - bug with redirection after login 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13317 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 16:29:21 +00:00
aFolletete
3f5d7edf0b // fixed bug #PSTEST-552 
// Clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13312 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 15:08:40 +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
tDidierjean
3311fd7d25 // AdminController refactoring 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13300 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 10:47:40 +00:00
tDidierjean
c2eaa4af59 [-] BO : fix Save&Stay not working on combination page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13298 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 10:44:08 +00:00
mDeflotte
e58ca980cd [-] Classes : #PSTEST-717 - Fix an infinite loop 
// Add missing params $products

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13293 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 10:36:53 +00:00
rMalie
bc016fc498 // Optimization on Product cache 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13283 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 09:39:18 +00:00
mDeflotte
7d64fa4d60 [-] Classes : #PSTEST-275 #PSFV-304 - Method Module::getPosition() was missing 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13279 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 08:35:31 +00:00
dMetzger
ec0798fe8a [-] FO : If a product is given for free in a cart rule and is already in the cart, the price is subtracted #PSTEST-715 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13275 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 17:47:40 +00:00
tDidierjean
1c6b736418 // revert wrong change ($_FILES is needed in afterImageUpload() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13274 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 17:38:03 +00:00
tDidierjean
4b9bcd5932 [-] BO : #PSTEST-705 fix scene image upload 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13273 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 17:36:34 +00:00
rMalie
e15452ce61 // Fix quick link access for multishop #PSFV-478 #PSTEST-687 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13272 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 17:22:12 +00:00
rMalie
d92c298178 // Fix redirection to index when friendly url are activated #PSFV-488 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13270 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 16:56:28 +00:00
lLefevre
fcc3b4b27d // Fix change controllers/ by controllers/front/ for list meta tags 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13267 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 15:40:23 +00:00
tDidierjean
54080062f7 // Finish removing the "id_theme in ImageType" code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13265 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 15:35:05 +00:00