Merge pull request cloudbeds#3 from kostya-p-dev/add_merchant_account…

…_service_to_sdk Updated create eftbankaccounts url in MerchantAccountService
screamer-gi · Mar 28, 2018 · 240aca0 · 240aca0
2 parents 7040e5a + 8b45466
commit 240aca0
Show file tree

Hide file tree

Showing 5 changed files with 135 additions and 11 deletions.
diff --git a/sample/index.html b/sample/index.html
@@ -15,6 +15,7 @@ <h2>Sample Scripts</h2>
 					<li><a href="merchant-account-create-business-owner-address.php">Add a Business Owner Address</a></li>
 					<li><a href="merchant-account-create-business-owner-government-id.php">Add a Business Owner Government ID</a></li>
 					<li><a href="merchant-account-add-bank-account.php">Add a Merchant Bank Account</a></li>
+					<li><a href="merchant-sub-account-add-bank-account.php">Add a Sub Merchant Bank Account</a></li>
 					<li><a href="merchant-account-terms-and-conditions.php">Accept Our Terms and Conditions</a></li>
 					<li><a href="merchant-account-activate.php">Activate Merchant Account</a></li>
 				</ul>

diff --git a/sample/merchant-account-add-bank-account.php b/sample/merchant-account-add-bank-account.php
@@ -7,15 +7,13 @@
 
 if ($_POST) {
 	$client = new PaysafeApiClient($paysafeApiKeyId, $paysafeApiKeySecret, Environment::TEST, $paysafeAccountNumber);
+	$client->setAccount($_POST['accountId']);
 	try {
-		$auth = $client->merchantAccountService()->addMerchantEftBankAccount(new \Paysafe\AccountManagement\MerchantEftBankAccount(array(
+		$auth = $client->merchantAccountService()->addSubMerchantEftBankAccount(new \Paysafe\AccountManagement\MerchantEftBankAccount(array(
 			 'accountNumber' => $_POST['accountNumber'],
 			 'transitNumber' => $_POST['transitNumber'],
 			 'institutionId' => $_POST['institutionId'],
-			 'merchantId' => $_POST['merchantId'],
             )));
-               // var_dump($auth);die;
-
 
         die('successful! ID: ' . $auth->id);
 	} catch (Paysafe\PaysafeException $e) {
@@ -44,10 +42,10 @@
 				<legend>Creation Merchant Banka Account (EFT)</legend>
 				<div>
 					<label>
-                        merchantId:
-						<input type="input" name="merchantId" value="<?php
-						if (isset($_POST['merchantId'])) {
-							echo $_POST['merchantId'];
+                        accountId:
+						<input type="input" name="accountId" value="<?php
+						if (isset($_POST['accountId'])) {
+							echo $_POST['accountId'];
 						} else {
                             echo "";
                         }

diff --git a/sample/merchant-sub-account-add-bank-account.php b/sample/merchant-sub-account-add-bank-account.php
@@ -0,0 +1,97 @@
+<?php
+require_once('config.php');
+
+use Paysafe\PaysafeApiClient;
+use Paysafe\Environment;
+use Paysafe\CardPayments\Authorization;
+
+if ($_POST) {
+	$client = new PaysafeApiClient($paysafeApiKeyId, $paysafeApiKeySecret, Environment::TEST, $paysafeAccountNumber);
+	try {
+		$auth = $client->merchantAccountService()->addMerchantEftBankAccount(new \Paysafe\AccountManagement\MerchantEftBankAccount(array(
+			 'accountNumber' => $_POST['accountNumber'],
+			 'transitNumber' => $_POST['transitNumber'],
+			 'institutionId' => $_POST['institutionId'],
+			 'merchantId' => $_POST['merchantId'],
+            )));
+               // var_dump($auth);die;
+
+
+        die('successful! ID: ' . $auth->id);
+	} catch (Paysafe\PaysafeException $e) {
+		echo '<pre>';
+		var_dump($e->getMessage());
+		if ($e->fieldErrors) {
+			var_dump($e->fieldErrors);
+		}
+		if ($e->links) {
+			var_dump($e->links);
+		}
+		echo '</pre>';
+	} catch (Paysafe\PaysafeException $e) {
+		var_dump($e->getMessage());
+	}
+}
+?>
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>Paysafe SDK - Creation Merchant Banka Account</title>
+	</head>
+	<body>
+		<form method="post">
+			<fieldset>
+				<legend>Creation Merchant Banka Account (EFT)</legend>
+				<div>
+					<label>
+                        merchantId:
+						<input type="input" name="merchantId" value="<?php
+						if (isset($_POST['merchantId'])) {
+							echo $_POST['merchantId'];
+						} else {
+                            echo "";
+                        }
+						?>"/>
+					</label>
+                </div>
+				<div>
+					<label>
+                        accountNumber:
+						<input type="input" name="accountNumber" value="<?php
+						if (isset($_POST['accountNumber'])) {
+							echo $_POST['accountNumber'];
+						} else {
+                            echo "5807560412853954";
+                        }
+						?>"/>
+					</label>
+                </div>
+				<div>
+					<label>
+                        transitNumber:
+						<input type="input" name="transitNumber" value="<?php
+						if (isset($_POST['transitNumber'])) {
+							echo $_POST['transitNumber'];
+						} else {
+                            echo "52487";
+                        }
+						?>"/>
+					</label>
+                </div>
+                <div>
+					<label>
+                        institutionId:
+						<input type="input" name="institutionId" value="<?php
+						if (isset($_POST['institutionId'])) {
+							echo $_POST['institutionId'];
+						} else {
+                            echo "052";
+                        }
+						?>"/>
+					</label>
+                </div>
+			</fieldset>
+			<input type="submit" />
+		</form>
+	</body>
+</html>
diff --git a/source/Paysafe/AccountManagement/MerchantAccount.php b/source/Paysafe/AccountManagement/MerchantAccount.php
@@ -6,6 +6,9 @@
  * Class MerchantAccount
  * @package Paysafe\AccountManagement
  *
+ * @property string $id
+ * @property string $status
+ * @property string $merchantId
  * @property string $name
  * @property string $currency
  * @property string $region
@@ -26,6 +29,7 @@ public static function getPageableArrayKey() {
 
     protected static $fieldTypes = array(
         'id' => 'string',
+        'status' => 'string',
         'merchantId' => 'string',
         'name' => 'string',
         'currency' => 'string',

diff --git a/source/Paysafe/MerchantAccountService.php b/source/Paysafe/MerchantAccountService.php
@@ -305,6 +305,30 @@ function addBusinessOwnerIdentityDocument(MerchantAccountBusinessOwnerIdentityDo
      * @return MerchantEftBankAccount
      * @throws PaysafeException
      */
+    function addSubMerchantEftBankAccount(MerchantEftBankAccount $bankAccount)
+    {
+        $bankAccount->setRequiredFields(array(
+            'accountNumber',
+            'transitNumber',
+            'institutionId'
+        ));
+        $request = new Request(array(
+            'method' => Request::POST,
+            'uri' => $this->prepareURI('/accounts/' . $this->client->getAccount() . '/eftbankaccounts'),
+            'body' => $bankAccount
+        ));
+        $response = $this->client->processRequest($request);
+
+        return new MerchantEftBankAccount($response);
+    }
+
+    /**
+     * Add Sub Merchant Eft Bank Account
+     *
+     * @param MerchantEftBankAccount $bankAccount
+     * @return MerchantEftBankAccount
+     * @throws PaysafeException
+     */
     function addMerchantEftBankAccount(MerchantEftBankAccount $bankAccount)
     {
         $bankAccount->setRequiredFields(array(
@@ -314,7 +338,7 @@ function addMerchantEftBankAccount(MerchantEftBankAccount $bankAccount)
         ));
         $request = new Request(array(
             'method' => Request::POST,
-            'uri' => $this->prepareURI('/merchants/' . $bankAccount->merchantId . '/eftbankaccounts'),
+            'uri' => $this->prepareURI('/accounts/' . $this->client->getAccount() . '/eftbankaccounts'),
             'body' => $bankAccount
         ));
         $response = $this->client->processRequest($request);
@@ -348,7 +372,7 @@ function acceptTermsAndConditions(TermsAndConditions $termsAndConditions)
      * Activate Merchant Account
      *
      * @param MerchantAccount $merchantAccount
-     * @return TermsAndConditions
+     * @return MerchantAccount
      * @throws PaysafeException
      */
     function activateMerchantAccount(MerchantAccount $merchantAccount)
@@ -360,7 +384,7 @@ function activateMerchantAccount(MerchantAccount $merchantAccount)
         ));
         $response = $this->client->processRequest($request);
 
-        return new TermsAndConditions($response);
+        return new MerchantAccount($response);
     }
 
     /**