Melhorado cs

Author: leonvaloes

src/Cielo/API30/Ecommerce/Payment.php

@@ -110,6 +110,8 @@ class Payment implements \JsonSerializable
 
     private $instructions;
 
+    private $paymentFacilitator;
+
     /**
      * Payment constructor.
      *
@@ -168,6 +170,10 @@ public function populate(\stdClass $data)
             $this->externalAuthentication->populate($data->ExternalAuthentication);
         }
 
+        if (isset($data->PaymentFacilitator)) {
+            $this->paymentFacilitator()->populate($data->paymentFacilitator);
+        }
+
         $this->expirationDate = isset($data->ExpirationDate) ? $data->ExpirationDate : null;
         $this->url            = isset($data->Url) ? $data->Url : null;
         $this->boletoNumber   = isset($data->BoletoNumber) ? $data->BoletoNumber : null;
@@ -1154,4 +1160,33 @@ public function setInstructions($instructions)
 
         return $this;
     }
+
+    public function paymentFacilitator()
+    {
+        if (is_null($this->paymentFacilitator)) {
+            $this->setPaymentFacilitator(new PaymentFacilitator());
+        }
+
+        return $this->getPaymentFacilitator();
+    }
+
+    /**
+     * Get the value of paymentFacilitator
+     */
+    public function getPaymentFacilitator()
+    {
+        return $this->paymentFacilitator;
+    }
+
+    /**
+     * Set the value of paymentFacilitator
+     *
+     * @return  self
+     */
+    public function setPaymentFacilitator($paymentFacilitator)
+    {
+        $this->paymentFacilitator = $paymentFacilitator;
+
+        return $this;
+    }
 }

src/Cielo/API30/Ecommerce/PaymentFacilitator.php

@@ -3,44 +3,24 @@
 namespace Cielo\API30\Ecommerce;
 
 /**
- * Class Payment
+ * Class PaymentFacilitator
  *
  * @package Cielo\API30\Ecommerce
  */
-
-
 class PaymentFacilitator implements \JsonSerializable
 {
-
-    private $paymentFacilitator;
-
     private $subEstablishment;
-    
 
-    public function __construct($paymentFacilitator)
+    public function __construct($subEstablishment = null)
     {
-        $this->paymentFacilitator = $paymentFacilitator;
-    }
-    
-    /**
-     * @param $json
-     *
-     * @return PaymentFacilitator
-     */
-    public static function fromJson($json)
-    {
-        $paymentFacilitator = new PaymentFacilitator(json_decode($json));
-        $paymentFacilitator->populate(json_decode($json));
-
-        return $paymentFacilitator;
+        $this->subEstablishment = $subEstablishment;
     }
 
     /**
      * @param \stdClass $data
      */
     public function populate(\stdClass $data)
     {
-        $this->paymentFacilitator = $data->paymentFacilitator ?? $data->paymentFacilitator;
         $this->subEstablishment =  new SubEstablishment();
         $this->subEstablishment->populate($data);
     }
@@ -53,29 +33,18 @@ public function jsonSerialize()
         return get_object_vars($this);
     }
 
-    /**
-     * Get the value of paymentFacilitator
-     */ 
-    public function getPaymentFacilitator()
+    public function subEstablishment()
     {
-        return $this->paymentFacilitator;
-    }
-
-    /**
-     * Set the value of paymentFacilitator
-     *
-     * @return  self
-     */ 
-    public function setPaymentFacilitator($paymentFacilitator)
-    {
-        $this->paymentFacilitator = $paymentFacilitator;
-
-        return $this;
+        if (is_null($this->subEstablishment)) {
+            $this->setSubEstablishment(new SubEstablishment());
+        }
+        
+        return $this->getSubEstablishment();
     }
 
     /**
      * Get the value of subEstablishment
-     */ 
+     */
     public function getSubEstablishment()
     {
         return $this->subEstablishment;
@@ -85,8 +54,8 @@ public function getSubEstablishment()
      * Set the value of subEstablishment
      *
      * @return  self
-     */ 
-    public function setSubEstablishment($subEstablishment)
+     */
+    public function setSubEstablishment(SubEstablishment $subEstablishment)
     {
         $this->subEstablishment = $subEstablishment;
 

src/Cielo/API30/Ecommerce/SubEstablishment.php

@@ -3,43 +3,52 @@
 namespace Cielo\API30\Ecommerce;
 
 /**
- * Class Payment
+ * Class SubEstablishment
  *
  * @package Cielo\API30\Ecommerce
  */
-
-
 class SubEstablishment implements \JsonSerializable
 {
+    const DEFAULT_COUTRY_CODE = "076";
+
     private $establishmentCode;
     private $identity;
     private $mcc;
     private $address;
     private $city;
     private $state;
-    private $countryCode;
     private $postalCode;
+    private $countryCode;
     private $phoneNumber;
 
-
     public function __construct()
     {
-        $this->countryCode = "076";
+        $this->countryCode = self::DEFAULT_COUTRY_CODE;
+        $this->establishmentCode = null;
+        $this->identity = null;
+        $this->mcc = null;
+        $this->address = null;
+        $this->city = null;
+        $this->state = null;
+        $this->countryCode = null;
+        $this->postalCode = null;
+        $this->phoneNumber = null;
     }
+
     /**
      * @param \stdClass $data
      */
     public function populate(\stdClass $data)
     {
-        $this->establishmentCode    = $data->establishmentCode ?? $data->establishmentCode;
-        $this->identity             = $data->identity          ?? $data->identity;
-        $this->mcc                  = $data->mcc               ?? $data->mcc;
-        $this->address              = $data->address           ?? $data->address;
-        $this->city                 = $data->city              ?? $data->city;
-        $this->state                = $data->state             ?? $data->state;
-        $this->countryCode          = $data->countryCode       ?? $data->countryCode;
-        $this->postalCode           = $data->postalCode        ?? $data->postalCode;
-        $this->phoneNumber          = $data->phoneNumber       ?? $data->phoneNumber;
+        $this->establishmentCode  = $data->EstablishmentCode ?? null;
+        $this->identity = $data->Identity ?? null;
+        $this->mcc = $data->Mcc ?? null;
+        $this->address = $data->Address ?? null;
+        $this->city = $data->City ?? null;
+        $this->state = $data->State ?? null;
+        $this->countryCode = $data->CountryCode ?? null;
+        $this->postalCode = $data->PostalCode ?? null;
+        $this->phoneNumber = $data->PhoneNumber ?? null;
     }
 
     public function jsonSerialize()
@@ -227,4 +236,4 @@ public function setPhoneNumber($phoneNumber)
 
         return $this;
     }
-}
+}