v0.2.0

mkreusch · Jan 6, 2021 · fbc5aed · fbc5aed
1 parent 7317606
commit fbc5aed
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/Client/Client.php b/Client/Client.php
@@ -46,9 +46,11 @@ public function createCheckoutSession($checkoutSession, $headers = null)
     public function getCheckoutSession($checkoutSessionId, $headers = null)
     {
         $result = parent::getCheckoutSession($checkoutSessionId, $headers);
-
-        //$result['status']
-        return new CheckoutSession(json_decode($result['response'], true));
+        $response = json_decode($result['response'], true);
+        if ((int)$result['status'] !== 200) {
+            throw new AmazonPayException($response['message']);
+        }
+        return new CheckoutSession($response);
     }
 
     /**
@@ -97,13 +99,16 @@ public function completeCheckoutSession($checkoutSessionId, $paymentDetails, $he
      * @param null $headers
      *
      * @return \AmazonPayApiSdkExtension\Struct\Charge|array|bool|string
+     * @throws AmazonPayException
      */
     public function getCharge($chargeId, $headers = null)
     {
         $result = parent::getCharge($chargeId, $headers);
-
-        //$result['status']
-        return new Charge(json_decode($result['response'], true));
+        $response = json_decode($result['response'], true);
+        if ((int)$result['status'] !== 200) {
+            throw new AmazonPayException('getCharge failed: ' . $response['message'] . ' - ' . $response['reasonCode']);
+        }
+        return new Charge($response);
     }
 
     public function captureCharge($chargeId, $charge, $headers = null)
@@ -176,24 +181,32 @@ public function createCharge($charge, $headers = null)
      * @param array|null $headers
      *
      * @return \AmazonPayApiSdkExtension\Struct\Refund
+     * @throws AmazonPayException
      */
     public function getRefund($refundId, $headers = null)
     {
         $result = parent::getRefund($refundId, $headers);
-
-        return new Refund(json_decode($result['response'], true));
+        $response = json_decode($result['response'], true);
+        if ((int)$result['status'] !== 200) {
+            throw new AmazonPayException('getCharge failed: ' . $response['message'] . ' - ' . $response['reasonCode']);
+        }
+        return new Refund($response);
     }
 
     /**
      * @param $buyerToken
      * @param array|null $headers
      *
      * @return \AmazonPayApiSdkExtension\Struct\Buyer
+     * @throws AmazonPayException
      */
     public function getBuyer($buyerToken, $headers = null)
     {
         $result = parent::getBuyer($buyerToken, $headers);
-
+        $response = json_decode($result['response'], true);
+        if ((int)$result['status'] !== 200) {
+            throw new AmazonPayException('getBuyer failed: ' . $response['message'] . ' - ' . $response['reasonCode']);
+        }
         return new Buyer(json_decode($result['response'], true));
     }
 

diff --git a/Struct/MerchantMetadata.php b/Struct/MerchantMetadata.php
@@ -50,7 +50,7 @@ public function setMerchantReferenceId($merchantReferenceId)
      */
     public function getMerchantStoreName()
     {
-        return $this->merchantStoreName;
+        return strlen($this->merchantStoreName)>50?substr($this->merchantStoreName, 0, 47).'...':$this->merchantStoreName;
     }
 
     /**

diff --git a/Struct/Price.php b/Struct/Price.php
@@ -22,13 +22,13 @@ public function getAmount()
     }
 
     /**
-     * @param string $amount
+     * @param string|float $amount
      *
      * @return Price
      */
     public function setAmount($amount)
     {
-        $this->amount = round($amount, 2);
+        $this->amount = number_format(round($amount, 2), 2, '.', '');
 
         return $this;
     }

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "mkreusch/amazon-pay-api-sdk-php-extension",
   "description": "Add a convenience layer to the Amazon Pay PHP SDK",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "require": {
     "php": ">=5.5.0",
     "amzn/amazon-pay-api-sdk-php": ">=2.0.0"