@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | } |
20 | 20 | |
21 | 21 | /** |
22 | - * @return transportationShipmentCharge |
|
22 | + * @return ShipmentCharge |
|
23 | 23 | */ |
24 | 24 | public function getTransportationShipmentCharge() |
25 | 25 | { |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | } |
44 | 44 | |
45 | 45 | /** |
46 | - * @return dutiesAndTaxesShipmentCharge |
|
46 | + * @return ShipmentCharge |
|
47 | 47 | */ |
48 | 48 | public function getDutiesAndTaxesShipmentCharge() |
49 | 49 | { |
@@ -33,7 +33,7 @@ |
||
33 | 33 | public function setShipmentCharge(ShipmentCharge $shipmentCharge) |
34 | 34 | { |
35 | 35 | if ($shipmentCharge->getType() == ShipmentCharge::SHIPMENT_CHARGE_TYPE_TRANSPORTATION) { |
36 | - $this->transportationShipmentCharge = $shipmentCharge; |
|
36 | + $this->transportationShipmentCharge = $shipmentCharge; |
|
37 | 37 | } else if ($shipmentCharge->getType() == ShipmentCharge::SHIPMENT_CHARGE_TYPE_DUTIES) { |
38 | 38 | $this->dutiesAndTaxesShipmentCharge = $shipmentCharge; |
39 | 39 | } else { |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | * @param BillShipper $billShipper |
86 | 86 | * @return ShipmentCharge |
87 | 87 | */ |
88 | - public function setBillShipper(BillShipper $billShipper= null) |
|
88 | + public function setBillShipper(BillShipper $billShipper = null) |
|
89 | 89 | { |
90 | 90 | $this->billShipper = $billShipper; |
91 | 91 | |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | * @param BillReceiver $billReceiver |
105 | 105 | * @return ShipmentCharge |
106 | 106 | */ |
107 | - public function setBillReceiver(BillReceiver $billReceiver= null) |
|
107 | + public function setBillReceiver(BillReceiver $billReceiver = null) |
|
108 | 108 | { |
109 | 109 | $this->billReceiver = $billReceiver; |
110 | 110 |
@@ -310,15 +310,15 @@ discard block |
||
310 | 310 | |
311 | 311 | for ($shipmentChargeRec = 1; $shipmentChargeRec <= 2; $shipmentChargeRec++) { |
312 | 312 | if ($shipmentChargeRec == 1) { |
313 | - $rec = $shipment->getItemizedPaymentInformation()->getTransportationShipmentCharge(); |
|
314 | - if ($rec == null) continue; |
|
315 | - $node = $paymentNode->appendChild($xml->createElement('ShipmentCharge')); |
|
316 | - $node->appendChild($xml->createElement('Type', \Ups\Entity\ShipmentCharge::SHIPMENT_CHARGE_TYPE_TRANSPORTATION)); |
|
313 | + $rec = $shipment->getItemizedPaymentInformation()->getTransportationShipmentCharge(); |
|
314 | + if ($rec == null) continue; |
|
315 | + $node = $paymentNode->appendChild($xml->createElement('ShipmentCharge')); |
|
316 | + $node->appendChild($xml->createElement('Type', \Ups\Entity\ShipmentCharge::SHIPMENT_CHARGE_TYPE_TRANSPORTATION)); |
|
317 | 317 | } else { |
318 | - $rec = $shipment->getItemizedPaymentInformation()->getDutiesAndTaxesShipmentCharge(); |
|
319 | - if ($rec == null) continue; |
|
320 | - $node = $paymentNode->appendChild($xml->createElement('ShipmentCharge')); |
|
321 | - $node->appendChild($xml->createElement('Type', \Ups\Entity\ShipmentCharge::SHIPMENT_CHARGE_TYPE_DUTIES)); |
|
318 | + $rec = $shipment->getItemizedPaymentInformation()->getDutiesAndTaxesShipmentCharge(); |
|
319 | + if ($rec == null) continue; |
|
320 | + $node = $paymentNode->appendChild($xml->createElement('ShipmentCharge')); |
|
321 | + $node->appendChild($xml->createElement('Type', \Ups\Entity\ShipmentCharge::SHIPMENT_CHARGE_TYPE_DUTIES)); |
|
322 | 322 | } |
323 | 323 | |
324 | 324 | if ($rec->getBillShipper()) { |
@@ -362,7 +362,7 @@ discard block |
||
362 | 362 | } |
363 | 363 | } |
364 | 364 | if ($shipment->getItemizedPaymentInformation()->getSplitDutyVATIndicator()) { |
365 | - $paymentNode->appendChild($xml->createElement('SplitDutyVATIndicator')); |
|
365 | + $paymentNode->appendChild($xml->createElement('SplitDutyVATIndicator')); |
|
366 | 366 | } |
367 | 367 | } |
368 | 368 |
@@ -311,12 +311,16 @@ |
||
311 | 311 | for ($shipmentChargeRec = 1; $shipmentChargeRec <= 2; $shipmentChargeRec++) { |
312 | 312 | if ($shipmentChargeRec == 1) { |
313 | 313 | $rec = $shipment->getItemizedPaymentInformation()->getTransportationShipmentCharge(); |
314 | - if ($rec == null) continue; |
|
314 | + if ($rec == null) { |
|
315 | + continue; |
|
316 | + } |
|
315 | 317 | $node = $paymentNode->appendChild($xml->createElement('ShipmentCharge')); |
316 | 318 | $node->appendChild($xml->createElement('Type', \Ups\Entity\ShipmentCharge::SHIPMENT_CHARGE_TYPE_TRANSPORTATION)); |
317 | 319 | } else { |
318 | 320 | $rec = $shipment->getItemizedPaymentInformation()->getDutiesAndTaxesShipmentCharge(); |
319 | - if ($rec == null) continue; |
|
321 | + if ($rec == null) { |
|
322 | + continue; |
|
323 | + } |
|
320 | 324 | $node = $paymentNode->appendChild($xml->createElement('ShipmentCharge')); |
321 | 325 | $node->appendChild($xml->createElement('Type', \Ups\Entity\ShipmentCharge::SHIPMENT_CHARGE_TYPE_DUTIES)); |
322 | 326 | } |