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

80 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
vChabot
ca945da2e8 [-] BO : BugFix : #PSCFV-2378 : Created carriers do not appear. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15339 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-16 13:40:12 +00:00
vAugagneur
9785afd5a2 //small fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15260 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 09:29:15 +00:00
mDeflotte
513c9be298 [-] FO : #PSCFV-2158 - Add warning message when a product cannot be delivered to an address 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15021 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-03 08:10:09 +00:00
vAugagneur
ea51aba2bb [-] BO : fixed bug #PSCFV-2155 - carrier max_height, max_depth, max_weight, max_width problem 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14996 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-02 10:09:01 +00:00
tDidierjean
a32a003b5c [-] Classes : fix bug #PSTEST-1191 - wrong carrier positions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14768 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-19 13:35:37 +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
vAugagneur
9ca9b3b6d0 [-] BO : fixed bug #PSTEST-1144 - carrier image problem 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14599 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-12 09:47:20 +00:00
mDeflotte
560fe9af01 [-] FO : #PSFV-719 - Fix bug with getting not available carriers on the cart 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14415 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-03 07:22:58 +00:00
rGaillard
efed5f4a88 // Clean product and carrier tax rules group on update 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14057 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-12 17:47:13 +00:00
rMalie
48e9590cf4 // Normalize 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13991 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-09 09:19:30 +00:00
rMalie
b8f637ee5b // Refacto of tax_rules_groups_shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13975 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-08 14:40:18 +00:00
rGaillard
aab9e2dedf // Fix tax rules group product and carriers deletion 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13967 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-08 13:36:45 +00:00
rGaillard
0401b31b17 [-] BO: Fix PSFV-630 tax rules group on product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13926 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-07 14:06:00 +00:00
vChabot
bca67eb97a [-] BO : BugFix : #PSTEST-943 : carrier position handled on carrier creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13916 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-07 10:01:29 +00:00
rMalie
c2cef61a5a // Replace shop->addSqlRestriction() and shop->addSqlRestrictionOnLang() by static versions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13618 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 12:15:30 +00:00
rGaillard
7fde51894d // tax rules product and carriers shop association in webservices 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13600 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-24 11:12:12 +00:00
rMalie
6e6c69e617 // Fix getContextType() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13596 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-24 10:11:01 +00:00
rMalie
d3a7ead1e2 // Fix shop->id in Carrier 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13589 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-24 09:34:54 +00:00
rGaillard
2408b4ac5f [+] Core : products and carriers tax rules are associated to shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13586 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-24 09:26:18 +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
rMalie
3c79768737 [*] Classes : table prefix is no longer required in Db::getInstance()->delete() method 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13396 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 14:54:52 +00:00
aFolletete
3f5d7edf0b // fixed bug #PSTEST-552 
// Clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13312 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 15:08:40 +00:00
vAugagneur
21e8fabafb [-] BO : fixed small image duplication in carrier listing 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13252 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 13:08:06 +00:00
mDeflotte
8dc8455e78 // fix bug with missing $context->cart and $context->customer durring payment process 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13089 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-07 17:15:44 +00:00
mDeflotte
56ba4a183b [-] BO : #PSTEST-659 - On creating group, table is not prefixed because of a bad parameter to the method DB::insert 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13011 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-06 09:51:45 +00:00
mDeflotte
fe1b3e7ee9 // Add a "@since 1.5.0" 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12964 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-03 10:05:38 +00:00
mDeflotte
791cc22ce0 [*] BO : #PSTEST-624 - On creating group, automaticaly assign the new groups to all carriers 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12952 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-03 08:59:46 +00:00
mDeflotte
2d4a9167fa // Bug Fix : use the PS_COUNTRY_DEFAULT to calculate shipping fees 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12837 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-31 10:50:24 +00:00
mDeflotte
11566e2577 [-] BO : #PSTEST-590 - Fix bug with undefined smarty variable "HOOK_EXTRACARRIER_ADDR" + By default use the default country of the shop to calculate shipping cost 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12775 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-30 08:07:49 +00:00
fGaillard
ff1910230a // Norm corrections applied 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12514 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-18 09:33:34 +00:00
fGaillard
6c74f83968 [-] Classes : #PSCFI-4640 : Country name depending on current language (countries restricted to active deliveries) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12513 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-01-18 09:30:48 +00:00
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