Skip to content

Commit e088ac3

Browse files
recca0120recca0120
committed
feat: Card4No, TransferOutAccount, USN, Barcode1~3
1 parent 9553d20 commit e088ac3

14 files changed

+326
-88
lines changed

‎src/Message/AbstractRequest.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
3+
namespace Omnipay\Payware\Message;
4+
5+
use Omnipay\Common\Message\AbstractRequest as BaseAbstractRequest;
6+
use Omnipay\Payware\Support\Helper;
7+
8+
abstract class AbstractRequest extends BaseAbstractRequest
9+
{
10+
public function initialize(array $parameters = [])
11+
{
12+
return parent::initialize(Helper::fixBarcode($parameters));
13+
}
14+
}

‎src/Message/CompletePurchaseRequest.php‎

Lines changed: 63 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,21 @@
22

33
namespace Omnipay\Payware\Message;
44

5-
use Omnipay\Common\Message\AbstractRequest;
5+
use Omnipay\Common\Exception\InvalidRequestException;
6+
use Omnipay\Common\Exception\InvalidResponseException;
67
use Omnipay\Common\Message\NotificationInterface;
78
use Omnipay\Payware\Support\Helper;
89
use Omnipay\Payware\Traits\HasBooking;
10+
use Omnipay\Payware\Traits\HasCreditCard;
11+
use Omnipay\Payware\Traits\HasCVS;
912
use Omnipay\Payware\Traits\HasMerchant;
1013

1114
class CompletePurchaseRequest extends AbstractRequest implements NotificationInterface
1215
{
1316
use HasMerchant;
1417
use HasBooking;
18+
use HasCreditCard;
19+
use HasCVS;
1520

1621
/**
1722
* @param int $authAmount
@@ -81,6 +86,23 @@ public function getPaymentDate()
8186
return $this->getParameter('PaymentDate');
8287
}
8388

89+
/**
90+
* @param $transferOutAccount
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+
84106
/**
85107
* @param string $checkMacValue
86108
* @return CompletePurchaseRequest
@@ -98,22 +120,29 @@ public function getCheckMacValue()
98120
return $this->getParameter('CheckMacValue');
99121
}
100122

123+
/**
124+
* @throws InvalidRequestException
125+
* @throws InvalidResponseException
126+
*/
101127
public function getData()
102128
{
103-
return [
129+
return $this->checkMacValue(Helper::filterEmpty([
104130
'MerchantId' => $this->getMerchantId(),
105131
'TerminalId' => $this->getTerminalId(),
106132
'PayType' => $this->getPayType(),
107-
'Amount' => (int) $this->getAmount(),
108-
'AuthAmount' => (int) $this->getAuthAmount(),
109133
'BookingId' => $this->getTransactionReference(),
110134
'CustOrderNo' => $this->getTransactionId(),
135+
'Amount' => (int) $this->getAmount(),
136+
'AuthAmount' => (int) $this->getAuthAmount(),
111137
'RtnCode' => $this->getRtnCode(),
138+
'Card4no' => $this->getCard4No(),
139+
'Payment_no' => $this->getPaymentNo(),
112140
'RtnMsg' => $this->getRtnMsg(),
113141
'PaymentDate' => Helper::parseDate($this->getPaymentDate()),
114-
'CheckMacValue' => $this->getCheckMacValue(),
142+
'TransferOutAccount' => $this->getTransferOutAccount(),
115143
'SendType' => $this->getSendType(),
116-
];
144+
'CheckMacValue' => $this->getCheckMacValue(),
145+
]));
117146
}
118147

119148
/**
@@ -142,4 +171,32 @@ private function getNotification()
142171
{
143172
return ! $this->response ? $this->send() : $this->response;
144173
}
174+
175+
/**
176+
* @return array
177+
* @throws InvalidResponseException
178+
*/
179+
private function checkMacValue($data)
180+
{
181+
$checkMacValue = $this->getCheckMacValue();
182+
if (! $checkMacValue || ! hash_equals($checkMacValue, $this->makeHash($data))) {
183+
throw new InvalidResponseException();
184+
}
185+
186+
return $data;
187+
}
188+
189+
/**
190+
* @param $data
191+
* @return false|string
192+
*/
193+
private function makeHash($data)
194+
{
195+
$keys = ['MerchantId', 'TerminalId', 'PayType', 'BookingId', 'CustOrderNo', 'Amount', 'RtnCode'];
196+
$values = array_reduce($keys, static function ($acc, $key) use ($data) {
197+
return $acc.(array_key_exists($key, $data) ? $data[$key] : '');
198+
}, '');
199+
200+
return hash_hmac('sha1', $values, $this->getValidateKey());
201+
}
145202
}

