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

92 Commits

Author SHA1 Message Date
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
rMalie
2a764cfd14 // Fix downloadable files in admin 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9031 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-04 16:10:05 +00:00
vChabot
2adb0ed5b7 // guest checkout works with the 2 registration process 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8983 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-03 14:35:43 +00:00
vChabot
8fcc94e777 [*] Registration type is now in 2 steps or all in one 
// refactoring AuthController.php (front)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8941 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 15:48:20 +00:00
rMalie
2068aaaf2a // Norm on controllers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8930 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 13:50:55 +00:00
vAugagneur
2fbc132933 [+] Classes : added new class Media => It contains all the method related to media like CSS, JS 
[+] Classes : added new method Media::addJquery(), Media::addJqueryUI(), Media::addJqueryPlugin()
[~] Deprecated : All method related to CCC has been moved in class Media

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8926 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 13:01:10 +00:00
rMalie
3620f0837f // Merge -> 8910 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8917 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 08:17:25 +00:00
mMarinetti
4b56fa5c68 // PdfOrderSlipController with eol 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8916 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 08:17:00 +00:00
mDeflotte
a2483c8114 // ChangeCurrencyController : refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8914 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 07:42:20 +00:00
mDeflotte
97a30b4aab // CompareController : refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8913 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 07:37:20 +00:00
mDeflotte
aab66997da // CaregoryController : FixBug : Product list must be assigned to the template AFTER being calculated 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8912 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 07:22:42 +00:00
mDeflotte
ddc6b504c8 // ContactController : refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8911 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 07:06:56 +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
227e13680b // Refacto of CategoryController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8898 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 16:31:32 +00:00
mDeflotte
117583a0d0 //CmsController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8891 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 15:55:36 +00:00
vChabot
355bad0fba // fix undefined var $customer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8889 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 15:45:09 +00:00
mDeflotte
a73ef6232a //DiscountController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8887 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 15:15:55 +00:00