@@ -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 { |
@@ -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 | |