dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,274 Commits 9 Branches 19 Tags
266bcd3652db9be4effff42e730ccb8ee1ffaed1
Commit Graph

47 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
bMancone
6a4eb7e768 // AdminWarehousesController: fixed association with carriers. Warehouse: fixed association with carriers. Carrier: norm & tags. AdminProductsController: added warning when using the advanced stock management without assocations with warehouses/carriers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11582 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-22 11:09:33 +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
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
mBertholino
0a1e6cf127 // improve config.inc.php code, id_shop is inserted in the cookie name. Debug in Carrier class, max_deep is now max_depth 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11194 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-14 08:59:55 +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
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
6cefe4465d // Remove $langMultiShop from all classes, and add 'multishop' in $definition instead 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10922 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-12-05 15:04:09 +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
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
174be2bfce // fix module tab dispatch 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10266 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 14:10:23 +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
tDidierjean
90a53b4cf1 // Change customer group for unidentified customers when getting carriers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10254 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-18 10:50:42 +00:00
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
vChabot
f9dec971b6 [*] BO : Carriers can now be sorted ascending or descending 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9877 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-11-04 10:23:41 +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
lLefevre
2f9e2b313f [*] BO #PSFV-94 : Added AdminCarrierController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9462 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-19 14:34:37 +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
vChabot
c4e28b117d [*] BO : Carriers are now sortable by position or price 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9276 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-12 14:31:36 +00:00
vChabot
8e659eb701 [*] BO : carriers are now sortable by position 
// Carriers class is now normalized
// Attribute class is now normalized

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9254 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-11 16:29:34 +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
mDeflotte
3b827893b1 [*] Add reference for carriers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8933 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 14:59:07 +00:00
mDeflotte
72672c7a8f [-] BO : BugFix - Not possible to save a carrier 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8927 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 13:19:25 +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
fBrignoli
facb2318e5 [*] BO : Taxes are now historized 
[*] BO : Taxes are no longer stored in the order details row



git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8556 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-14 09:06:20 +00:00
rMalie
5aab81dc66 // Fix carrier creation for multistore 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8396 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-07 15:47:45 +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
183e1289c4 // Fix bug of toto on line 451 of carrier.php (he report modifications after change on signature function) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8007 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-10 16:04:59 +00:00
rMalie
f2b5ee338b // Merge -> revision 7875 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7877 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-03 16:16:49 +00:00
rMalie
ffeb22bfb9 // Merge with revision 7841 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7844 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-02 11:43:58 +00:00
rMalie
ad3e1f1804 // Fix #PSFV-31 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7788 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 13:53:51 +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
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
rMalie
6814ae87c6 // Carrier range price / weight for multishop + fix duplicate of carrier_lang when a new shop is created 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7716 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-25 10:32:56 +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
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
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
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