Fix for PaymentSend endpoints; removed unused constants

Author: daniel-zahariev

README.md

@@ -41,7 +41,7 @@ Each resource (class) can be accessed via magic property on the Merchants API ob
 $merchant_api->api_keys->...;
 $merchant_api->balance->...;
 $merchant_api->payment_requests->...;
-$merchant_api->payment_sends->...;
+$merchant_api->payment_send->...;
 $merchant_api->pos->...;
 $merchant_api->profile->...;
 $merchant_api->settlements->...;

src/MerchantApi/ApiKeys.php

@@ -18,7 +18,7 @@ class ApiKeys extends SettleApi
      */
     public function list()
     {
-        return $this->call('GET', 'api_key/');
+        return $this->call('GET', 'merchant/v1/api_key/');
     }
 
     /**
@@ -28,7 +28,7 @@ public function list()
      */
     public function get($api_key_id)
     {
-        return $this->call('GET', "api_key/{$api_key_id}/");
+        return $this->call('GET', "merchant/v1/api_key/{$api_key_id}/");
     }
 
     /**
@@ -38,7 +38,7 @@ public function get($api_key_id)
      */
     public function create(array $data)
     {
-        return $this->call('POST', 'api_key/', $data);
+        return $this->call('POST', 'merchant/v1/api_key/', $data);
     }
 
     /**
@@ -49,7 +49,7 @@ public function create(array $data)
      */
     public function update($api_key_id, array $data)
     {
-        return $this->call('PUT', "api_key/{$api_key_id}/", $data);
+        return $this->call('PUT', "merchant/v1/api_key/{$api_key_id}/", $data);
     }
 
     /**
@@ -59,6 +59,6 @@ public function update($api_key_id, array $data)
      */
     public function delete($api_key_id)
     {
-        return $this->call('DELETE', "api_key/{$api_key_id}/");
+        return $this->call('DELETE', "merchant/v1/api_key/{$api_key_id}/");
     }
 }

src/MerchantApi/Balance.php

@@ -19,6 +19,6 @@ class Balance extends SettleApi
      */
     public function get($merchant_id)
     {
-        return $this->call('GET', "merchant/{$merchant_id}/balance/");
+        return $this->call('GET', "merchant/v1/merchant/{$merchant_id}/balance/");
     }
 }

src/MerchantApi/MerchantApi.php

@@ -10,7 +10,7 @@
  *
  * @property ApiKeys api_keys
  * @property PaymentRequests payment_requests
- * @property PaymentSends payment_sends
+ * @property PaymentSend payment_send
  * @property Pos pos
  * @property Settlements settlements
  * @property ShortLinks short_links
@@ -30,7 +30,7 @@ protected function getMagicProperties()
             'api_keys' => ApiKeys::class,
             'balance' => Balance::class,
             'payment_requests' => PaymentRequests::class,
-            'payment_sends' => PaymentSends::class,
+            'payment_send' => PaymentSend::class,
             'pos' => Pos::class,
             'profile' => Profile::class,
             'settlements' => Settlements::class,

src/MerchantApi/PaymentRequests.php

@@ -46,7 +46,7 @@ class PaymentRequests extends SettleApi
      */
     public function list($query = [])
     {
-        return $this->call('GET', 'payment_request/', $query);
+        return $this->call('GET', 'merchant/v1/payment_request/', $query);
     }
 
     /**
@@ -56,7 +56,7 @@ public function list($query = [])
      */
     public function get($payment_request_id)
     {
-        return $this->call('GET', "payment_request/{$payment_request_id}/");
+        return $this->call('GET', "merchant/v1/payment_request/{$payment_request_id}/");
     }
 
     /**
@@ -66,7 +66,7 @@ public function get($payment_request_id)
      */
     public function create(array $data)
     {
-        return $this->call('POST', 'payment_request/', $data, self::REQUEST_SHAPE);
+        return $this->call('POST', 'merchant/v1/payment_request/', $data, self::REQUEST_SHAPE);
     }
 
     /**
@@ -77,7 +77,7 @@ public function create(array $data)
      */
     public function update($payment_request_id, array $data)
     {
-        $path = "payment_request/{$payment_request_id}/";
+        $path = "merchant/v1/payment_request/{$payment_request_id}/";
 
         return $this->call('PUT', $path, $data, self::REQUEST_SHAPE);
     }
@@ -89,7 +89,7 @@ public function update($payment_request_id, array $data)
      */
     public function outcome($payment_request_id)
     {
-        return $this->call('GET', "payment_request/{$payment_request_id}/outcome/");
+        return $this->call('GET', "merchant/v1/payment_request/{$payment_request_id}/outcome/");
     }
 
     /**

src/MerchantApi/PaymentSends.php src/MerchantApi/PaymentSend.phpsrc/MerchantApi/PaymentSends.php renamed to src/MerchantApi/PaymentSend.php

@@ -6,11 +6,11 @@
 use SettleApi\SettleApiException;
 
 /**
- * Class PaymentSends
+ * Class PaymentSend
  * @package SettleApi\MerchantApi
  * @link https://settleapi.stoplight.io/docs/settleapis/b3A6MTUzOTU0Mzc-merchant-payment-send-create
  */
