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

64 Commits

Author SHA1 Message Date
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
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
ef17d0b7da // Merge -> revision 8952 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8957 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-03 09:14:01 +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
be8d2136be // Merge -> revision 8851 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8854 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-28 16:03:30 +00:00
rMalie
ccd0383e88 // Refacto of cartController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8853 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-28 15:40:28 +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
rMalie
4f2a090e24 // Merge -> revision 8720 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8722 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-22 15:45:10 +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
rMalie
526a94a0e6 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8682 b9a71923-0436-4b27-9f14-aed3839534dd 2011-09-21 09:52:19 +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
rMalie
394549b805 // norm 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8615 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-16 08:40:26 +00:00
vChabot
34c9336b37 [*] FO : display initial price in the cart when a specific price is applied to a product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8604 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-15 12:37:44 +00:00
rMalie
39f2f53db2 // Merge -> revision 8363 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8365 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-06 12:38:55 +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
tDidierjean
16516953fb // Merge -> revision 8206 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8210 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-26 15:52:42 +00:00
rMalie
22d23f8324 // Merge -> revision 8149 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8151 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-22 16:22:16 +00:00
rMalie
382584ad35 // Fix all category_lang sql restrictions with multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8124 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-19 14:21:45 +00:00
rMalie
7cadad5d3e // Fix all product_lang sql restrictions with multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8121 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-19 14:01:23 +00:00
rMalie
a1843c1900 // Merge -> revision 8114 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8115 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-19 09:46:12 +00:00
fBrignoli
f371f3e3bc [*] Project : US + CA TaxSystem 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8105 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-18 10:10:50 +00:00
rMalie
49468717c2 // Fix #PSFV-48 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8032 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-11 14:42:31 +00:00
rMalie
d1d4d57eca // Revert normalization 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8019 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-11 10:20:59 +00:00
rMalie
f62cdb1963 // Normalization 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8017 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-11 09:58:20 +00:00
rMalie
89cc9649cf // Fix on discounts with multishop + index?controller=index fixed to be only index.php 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7929 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-08 08:29:32 +00:00
rMalie
ab5fc723b4 // Routes for dispatcher (part 4) + some fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7830 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-01 13:28:02 +00:00
rMalie
a875fecb20 // MERGE with 1.4 r7770 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 09:20:57 +00:00
rMalie
be4811aa6e // REVERT MERGE 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 13:35:06 +00:00
rMalie
e159c925d8 // MERGE with trunk revision 7754 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7759 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 12:48:42 +00:00
tDidierjean
4ade3a0ea0 // remove 1.4 deprecated functions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7755 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 09:51:43 +00:00
tDidierjean
d05d16d399 // Context part 21 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7742 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-26 16:40:17 +00:00
tDidierjean
51b4c8591d // Context part 20 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7740 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-26 15:55:04 +00:00
tDidierjean
e72ae93557 // Context part 17 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7688 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-22 09:35:28 +00:00
rMalie
e62be3d793 // id_shop on cart product (for links) + change Shop::sqlAsso() + share_order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7687 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-22 08:57:51 +00:00
tDidierjean
9619b93c73 // fix delete customization 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7681 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-21 16:41:12 +00:00
tDidierjean
462c362191 // removing cookie from product customization 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7680 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-21 14:38:04 +00:00
rMalie
42da42f827 // Context part 16 (shops) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7664 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-20 12:08:15 +00:00