dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,105 Commits 9 Branches 19 Tags
7b10cf02a2e7912ee58ab643c0eb79d9d5ec00b2
Commit Graph

104 Commits

Author SHA1 Message Date
mDeflotte
d843b14ac6 // BugFix : Display errors when no carriers available 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11112 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 10:21:56 +00:00
mDeflotte
0d917153da // Little BugFix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11033 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-08 09:00:29 +00:00
mDeflotte
85b186a956 // BugFix : Problem with delivery_option calculation 
// @TODO : All the undefined index are now fixed but there is not all the available delivery option

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11007 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-06 17:35:38 +00:00
aFolletete
0d65bf62b2 [-] Classes : fixed notice error on Cart class 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10962 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-06 08:54:07 +00:00
mDeflotte
31e90d9031 // Retrocompatibility : Now old 1.4 template works with new chechout process. Multishipping cannot be enabled. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10948 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-05 17:11:26 +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
aFolletete
911c8ad6c4 // Comment useless line in order to clean this 
// Add table and identifier to CartRule class

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10889 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-03 09:56:38 +00:00
dSevere
c105c81b52 // Stock Available : Improve BackOffice interfaces with groups of shops management + bugs fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10887 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-02 17:32:51 +00:00
dSevere
468ca00519 // Stock Available : Improve BackOffice interfaces with groups of shops management + bugs fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10886 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-02 17:31:16 +00:00
dSevere
43654ffba1 // StockManager : bugs fix + improvement of StockManager utilisation in fucntion of global configuration 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10861 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-02 15:23:01 +00:00
rMalie
d76998340a // Use Collection instead of HydrateCollection in several places 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10860 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-02 15:20:47 +00:00
mDeflotte
a0a83e9e58 // Code cleanning + Fixing some bug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10856 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-02 12:17:19 +00:00
dSevere
16cf709d52 // Improve StockAvailable requests + code refactoring 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10855 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-02 11:36:04 +00:00
mDeflotte
5f3d417441 // Fix some problems with getPackageShippingCost 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10850 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-02 10:48:26 +00:00
dSevere
8b618652bb // Stock Available : Improve BackOffice interface + Update all SQL requests relative to StockAvailable + code refactoring on Product Class 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10843 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-01 19:09:27 +00:00
mDeflotte
bf9a629c94 // BugFix in "Cart::isAllProductsInStock()" 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10839 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-01 17:16:56 +00:00
mDeflotte
77664f1056 // Fix some bad php doc 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10838 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-01 16:43:07 +00:00
aFolletete
8bbd830446 // fix little bug on AdminOrdersController 
[~] Deprecated: Cart::getOrderShippingCost()

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10818 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-30 17:25:27 +00:00
tDidierjean
5c61feb04b // Changes to controller and AdminCustomers refactoring 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10764 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-29 18:35:17 +00:00
mDeflotte
46f9cc5ec5 // Removing an elog 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10725 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-29 08:03:53 +00:00
mDeflotte
7577e5ff0f // Change sentence "Allow seperated package" 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10718 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-28 16:47:50 +00:00
mDeflotte
bd9bcc6729 // Add "Allow seperated package" checkbox on the cart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10698 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-28 10:50:54 +00:00
fBrignoli
0a9889f3af [-] CO : incorrect left join conditions in getTaxRules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10649 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-25 10:22:58 +00:00
dMetzger
7648f8ece0 // Order processing bugs fixed 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10603 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 21:02:51 +00:00
rGaillard
0b3c094698 // Fix PHP notice 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10600 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 20:47:50 +00:00
mDeflotte
f21b8defa1 // BugFix with id_address_delivery 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10595 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 19:27:57 +00:00
dMetzger
f670f7573f [+] BO : add new feature, Order edition 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10579 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 17:45:52 +00:00
mDeflotte
7ac2f24ff3 // BugFix : use current($array instead of $array[0] 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10557 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 16:22:08 +00:00
dMetzger
b854caf867 // Avoid some crashes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10488 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 08:39:49 +00:00
mDeflotte
5532f12d80 // Multishipping : on opc, on putting multi-shipping to off, the cart is set to one address delivery 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10458 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 17:18:30 +00:00
mDeflotte
e4361ad56b // BugFix Error on clicking carrier option in cart/opc 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10437 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 15:07:08 +00:00
mDeflotte
0d5421a40c // Dont need to set the id_carrier in class Cart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10430 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 14:41:41 +00:00
mDeflotte
da416dea61 // Autoset id_carrier on the cart constructor + Replace a hookExec() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10420 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 14:09:52 +00:00
mDeflotte
8c0e148b75 // Re-put Cart->id_carrier + BugFix with shipping cost calculation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10417 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 13:50:53 +00:00
mDeflotte
eab460df2d // BugFix id_carrier in cart not defined + choosing address delivery for multishiping on opc 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10389 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 09:28:22 +00:00
mDeflotte
0ce1e22813 // BugFix with opc and multishipping 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10330 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 10:42:14 +00:00
mDeflotte
8add301ef3 // Bug with sql query to duplicate product from the cart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10308 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 08:12:48 +00:00
mDeflotte
eda71ac8fb // BugFix with carrier module and multishipping 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10267 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 14:14:06 +00:00
mDeflotte
107bd4f779 [-] allow_seperated_package need to be an int and not a boolean on class cart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10262 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 12:49:25 +00:00
mDeflotte
5e6ab08a00 // Merging multishipping branche on 1.5 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10259 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 11:13:31 +00:00
rMalie
14c94558a6 // Some fix on objectModel children classes (fields not valid, etc.) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9985 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-09 12:16:37 +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
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
dMetzger
953cb8b872 // Retro compatibility for Discount 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9789 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-02 10:47:01 +00:00
dMetzger
cb2307abaf // A few table name replaced 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9772 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-01 19:06:26 +00:00
dMetzger
486622522c [+] Project : Vouchers are now replaced by cart rules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9771 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-01 18:50:42 +00:00
rGaillard
f61f2f0570 // Add CartController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9676 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-27 14:04:58 +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
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
rMalie
de69396a04 // Merge -> revision 9221 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9226 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-11 12:45:12 +00:00