Skip to content

Added ability to change endpoint urls #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 33 commits into
base: master
Choose a base branch
from
Open

Added ability to change endpoint urls #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
4daf2f7
Added ability to change endpoint urls
3dgroup May 31, 2016
49d9807
changed opening brace to new lines
3dgroup May 31, 2016
4b467bc
updated closing brace position
3dgroup May 31, 2016
d6d40ee
Added Realex PayandShop.com default values
3dgroup Jun 2, 2016
31cf30b
changed formatting and removed comments
3dgroup Jun 6, 2016
ec574a3
removed commented line
3dgroup Jul 11, 2016
4a8f35b
xml text node coding problem bugfix
Oct 7, 2016
746a6fe
replace tabs to 4 spaces
Oct 11, 2016
0f14eb8
tidy changes
Oct 11, 2016
8543016
RemoteAbstractRequest Amount node currency attribute value convert wa…
Oct 12, 2016
6abd1d3
added space after comma
Oct 12, 2016
be85459
added Redirect features
3dgroup Jun 15, 2017
a7c887c
Merge remote-tracking branch 'refs/remotes/digitickets/master'
3dgroup Jun 15, 2017
a0c0b24
format code
3dgroup Jun 16, 2017
ddef3d6
cs fixer update
3dgroup Jun 16, 2017
c40724a
Format fix's
3dgroup Jun 16, 2017
dc32d8e
more formatting
3dgroup Jun 16, 2017
8b929e4
formatting issue
3dgroup Jun 16, 2017
53e342d
formatting
3dgroup Jun 16, 2017
bad47ad
format issue
3dgroup Jun 16, 2017
0802aab
Multi line format issue
3dgroup Jun 16, 2017
948b737
formatting
3dgroup Jun 16, 2017
3b83247
formatting issue
3dgroup Jun 16, 2017
71ecb9a
formatting last attempt
3dgroup Jun 16, 2017
d270e3c
Code Tidy
3dgroup Apr 16, 2018
cab2de2
Merge remote-tracking branch 'refs/remotes/digitickets/master'
3dgroup Apr 16, 2018
4072174
Merge remote-tracking branch 'origin/master'
3dgroup Apr 16, 2018
6a9b41e
Rename response.php to Response.php
3dgroup May 18, 2020
6e6e542
Add script timeout
3dgroup Oct 15, 2020
3a45694
Merge branch 'digitickets:master' into master
3dgroup Apr 22, 2022
d534dac
Update dataVaultResponse.php
3dgroup May 5, 2022
1e71f28
Update RedirectCompleteStoreCardRequest.php
3dgroup May 5, 2022
23333f8
Update RemoteAbstractRequest.php
3dgroup Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ composer.lock
composer.phar
phpunit.xml
.idea
/nbproject/private/
.php_cs.cache
51 changes: 34 additions & 17 deletions src/Omnipay/Realex/Message/AuthRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
*/
class AuthRequest extends RemoteAbstractRequest
{
protected $endpoint = 'https://epage.payandshop.com/epage-remote.cgi';

public function getCavv()
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it not make more sense to leave the endpoint property in place, and allow the setter and getter to set it/access it? Also by removing it will break the existing Global Iris driver, which extends these requests (see https://github.com/coatesap/omnipay-global-iris/blob/master/src/Omnipay/GlobalIris/Message/AuthRequest.php for example). If there is no real reason to remove it, I'd rather not have to remove/upgrade/lock down the Global Iris driver...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I sort of agree with this implementation. This makes it possible to inject the parameters at the configuration stage (as per the merchant ID etc). Obviously the omnipay interfaces need to be adhered to so this results in not being able to explicitly pass the endpoint other than in the params.

{
return $this->getParameter('cavv');
Expand Down Expand Up @@ -73,19 +71,23 @@ public function getData()
$root = $domTree->appendChild($root);

// merchant ID
$merchantEl = $domTree->createElement('merchantid', $merchantId);
$merchantEl = $domTree->createElement('merchantid');
$merchantEl->appendChild($domTree->createTextNode($merchantId));
$root->appendChild($merchantEl);

// account
$merchantEl = $domTree->createElement('account', $this->getAccount());
$merchantEl = $domTree->createElement('account');
$merchantEl->appendChild($domTree->createTextNode($this->getAccount()));
$root->appendChild($merchantEl);

// order ID
$merchantEl = $domTree->createElement('orderid', $orderId);
$merchantEl = $domTree->createElement('orderid');
$merchantEl->appendChild($domTree->createTextNode($orderId));
$root->appendChild($merchantEl);

// amount
$amountEl = $domTree->createElement('amount', $amount);
$amountEl = $domTree->createElement('amount');
$amountEl->appendChild($domTree->createTextNode($amount));
$amountEl->setAttribute('currency', $this->getCurrency());
$root->appendChild($amountEl);

Expand All @@ -97,29 +99,35 @@ public function getData()
// Card details
$cardEl = $domTree->createElement('card');

$cardNumberEl = $domTree->createElement('number', $card->getNumber());
$cardNumberEl = $domTree->createElement('number');
$cardNumberEl->appendChild($domTree->createTextNode($card->getNumber()));
$cardEl->appendChild($cardNumberEl);

$expiryEl = $domTree->createElement('expdate', $card->getExpiryDate("my")); // mmyy
$expiryEl = $domTree->createElement('expdate'); // mmyy
$expiryEl->appendChild($domTree->createTextNode($card->getExpiryDate("my")));
$cardEl->appendChild($expiryEl);

$cardTypeEl = $domTree->createElement('type', $this->getCardBrand());
$cardTypeEl = $domTree->createElement('type');
$cardTypeEl->appendChild($domTree->createTextNode($this->getCardBrand()));
$cardEl->appendChild($cardTypeEl);

$cardNameEl = $domTree->createElement('chname', $card->getBillingName());
$cardNameEl = $domTree->createElement('chname');
$cardNameEl->appendChild($domTree->createTextNode($card->getBillingName()));
$cardEl->appendChild($cardNameEl);

$cvnEl = $domTree->createElement('cvn');

$cvnNumberEl = $domTree->createElement('number', $card->getCvv());
$cvnNumberEl = $domTree->createElement('number');
$cvnNumberEl->appendChild($domTree->createTextNode($card->getCvv()));
$cvnEl->appendChild($cvnNumberEl);

$presIndEl = $domTree->createElement('presind', 1);
$cvnEl->appendChild($presIndEl);

$cardEl->appendChild($cvnEl);

$issueEl = $domTree->createElement('issueno', $card->getIssueNumber());
$issueEl = $domTree->createElement('issueno');
$issueEl->appendChild($domTree->createTextNode($card->getIssueNumber()));
$cardEl->appendChild($issueEl);

$root->appendChild($cardEl);
Expand All @@ -130,9 +138,12 @@ public function getData()

// 3D Secure section
$mpiEl = $domTree->createElement('mpi');
$cavvEl = $domTree->createElement('cavv', $this->getCavv());
$xidEl = $domTree->createElement('xid', $this->getXid());
$eciEl = $domTree->createElement('eci', $this->getEci());
$cavvEl = $domTree->createElement('cavv');
$cavvEl->appendChild($domTree->createTextNode($this->getCavv()));
$xidEl = $domTree->createElement('xid');
$xidEl->appendChild($domTree->createTextNode($this->getXid()));
$eciEl = $domTree->createElement('eci');
$eciEl->appendChild($domTree->createTextNode($this->getEci()));
$mpiEl->appendChild($cavvEl);
$mpiEl->appendChild($xidEl);
$mpiEl->appendChild($eciEl);
Expand All @@ -144,7 +155,8 @@ public function getData()
$tssEl = $domTree->createElement('tssinfo');
$addressEl = $domTree->createElement('address');
$addressEl->setAttribute('type', 'billing');
$countryEl = $domTree->createElement('country', $card->getBillingCountry());
$countryEl = $domTree->createElement('country');
$countryEl->appendChild($domTree->createTextNode($card->getBillingCountry()));
$addressEl->appendChild($countryEl);
$tssEl->appendChild($addressEl);
$root->appendChild($tssEl);
Expand All @@ -161,6 +173,11 @@ protected function createResponse($data)

public function getEndpoint()
{
return $this->endpoint;
return $this->getParameter('AuthEndpoint');
}

public function setAuthEndpoint($value)
{
return $this->setParameter('AuthEndpoint', $value);
}
}
10 changes: 5 additions & 5 deletions src/Omnipay/Realex/Message/AuthResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,27 @@ public function isRealexSystemError()

public function getMessage()
{
return (string)$this->xml->message;
return (string) $this->xml->message;
}

public function getTransactionId()
{
return ($this->xml->orderid) ? (string)$this->xml->orderid : null;
return ($this->xml->orderid) ? (string) $this->xml->orderid : null;
}

public function getTransactionReference()
{
return ($this->xml->pasref) ? (string)$this->xml->pasref : null;
return ($this->xml->pasref) ? (string) $this->xml->pasref : null;
}

public function getAuthCode()
{
return ($this->xml->authcode) ? (string)$this->xml->authcode : null;
return ($this->xml->authcode) ? (string) $this->xml->authcode : null;
}

public function getBatchId()
{
return ($this->xml->batchid) ? (string)$this->xml->batchid : null;
return ($this->xml->batchid) ? (string) $this->xml->batchid : null;
}

public function isRedirect()
Expand Down
53 changes: 33 additions & 20 deletions src/Omnipay/Realex/Message/CreateCardRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
<?php

/**
* @author Philip Wright- Christie <[email protected]>
* Date: 04/08/15
*/

namespace Omnipay\Realex\Message;


class CreateCardRequest extends RemoteAbstractRequest
{
protected $endpoint = 'https://epage.payandshop.com/epage-remote-plugins.cgi';

public function getCustomerRef()
{
return $this->getParameter('customerRef');
Expand All @@ -24,21 +22,21 @@ public function setCustomerRef($customerRef)
public function getData()
{
// Create the hash
$timestamp = strftime("%Y%m%d%H%M%S");
$timestamp = strftime("%Y%m%d%H%M%S");
$merchantId = $this->getMerchantId();
$orderId = $this->getTransactionId();
$secret = $this->getSecret();
$payerRef = $this->getCustomerRef();
$orderId = $this->getTransactionId();
$secret = $this->getSecret();
$payerRef = $this->getCustomerRef();

/**
* @var \Omnipay\Common\CreditCard $card
*/
$card = $this->getCard();

//$tmp = "$timestamp.$merchantId.$orderId.$amount.$currency.$payerRef";
$tmp = "$timestamp.$merchantId.$orderId...$payerRef.{$card->getBillingName()}.{$card->getNumber()}";
$tmp = "$timestamp.$merchantId.$orderId...$payerRef.{$card->getBillingName()}.{$card->getNumber()}";
$sha1hash = sha1($tmp);
$tmp2 = "$sha1hash.$secret";
$tmp2 = "$sha1hash.$secret";
$sha1hash = sha1($tmp2);

$domTree = new \DOMDocument('1.0', 'UTF-8');
Expand All @@ -50,39 +48,49 @@ public function getData()
$root = $domTree->appendChild($root);

// merchant ID
$merchantEl = $domTree->createElement('merchantid', $merchantId);
$merchantEl = $domTree->createElement('merchantid');
$merchantEl->appendChild($domTree->createTextNode($merchantId));
$root->appendChild($merchantEl);

// order ID
$merchantEl = $domTree->createElement('orderid', $orderId);
$merchantEl = $domTree->createElement('orderid');
$merchantEl->appendChild($domTree->createTextNode($orderId));
$root->appendChild($merchantEl);

$cardEl = $domTree->createElement('card');

$cardRefEl = $domTree->createElement('ref', $this->getCardReference());
$cardRefEl = $domTree->createElement('ref');
$cardRefEl->appendChild($domTree->createTextNode($this->getCardReference()));
$cardEl->appendChild($cardRefEl);

$payerRefEl = $domTree->createElement('payerref', $this->getCustomerRef());
$payerRefEl = $domTree->createElement('payerref');
$payerRefEl->appendChild($domTree->createTextNode($this->getCustomerRef()));
$cardEl->appendChild($payerRefEl);

$numberEl = $domTree->createElement('number', $card->getNumber());
$numberEl = $domTree->createElement('number');
$numberEl->appendChild($domTree->createTextNode($card->getNumber()));
$cardEl->appendChild($numberEl);

$expDateEl = $domTree->createElement('expdate', $card->getExpiryDate("my"));
$expDateEl = $domTree->createElement('expdate');
$expDateEl->appendChild($domTree->createTextNode($card->getExpiryDate("my")));
$cardEl->appendChild($expDateEl);

$chNameEl = $domTree->createElement('chname', $card->getBillingName());
$chNameEl = $domTree->createElement('chname');
$chNameEl->appendChild($domTree->createTextNode($card->getBillingName()));
$cardEl->appendChild($chNameEl);

$typeEl = $domTree->createElement('type', $this->getCardBrand());
$typeEl = $domTree->createElement('type');
$typeEl->appendChild($domTree->createTextNode($this->getCardBrand()));
$cardEl->appendChild($typeEl);

$issueNoEl = $domTree->createElement('issueno', $card->getIssueNumber());
$issueNoEl = $domTree->createElement('issueno');
$issueNoEl->appendChild($domTree->createTextNode($card->getIssueNumber()));
$cardEl->appendChild($issueNoEl);

$root->appendChild($cardEl);

$sha1El = $domTree->createElement('sha1hash', $sha1hash);
$sha1El = $domTree->createElement('sha1hash');
$sha1El->appendChild($domTree->createTextNode($sha1hash));
$root->appendChild($sha1El);

$xmlString = $domTree->saveXML($root);
Expand All @@ -97,6 +105,11 @@ protected function createResponse($data)

public function getEndpoint()
{
return $this->endpoint;
return $this->getParameter('AuthEndpoint');
}

public function setAuthEndpoint($value)
{
return $this->setParameter('AuthEndpoint', $value);
}
}
1 change: 1 addition & 0 deletions src/Omnipay/Realex/Message/CreateCardResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?php

/**
* @author Philip Wright- Christie <[email protected]>
* Date: 04/08/15
Expand Down
Loading