correct naming from Sender to Recipient, remove aft flag

fixed some formatting

Author: dennisk8

src/Json/JsonGenerator.php

@@ -151,27 +151,27 @@ public function generateSchedule($action, $scheduleData){
     protected function createDebit($transaction, $language){
         /** @var Debit $transaction */
         $data = [
-            'referenceUuid'        => $transaction->getReferenceUuid(),
-            'amount'               => (string)$transaction->getAmount(),
-            'currency'             => $transaction->getCurrency(),
-            'successUrl'           => $transaction->getSuccessUrl(),
-            'cancelUrl'            => $transaction->getCancelUrl(),
-            'errorUrl'             => $transaction->getErrorUrl(),
-            'callbackUrl'          => $transaction->getCallbackUrl(),
-            'transactionToken'     => $transaction->getTransactionToken(),
-            'description'          => $transaction->getDescription(),
-            'items'                => $this->createItems($transaction->getItems()),
-            'splits'               => $this->createSplits($transaction->getTransactionSplits()),
-            'withRegister'         => $transaction->isWithRegister(),
+            'referenceUuid' => $transaction->getReferenceUuid(),
+            'amount' => (string)$transaction->getAmount(),
+            'currency' => $transaction->getCurrency(),
+            'successUrl' => $transaction->getSuccessUrl(),
+            'cancelUrl' => $transaction->getCancelUrl(),
+            'errorUrl' => $transaction->getErrorUrl(),
+            'callbackUrl' => $transaction->getCallbackUrl(),
+            'transactionToken' => $transaction->getTransactionToken(),
+            'description' => $transaction->getDescription(),
+            'items' => $this->createItems($transaction->getItems()),
+            'splits' => $this->createSplits($transaction->getTransactionSplits()),
+            'withRegister' => $transaction->isWithRegister(),
             'transactionIndicator' => $transaction->getTransactionIndicator(),
-            'customer'             => $this->createCustomer($transaction->getCustomer()),
-            'schedule'             => $this->createSchedule($transaction->getSchedule()),
-            'customerProfileData'  => $this->createAddToCustomerProfile($transaction->getCustomerProfileData()),
-            'threeDSecureData'     => $this->createThreeDSecureData($transaction->getThreeDSecureData()),
-            'language'             => $language,
+            'customer' => $this->createCustomer($transaction->getCustomer()),
+            'schedule' => $this->createSchedule($transaction->getSchedule()),
+            'customerProfileData' => $this->createAddToCustomerProfile($transaction->getCustomerProfileData()),
+            'threeDSecureData' => $this->createThreeDSecureData($transaction->getThreeDSecureData()),
+            'language' => $language,
             'referenceSchemeTransactionIdentifier' => $transaction->getReferenceSchemeTransactionIdentifier(),
-            'surchargeAmount'      => $transaction->getSurchargeAmount(),
-            'senderAccountReferenceUuid' => $transaction->getSenderAccountReferenceUuid()
+            'surchargeAmount' => $transaction->getSurchargeAmount(),
+            'recipientAccountReferenceUuid' => $transaction->getRecipientAccountReferenceUuid()
         ];
 
         if ($transaction->getL2L3Data()) {
@@ -297,7 +297,6 @@ protected function createRegister($transaction, $language){
             'customerProfileData' => $this->createAddToCustomerProfile($transaction->getCustomerProfileData()),
             'threeDSecureData' => $this->createThreeDSecureData($transaction->getThreeDSecureData()),
             'language' => $language,
-            'isAft' => $transaction->isAft(),
         ];
 
         if ($transaction->getL2L3Data()) {

src/Transaction/Base/RecipientAccountPanInterface.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Ixopay\Client\Transaction\Base;
+
+interface RecipientAccountPanInterface
+{
+    /** @return string|null */
+    public function getRecipientAccountReferenceUuid();
+
+    /** @param string $recipientAccountReferenceUuid */
+    public function setRecipientAccountReferenceUuid($recipientAccountReferenceUuid);
+}

src/Transaction/Base/RecipientAccountPanTrait.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Ixopay\Client\Transaction\Base;
+
+trait RecipientAccountPanTrait
+{
+    /** @var null|string */
+    protected $recipientAccountReferenceUuid = null;
+
+    /** @return null|string */
+    public function getRecipientAccountReferenceUuid()
+    {
+        return $this->recipientAccountReferenceUuid;
+    }
+
+    /** @param string $recipientAccountReferenceUuid */
+    public function setRecipientAccountReferenceUuid($recipientAccountReferenceUuid)
+    {
+        $this->recipientAccountReferenceUuid = $recipientAccountReferenceUuid;
+    }
+
+}

src/Transaction/Base/SenderAccountPanInterface.php

@@ -24,8 +24,8 @@
 use Ixopay\Client\Transaction\Base\ReferenceSchemeTransactionIdentifierTrait;
 use Ixopay\Client\Transaction\Base\ScheduleInterface;
 use Ixopay\Client\Transaction\Base\ScheduleTrait;
-use Ixopay\Client\Transaction\Base\SenderAccountPanInterface;
-use Ixopay\Client\Transaction\Base\SenderAccountPanTrait;
+use Ixopay\Client\Transaction\Base\RecipientAccountPanInterface;
+use Ixopay\Client\Transaction\Base\RecipientAccountPanTrait;
 use Ixopay\Client\Transaction\Base\SurchargeInterface;
 use Ixopay\Client\Transaction\Base\SurchargeTrait;
 use Ixopay\Client\Transaction\Base\TransactionSplitsInterface;
@@ -51,7 +51,7 @@ class Debit extends AbstractTransactionWithReference
                        DccDataInterface,
                        SurchargeInterface,
                        ReferenceSchemeTransactionIdentifierInterface,
-                       SenderAccountPanInterface,
+                       RecipientAccountPanInterface,
                        LevelTwoAndThreeDataInterface
 {
     use AddToCustomerProfileTrait;
@@ -67,7 +67,7 @@ class Debit extends AbstractTransactionWithReference
     use DccDataTrait;
     use SurchargeTrait;
     use ReferenceSchemeTransactionIdentifierTrait;
-    use SenderAccountPanTrait;
+    use RecipientAccountPanTrait;
     use LevelTwoAndThreeDataTrait;
 
     const TRANSACTION_INDICATOR_SINGLE = 'SINGLE';

src/Transaction/Base/SenderAccountPanTrait.php

@@ -24,8 +24,8 @@
 use Ixopay\Client\Transaction\Base\ReferenceSchemeTransactionIdentifierTrait;
 use Ixopay\Client\Transaction\Base\ScheduleInterface;
 use Ixopay\Client\Transaction\Base\ScheduleTrait;
-use Ixopay\Client\Transaction\Base\SenderAccountPanInterface;
-use Ixopay\Client\Transaction\Base\SenderAccountPanTrait;
+use Ixopay\Client\Transaction\Base\RecipientAccountPanInterface;
+use Ixopay\Client\Transaction\Base\RecipientAccountPanTrait;
 use Ixopay\Client\Transaction\Base\SurchargeInterface;
 use Ixopay\Client\Transaction\Base\SurchargeTrait;
 use Ixopay\Client\Transaction\Base\TransactionSplitsInterface;
@@ -51,7 +51,7 @@ class Preauthorize extends AbstractTransactionWithReference
                               DccDataInterface,
                               SurchargeInterface,
                               ReferenceSchemeTransactionIdentifierInterface,
-                              SenderAccountPanInterface,
+                              RecipientAccountPanInterface,
                               LevelTwoAndThreeDataInterface
 {
 
@@ -68,7 +68,7 @@ class Preauthorize extends AbstractTransactionWithReference
     use DccDataTrait;
     use SurchargeTrait;
     use ReferenceSchemeTransactionIdentifierTrait;
-    use SenderAccountPanTrait;
+    use RecipientAccountPanTrait;
     use LevelTwoAndThreeDataTrait;
 
     const TRANSACTION_INDICATOR_SINGLE = 'SINGLE';

src/Transaction/Debit.php

@@ -56,25 +56,6 @@ class Register extends AbstractTransaction
      */
     protected $transactionIndicator;
 
-    /** @var bool */
-    protected $isAft=false;
-
-    /**
-     * @return bool
-     */
-    public function isAft()
-    {
-        return $this->isAft;
-    }
-
-    /**
-     * @param bool $isAft
-     */
-    public function setIsAft($isAft)
-    {
-        $this->isAft = $isAft;
-    }
-
     /**
      * @return string
      */