Skip to content

Commit 13d5078

Browse files
JeremyDunnJeremyDunn
committed
Merge branch 'master' of https://github.com/Chris-Whitmore-Associates/php-fedex-api-wrapper into Chris-Whitmore-Associates-master
2 parents 19679f3 + cd7388c commit 13d5078

File tree

520 files changed

+42149
-15009
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

520 files changed

+42149
-15009
lines changed

‎examples/create-pickup.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
// Version.
1919
$createPickupRequest->Version->ServiceId = 'disp';
20-
$createPickupRequest->Version->Major = 17;
20+
$createPickupRequest->Version->Major = 22;
2121
$createPickupRequest->Version->Intermediate = 0;
2222
$createPickupRequest->Version->Minor = 0;
2323

‎examples/location-service.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
// Version.
2121
$searchLocationsRequest->Version->ServiceId = 'locs';
22-
$searchLocationsRequest->Version->Major = 9;
22+
$searchLocationsRequest->Version->Major = 12;
2323
$searchLocationsRequest->Version->Intermediate = 0;
2424
$searchLocationsRequest->Version->Minor = 0;
2525

‎examples/rate-request.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
//version
2626
$rateRequest->Version->ServiceId = 'crs';
27-
$rateRequest->Version->Major = 24;
27+
$rateRequest->Version->Major = 28;
2828
$rateRequest->Version->Minor = 0;
2929
$rateRequest->Version->Intermediate = 0;
3030

‎examples/ship.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
$version = new ComplexType\VersionId();
2929
$version
30-
->setMajor(21)
30+
->setMajor(26)
3131
->setIntermediate(0)
3232
->setMinor(0)
3333
->setServiceId('ship');

‎examples/validation-availability-and-commitment-service.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
$serviceAvailabilityRequest->ClientDetail->MeterNumber = FEDEX_METER_NUMBER;
1919
//version
2020
$serviceAvailabilityRequest->Version->ServiceId = 'vacs';
21-
$serviceAvailabilityRequest->Version->Major = 8;
21+
$serviceAvailabilityRequest->Version->Major = 14;
2222
$serviceAvailabilityRequest->Version->Intermediate = 0;
2323
$serviceAvailabilityRequest->Version->Minor = 0;
2424
//origin

‎src/FedEx/LocationsService/ComplexType/CarrierDetail.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* @property \FedEx\LocationsService\SimpleType\CarrierCodeType|string $Carrier
1414
* @property \FedEx\LocationsService\SimpleType\ServiceCategoryType|string $ServiceCategory
15-
* @property \FedEx\LocationsService\SimpleType\ServiceType|string $ServiceType
15+
* @property string $ServiceType
1616
* @property \FedEx\LocationsService\SimpleType\CountryRelationshipType|string $CountryRelationship
1717
* @property LatestDropOffDetail[] $NormalLatestDropOffDetails
1818
* @property LatestDropOffDetail[] $ExceptionalLatestDropOffDetails
@@ -56,7 +56,7 @@ public function setServiceCategory($serviceCategory)
5656
/**
5757
* Set ServiceType
5858
*
59-
* @param \FedEx\LocationsService\SimpleType\ServiceType|string $serviceType
59+
* @param string $serviceType
6060
* @return $this
6161
*/
6262
public function setServiceType($serviceType)

‎src/FedEx/LocationsService/ComplexType/ClearanceCountryDetail.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
* @subpackage Locations Service
1212
*
1313
* @property string $ClearanceCountry
14-
* @property \FedEx\LocationsService\SimpleType\ServiceType|string[] $ServicesSupported
15-
* @property \FedEx\LocationsService\SimpleType\PackageSpecialServiceType|string[] $SpecialServicesSupported
14+
* @property string[] $ServicesSupported
15+
* @property string[] $SpecialServicesSupported
1616
1717
*/
1818
class ClearanceCountryDetail extends AbstractComplexType
@@ -39,22 +39,22 @@ public function setClearanceCountry($clearanceCountry)
3939
/**
4040
* Set ServicesSupported
4141
*
42-
* @param \FedEx\LocationsService\SimpleType\ServiceType[]|string[] $servicesSupported
42+
* @param string $servicesSupported
4343
* @return $this
4444
*/
45-
public function setServicesSupported(array $servicesSupported)
45+
public function setServicesSupported($servicesSupported)
4646
{
4747
$this->values['ServicesSupported'] = $servicesSupported;
4848
return $this;
4949
}
5050

