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

123 Commits

Author SHA1 Message Date
mDeflotte
d0511c3211 // Improving method getAvailableCarrierList 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11648 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 17:37:27 +00:00
mDeflotte
d1f8e02485 // Fixing problems with blockcart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11642 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 16:56:10 +00:00
mDeflotte
74dab4ca50 // BugFix with shiping and warehouse 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11614 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 14:57:43 +00:00
mDeflotte
cc7584e340 // Problem with product return 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11566 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 09:39:44 +00:00
mDeflotte
93d945d403 // Fix some problems with multishipping 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11524 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-21 17:24:16 +00:00
mDeflotte
07c031260e // Fix some problems with multishipping 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11511 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-21 16:27:02 +00:00
bMancone
0d0f43f783 // Orders : fixed stock (available quantity & Stock) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11491 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-21 14:24:34 +00:00
fGaillard
b03bfc5efd // Fixed warehouse shops list 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11435 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-20 17:29:24 +00:00
mDeflotte
7776b7af6d // Add id_shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11431 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-20 16:58:27 +00:00
mDeflotte
772147a6ee // Removing some id_warehouse 
// Adding some checks with advanced_stock_management product attribute

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11375 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 16:01:41 +00:00
rMalie
b7ae37f6d7 // Change prototype of methods from(), leftJoin(), innerJoin(), leftOuterJoin() and naturalJoin() for DbQuery class 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11351 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 11:13:13 +00:00
fBrignoli
2139d3983d [*] CO : Additional Shipping Cost / Purchase Price / Reduction Amount texc in OrderDetails 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11345 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 10:16:04 +00:00
mDeflotte
9688e7741f // Fixing bugs in admin cart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11343 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-19 09:51:59 +00:00
dMetzger
6c7337d2cb // Fixed rounding bug on cart rules 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11245 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 10:41:00 +00:00
rMalie
49129f85dc // Format definitions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11230 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 17:21:18 +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
b8f5b693b9 // Format definitions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11157 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 21:06:59 +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
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