Skip to content

Commit bf72834

Browse files
recca0120recca0120
committed
get data from request
1 parent 7802f3f commit bf72834

8 files changed

+48
-218
lines changed

‎src/Gateway.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ public function purchase(array $options = [])
119119
*/
120120
public function completePurchase(array $options = [])
121121
{
122-
return ! empty($options['SendType']) && (string) $options['SendType'] === '1'
122+
$sendType = $this->httpRequest->request->get('SendType');
123+
124+
return $sendType === '1'
123125
? $this->acceptNotification($options)
124126
: $this->createRequest(CompletePurchaseRequest::class, $options);
125127
}

‎src/Message/AcceptNotificationRequest.php‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,24 @@
77
class AcceptNotificationRequest extends CompletePurchaseRequest implements NotificationInterface
88
{
99
/**
10-
* @param mixed $data
10+
* @param array $data
1111
* @return AcceptNotificationResponse
1212
*/
1313
public function sendData($data)
1414
{
1515
return $this->response = new AcceptNotificationResponse($this, $data);
1616
}
1717

18+
public function getTransactionId()
19+
{
20+
return $this->getNotificationResponse()->getTransactionId();
21+
}
22+
23+
public function getTransactionReference()
24+
{
25+
return $this->getNotificationResponse()->getTransactionReference();
26+
}
27+
1828
public function getTransactionStatus()
1929
{
2030
return $this->getNotificationResponse()->getTransactionStatus();

‎src/Message/CompletePurchaseRequest.php‎

Lines changed: 3 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -2,147 +2,19 @@
22

33
namespace Omnipay\Payware\Message;
44

5-
use Omnipay\Common\Exception\InvalidRequestException;
65
use Omnipay\Common\Exception\InvalidResponseException;
7-
use Omnipay\Payware\Support\Helper;
8-
use Omnipay\Payware\Traits\HasAmount;
9-
use Omnipay\Payware\Traits\HasBooking;
10-
use Omnipay\Payware\Traits\HasCreditCard;
11-
use Omnipay\Payware\Traits\HasCVS;
126
use Omnipay\Payware\Traits\HasMerchant;
137

148
class CompletePurchaseRequest extends AbstractRequest
159
{
1610
use HasMerchant;
17-
use HasBooking;
18-
use HasCreditCard;
19-
use HasCVS;
20-
use HasAmount;
2111

2212
/**
23-
* @param int $authAmount
24-
* @return CompletePurchaseRequest
25-
*/
26-
public function setAuthAmount($authAmount)
27-
{
28-
return $this->setParameter('AuthAmount', $authAmount);
29-
}
30-
31-
/**
32-
* @return int
33-
*/
34-
public function getAuthAmount()
35-
{
36-
return $this->getParameter('AuthAmount');
37-
}
38-
39-
/**
40-
* @param string $rtnCode
41-
* @return CompletePurchaseRequest
42-
*/
43-
public function setRtnCode($rtnCode)
44-
{
45-
return $this->setParameter('RtnCode', $rtnCode);
46-
}
47-
48-
/**
49-
* @return string
50-
*/
51-
public function getRtnCode()
52-
{
53-
return $this->getParameter('RtnCode');
54-
}
55-
56-
/**
57-
* @param string $rtnMsg
58-
* @return CompletePurchaseRequest
59-
*/
60-
public function setRtnMsg($rtnMsg)
61-
{
62-
return $this->setParameter('RtnMsg', $rtnMsg);
63-
}
64-
65-
/**
66-
* @return string
67-
*/
68-
public function getRtnMsg()
69-
{
70-
return $this->getParameter('RtnMsg');
71-
}
72-
73-
/**
74-
* @param string $paymentDate
75-
* @return CompletePurchaseRequest
76-
*/
77-
public function setPaymentDate($paymentDate)
78-
{
79-
return $this->setParameter('PaymentDate', $paymentDate);
80-
}
81-
82-
/**
83-
* @return string
84-
*/
85-
public function getPaymentDate()
86-
{
87-
return $this->getParameter('PaymentDate');
88-
}
89-
90-
/**
91-
* @return CompletePurchaseRequest
92-
*/
93-
public function setTransferOutAccount($transferOutAccount)
94-
{
95-
return $this->setParameter('TransferOutAccount', $transferOutAccount);
96-
}
97-
98-
/**
99-
* @return string
100-
*/
101-
public function getTransferOutAccount()
102-
{
103-
return $this->getParameter('TransferOutAccount');
104-
}
105-
106-
/**
107-
* @param string $checkMacValue
108-
* @return CompletePurchaseRequest
109-
*/
110-
public function setCheckMacValue($checkMacValue)
111-
{
112-
return $this->setParameter('CheckMacValue', $checkMacValue);
113-
}
114-
115-
/**
116-
* @return string
117-
*/
118-
public function getCheckMacValue()
119-
{
120-
return $this->getParameter('CheckMacValue');
121-
}
122-
123-
/**
124-
* @throws InvalidRequestException
12513
* @throws InvalidResponseException
12614
*/
12715
public function getData()
12816
{
129-
return $this->checkMacValue(Helper::filterEmpty([
130-
'MerchantId' => $this->getMerchantId(),
131-
'TerminalId' => $this->getTerminalId(),
132-
'PayType' => $this->getPayType(),
133-
'BookingId' => $this->getTransactionReference(),
134-
'CustOrderNo' => $this->getTransactionId(),
135-
'Amount' => $this->getAmount(),
136-
'AuthAmount' => $this->getAuthAmount(),
137-
'RtnCode' => $this->getRtnCode(),
138-
'Card4no' => $this->getCard4No(),
139-
'Payment_no' => $this->getPaymentNo(),
140-
'RtnMsg' => $this->getRtnMsg(),
141-
'PaymentDate' => Helper::parseDate($this->getPaymentDate()),
142-
'TransferOutAccount' => $this->getTransferOutAccount(),
143-
'SendType' => $this->getSendType(),
144-
'CheckMacValue' => $this->getCheckMacValue(),
145-
]));
17+
return $this->checkMacValue($this->httpRequest->request->all());
14618
}
14719

14820
/**
@@ -161,16 +33,15 @@ public function sendData($data)
16133
*/
16234
private function checkMacValue($data)
16335
{
164-
$checkMacValue = $this->getCheckMacValue();
165-
if (! $checkMacValue || ! hash_equals($checkMacValue, $this->makeHash($data))) {
36+
if (! hash_equals($this->httpRequest->request->get('CheckMacValue', ''), $this->makeHash($data))) {
16637
throw new InvalidResponseException();
16738
}
16839

16940
return $data;
17041
}
17142

17243
/**
173-
* @return false|string
44+
* @return string
17445
*/
17546
private function makeHash($data)
17647
{

‎src/Message/ReceiveTransactionInfoRequest.php‎

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,61 +2,16 @@
22

33
namespace Omnipay\Payware\Message;
44

5-
use Omnipay\Common\Exception\InvalidRequestException;
65
use Omnipay\Common\Message\ResponseInterface;
7-
use Omnipay\Payware\Support\Helper;
8-
use Omnipay\Payware\Traits\HasAmount;
9-
use Omnipay\Payware\Traits\HasBooking;
10-
use Omnipay\Payware\Traits\HasCVS;
11-
use Omnipay\Payware\Traits\HasMerchant;
12-
use Omnipay\Payware\Traits\HasWebATM;
136

147
class ReceiveTransactionInfoRequest extends AbstractRequest
158
{
16-
use HasMerchant;
17-
use HasBooking;
18-
use HasWebATM;
19-
use HasCVS;
20-
use HasAmount;
21-
22-
/**
23-
* @param string $payEndDate
24-
* @return ReceiveTransactionInfoRequest
25-
*/
26-
public function setPayEndDate($payEndDate)
27-
{
28-
return $this->setParameter('PayEndDate', $payEndDate);
29-
}
30-
31-
/**
32-
* @return string
33-
*/
34-
public function getPayEndDate()
35-
{
36-
return $this->getParameter('PayEndDate');
37-
}
38-
399
/**
4010
* @return array
41-
*
42-
* @throws InvalidRequestException
4311
*/
4412
public function getData()
4513
{
46-
return Helper::filterEmpty([
47-
'MerchantId' => $this->getMerchantId(),
48-
'TerminalId' => $this->getTerminalId(),
49-
'PayType' => $this->getPayType(),
50-
'Amount' => $this->getAmount(),
51-
'BookingId' => $this->getBookingId(),
52-
'CustOrderNo' => $this->getTransactionId(),
53-
'SendType' => $this->getSendType(),
54-
'BankCode' => $this->getBankCode(),
55-
'AtmNo' => $this->getAtmNo(),
56-
'PayEndDate' => Helper::parseDate($this->getPayEndDate()),
57-
'Barcode1~3' => $this->getBarcode1_3(),
58-
'PaymentNo' => $this->getPaymentNo(),
59-
]);
14+
return $this->httpRequest->request->all();
6015
}
6116

6217
/**

‎tests/GatewayTest.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function testPurchase()
3030

3131
public function testCompletePurchase()
3232
{
33-
$options = [
33+
$data = [
3434
'MerchantId' => '1',
3535
'TerminalId' => '101',
3636
'PayType' => '1',
@@ -45,15 +45,16 @@ public function testCompletePurchase()
4545
'SendType' => '1',
4646
'Card4no' => '1111',
4747
];
48-
$request = $this->gateway->completePurchase($options);
48+
$this->getHttpRequest()->request->add($data);
49+
$request = $this->gateway->completePurchase();
4950

5051
self::assertInstanceOf(CompletePurchaseRequest::class, $request);
5152
self::assertArrayHasKey('BookingId', $request->getData());
5253
}
5354

5455
public function testAccessNotification()
5556
{
56-
$options = [
57+
$data = [
5758
'MerchantId' => '1',
5859
'TerminalId' => '101',
5960
'PayType' => '1',
@@ -68,7 +69,8 @@ public function testAccessNotification()
6869
'SendType' => '1',
6970
'Card4no' => '1111',
7071
];
71-
$request = $this->gateway->completePurchase($options);
72+
$this->getHttpRequest()->request->add($data);
73+
$request = $this->gateway->completePurchase();
7274

7375
self::assertInstanceOf(AcceptNotificationRequest::class, $request);
7476
self::assertArrayHasKey('BookingId', $request->getData());

‎tests/Message/AcceptNotificationRequestTest.php‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class AcceptNotificationRequestTest extends TestCase
1111
{
1212
public function testGetData()
1313
{
14-
$options = [
14+
$data = [
1515
'MerchantId' => '1',
1616
'TerminalId' => '101',
1717
'PayType' => '1',
@@ -28,14 +28,11 @@ public function testGetData()
2828
'Payment_no' => '2222',
2929
'TransferOutAccount' => 'foo_account',
3030
];
31+
$this->getHttpRequest()->request->add($data);
3132
$request = new AcceptNotificationRequest($this->getHttpClient(), $this->getHttpRequest());
32-
$request->initialize(array_merge($options, [
33-
'ValidateKey' => 'validateKey',
34-
]));
33+
$request->initialize(['ValidateKey' => 'validateKey']);
3534

36-
self::assertEquals(array_merge($options, [
37-
'PaymentDate' => '2019-08-08',
38-
]), $request->getData());
35+
self::assertEquals(array_merge($data, ['PaymentDate' => '2019/08/08']), $request->getData());
3936

4037
return [$request];
4138
}
@@ -78,10 +75,9 @@ public function testInvalidCheckMacValue()
7875
'Payment_no' => '2222',
7976
'TransferOutAccount' => 'foo_account',
8077
];
78+
$this->getHttpRequest()->request->add($options);
8179
$request = new AcceptNotificationRequest($this->getHttpClient(), $this->getHttpRequest());
82-
$request->initialize(array_merge($options, [
83-
'ValidateKey' => 'validateKey',
84-
]));
80+
$request->initialize(['ValidateKey' => 'validateKey']);
8581

8682
self::assertEquals(array_merge($options, [
8783
'PaymentDate' => '2019-08-08',

‎tests/Message/CompletePurchaseRequestTest.php‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class CompletePurchaseRequestTest extends TestCase
1010
{
1111
public function testGetData()
1212
{
13-
$options = [
13+
$data = [
1414
'MerchantId' => '1',
1515
'TerminalId' => '101',
1616
'PayType' => '1',
@@ -27,14 +27,11 @@ public function testGetData()
2727
'Payment_no' => '2222',
2828
'TransferOutAccount' => 'foo_account',
2929
];
30+
$this->getHttpRequest()->request->add($data);
3031
$request = new CompletePurchaseRequest($this->getHttpClient(), $this->getHttpRequest());
31-
$request->initialize(array_merge($options, [
32-
'ValidateKey' => 'validateKey',
33-
]));
32+
$request->initialize(['ValidateKey' => 'validateKey']);
3433

35-
self::assertEquals(array_merge($options, [
36-
'PaymentDate' => '2019-08-08',
37-
]), $request->getData());
34+
self::assertEquals(array_merge($data, ['PaymentDate' => '2019/08/08']), $request->getData());
3835

3936
return [$request->send()];
4037
}
@@ -60,7 +57,7 @@ public function testInvalidCheckMacValue()
6057
$this->expectException(InvalidResponseException::class);
6158
$this->expectExceptionMessage('Invalid response from payment gateway');
6259

63-
$options = [
60+
$data = [
6461
'MerchantId' => '1',
6562
'TerminalId' => '101',
6663
'PayType' => '1',
@@ -77,13 +74,10 @@ public function testInvalidCheckMacValue()
7774
'Payment_no' => '2222',
7875
'TransferOutAccount' => 'foo_account',
7976
];
77+
$this->getHttpRequest()->request->add($data);
8078
$request = new CompletePurchaseRequest($this->getHttpClient(), $this->getHttpRequest());
81-
$request->initialize(array_merge($options, [
82-
'ValidateKey' => 'validateKey',
83-
]));
79+
$request->initialize(['ValidateKey' => 'validateKey']);
8480

85-
self::assertEquals(array_merge($options, [
86-
'PaymentDate' => '2019-08-08',
87-
]), $request->getData());
81+
self::assertEquals(array_merge($data, ['PaymentDate' => '2019-08-08']), $request->getData());
8882
}
8983
}

0 commit comments

Comments
 (0)