gabrielbull / php-ups-api

src/Entity/ItemizedPaymentInformation.php

Doc Comments +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
     }
 
     /**
-     * @return transportationShipmentCharge
+     * @return ShipmentCharge
      */
     public function getTransportationShipmentCharge()
     {
@@ -43,7 +43,7 @@ 
     }
 
     /**
-     * @return dutiesAndTaxesShipmentCharge
+     * @return ShipmentCharge
      */
     public function getDutiesAndTaxesShipmentCharge()
     {

Indentation +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
     public function setShipmentCharge(ShipmentCharge $shipmentCharge)
     {
         if ($shipmentCharge->getType() == ShipmentCharge::SHIPMENT_CHARGE_TYPE_TRANSPORTATION) { 
-           $this->transportationShipmentCharge = $shipmentCharge;
+            $this->transportationShipmentCharge = $shipmentCharge;
         } else if ($shipmentCharge->getType() == ShipmentCharge::SHIPMENT_CHARGE_TYPE_DUTIES) { 
             $this->dutiesAndTaxesShipmentCharge = $shipmentCharge;
         } else {

src/Shipping.php

Indentation +45 added lines, -45 removed lines

@@ -310,60 +310,60 @@
 
             for ($shipmentChargeRec = 1; $shipmentChargeRec <= 2; $shipmentChargeRec++)  {
                
-               if ($shipmentChargeRec == 1) { 
-                  $rec = $shipment->getItemizedPaymentInformation()->getTransportationShipmentCharge(); 
-                  if ($rec == null) continue; 
-                  $node = $paymentNode->appendChild($xml->createElement('ShipmentCharge'));
-                  $node->appendChild($xml->createElement('Type', \Ups\Entity\ShipmentCharge::SHIPMENT_CHARGE_TYPE_TRANSPORTATION));
-               } else {
-                  $rec = $shipment->getItemizedPaymentInformation()->getDutiesAndTaxesShipmentCharge(); 
-                  if ($rec == null) continue; 
-                  $node = $paymentNode->appendChild($xml->createElement('ShipmentCharge'));
-                  $node->appendChild($xml->createElement('Type', \Ups\Entity\ShipmentCharge::SHIPMENT_CHARGE_TYPE_DUTIES));
-               }
+                if ($shipmentChargeRec == 1) { 
+                    $rec = $shipment->getItemizedPaymentInformation()->getTransportationShipmentCharge(); 
+                    if ($rec == null) continue; 
+                    $node = $paymentNode->appendChild($xml->createElement('ShipmentCharge'));
+                    $node->appendChild($xml->createElement('Type', \Ups\Entity\ShipmentCharge::SHIPMENT_CHARGE_TYPE_TRANSPORTATION));
+                } else {
+                    $rec = $shipment->getItemizedPaymentInformation()->getDutiesAndTaxesShipmentCharge(); 
+                    if ($rec == null) continue; 
+                    $node = $paymentNode->appendChild($xml->createElement('ShipmentCharge'));
+                    $node->appendChild($xml->createElement('Type', \Ups\Entity\ShipmentCharge::SHIPMENT_CHARGE_TYPE_DUTIES));
+                }
                
-               if ($rec->getBillShipper()) {
-                   $node = $node->appendChild($xml->createElement('BillShipper'));
+                if ($rec->getBillShipper()) {
+                    $node = $node->appendChild($xml->createElement('BillShipper'));
    
-                   $billShipper = $rec->getBillShipper();
-                   if (isset($billShipper) && $rec->getBillShipper()->getAccountNumber()) {
-                       $node->appendChild($xml->createElement('AccountNumber', $rec->getBillShipper()->getAccountNumber()));
-                   } elseif (isset($billShipper) && $rec->getBillShipper()->getCreditCard()) {
-                       $ccNode = $node->appendChild($xml->createElement('CreditCard'));
-                       $ccNode->appendChild($xml->createElement('Type', $rec->getBillShipper()->getCreditCard()->getType()));
-                       $ccNode->appendChild($xml->createElement('Number', $rec->getBillShipper()->getCreditCard()->getNumber()));
-                       $ccNode->appendChild($xml->createElement('ExpirationDate', $rec->getBillShipper()->getCreditCard()->getExpirationDate()));
+                    $billShipper = $rec->getBillShipper();
+                    if (isset($billShipper) && $rec->getBillShipper()->getAccountNumber()) {
+                        $node->appendChild($xml->createElement('AccountNumber', $rec->getBillShipper()->getAccountNumber()));
+                    } elseif (isset($billShipper) && $rec->getBillShipper()->getCreditCard()) {
+                        $ccNode = $node->appendChild($xml->createElement('CreditCard'));
+                        $ccNode->appendChild($xml->createElement('Type', $rec->getBillShipper()->getCreditCard()->getType()));
+                        $ccNode->appendChild($xml->createElement('Number', $rec->getBillShipper()->getCreditCard()->getNumber()));
+                        $ccNode->appendChild($xml->createElement('ExpirationDate', $rec->getBillShipper()->getCreditCard()->getExpirationDate()));
    
-                       if ($rec->getBillShipper()->getCreditCard()->getSecurityCode()) {
-                           $ccNode->appendChild($xml->createElement('SecurityCode', $rec->getBillShipper()->getCreditCard()->getSecurityCode()));
-                       }
+                        if ($rec->getBillShipper()->getCreditCard()->getSecurityCode()) {
+                            $ccNode->appendChild($xml->createElement('SecurityCode', $rec->getBillShipper()->getCreditCard()->getSecurityCode()));
+                        }
    
-                       if ($rec->getBillShipper()->getCreditCard()->getAddress()) {
-                           $ccNode->appendChild($rec->getBillShipper()->getCreditCard()->getAddress()->toNode($xml));
-                       }
-                   }
-               } else if ($rec->getBillReceiver()) {
-                   // TODO not done yet 
-               } elseif ($rec->getBillThirdParty()) {
-                   $node = $node->appendChild($xml->createElement('BillThirdParty'));
-                   $btpNode = $node->appendChild($xml->createElement('BillThirdPartyShipper'));
-                   $btpNode->appendChild($xml->createElement('AccountNumber', $rec->getBillThirdParty()->getAccountNumber()));
+                        if ($rec->getBillShipper()->getCreditCard()->getAddress()) {
+                            $ccNode->appendChild($rec->getBillShipper()->getCreditCard()->getAddress()->toNode($xml));
+                        }
+                    }
+                } else if ($rec->getBillReceiver()) {
+                    // TODO not done yet 
+                } elseif ($rec->getBillThirdParty()) {
+                    $node = $node->appendChild($xml->createElement('BillThirdParty'));
+                    $btpNode = $node->appendChild($xml->createElement('BillThirdPartyShipper'));
+                    $btpNode->appendChild($xml->createElement('AccountNumber', $rec->getBillThirdParty()->getAccountNumber()));
    
-                   $tpNode = $btpNode->appendChild($xml->createElement('ThirdParty'));
-                   $addressNode = $tpNode->appendChild($xml->createElement('Address'));
+                    $tpNode = $btpNode->appendChild($xml->createElement('ThirdParty'));
+                    $addressNode = $tpNode->appendChild($xml->createElement('Address'));
    
-                   $thirdPartAddress = $rec->getBillThirdParty()->getThirdPartyAddress();
-                   if (isset($thirdPartAddress) && $rec->getBillThirdParty()->getThirdPartyAddress()->getPostalCode()) {
-                       $addressNode->appendChild($xml->createElement('PostalCode', $rec->getBillThirdParty()->getThirdPartyAddress()->getPostalCode()));
-                   }
+                    $thirdPartAddress = $rec->getBillThirdParty()->getThirdPartyAddress();
+                    if (isset($thirdPartAddress) && $rec->getBillThirdParty()->getThirdPartyAddress()->getPostalCode()) {
+                        $addressNode->appendChild($xml->createElement('PostalCode', $rec->getBillThirdParty()->getThirdPartyAddress()->getPostalCode()));
+                    }
    
-                   $addressNode->appendChild($xml->createElement('CountryCode', $rec->getBillThirdParty()->getThirdPartyAddress()->getCountryCode()));
-               } elseif ($rec->getConsigneeBilled()) {
-                   $node->appendChild($xml->createElement('ConsigneeBilled'));
-               }
+                    $addressNode->appendChild($xml->createElement('CountryCode', $rec->getBillThirdParty()->getThirdPartyAddress()->getCountryCode()));
+                } elseif ($rec->getConsigneeBilled()) {
+                    $node->appendChild($xml->createElement('ConsigneeBilled'));
+                }
             }  
             if ($shipment->getItemizedPaymentInformation()->getSplitDutyVATIndicator()) { 
-               $paymentNode->appendChild($xml->createElement('SplitDutyVATIndicator'));
+                $paymentNode->appendChild($xml->createElement('SplitDutyVATIndicator'));
             }
         }
 

Spacing +1 added lines, -1 removed lines

@@ -308,7 +308,7 @@
         } elseif ($shipment->getItemizedPaymentInformation()) {
             $paymentNode = $shipmentNode->appendChild($xml->createElement('ItemizedPaymentInformation'));
 
-            for ($shipmentChargeRec = 1; $shipmentChargeRec <= 2; $shipmentChargeRec++)  {
+            for ($shipmentChargeRec = 1; $shipmentChargeRec <= 2; $shipmentChargeRec++) {
                
                if ($shipmentChargeRec == 1) { 
                   $rec = $shipment->getItemizedPaymentInformation()->getTransportationShipmentCharge(); 

Braces +6 added lines, -2 removed lines

@@ -312,12 +312,16 @@
                
                if ($shipmentChargeRec == 1) { 
                   $rec = $shipment->getItemizedPaymentInformation()->getTransportationShipmentCharge(); 
-                  if ($rec == null) continue; 
+                  if ($rec == null) {
+                      continue;
+                  }
                   $node = $paymentNode->appendChild($xml->createElement('ShipmentCharge'));
                   $node->appendChild($xml->createElement('Type', \Ups\Entity\ShipmentCharge::SHIPMENT_CHARGE_TYPE_TRANSPORTATION));
                } else {
                   $rec = $shipment->getItemizedPaymentInformation()->getDutiesAndTaxesShipmentCharge(); 
-                  if ($rec == null) continue; 
+                  if ($rec == null) {
+                      continue;
+                  }
                   $node = $paymentNode->appendChild($xml->createElement('ShipmentCharge'));
                   $node->appendChild($xml->createElement('Type', \Ups\Entity\ShipmentCharge::SHIPMENT_CHARGE_TYPE_DUTIES));
                }

src/Entity/ShipmentCharge.php

Spacing +2 added lines, -2 removed lines

@@ -85,7 +85,7 @@ 
      * @param BillShipper $billShipper
      * @return ShipmentCharge
      */
-    public function setBillShipper(BillShipper $billShipper= null)
+    public function setBillShipper(BillShipper $billShipper = null)
     {
         $this->billShipper = $billShipper;
 
@@ -104,7 +104,7 @@ 
      * @param BillReceiver $billReceiver
      * @return ShipmentCharge
      */
-    public function setBillReceiver(BillReceiver $billReceiver= null)
+    public function setBillReceiver(BillReceiver $billReceiver = null)
     {
         $this->billReceiver = $billReceiver;