Skip to content

Commit 808e4c4

Browse files
recca0120recca0120
committed
cancel url
1 parent 7eca816 commit 808e4c4

File tree

3 files changed

+45
-44
lines changed

3 files changed

+45
-44
lines changed

‎src/Traits/HasYiPay.php‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,32 +76,33 @@ public function getPaymentInfoUrl()
7676
return $this->getParameter('paymentInfoUrl');
7777
}
7878

79-
public function checkCode($keys, $data)
80-
{
81-
$signed = [];
82-
foreach ($keys as $key) {
83-
$signed[$key] = $data[$key];
84-
}
85-
86-
return (new Hasher($this->getKey(), $this->getIv()))->make($signed);
87-
}
88-
8979
protected function getUrls($data)
9080
{
9181
$type = (int) $data['type'];
82+
$cancelUrl = $this->getCancelUrl() ?: $this->getReturnUrl();
9283

9384
if (in_array($type, [3, 4], true) && ! empty($this->getPaymentInfoUrl())) {
9485
return [
9586
'returnURL' => $this->getNotifyUrl(),
96-
'cancelURL' => $this->getCancelUrl(),
87+
'cancelURL' => $cancelUrl,
9788
'backgroundURL' => $this->getPaymentInfoUrl(),
9889
];
9990
}
10091

10192
return [
10293
'returnURL' => $this->getReturnUrl(),
103-
'cancelURL' => $this->getCancelUrl(),
94+
'cancelURL' => $cancelUrl,
10495
'backgroundURL' => $this->getNotifyUrl(),
10596
];
10697
}
98+
99+
public function checkCode($keys, $data)
100+
{
101+
$signed = [];
102+
foreach ($keys as $key) {
103+
$signed[$key] = $data[$key];
104+
}
105+
106+
return (new Hasher($this->getKey(), $this->getIv()))->make($signed);
107+
}
107108
}

‎tests/Message/AcceptNotificationRequestTest.php‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,18 @@
88

99
class AcceptNotificationRequestTest extends TestCase
1010
{
11-
public function testSendCreditCardData()
11+
public function testSendATMData()
1212
{
1313
$httpRequest = $this->getHttpRequest();
1414
$httpRequest->request->replace([
1515
'merchantId' => '1604000006',
16-
'type' => '2',
16+
'type' => '4',
1717
'amount' => '1500',
1818
'orderNo' => 'YP2016111503353',
1919
'transactionNo' => 'C0216111500000000001',
2020
'statusCode' => '00',
21-
'statusMessage' => '成功',
22-
'approvalCode' => '629540',
23-
'last4CardNumber' => '2222',
24-
'checkCode' => '4894f133d4a7f0dc0a5d41c77b0157fe4023dbdd',
21+
'account' => '63167185726653',
22+
'checkCode' => '23b685ff8857b5d1c9e7e29bc81d19db09c328a3',
2523
]);
2624

2725
$request = new AcceptNotificationRequest($this->getHttpClient(), $httpRequest);
@@ -31,29 +29,30 @@ public function testSendCreditCardData()
3129
'iv' => 'YeQInQjfelvkBcWuyhWDAw==',
3230
'testMode' => true,
3331
]);
34-
$request->setReturnUrl('https://gateway-test.yipay.com.tw/demo/return');
35-
$request->setCancelUrl('https://gateway-test.yipay.com.tw/demo/cancel');
3632
$request->setNotifyUrl('https://gateway-test.yipay.com.tw/demo/notify');
33+
$request->setCancelUrl('https://gateway-test.yipay.com.tw/demo/cancel');
34+
$request->setPaymentInfoUrl('https://gateway-test.yipay.com.tw/demo/payment-info');
3735

3836
self::assertEquals(NotificationInterface::STATUS_COMPLETED, $request->getTransactionStatus());
39-
self::assertEquals('成功', $request->getMessage());
4037
self::assertEquals('YP2016111503353', $request->getTransactionId());
4138
self::assertEquals('C0216111500000000001', $request->getTransactionReference());
4239
self::assertEquals('OK', $request->getReply());
4340
}
4441