‎src/Message/CompletePurchaseResponse.php‎

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class CompletePurchaseResponse extends AbstractResponse
1313
*/
1414
public function isSuccessful()
1515
{
16-
return $this->valid() && $this->getCode() === '000';
16+
return $this->getCode() === '000';
1717
}
1818

1919
/**
@@ -55,22 +55,4 @@ public function getTransactionId()
5555
{
5656
return $this->data['CustOrderNo'];
5757
}
58-
59-
protected function valid()
60-
{
61-
return hash_equals($this->request->getCheckMacValue(), $this->makeHash());
62-
}
63-
64-
/**
65-
* @return string
66-
*/
67-
private function makeHash()
68-
{
69-
$keys = ['MerchantId', 'TerminalId', 'PayType', 'BookingId', 'CustOrderNo', 'Amount', 'RtnCode'];
70-
$values = array_reduce($keys, function ($acc, $key) {
71-
return $acc.$this->data[$key];
72-
}, '');
73-
74-
return hash_hmac('sha1', $values, $this->request->getValidateKey());
75-
}
7658
}

‎src/Message/PurchaseRequest.php‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace Omnipay\Payware\Message;
44

55
use Omnipay\Common\Exception\InvalidRequestException;
6-
use Omnipay\Common\Message\AbstractRequest;
76
use Omnipay\Payware\Support\Helper;
87
use Omnipay\Payware\Traits\HasMerchant;
98

@@ -206,6 +205,23 @@ public function getDeadlineTime()
206205
return $this->getParameter('DeadlineTime');
207206
}
208207

208+
/**
209+
* @param string $deadlineTime
210+
* @return PurchaseRequest
211+
*/
212+
public function setUSN($deadlineTime)
213+
{
214+
return $this->setParameter('USN', $deadlineTime);
215+
}
216+
217+
/**
218+
* @return string
219+
*/
220+
public function getUSN()
221+
{
222+
return $this->getParameter('USN');
223+
}
224+
209225
/**
210226
* @return array
211227
* @throws InvalidRequestException
@@ -233,6 +249,7 @@ public function getData()
233249
'MemberId' => $this->getMemberId(),
234250
'DeadlineDate' => Helper::parseDate($this->getDeadlineDate(), 'Y/m/d'),
235251
'DeadlineTime' => Helper::parseDate($this->getDeadlineTime(), 'H:i:s'),
252+
'USN' => $this->getUSN(),
236253
];
237254
}
238255

‎src/Message/ReceiveTransactionInfoRequest.php‎

Lines changed: 8 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3,67 +3,19 @@
33
namespace Omnipay\Payware\Message;
44

55
use Omnipay\Common\Exception\InvalidRequestException;
6-
use Omnipay\Common\Message\AbstractRequest;
76
use Omnipay\Common\Message\ResponseInterface;
87
use Omnipay\Payware\Support\Helper;
98
use Omnipay\Payware\Traits\HasBooking;
9+
use Omnipay\Payware\Traits\HasCVS;
1010
use Omnipay\Payware\Traits\HasMerchant;
11+
use Omnipay\Payware\Traits\HasWebATM;
1112

1213
class ReceiveTransactionInfoRequest extends AbstractRequest
1314
{
1415
use HasMerchant;
1516
use HasBooking;
16-
17-
/**
18-
* @param string $bankCode
19-
* @return ReceiveTransactionInfoRequest
20-
*/
21-
public function setBankCode($bankCode)
22-
{
23-
return $this->setParameter('BankCode', $bankCode);
24-
}
25-
26-
/**
27-
* @return string
28-
*/
29-
public function getBankCode()
30-
{
31-
return $this->getParameter('BankCode');
32-
}
33-
34-
/**
35-
* @param string $atmNo
36-
* @return ReceiveTransactionInfoRequest
37-
*/
38-
public function setAtmNo($atmNo)
39-
{
40-
return $this->setParameter('AtmNo', $atmNo);
41-
}
42-
43-
/**
44-
* @return string
45-
*/
46-
public function getAtmNo()
47-
{
48-
return $this->getParameter('AtmNo');
49-
}
50-
51-
/**
52-
* @param string $paymentNo
53-
* @return ReceiveTransactionInfoRequest
54-
*/
55-
public function setPaymentNo($paymentNo)
56-
{
57-
return $this->setParameter('PaymentNo', $paymentNo);
58-
}
59-
60-
/**
61-
* @return string
62-
*/
63-
public function getPaymentNo()
64-
{
65-
return $this->getParameter('PaymentNo');
66-
}
17+
use HasWebATM;
18+
use HasCVS;
6719

