diff --git a/src/Message/PurchaseRequest.php b/src/Message/PurchaseRequest.php index 0e17fab..0eee6e6 100644 --- a/src/Message/PurchaseRequest.php +++ b/src/Message/PurchaseRequest.php @@ -146,7 +146,6 @@ public function getData() // Recurring payments use a different endpoint. $this->action = 'recurringtransactions'; } else { - $this->validate('siteId', 'currency', 'transactionId'); // These parameters are not used for recurring transactions @@ -161,7 +160,6 @@ public function getData() // Card token payments use a different endpoint to card payments. $this->action = 'tokensaletransactions'; - } else { // Card payments $this->validate('card', 'clientIp'); diff --git a/src/Message/SoapAbstractRequest.php b/src/Message/SoapAbstractRequest.php index 28c37fd..f56734c 100644 --- a/src/Message/SoapAbstractRequest.php +++ b/src/Message/SoapAbstractRequest.php @@ -2,10 +2,10 @@ namespace Omnipay\AlliedWallet\Message; +use Guzzle\Http\ClientInterface; use Omnipay\Common\Message\AbstractRequest as OmnipayAbstractRequest; use SoapClient; use SoapFault; -use Guzzle\Http\ClientInterface; use Symfony\Component\HttpFoundation\Request as HttpRequest; /** @@ -144,7 +144,7 @@ public function setSiteId($value) */ public function getData() { - $this->request = array(); + $this->request = array(); $this->request['MerchantID'] = $this->getMerchantId(); return $this->request; diff --git a/src/Message/SoapPurchaseRequest.php b/src/Message/SoapPurchaseRequest.php index 43e8c05..6bc7c6b 100644 --- a/src/Message/SoapPurchaseRequest.php +++ b/src/Message/SoapPurchaseRequest.php @@ -71,11 +71,11 @@ public function getData() $this->validate('amount', 'card', 'currency'); // Create the base request - $this->request = parent::getData(); + $this->request = parent::getData(); $this->request['SiteID'] = $this->getSiteId(); // Fill the request data - $card = $this->getCard(); + $card = $this->getCard(); $this->request['IPAddress'] = $this->getClientIp(); $this->request['Amount'] = $this->getAmount(); $this->request['CurrencyID'] = $this->getCurrency(); diff --git a/src/Message/SoapResponse.php b/src/Message/SoapResponse.php index e72fd2b..4899863 100644 --- a/src/Message/SoapResponse.php +++ b/src/Message/SoapResponse.php @@ -15,7 +15,7 @@ public function __construct(SoapAbstractRequest $request, $data) // Convert the SOAP Response (stdClass containing a stdClass) to an array. $responseName = $request->responseName; - $this->data = json_decode(json_encode($data->$responseName), true); + $this->data = json_decode(json_encode($data->$responseName), true); } public function isSuccessful()