45-
public function testSendCVSData()
42+
public function testSendCreditCardData()
4643
{
4744
$httpRequest = $this->getHttpRequest();
4845
$httpRequest->request->replace([
4946
'merchantId' => '1604000006',
50-
'type' => '3',
47+
'type' => '2',
5148
'amount' => '1500',
5249
'orderNo' => 'YP2016111503353',
5350
'transactionNo' => 'C0216111500000000001',
5451
'statusCode' => '00',
55-
'pinCode' => '1550D0332H2902',
56-
'checkCode' => 'eef416eec27026d62d0aa519bda9f91e142c8a6d',
52+
'statusMessage' => '成功',
53+
'approvalCode' => '629540',
54+
'last4CardNumber' => '2222',
55+
'checkCode' => '4894f133d4a7f0dc0a5d41c77b0157fe4023dbdd',
5756
]);
5857

5958
$request = new AcceptNotificationRequest($this->getHttpClient(), $httpRequest);
@@ -63,28 +62,29 @@ public function testSendCVSData()
6362
'iv' => 'YeQInQjfelvkBcWuyhWDAw==',
6463
'testMode' => true,
6564
]);
66-
$request->setNotifyUrl('https://gateway-test.yipay.com.tw/demo/notify');
65+
$request->setReturnUrl('https://gateway-test.yipay.com.tw/demo/return');
6766
$request->setCancelUrl('https://gateway-test.yipay.com.tw/demo/cancel');
68-
$request->setPaymentInfoUrl('https://gateway-test.yipay.com.tw/demo/payment-info');
67+
$request->setNotifyUrl('https://gateway-test.yipay.com.tw/demo/notify');
6968

7069
self::assertEquals(NotificationInterface::STATUS_COMPLETED, $request->getTransactionStatus());
70+
self::assertEquals('成功', $request->getMessage());
7171
self::assertEquals('YP2016111503353', $request->getTransactionId());
7272
self::assertEquals('C0216111500000000001', $request->getTransactionReference());
7373
self::assertEquals('OK', $request->getReply());
7474
}
7575

76-
public function testSendATMData()
76+
public function testSendCVSData()
7777
{
7878
$httpRequest = $this->getHttpRequest();
7979
$httpRequest->request->replace([
8080
'merchantId' => '1604000006',
81-
'type' => '4',
81+
'type' => '3',
8282
'amount' => '1500',
8383
'orderNo' => 'YP2016111503353',
8484
'transactionNo' => 'C0216111500000000001',
8585
'statusCode' => '00',
86-
'account' => '63167185726653',
87-
'checkCode' => '23b685ff8857b5d1c9e7e29bc81d19db09c328a3',
86+
'pinCode' => '1550D0332H2902',
87+
'checkCode' => 'eef416eec27026d62d0aa519bda9f91e142c8a6d',
8888
]);
8989

9090
$request = new AcceptNotificationRequest($this->getHttpClient(), $httpRequest);

‎tests/Message/GetPaymentInfoRequestTest.php‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,23 @@
77

88
class GetPaymentInfoRequestTest extends TestCase
99
{
10-
public function testSendCVSData()
10+
public function testSendATMData()
1111
{
1212
$httpRequest = $this->getHttpRequest();
1313
$httpRequest->request->replace([
1414
'merchantId' => '1604000006',
15-
'type' => '3',
15+
'type' => '4',
1616
'amount' => '1500',
1717
'orderNo' => 'YP2016111503353',
1818
'transactionNo' => 'C0216111500000000001',
1919
'statusCode' => '00',
20-
'pinCode' => '1550D0332H2902',
21-
'checkCode' => 'eef416eec27026d62d0aa519bda9f91e142c8a6d',
20+
'account' => '63167185726653',
21+
'bankCode' => '822',
22+
'bankName' => '中國信託商業銀行',
23+
'bankBranchCode' => '0015',
24+
'bankBranchName' => '商業銀行敦北分行',
25+
'expirationDate' => '2025-01-01',
26+
'checkCode' => '23b685ff8857b5d1c9e7e29bc81d19db09c328a3',
2227
]);
2328

2429
$request = new GetPaymentInfoRequest($this->getHttpClient(), $httpRequest);
@@ -42,23 +47,18 @@ public function testSendCVSData()
4247
self::assertEquals('OK', $response->getReply());
4348
}
4449

45-
public function testSendATMData()
50+
public function testSendCVSData()
4651
{
4752
$httpRequest = $this->getHttpRequest();
4853
$httpRequest->request->replace([
4954
'merchantId' => '1604000006',
50-
'type' => '4',
55+
'type' => '3',
5156
'amount' => '1500',
5257
'orderNo' => 'YP2016111503353',
5358
'transactionNo' => 'C0216111500000000001',
5459
'statusCode' => '00',
55-
'account' => '63167185726653',
56-
'bankCode' => '822',
57-
'bankName' => '中國信託商業銀行',
58-
'bankBranchCode' => '0015',
59-
'bankBranchName' => '商業銀行敦北分行',
60-
'expirationDate' => '2025-01-01',
61-
'checkCode' => '23b685ff8857b5d1c9e7e29bc81d19db09c328a3',
60+
'pinCode' => '1550D0332H2902',
61+
'checkCode' => 'eef416eec27026d62d0aa519bda9f91e142c8a6d',
6262
]);
6363

6464
$request = new GetPaymentInfoRequest($this->getHttpClient(), $httpRequest);

0 commit comments

Comments
 (0)