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

45 Commits

Author SHA1 Message Date
rMalie
a37dbc1e44 // Fix lot of multishop bugs (updateAssoShop reworked, remove multishop property for country / zone / currency / carrier, getList()) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15386 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 14:54:37 +00:00
fBrignoli
ae47d8b9f2 [-] BO : Bug fixed related to #PSCFV-1354 - Specific price with multishop, groups/currencies/countries should vary in function of the selected shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15353 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-16 15:51:22 +00:00
vChabot
ce873cebc5 [-] BO : BugFix : #PSCFV-2373 : Created currency do not appear 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15335 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-16 13:02:16 +00:00
rMalie
0c2dd0cd2f // MERGE product_multistore branch : product fields are now editable per shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 13:32:12 +00:00
aFolletete
8967e72bc1 // clean code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14543 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-07 16:35:14 +00:00
aFolletete
77f96a37d6 // clean code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14542 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-07 16:33:16 +00:00
aFolletete
296a6431f7 // clean code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14541 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-07 16:32:55 +00:00
fGaillard
ae4ca19eb9 [-] BO : #PSFV-411 : BugFix - Check module id in checkPaymentCurrencies() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13702 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 16:27:40 +00:00
rMalie
4ee2698992 // Replace shop->addSqlAssociation() by static call 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13620 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 13:07:51 +00:00
rMalie
1c2f174bdb // Improve multishop_context in AdminController and rename shop->getListOfID() by Shop::getContextListShopID() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13615 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 09:49:19 +00:00
rMalie
2454cd7863 // Welcome 2012² 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13573 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-23 16:33:10 +00:00
rMalie
b24dcffc9c // Improve multishop API 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13566 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-23 15:39:44 +00:00
bMancone
2145cd543b // Fixed missing parameters when calling Currency::exists 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13450 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 09:22:15 +00:00
fBrignoli
07e1787cdd [-] BO : Bug Fixed #PSTESTS-672 An error has occured during currency creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13433 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 14:49:49 +00:00
rMalie
1c0f430600 // Normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12658 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-24 17:30:33 +00:00
rMalie
6887541bdd [-] Classes : all classes and controllers now use their name in static calls instead of self (improve override) #PSFV-376 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12552 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-19 10:14:10 +00:00
rMalie
13a70e1044 [*] Classes: ObjectModel::getTranslationsField|Child() is now deprecated, use ObjectModel::getFieldsLang() if need instead 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11256 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-15 13:24:03 +00:00
rMalie
03bd438c7d // Format definitions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11173 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-13 13:41:54 +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
rMalie
d0c1239c17 // Remove $this->table and $this->identifier from objectModels + normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11076 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-09 14:05:24 +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
mDeflotte
1e8ed9d47e // Little fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10827 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-01 12:58:35 +00:00
rGaillard
3a5a061717 // Change URLs calling for prestashop.com 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10686 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-25 18:45:07 +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
mMarinetti
90853d47e7 [*] FO : $currency->prefix and $currency->suffix are now a convenient shortcut for displaying price 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9661 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-26 17:41:32 +00:00
mDeflotte
78ddaa120c // Stock decrementation when order is shipped 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9486 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-20 09:08:59 +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
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
mDeflotte
ddc82146fc [-] BO : #PSFV-66 - Bad warnings "Currency not set" 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8771 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-26 13:49:38 +00:00
rMalie
d33325c23f // Fix currencies for multishop + meta 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8209 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-26 15:10:52 +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
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
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
rMalie
e08b70a242 // Carrier association + discount association 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7696 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-22 15:53:07 +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
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
rMalie
4ae81d8acd // Context part 15 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7658 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-19 16:17:14 +00:00
tDidierjean
89213e18e5 // Context part 12 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7649 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-19 09:28:11 +00:00
rMalie
10dd3db8d4 // Refactoring of shop class with new context 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7604 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-12 16:28:20 +00:00
tDidierjean
25b1bceffd // Context part 2 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7598 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-12 12:50:00 +00:00
rGaillard
8a59d0dc41 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:54:11 +00:00
rGaillard
69f2f09dc5 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7522 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:10:43 +00:00
gBrunier
93a8b5d87f [-] FO : fixed bug #PSCFI-1444 - Now disable currencies are no longer displayed 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5925 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-15 13:54:29 +00:00
aFolletete
5ef57ae0ac [*] Core : clean all deprecated methods 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5882 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-12 18:50:26 +00:00
aFolletete
10445ad61d // 1.5 branche creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5881 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-12 18:24:40 +00:00