6820
/**
6921
* @param string $payEndDate
@@ -88,7 +40,7 @@ public function getPayEndDate()
8840
*/
8941
public function getData()
9042
{
91-
return array_filter([
43+
return Helper::filterEmpty([
9244
'MerchantId' => $this->getMerchantId(),
9345
'TerminalId' => $this->getTerminalId(),
9446
'PayType' => $this->getPayType(),
@@ -98,11 +50,10 @@ public function getData()
9850
'SendType' => $this->getSendType(),
9951
'BankCode' => $this->getBankCode(),
10052
'AtmNo' => $this->getAtmNo(),
101-
'PaymentNo' => $this->getPaymentNo(),
10253
'PayEndDate' => Helper::parseDate($this->getPayEndDate()),
103-
], function ($value) {
104-
return ! empty($value);
105-
});
54+
'Barcode1~3' => $this->getBarcode1_3(),
55+
'PaymentNo' => $this->getPaymentNo(),
56+
]);
10657
}
10758

10859
/**

‎src/Support/Helper.php‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,21 @@ public static function parseDate($date, $format = null)
1919
? str_replace('/', '-', $date)
2020
: date($format, strtotime($date));
2121
}
22+
23+
public static function fixBarcode($data)
24+
{
25+
if (array_key_exists('Barcode1~3', $data)) {
26+
$data['Barcode1_3'] = $data['Barcode1~3'];
27+
unset($data['Barcode1~3']);
28+
}
29+
30+
return $data;
31+
}
32+
33+
public static function filterEmpty($data = [])
34+
{
35+
return array_filter($data, function ($value) {
36+
return ! empty($value);
37+
});
38+
}
2239
}

‎src/Traits/HasCVS.php‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?php
2+
3+
namespace Omnipay\Payware\Traits;
4+
5+
trait HasCVS
6+
{
7+
/**
8+
* @param string $barcode
9+
* @return $this
10+
*/
11+
public function setBarcode1_3($barcode)
12+
{
13+
return $this->setParameter('Barcode1~3', $barcode);
14+
}
15+
16+
/**
17+
* @return string
18+
*/
19+
public function getBarcode1_3()
20+
{
21+
return $this->getParameter('Barcode1~3');
22+
}
23+
24+
/**
25+
* @param string $paymentNo
26+
* @return $this
27+
*/
28+
public function setPaymentNo($paymentNo)
29+
{
30+
return $this->setParameter('PaymentNo', $paymentNo);
31+
}
32+
33+
/**
34+
* @return string
35+
*/
36+
public function getPaymentNo()
37+
{
38+
return $this->getParameter('PaymentNo');
39+
}
40+
}

‎src/Traits/HasCreditCard.php‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?php
2+
3+
namespace Omnipay\Payware\Traits;
4+
5+
trait HasCreditCard
6+
{
7+
/**
8+
* @param string $card4No
9+
* @return $this
10+
*/
11+
public function setCard4No($card4No)
12+
{
13+
return $this->setParameter('Card4No', $card4No);
14+
}
15+
16+
/**
17+
* @return string
18+
*/
19+
public function getCard4No()
20+
{
21+
return $this->getParameter('Card4No');
22+
}
23+
}

0 commit comments

Comments
 (0)