5151
/**
52-
* Identifies the constrained special services supported for the country above.
52+
* Set SpecialServicesSupported
5353
*
54-
* @param \FedEx\LocationsService\SimpleType\PackageSpecialServiceType[]|string[] $specialServicesSupported
54+
* @param string $specialServicesSupported
5555
* @return $this
5656
*/
57-
public function setSpecialServicesSupported(array $specialServicesSupported)
57+
public function setSpecialServicesSupported($specialServicesSupported)
5858
{
5959
$this->values['SpecialServicesSupported'] = $specialServicesSupported;
6060
return $this;

‎src/FedEx/LocationsService/ComplexType/ClearanceLocationDetail.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
* @package PHP FedEx API wrapper
1111
* @subpackage Locations Service
1212
*
13-
* @property \FedEx\LocationsService\SimpleType\ServiceType|string[] $ServicesSupported
13+
* @property string[] $ServicesSupported
1414
* @property \FedEx\LocationsService\SimpleType\ConsolidationType|string $ConsolidationType
1515
* @property \FedEx\LocationsService\SimpleType\DistributionClearanceType|string $ClearanceLocationType
16-
* @property \FedEx\LocationsService\SimpleType\PackageSpecialServiceType|string[] $SpecialServicesSupported
16+
* @property string[] $SpecialServicesSupported
1717
* @property ClearanceCountryDetail[] $ClearanceCountries
1818
* @property string $ClearanceRoutingCode
1919
@@ -28,12 +28,12 @@ class ClearanceLocationDetail extends AbstractComplexType
2828
protected $name = 'ClearanceLocationDetail';
2929

3030
/**
31-
* Services supported for clearance
31+
* Services supported for clearance.
3232
*
33-
* @param \FedEx\LocationsService\SimpleType\ServiceType[]|string[] $servicesSupported
33+
* @param string $servicesSupported
3434
* @return $this
3535
*/
36-
public function setServicesSupported(array $servicesSupported)
36+
public function setServicesSupported($servicesSupported)
3737
{
3838
$this->values['ServicesSupported'] = $servicesSupported;
3939
return $this;
@@ -64,12 +64,12 @@ public function setClearanceLocationType($clearanceLocationType)
6464
}
6565

6666
/**
67-
* Identifies the constrained special services supported at this location.
67+
* Set SpecialServicesSupported
6868
*
69-
* @param \FedEx\LocationsService\SimpleType\PackageSpecialServiceType[]|string[] $specialServicesSupported
69+
* @param string $specialServicesSupported
7070
* @return $this
7171
*/
72-
public function setSpecialServicesSupported(array $specialServicesSupported)
72+
public function setSpecialServicesSupported($specialServicesSupported)
7373
{
7474
$this->values['SpecialServicesSupported'] = $specialServicesSupported;
7575
return $this;

‎src/FedEx/LocationsService/ComplexType/LocationCapabilityDetail.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* @subpackage Locations Service
1212
*
1313
* @property \FedEx\LocationsService\SimpleType\CarrierCodeType|string $CarrierCode
14-
* @property \FedEx\LocationsService\SimpleType\ServiceType|string $ServiceType
14+
* @property string $ServiceType
1515
* @property \FedEx\LocationsService\SimpleType\ServiceCategoryType|string $ServiceCategory
1616
* @property \FedEx\LocationsService\SimpleType\LocationTransferOfPossessionType|string $TransferOfPossessionType
1717
* @property \FedEx\LocationsService\SimpleType\DayOfWeekType|string[] $DaysOfWeek
@@ -41,7 +41,7 @@ public function setCarrierCode($carrierCode)
4141
/**
4242
* Set ServiceType
4343
*
44-
* @param \FedEx\LocationsService\SimpleType\ServiceType|string $serviceType
44+
* @param string $serviceType
4545
* @return $this
4646
*/
4747
public function setServiceType($serviceType)

‎src/FedEx/LocationsService/ComplexType/LocationDetail.php

+13-13
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
* @property string $StoreNumber
1515
* @property LocationContactAndAddress $LocationContactAndAddress
1616
* @property string $SpecialInstructions
17-
* @property string $GeographicCoordinates
1817
* @property string $TimeZoneOffset
1918
* @property \FedEx\LocationsService\SimpleType\FedExLocationType|string $LocationType
2019
* @property string $LocationTypeForDisplay
20+
* @property LocationFieldsForInternalFedexUseDetail $InternalFieldsDetail
2121
* @property \FedEx\LocationsService\SimpleType\LocationAttributesType|string[] $Attributes
2222
* @property LocationCapabilityDetail[] $LocationCapabilities
2323
* @property LocationPackageLimitsDetail $PackageMaximumLimits
@@ -90,18 +90,6 @@ public function setSpecialInstructions($specialInstructions)
9090
return $this;
9191
}
9292

93-
/**
94-
* Set GeographicCoordinates
95-
*
96-
* @param string $geographicCoordinates
97-
* @return $this
98-
*/
99-
public function setGeographicCoordinates($geographicCoordinates)
100-
{
101-
$this->values['GeographicCoordinates'] = $geographicCoordinates;
102-
return $this;
103-
}
104-
10593
/**
10694
* Set TimeZoneOffset
10795
*
@@ -138,6 +126,18 @@ public function setLocationTypeForDisplay($locationTypeForDisplay)
138126
return $this;
139127
}
140128

129+
/**
130+
* Set InternalFieldsDetail
131+
*
132+
* @param LocationFieldsForInternalFedexUseDetail $internalFieldsDetail
133+
* @return $this
134+
*/
135+
public function setInternalFieldsDetail(LocationFieldsForInternalFedexUseDetail $internalFieldsDetail)
136+
{
137+
$this->values['InternalFieldsDetail'] = $internalFieldsDetail;
138+
return $this;
139+
}
140+
141141
/**
142142
* Set Attributes
143143
*

‎src/FedEx/LocationsService/ComplexType/LocationFieldsForInternalFedexUseDetail.php

+127
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
<?php
2+
namespace FedEx\LocationsService\ComplexType;
3+
4+
use FedEx\AbstractComplexType;
5+
6+
/**
7+
* LocationFieldsForInternalFedexUseDetail
8+
*
9+
* @author Jeremy Dunn <[email protected]>
10+
* @package PHP FedEx API wrapper
11+
* @subpackage Locations Service
12+
*
13+
* @property string $NonRevenueAccountNumber
14+
* @property string $CityCenterAccountNumber
15+
* @property string $CustomsLocationId
16+
* @property string $CostCenterCode
17+
* @property \FedEx\LocationsService\SimpleType\LocationAttributesForInternalFedexUseType|string[] $Attributes
18+
* @property Contact $OperationalContact
19+
* @property string $LocalAirportId
20+
* @property string $RegionalAirportId
21+
22+
*/
23+
class LocationFieldsForInternalFedexUseDetail extends AbstractComplexType
24+
{
25+
/**
26+
* Name of this complex type
27+
*
28+
* @var string
29+
*/
30+
protected $name = 'LocationFieldsForInternalFedexUseDetail';
31+
32+
/**
33+
* Set NonRevenueAccountNumber
34+
*
35+
* @param string $nonRevenueAccountNumber
36+
* @return $this
37+
*/
38+
public function setNonRevenueAccountNumber($nonRevenueAccountNumber)
39+
{
40+
$this->values['NonRevenueAccountNumber'] = $nonRevenueAccountNumber;
41+
return $this;
42+
}
43+
44+
/**
45+
* The city center account number of the location.
46+
*
47+
* @param string $cityCenterAccountNumber
48+
* @return $this
49+
*/
50+
public function setCityCenterAccountNumber($cityCenterAccountNumber)
51+
{
52+
$this->values['CityCenterAccountNumber'] = $cityCenterAccountNumber;
53+
return $this;
54+
}
55+
56+
/**
57+
* Set CustomsLocationId
58+
*
59+
* @param string $customsLocationId
60+
* @return $this
61+
*/
62+
public function setCustomsLocationId($customsLocationId)
63+
{
64+
$this->values['CustomsLocationId'] = $customsLocationId;
65+
return $this;
66+
}
67+
68+
/**
69+
* Set CostCenterCode
70+
*
71+
* @param string $costCenterCode
72+
* @return $this
73+
*/
74+
public function setCostCenterCode($costCenterCode)
75+
{
76+
$this->values['CostCenterCode'] = $costCenterCode;
77+
return $this;
78+
}
79+
80+
/**
81+
* Set Attributes
82+
*
83+
* @param \FedEx\LocationsService\SimpleType\LocationAttributesForInternalFedexUseType[]|string[] $attributes
84+
* @return $this
85+
*/
86+
public function setAttributes(array $attributes)
87+
{
88+
$this->values['Attributes'] = $attributes;
89+
return $this;
90+
}
91+
92+
/**
93+
* Specifies the details of a FedEx facility that the operational personnel can contact for clearance purposes.
94+
*
95+
* @param Contact $operationalContact
96+
* @return $this
97+
*/
98+
public function setOperationalContact(Contact $operationalContact)
99+
{
100+
$this->values['OperationalContact'] = $operationalContact;
101+
return $this;
102+
}
103+
104+
/**
105+
* This contains the local airport identifier-formerly known as the airport code.
106+
*
107+
* @param string $localAirportId
108+
* @return $this
109+
*/
110+
public function setLocalAirportId($localAirportId)
111+
{
112+
$this->values['LocalAirportId'] = $localAirportId;
113+
return $this;
114+
}
115+
116+
/**
117+
* This contains the regional airport identifier-formerly known as the market location code.
118+
*
119+
* @param string $regionalAirportId
120+
* @return $this
121+
*/
122+
public function setRegionalAirportId($regionalAirportId)
123+
{
124+
$this->values['RegionalAirportId'] = $regionalAirportId;
125+
return $this;
126+
}
127+
}

‎src/FedEx/LocationsService/ComplexType/LocationSupportedPackageDetail.php

+13
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
*
1313
* @property Weight $Weight
1414
* @property Dimensions $Dimensions
15+
* @property string[] $ServiceOptions
1516
1617
*/
1718
class LocationSupportedPackageDetail extends AbstractComplexType
@@ -46,4 +47,16 @@ public function setDimensions(Dimensions $dimensions)
4647
$this->values['Dimensions'] = $dimensions;
4748
return $this;
4849
}
50+
51+
/**
52+
* Set ServiceOptions
53+
*
54+
* @param string $serviceOptions
55+
* @return $this
56+
*/
57+
public function setServiceOptions($serviceOptions)
58+
{
59+
$this->values['ServiceOptions'] = $serviceOptions;
60+
return $this;
61+
}
4962
}

‎src/FedEx/LocationsService/Request.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Request extends AbstractRequest
1515
const PRODUCTION_URL = 'https://ws.fedex.com:443/web-services/locs';
1616
const TESTING_URL = 'https://wsbeta.fedex.com:443/web-services/locs';
1717

18-
protected static $wsdlFileName = 'LocationsService_v9.wsdl';
18+
protected static $wsdlFileName = 'LocationsService_v12.wsdl';
1919

2020
/**
2121
* Sends the SearchLocationsRequest and returns the response

‎src/FedEx/LocationsService/SimpleType/CarrierCodeType.php

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ class CarrierCodeType extends AbstractSimpleType
1515
const _FDXC = 'FDXC';
1616
const _FDXE = 'FDXE';
1717
const _FDXG = 'FDXG';
18+
const _FDXO = 'FDXO';
1819
const _FXCC = 'FXCC';
1920
const _FXFR = 'FXFR';
2021
const _FXSP = 'FXSP';

0 commit comments

Comments
 (0)