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

108 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 2df30b8f8e // BugFix : empty errors message on adding products 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11104 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-12 09:00:22 +00:00
mDeflotte 943741871e // Multishipping button is replaced by a checkbox 
// BugFix with back params in the checkout process

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10994 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-06 14:56:29 +00:00
mDeflotte 6be1ed9428 // BugFix : Problem with account creation and OPC 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10970 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-06 10:05:00 +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 394aeab269 // Fix missing Core suffix for some classes / controllers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10941 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-05 16:49:05 +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 9e72ba7740 // Allow / Disallow multishipping 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10837 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-01 16:34:20 +00:00
mDeflotte b08563276b // BugFix : message "Please chose a carrier" but a delivery option is setted. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10807 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-30 14:56:33 +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
rGaillard ffc24ed10b // Fix ajax create account 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10631 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 22:52:34 +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
tDidierjean 9ebe542fdb // fix product live preview and duplication 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10585 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 18:33:11 +00:00
mDeflotte 3989b708c8 // Delivery option are now auto-selected in the checkout 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10572 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 17:21:30 +00:00
rMalie e4654570e9 // Some fix on multishop + stock 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10564 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 17:00:20 +00:00
mDeflotte 73e4b5fe56 // BugFix : With Guest Checkout, an alert is displaying each time we increase/decrease the quantity of a product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10530 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 13:59:14 +00:00
mDeflotte 4261dbc0df // Multishipping : Refresh carrier list 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10502 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-23 09:57:21 +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 49922799e1 // BugFix : Problem with token 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10446 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 16:09:49 +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 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
fBrignoli e176ea6dd3 // broken due to merge 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10384 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-22 09:11:30 +00:00
rMalie 9d10de0848 // Merge -> 10309 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 11:05:10 +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
rMalie 8cb669fb2c // Fix modules ID on <body> for module controller page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10312 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-21 08:51:47 +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
vChabot 1a76c8975f [*] BO : You have now 3 new default groups. Unidentified group, guest group, and customer group. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10232 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 17:22:15 +00:00
fBrignoli e5f3c3ca2a [*] PDF : PDF is now rendered by TCPDF throught HTML template 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10231 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-17 17:15:23 +00:00
tDidierjean 72644e0118 [*] BO : #PSFV-94 - added AdminCMSContentController, AdminCMSController, AdminCMSCategoriesController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10174 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-16 14:18:36 +00:00
rGaillard a1fb08f026 // Improve Specific prices 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10118 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-14 17:40:42 +00:00
vChabot 669aed08c6 [*] FO : Register process enhancement 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10029 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-10 10:56:14 +00:00
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
rGaillard e2026d1cc3 // Replacement of getDiscounts method 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9900 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-04 16:52:39 +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
vChabot c60054b040 [*] FO : when an user is created in one step account creation, he is redirected to the cart if the cart is not empty, or in the my-account page if not. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9860 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-03 17:16:28 +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 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
fBrignoli cc470048d1 [-] FO : Order history does not display order details 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9692 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-27 16:56:15 +00:00
aFolletete 14632c7fbe // bug fix on new AdminOrders + optimization 
[~] FO : usage of $customizedDatas var in order-detail.tpl is now deprecated use $product.customizedDatas

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9589 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-24 13:19:54 +00:00
vChabot 7cbd4c20f2 // removing ajaxProcess, now useless because the process doesn't need ajax anymore 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9483 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-20 08:04:41 +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
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 45645f1f50 // Merge -> revision 9352 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9354 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-14 08:20:54 +00:00
jmCollin 2e67942ba5 // Fix download file 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9310 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-13 11:40:03 +00:00
fBrignoli 329a0966ca [-] FO : Notice if blocknewsletter has been removed 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9229 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-11 12:59:30 +00:00
aNiassy 3a6f44828e [-] FO : Applied the context to the cart in the ParentOrderController::_setDefaultCarrierSelection() method 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9223 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-11 12:34:44 +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
rMalie b4d436ca21 // Merge -> revision 9061 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9069 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-05 15:21:55 +00:00
lBrieu 22d2088e69 [-] Solve problem when trying to view a specific order on the history page (bad order id) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9040 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-05 07:55:21 +00:00