Changes receipt reading methods

craigpaul · Oct 25, 2016 · f2958c7 · f2958c7
1 parent df1adb4
commit f2958c7
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/Response.php b/src/Response.php
@@ -111,12 +111,12 @@ public static function create(Transaction $transaction)
     /**
      * Retrieve the transaction's receipt if it is available.
      *
-     * @return \SimpleXMLElement|\SimpleXMLElement[]|null
+     * @return \CraigPaul\Moneris\Receipt|null
      */
     public function receipt()
     {
         if (!is_null($response = $this->transaction->response)) {
-            return $response->receipt;
+            return new Receipt($response->receipt);
         }
 
         return null;
@@ -132,17 +132,17 @@ public function validate()
         $receipt = $this->receipt();
         $gateway = $this->transaction->gateway;
 
-        if ($receipt->ReceiptId === 'Global Error Receipt') {
+        if ($receipt->read('id') === 'Global Error Receipt') {
             $this->status = Response::GLOBAL_ERROR_RECEIPT;
             $this->successful = false;
 
             return $this;
         }
 
-        $code = (int)$receipt->ResponseCode;
+        $code = (int)$receipt->read('code');
 
         if ($code >= 50 || $code === 0) {
-            switch ($receipt->ResponseCode) {
+            switch ($receipt->read('code')) {
                 case '050':
                 case '074':
                 case 'null':
@@ -192,7 +192,7 @@ public function validate()
             return $this;
         }
 
-        $code = isset($receipt->AvsResultCode) ? (string)$receipt->AvsResultCode : false;
+        $code = $receipt->read('avs_result') ?? false;
 
         if ($gateway->avs && $code && $code !== 'null' && !in_array($code, $gateway->avsCodes)) {
             switch ($code) {
@@ -224,7 +224,7 @@ public function validate()
             return $this;
         }
 
-        $code = isset($receipt->CvdResultCode) ? (string)$receipt->CvdResultCode : null;
+        $code = $receipt->read('cvd_result') ?? null;
 
         if ($gateway->avs && !is_null($code) && $code !== 'null' && !in_array($code{1}, $gateway->cvdCodes)) {
             $this->status = Response::CVD;