Skip to content

Commit

Permalink
Merge branch 'master' of github.com:delatbabel/omnipay-alliedwallet
Browse files Browse the repository at this point in the history
  • Loading branch information
delatbabel committed Aug 27, 2016
2 parents b1f52f3 + 6903f4f commit 8fb0892
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 0 additions & 2 deletions src/Message/PurchaseRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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');
Expand Down
4 changes: 2 additions & 2 deletions src/Message/SoapAbstractRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/Message/SoapPurchaseRequest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/Message/SoapResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down

0 comments on commit 8fb0892

Please sign in to comment.