@@ -8,9 +8,9 @@ |
||
8 | 8 | |
9 | 9 | class ShipperFiled implements NodeInterface |
10 | 10 | { |
11 | - const SF_ITN = 'A'; // Requires the ITN |
|
12 | - const SF_EXEMPTION_LEGEND = 'B'; // Requires the Exemption Legend |
|
13 | - const SF_POST_DEPARTURE_FILING = 'C'; // Requires Post Departure Filing Citation |
|
11 | + const SF_ITN = 'A'; // Requires the ITN |
|
12 | + const SF_EXEMPTION_LEGEND = 'B'; // Requires the Exemption Legend |
|
13 | + const SF_POST_DEPARTURE_FILING = 'C'; // Requires Post Departure Filing Citation |
|
14 | 14 | |
15 | 15 | /** |
16 | 16 | * @var string |
@@ -8,8 +8,8 @@ |
||
8 | 8 | |
9 | 9 | class EEIFilingOption implements NodeInterface |
10 | 10 | { |
11 | - const FO_SHIPPER = '1'; // Shipper Filed |
|
12 | - const FO_UPS = '3'; // UPS Filed |
|
11 | + const FO_SHIPPER = '1'; // Shipper Filed |
|
12 | + const FO_UPS = '3'; // UPS Filed |
|
13 | 13 | |
14 | 14 | /** |
15 | 15 | * @var string |
@@ -4,11 +4,11 @@ |
||
4 | 4 | |
5 | 5 | class StatusType |
6 | 6 | { |
7 | - const ST_IN_TRANSIT = 'I'; // In Transit |
|
8 | - const ST_DELIVERED = 'D'; // Delivered |
|
9 | - const ST_EXCEPTION = 'X'; // Exception |
|
10 | - const ST_PICKUP = 'P'; // Pickup |
|
11 | - const ST_MANIFEST_PICKUP = 'M'; // Manifest Pickup |
|
7 | + const ST_IN_TRANSIT = 'I'; // In Transit |
|
8 | + const ST_DELIVERED = 'D'; // Delivered |
|
9 | + const ST_EXCEPTION = 'X'; // Exception |
|
10 | + const ST_PICKUP = 'P'; // Pickup |
|
11 | + const ST_MANIFEST_PICKUP = 'M'; // Manifest Pickup |
|
12 | 12 | |
13 | 13 | public $Code; |
14 | 14 | public $Description; |
@@ -186,46 +186,46 @@ |
||
186 | 186 | $patterns = [ |
187 | 187 | |
188 | 188 | // UPS Mail Innovations tracking numbers |
189 | - '/^MI\d{6}\d{1,22}$/',// MI 000000 00000000+ |
|
189 | + '/^MI\d{6}\d{1,22}$/', // MI 000000 00000000+ |
|
190 | 190 | |
191 | 191 | // USPS - Certified Mail |
192 | - '/^94071\d{17}$/', // 9407 1000 0000 0000 0000 00 |
|
193 | - '/^7\d{19}$/', // 7000 0000 0000 0000 0000 |
|
192 | + '/^94071\d{17}$/', // 9407 1000 0000 0000 0000 00 |
|
193 | + '/^7\d{19}$/', // 7000 0000 0000 0000 0000 |
|
194 | 194 | |
195 | 195 | // USPS - Collect on Delivery |
196 | - '/^93033\d{17}$/', // 9303 3000 0000 0000 0000 00 |
|
197 | - '/^M\d{9}$/', // M000 0000 00 |
|
196 | + '/^93033\d{17}$/', // 9303 3000 0000 0000 0000 00 |
|
197 | + '/^M\d{9}$/', // M000 0000 00 |
|
198 | 198 | |
199 | 199 | // USPS - Global Express Guaranteed |
200 | - '/^82\d{10}$/', // 82 000 000 00 |
|
200 | + '/^82\d{10}$/', // 82 000 000 00 |
|
201 | 201 | |
202 | 202 | // USPS - Priority Mail Express International |
203 | - '/^EC\d{9}US$/', // EC 000 000 000 US |
|
203 | + '/^EC\d{9}US$/', // EC 000 000 000 US |
|
204 | 204 | |
205 | 205 | // USPS Innovations Expedited |
206 | - '/^927\d{23}$/', // 9270 8900 8900 8900 8900 8900 00 |
|
206 | + '/^927\d{23}$/', // 9270 8900 8900 8900 8900 8900 00 |
|
207 | 207 | |
208 | 208 | // USPS - Priority Mail Express |
209 | - '/^927\d{19}$/', // 9270 1000 0000 0000 0000 00 |
|
210 | - '/^EA\d{9}US$/', // EA 000 000 000 US |
|
209 | + '/^927\d{19}$/', // 9270 1000 0000 0000 0000 00 |
|
210 | + '/^EA\d{9}US$/', // EA 000 000 000 US |
|
211 | 211 | |
212 | 212 | // USPS - Priority Mail International |
213 | - '/^CP\d{9}US$/', // CP 000 000 000 US |
|
213 | + '/^CP\d{9}US$/', // CP 000 000 000 US |
|
214 | 214 | |
215 | 215 | // USPS - Priority Mail |
216 | - '/^92055\d{17}$/', // 9205 5000 0000 0000 0000 00 |
|
217 | - '/^14\d{18}$/', // 1400 0000 0000 0000 0000 |
|
216 | + '/^92055\d{17}$/', // 9205 5000 0000 0000 0000 00 |
|
217 | + '/^14\d{18}$/', // 1400 0000 0000 0000 0000 |
|
218 | 218 | |
219 | 219 | // USPS - Registered Mail |
220 | - '/^92088\d{17}$/', // 9208 8000 0000 0000 0000 00 |
|
221 | - '/^RA\d{9}US$/', // RA 000 000 000 US |
|
220 | + '/^92088\d{17}$/', // 9208 8000 0000 0000 0000 00 |
|
221 | + '/^RA\d{9}US$/', // RA 000 000 000 US |
|
222 | 222 | |
223 | 223 | // USPS - Signature Confirmation |
224 | - '/^9202\d{16}US$/', // 9202 1000 0000 0000 0000 00 |
|
225 | - '/^23\d{16}US$/', // 2300 0000 0000 0000 0000 |
|
224 | + '/^9202\d{16}US$/', // 9202 1000 0000 0000 0000 00 |
|
225 | + '/^23\d{16}US$/', // 2300 0000 0000 0000 0000 |
|
226 | 226 | |
227 | 227 | // USPS - Tracking |
228 | - '/^94\d{20}$/', // 9400 1000 0000 0000 0000 00 |
|
228 | + '/^94\d{20}$/', // 9400 1000 0000 0000 0000 00 |
|
229 | 229 | '/^03\d{18}$/' // 0300 0000 0000 0000 0000 |
230 | 230 | ]; |
231 | 231 |
@@ -41,7 +41,7 @@ |
||
41 | 41 | * |
42 | 42 | * @throws Exception |
43 | 43 | * |
44 | - * @return TimeInTransitRequest |
|
44 | + * @return TimeInTransitResponse |
|
45 | 45 | */ |
46 | 46 | public function getTimeInTransit(TimeInTransitRequest $shipment) |
47 | 47 | { |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | 'endpointurl' => $this->getEndpointUrl(), |
102 | 102 | ]); |
103 | 103 | |
104 | - $this->logger->debug('Request: ' . $this->getRequest(), [ |
|
104 | + $this->logger->debug('Request: '.$this->getRequest(), [ |
|
105 | 105 | 'id' => $id, |
106 | 106 | 'endpointurl' => $this->getEndpointUrl(), |
107 | 107 | ]); |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | $response = $this->client->post( |
111 | 111 | $this->getEndpointUrl(), |
112 | 112 | [ |
113 | - 'body' => $this->getAccess() . $this->getRequest(), |
|
113 | + 'body' => $this->getAccess().$this->getRequest(), |
|
114 | 114 | 'headers' => [ |
115 | 115 | 'Content-type' => 'application/x-www-form-urlencoded; charset=utf-8', |
116 | 116 | 'Accept-Charset' => 'UTF-8', |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | 'endpointurl' => $this->getEndpointUrl(), |
127 | 127 | ]); |
128 | 128 | |
129 | - $this->logger->debug('Response: ' . $body, [ |
|
129 | + $this->logger->debug('Response: '.$body, [ |
|
130 | 130 | 'id' => $id, |
131 | 131 | 'endpointurl' => $this->getEndpointUrl(), |
132 | 132 | ]); |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | |
142 | 142 | return $responseInstance->setText($body)->setResponse($xml); |
143 | 143 | } elseif ($xml->Response->ResponseStatusCode == 0) { |
144 | - throw new InvalidResponseException('Failure: ' . $xml->Response->Error->ErrorDescription . ' (' . $xml->Response->Error->ErrorCode . ')'); |
|
144 | + throw new InvalidResponseException('Failure: '.$xml->Response->Error->ErrorDescription.' ('.$xml->Response->Error->ErrorCode.')'); |
|
145 | 145 | } |
146 | 146 | } else { |
147 | 147 | throw new InvalidResponseException('Failure: response is in an unexpected format.'); |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | 'endpointurl' => $this->getEndpointUrl(), |
154 | 154 | ]); |
155 | 155 | |
156 | - throw new RequestException('Failure: ' . $e->getMessage()); |
|
156 | + throw new RequestException('Failure: '.$e->getMessage()); |
|
157 | 157 | } |
158 | 158 | } |
159 | 159 |
@@ -38,46 +38,46 @@ |
||
38 | 38 | const S_UPSEXPRESS_1200 = '74'; |
39 | 39 | |
40 | 40 | // Time in Transit Response Service Codes: United States Domestic Shipments |
41 | - const TT_S_US_AIR_1DAYAM = '1DM'; // UPS Next Day Air Early |
|
42 | - const TT_S_US_AIR_1DAY = '1DA'; // UPS Next Day Air |
|
43 | - const TT_S_US_AIR_SAVER = '1DP'; // UPS Next Day Air Saver |
|
44 | - const TT_S_US_AIR_2DAYAM = '2DM'; // UPS Second Day Air A.M. |
|
45 | - const TT_S_US_AIR_2DAY = '2DA'; // UPS Second Day Air |
|
46 | - const TT_S_US_3DAYSELECT = '3DS'; // UPS Three-Day Select |
|
47 | - const TT_S_US_GROUND = 'GND'; // UPS Ground |
|
41 | + const TT_S_US_AIR_1DAYAM = '1DM'; // UPS Next Day Air Early |
|
42 | + const TT_S_US_AIR_1DAY = '1DA'; // UPS Next Day Air |
|
43 | + const TT_S_US_AIR_SAVER = '1DP'; // UPS Next Day Air Saver |
|
44 | + const TT_S_US_AIR_2DAYAM = '2DM'; // UPS Second Day Air A.M. |
|
45 | + const TT_S_US_AIR_2DAY = '2DA'; // UPS Second Day Air |
|
46 | + const TT_S_US_3DAYSELECT = '3DS'; // UPS Three-Day Select |
|
47 | + const TT_S_US_GROUND = 'GND'; // UPS Ground |
|
48 | 48 | const TT_S_US_AIR_1DAYSATAM = '1DMS'; // UPS Next Day Air Early (Saturday Delivery) |
49 | 49 | const TT_S_US_AIR_1DAYSAT = '1DAS'; // UPS Next Day Air (Saturday Delivery) |
50 | 50 | const TT_S_US_AIR_2DAYSAT = '2DAS'; // UPS Second Day Air (Saturday Delivery) |
51 | 51 | |
52 | 52 | // Time in Transit Response Service Codes: Other Shipments Originating in US |
53 | - const TT_S_US_INTL_EXPRESSPLUS = '21'; // UPS Worldwide Express Plus |
|
54 | - const TT_S_US_INTL_EXPRESS = '01'; // UPS Worldwide Express |
|
55 | - const TT_S_US_INTL_SAVER = '28'; // UPS Worldwide Express Saver |
|
56 | - const TT_S_US_INTL_STANDARD = '03'; // UPS Standard |
|
57 | - const TT_S_US_INTL_EXPEDITED = '05'; // UPS Worldwide Expedited |
|
53 | + const TT_S_US_INTL_EXPRESSPLUS = '21'; // UPS Worldwide Express Plus |
|
54 | + const TT_S_US_INTL_EXPRESS = '01'; // UPS Worldwide Express |
|
55 | + const TT_S_US_INTL_SAVER = '28'; // UPS Worldwide Express Saver |
|
56 | + const TT_S_US_INTL_STANDARD = '03'; // UPS Standard |
|
57 | + const TT_S_US_INTL_EXPEDITED = '05'; // UPS Worldwide Expedited |
|
58 | 58 | |
59 | 59 | // Time in Transit Response Service Codes: Shipments Originating in the EU |
60 | 60 | // Destination is WITHIN the Origin Country |
61 | - const TT_S_EU_EXPRESSPLUS = '23'; // UPS Express Plus |
|
62 | - const TT_S_EU_EXPRESS = '24'; // UPS Express |
|
63 | - const TT_S_EU_SAVER = '26'; // UPS Express Saver |
|
64 | - const TT_S_EU_STANDARD = '25'; // UPS Standard |
|
61 | + const TT_S_EU_EXPRESSPLUS = '23'; // UPS Express Plus |
|
62 | + const TT_S_EU_EXPRESS = '24'; // UPS Express |
|
63 | + const TT_S_EU_SAVER = '26'; // UPS Express Saver |
|
64 | + const TT_S_EU_STANDARD = '25'; // UPS Standard |
|
65 | 65 | |
66 | 66 | // Time in Transit Response Service Codes: Shipments Originating in the EU |
67 | 67 | // Destination is Another EU Country |
68 | - const TT_S_EU_TO_EU_EXPRESSPLUS = '22'; // UPS Express Plus |
|
69 | - const TT_S_EU_TO_EU_EXPRESS = '10'; // UPS Express |
|
70 | - const TT_S_EU_TO_EU_SAVER = '18'; // UPS Express Saver |
|
71 | - const TT_S_EU_TO_EU_STANDARD = '08'; // UPS Standard |
|
68 | + const TT_S_EU_TO_EU_EXPRESSPLUS = '22'; // UPS Express Plus |
|
69 | + const TT_S_EU_TO_EU_EXPRESS = '10'; // UPS Express |
|
70 | + const TT_S_EU_TO_EU_SAVER = '18'; // UPS Express Saver |
|
71 | + const TT_S_EU_TO_EU_STANDARD = '08'; // UPS Standard |
|
72 | 72 | |
73 | 73 | // Time in Transit Response Service Codes: Shipments Originating in the EU |
74 | 74 | // Destination is Outside the EU |
75 | - const TT_S_EU_TO_OTHER_EXPRESS_NA1 = '11'; // UPS Express NA 1 |
|
76 | - const TT_S_EU_TO_OTHER_EXPRESSPLUS = '21'; // UPS Worldwide Express Plus |
|
77 | - const TT_S_EU_TO_OTHER_EXPRESS = '01'; // UPS Express |
|
78 | - const TT_S_EU_TO_OTHER_SAVER = '28'; // UPS Express Saver |
|
79 | - const TT_S_EU_TO_OTHER_EXPEDITED = '05'; // UPS Expedited |
|
80 | - const TT_S_EU_TO_OTHER_STANDARD = '68'; // UPS Standard |
|
75 | + const TT_S_EU_TO_OTHER_EXPRESS_NA1 = '11'; // UPS Express NA 1 |
|
76 | + const TT_S_EU_TO_OTHER_EXPRESSPLUS = '21'; // UPS Worldwide Express Plus |
|
77 | + const TT_S_EU_TO_OTHER_EXPRESS = '01'; // UPS Express |
|
78 | + const TT_S_EU_TO_OTHER_SAVER = '28'; // UPS Express Saver |
|
79 | + const TT_S_EU_TO_OTHER_EXPEDITED = '05'; // UPS Expedited |
|
80 | + const TT_S_EU_TO_OTHER_STANDARD = '68'; // UPS Standard |
|
81 | 81 | |
82 | 82 | private static $serviceNames = [ |
83 | 83 | '01' => 'UPS Next Day Air', |