-class PaymentSends extends SettleApi
+class PaymentSend extends SettleApi
 {
     /**
      * @param array $data
@@ -19,7 +19,7 @@ class PaymentSends extends SettleApi
      */
     public function create(array $data)
     {
-        return $this->call('POST', 'payment/', $data);
+        return $this->call('POST', 'payment/v2/payment/', $data);
     }
 
     /**
@@ -29,6 +29,6 @@ public function create(array $data)
      */
     public function outcome($payment_send_id)
     {
-        return $this->call('GET', "payment/{$payment_send_id}/outcome/");
+        return $this->call('GET', "payment/v2/payment/{$payment_send_id}/");
     }
 }

src/MerchantApi/PermissionRequests.php

@@ -19,7 +19,7 @@ class PermissionRequests extends SettleApi
      */
     public function create(array $data)
     {
-        return $this->call('POST', 'permission_request/', $data, [
+        return $this->call('POST', 'merchant/v1/permission_request/', $data, [
             'customer' => 'required|string',
             'scope' => 'required|string',
             'legal_terms_url' => 'required|string',
@@ -38,7 +38,7 @@ public function create(array $data)
      */
     public function get($permissionRequestId)
     {
-        return $this->call('GET', "permission_request/{$permissionRequestId}/");
+        return $this->call('GET', "merchant/v1/permission_request/{$permissionRequestId}/");
     }
 
     /**
@@ -48,6 +48,6 @@ public function get($permissionRequestId)
      */
     public function outcome($permissionRequestId)
     {
-        return $this->call('GET', "permission_request/{$permissionRequestId}/outcome/");
+        return $this->call('GET', "merchant/v1/permission_request/{$permissionRequestId}/outcome/");
     }
 }

src/MerchantApi/Pos.php

@@ -18,7 +18,7 @@ class Pos extends SettleApi
      */
     public function list()
     {
-        return $this->call('GET', 'pos/');
+        return $this->call('GET', 'merchant/v1/pos/');
     }
 
     /**
@@ -28,7 +28,7 @@ public function list()
      */
     public function get($pos_id)
     {
-        return $this->call('GET', "pos/{$pos_id}/");
+        return $this->call('GET', "merchant/v1/pos/{$pos_id}/");
     }
 
     /**
@@ -38,7 +38,7 @@ public function get($pos_id)
      */
     public function create(array $data)
     {
-        return $this->call('POST', 'pos/', $data);
+        return $this->call('POST', 'merchant/v1/pos/', $data);
     }
 
     /**
@@ -49,7 +49,7 @@ public function create(array $data)
      */
     public function update($pos_id, array $data)
     {
-        return $this->call('PUT', "pos/{$pos_id}/", $data);
+        return $this->call('PUT', "merchant/v1/pos/{$pos_id}/", $data);
     }
 
     /**
@@ -59,6 +59,6 @@ public function update($pos_id, array $data)
      */
     public function delete($pos_id)
     {
-        return $this->call('DELETE', "pos/{$pos_id}/");
+        return $this->call('DELETE', "merchant/v1/pos/{$pos_id}/");
     }
 }

src/MerchantApi/Profile.php

@@ -19,7 +19,7 @@ class Profile extends SettleApi
      */
     public function get($merchant_id)
     {
-        return $this->call('GET', "merchant/{$merchant_id}/");
+        return $this->call('GET', "merchant/v1/merchant/{$merchant_id}/");
     }
 
     /**
@@ -29,6 +29,6 @@ public function get($merchant_id)
      */
     public function lookup($merchant_id)
     {
-        return $this->call('GET', "merchant_lookup/{$merchant_id}/");
+        return $this->call('GET', "merchant/v1/merchant_lookup/{$merchant_id}/");
     }
 }

src/MerchantApi/Settlements.php

@@ -18,7 +18,7 @@ class Settlements extends SettleApi
      */
     public function list()
     {
-        return $this->call('GET', 'settlement/');
+        return $this->call('GET', 'merchant/v1/settlement/');
     }
 
     /**
@@ -28,7 +28,7 @@ public function list()
      */
     public function get($settlement_id)
     {
-        return $this->call('GET', "settlement/{$settlement_id}/");
+        return $this->call('GET', "merchant/v1/settlement/{$settlement_id}/");
     }
 
     /**
@@ -38,16 +38,15 @@ public function get($settlement_id)
      */
     public function latest()
     {
-        return $this->call('GET', 'last_settlement/');
+        return $this->call('GET', 'merchant/v1/last_settlement/');
     }
 
     /**
      * @return array
      * @throws SettleApiException
-     * @todo This endpoint isn't working properly
      */
     public function report()
     {
-        return $this->call('GET', 'settlement_report/');
+        return $this->call('GET', 'merchant/v1/settlement_report/');
     }
 }