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

107 Commits

Author SHA1 Message Date
vChabot
568327849c [*] FO : combination link from product page are now the same as the combination link from blocklayered 
// Cart is now accepting the combination link

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10028 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-10 10:45:19 +00:00
tDidierjean
81e5f72142 [*] BO : #PSFV-94 - added AdminAttributeGeneratorController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9949 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-08 10:09:57 +00:00
rGaillard
77a66c64fd [*] Core : Specific prices can now be applied to combinations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9897 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-04 15:53:53 +00:00
fBrignoli
17b7d300b7 // removeTax => removeTaxes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9861 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-03 17:20:49 +00:00
mMarinetti
43c32d61c0 // bugfix retrocompatibility addProductAttributes and addProductCombination (quantity problem) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9845 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-03 14:54:50 +00:00
fSerny
0ba4fe9c7e [*] PROJECT : New Module API (part 1) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9790 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-02 10:49:01 +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
mDeflotte
7a6364bfa7 // BugFix : Porblem during adding product to cart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9601 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-24 15:04:29 +00:00
mDeflotte
78ddaa120c // Stock decrementation when order is shipped 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9486 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-20 09:08:59 +00:00
rGaillard
2a22c9a502 [*] Core: Upgrade smarty to version 3.1.3 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9469 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-19 15:16:52 +00:00
mDeflotte
886fcda18e // Decrement stock available on order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9430 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-18 15:43:28 +00:00
vChabot
6517b06539 [+] FO : you can access to a product combination with its own url (e.g: http://www.myshop.com/index.php?controller=product&id_product=1#disk-space=16go&color=yellow) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9425 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-18 14:03:02 +00:00
bMancone
e5ae345855 // Stock : fixed Pack & Product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9406 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-18 08:59:31 +00:00
bMancone
23a24b58e2 // Removed occurences of setStock / getStock 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9395 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-17 15:03:15 +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
mDeflotte
2ea57df6cb // Add stock avaibility 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9339 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-13 16:37:07 +00:00
dSevere
f1c26377a5 // stock: add warehouse tab 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9334 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-13 16:19:10 +00:00
mDeflotte
205e54c31c // Add stock avaibility 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9327 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-13 15:58:29 +00:00
jmCollin
c4391df038 // fix bug with virtual product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9325 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-13 15:44:33 +00:00
bMancone
cc24b5abc0 // Stock : removed references to the actual stock management in AdminOrders/Product in order to merge with the new stock management system 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9322 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-13 15:32:06 +00:00
vChabot
8e659eb701 [*] BO : carriers are now sortable by position 
// Carriers class is now normalized
// Attribute class is now normalized

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9254 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-11 16:29:34 +00:00
rMalie
577221ff08 // Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9178 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-10 12:18:56 +00:00
jmCollin
5e8cd2a3f2 // Fix shipping cost for virtual products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9078 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-05 16:02:12 +00:00
rMalie
ae5fc92bf7 // Merge -> revision 8984 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8988 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-03 15:48:07 +00:00
mDeflotte
9e5832fb33 [-] All : Class Product, error in SQL request 
// some normalization is class product (all is not done)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8919 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 09:29:36 +00:00
jmCollin
3e9e437ac1 [+] FO : add files for combination 
[*] FO : Create virtual products with no associated file

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8901 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 16:40:44 +00:00
rMalie
1b6d0d1be3 // Merge -> revision 8800 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8808 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-27 14:30:06 +00:00
aFolletete
78f6a4e20a [*] Classes : improve performances of "Feature detachable" feature 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8754 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-24 15:03:21 +00:00
vChabot
83fc0977c9 [*] BO : Features are now sortable. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8751 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-23 15:45:40 +00:00
rMalie
7c85e104de // Merge -> revision 8734 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8740 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-23 14:06:47 +00:00
fBrignoli
f8989018a7 // Tax::initializeAddress =>Address::initialize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8700 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-21 15:43:12 +00:00
rMalie
1d6a3e90c8 // Remove Tools::buildQuery 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8698 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-21 15:36:23 +00:00
vAugagneur
8b6ec916e0 [+] BO : now you can choose type of attribute group (select , color, radio) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8691 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-21 14:29:32 +00:00
vChabot
d0102a81b7 [*] BO : groups attributes are now sortable 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8683 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-21 10:04:54 +00:00
bMancone
22707acfae // Fixed setStock(): Quantity is now set correctly 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8681 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-21 09:47:30 +00:00
rMalie
7eef9391af // Improve DbQuery 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8670 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-20 16:49:22 +00:00
rMalie
95233f9df5 [+] Classes: add DbQuery class in order to build queries (usefull when working with chunks of queries) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8668 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-20 16:14:19 +00:00
vChabot
a88c90fbe1 [*] BO : Product attributes are now sortable. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8639 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-19 13:11:00 +00:00
fBrignoli
e5703a3d69 // first line was empty 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8567 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-14 13:11:11 +00:00
fBrignoli
8bcea2496e [-] FO : add to cart broken TaxCalculator::getTaxesRate => getTotalRate 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8566 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-14 13:09:24 +00:00
aFolletete
59b55487be [-] Classes : Fixed bug on Feature detachables and Customizations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8557 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-14 09:18:18 +00:00
vChabot
e4a09c5222 // changing name "available_date_combi" to "available_date" and some features 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8541 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-13 14:52:42 +00:00
tDidierjean
4e85800d20 // fix validation of available_date field in Product class 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8540 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-13 14:21:59 +00:00
vChabot
7564ceb76a [*] BO : add an available date when product is out of stock 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8520 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-13 08:07:34 +00:00
rMalie
b50c7e4334 // Merge -> revision 8507 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8513 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-12 16:17:37 +00:00
rMalie
9032e37b38 // Fix stock for customizable features 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8340 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-05 13:53:39 +00:00
aFolletete
3eff951265 [+] Project : adding Features detachables in order to improve performance 
// clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8328 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-03 17:21:32 +00:00
tDidierjean
c2258ae8e9 //// Merge -> revision 8290 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8295 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-01 09:53:43 +00:00
rMalie
2c60ea0863 // Fix multi virtual uri on same domain for htaccess + products on multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8196 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-25 15:27:49 +00:00
rMalie
b12bf222a9 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8179 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-24 15:57:10 +00:00