Netsyms/ShippingRates
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moving default values to __construct, because otherwise they get overwritten

Browse Source
This commit is contained in:
Pereyaslov Konstantin 2014-12-08 19:34:31 +03:00
parent 6d6853cbda
commit 2938be5a2d
3 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Fedex/Rate.php
View File

@ -20,15 +20,14 @@ class Rate extends RateAdapter
private $password; private $password;
private $accountNumber; private $accountNumber;
private $meterNumber; private $meterNumber;
private $dropOffType = 'BUSINESS_SERVICE_CENTER'; /**
* Type of Drop off, default value "BUSINESS_SERVICE_CENTER" is defined in __construct if not specified.
public $approvedCodes = [ */
'PRIORITY_OVERNIGHT', private $dropOffType;
'FEDEX_2_DAY', /**
'FEDEX_EXPRESS_SAVER', * Codes of appropriate shipping types. Default value is specified in __construct.
'FEDEX_GROUND', */
'GROUND_HOME_DELIVERY', public $approvedCodes;
];
private $shippingCodes = [ private $shippingCodes = [
'EUROPE_FIRST_INTERNATIONAL_PRIORITY' => 'Europe First International Priority', 'EUROPE_FIRST_INTERNATIONAL_PRIORITY' => 'Europe First International Priority',
@ -62,8 +61,14 @@ class Rate extends RateAdapter
$this->password = Arr::get($options, 'password'); $this->password = Arr::get($options, 'password');
$this->accountNumber = Arr::get($options, 'accountNumber'); $this->accountNumber = Arr::get($options, 'accountNumber');
$this->meterNumber = Arr::get($options, 'meterNumber'); $this->meterNumber = Arr::get($options, 'meterNumber');
$this->approvedCodes = Arr::get($options, 'approvedCodes'); $this->approvedCodes = Arr::get($options, 'approvedCodes', [
$this->dropOffType = Arr::get($options, 'dropOffType'); 'PRIORITY_OVERNIGHT',
'FEDEX_2_DAY',
'FEDEX_EXPRESS_SAVER',
'FEDEX_GROUND',
'GROUND_HOME_DELIVERY',
]);
$this->dropOffType = Arr::get($options, 'dropOffType', 'BUSINESS_SERVICE_CENTER');
$this->setRequestAdapter(Arr::get($options, 'requestAdapter', new RateRequest\Post())); $this->setRequestAdapter(Arr::get($options, 'requestAdapter', new RateRequest\Post()));
} }

14
src/UPS/Rate.php
View File

@ -18,11 +18,10 @@ class Rate extends RateAdapter
private $userId; private $userId;
private $password; private $password;
private $shipperNumber; private $shipperNumber;
/**
public $approvedCodes = [ * Codes of appropriate shipping types. Default value is specified in __construct.
'03', */
'12', public $approvedCodes;
];
private $shippingCodes = [ private $shippingCodes = [
'US' => [ // United States 'US' => [ // United States
@ -90,7 +89,10 @@ class Rate extends RateAdapter
$this->userId = Arr::get($options, 'userId'); $this->userId = Arr::get($options, 'userId');
$this->password = Arr::get($options, 'password'); $this->password = Arr::get($options, 'password');
$this->shipperNumber = Arr::get($options, 'shipperNumber'); $this->shipperNumber = Arr::get($options, 'shipperNumber');
$this->approvedCodes = Arr::get($options, 'approvedCodes'); $this->approvedCodes = Arr::get($options, 'approvedCodes',[
'03',
'12',
]);
$this->setRequestAdapter(Arr::get($options, 'requestAdapter', new RateRequest\Post())); $this->setRequestAdapter(Arr::get($options, 'requestAdapter', new RateRequest\Post()));

14
src/USPS/Rate.php
View File

@ -17,11 +17,10 @@ class Rate extends RateAdapter
private $username; private $username;
private $password; private $password;
/**
public $approvedCodes = [ * Codes of appropriate shipping types. Default value is specified in __construct.
'1', */
'4', public $approvedCodes;
];
private $shipping_codes = [ private $shipping_codes = [
'domestic' => [ 'domestic' => [
@ -74,7 +73,10 @@ class Rate extends RateAdapter
$this->username = Arr::get($options, 'username'); $this->username = Arr::get($options, 'username');
$this->password = Arr::get($options, 'password'); $this->password = Arr::get($options, 'password');
$this->approvedCodes = Arr::get($options, 'approvedCodes'); $this->approvedCodes = Arr::get($options, 'approvedCodes', [
'1',
'4',
]);
$this->setRequestAdapter(Arr::get($options, 'requestAdapter', new RateRequest\Get())); $this->setRequestAdapter(Arr::get($options, 'requestAdapter', new RateRequest\Get()));
} }
protected function validate() protected function validate()