Skip to content

Commit fa83c63

Browse files
recca0120recca0120
committed
ATM
1 parent 563fd65 commit fa83c63

File tree

7 files changed

+127
-8
lines changed

7 files changed

+127
-8
lines changed

‎src/Message/CompletePurchaseRequest.php‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,18 @@ public function getData()
3131
'statusCode',
3232
'pinCode',
3333
], $data);
34+
} elseif ($type === 4) {
35+
$checkCode = $this->checkCode([
36+
'merchantId',
37+
'amount',
38+
'orderNo',
39+
'returnURL',
40+
'cancelURL',
41+
'backgroundURL',
42+
'transactionNo',
43+
'statusCode',
44+
'account',
45+
], $data);
3446
} else {
3547
$checkCode = $this->checkCode([
3648
'merchantId',

‎src/Message/PurchaseRequest.php‎

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

33
namespace Omnipay\YiPAY\Message;
44

5-
use Omnipay\YiPAY\Traits\HasCVS;
5+
use Omnipay\YiPAY\Traits\HasAtmOrCvs;
66
use Omnipay\YiPAY\Traits\HasDefaults;
77
use Omnipay\YiPAY\Traits\HasYiPAY;
88

99
class PurchaseRequest extends AbstractRequest
1010
{
1111
use HasYiPAY;
1212
use HasDefaults;
13-
use HasCVS;
13+
use HasAtmOrCvs;
1414

1515
public function getData()
1616
{
@@ -31,7 +31,7 @@ public function getData()
3131
'timeoutURL' => $this->getTimeoutUrl(),
3232
];
3333

34-
if ($type === 3) {
34+
if (in_array($type, [3, 4], true)) {
3535
$data['expirationDay'] = $this->getExpirationDay();
3636
}
3737

‎src/Traits/HasCVS.php‎ renamed to ‎src/Traits/HasAtmOrCvs.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Omnipay\YiPAY\Traits;
44

5-
trait HasCVS
5+
trait HasAtmOrCvs
66
{
77
/**
88
* 設定繳款截止日期

‎src/Traits/HasYiPAY.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ protected function getUrls($data)
9090
{
9191
$type = (int) $data['type'];
9292

93-
if ($type === 3) {
93+
if (in_array($type, [3, 4], true)) {
9494
return [
9595
'returnURL' => $this->getNotifyUrl(),
9696
'cancelURL' => $this->getCancelUrl(),

‎tests/Message/CompletePurchaseRequestTest.php‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,38 @@ public function testSendCVSData()
7676
self::assertEquals('YP2016111503353', $response->getTransactionId());
7777
self::assertEquals('C0216111500000000001', $response->getTransactionReference());
7878
}
79+
80+
public function testSendATMData()
81+
{
82+
$httpRequest = $this->getHttpRequest();
83+
$httpRequest->request->replace([
84+
'merchantId' => '1604000006',
85+
'type' => '4',
86+
'amount' => '1500',
87+
'orderNo' => 'YP2016111503353',
88+
'transactionNo' => 'C0216111500000000001',
89+
'statusCode' => '00',
90+
'account' => '63167185726653',
91+
'checkCode' => '23b685ff8857b5d1c9e7e29bc81d19db09c328a3',
92+
]);
93+
94+
$request = new CompletePurchaseRequest($this->getHttpClient(), $httpRequest);
95+
$request->initialize([
96+
'merchantId' => '1604000006',
97+
'key' => 'zBaw7bzzD8K1THSGoIbev08xEJp5yzyeuv1MWJDR2L0',
98+
'iv' => 'YeQInQjfelvkBcWuyhWDAw==',
99+
'testMode' => true,
100+
]);
101+
$request->setNotifyUrl('https://gateway-test.yipay.com.tw/demo/notify');
102+
$request->setCancelUrl('https://gateway-test.yipay.com.tw/demo/cancel');
103+
$request->setPaymentInfoUrl('https://gateway-test.yipay.com.tw/demo/payment-info');
104+
105+
$response = $request->send();
106+
107+
self::assertTrue($response->isSuccessful());
108+
self::assertEquals('00', $response->getCode());
109+
self::assertNull($response->getMessage());
110+
self::assertEquals('YP2016111503353', $response->getTransactionId());
111+
self::assertEquals('C0216111500000000001', $response->getTransactionReference());
112+
}
79113
}

‎tests/Message/GetPaymentInfoRequestTest.php‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,44 @@ public function testSendCVSData()
4141
self::assertEquals('C0216111500000000001', $response->getTransactionReference());
4242
self::assertEquals('OK', $response->getReply());
4343
}
44+
45+
public function testSendATMData()
46+
{
47+
$httpRequest = $this->getHttpRequest();
48+
$httpRequest->request->replace([
49+
'merchantId' => '1604000006',
50+
'type' => '4',
51+
'amount' => '1500',
52+
'orderNo' => 'YP2016111503353',
53+
'transactionNo' => 'C0216111500000000001',
54+
'statusCode' => '00',
55+
'account' => '63167185726653',
56+
'bankCode' => '822',
57+
'bankName' => '中國信託商業銀行',
58+
'bankBranchCode' => '0015',
59+
'bankBranchName' => '商業銀行敦北分行',
60+
'expirationDate' => '2025-01-01',
61+
'checkCode' => '23b685ff8857b5d1c9e7e29bc81d19db09c328a3',
62+
]);
63+
64+
$request = new GetPaymentInfoRequest($this->getHttpClient(), $httpRequest);
65+
$request->initialize(array_merge([
66+
'merchantId' => '1604000006',
67+
'key' => 'zBaw7bzzD8K1THSGoIbev08xEJp5yzyeuv1MWJDR2L0',
68+
'iv' => 'YeQInQjfelvkBcWuyhWDAw==',
69+
'testMode' => true,
70+
]));
71+
$request->setNotifyUrl('https://gateway-test.yipay.com.tw/demo/notify');
72+
$request->setCancelUrl('https://gateway-test.yipay.com.tw/demo/cancel');
73+
$request->setPaymentInfoUrl('https://gateway-test.yipay.com.tw/demo/payment-info');
74+
75+
$response = $request->send();
76+
77+
self::assertTrue($response->isSuccessful());
78+
self::assertEquals('00', $response->getCode());
79+
self::assertNull($response->getMessage());
80+
self::assertEquals('YP2016111503353', $response->getTransactionId());
81+
self::assertEquals('C0216111500000000001', $response->getTransactionReference());
82+
self::assertEquals('OK', $response->getReply());
83+
}
4484
}

‎tests/Message/PurchaseRequestTest.php‎

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ public function testGetCVSData()
7171
'orderNote2' => 'Order Note 2',
7272
'expirationDay' => '2',
7373
'notificationEmail' => '[email protected]',
74-
// 'returnURL' => 'https://gateway-test.yipay.com.tw/demo/return',
75-
'cancelURL' => 'https://gateway-test.yipay.com.tw/demo/cancel',
76-
// 'backgroundURL' => 'https://gateway-test.yipay.com.tw/demo/background',
7774
'timeout' => 28800,
7875
'validTime' => '202001011330',
7976
'timeoutURL' => 'https://gateway-test.yipay.com.tw/demo/timeout',
@@ -116,4 +113,40 @@ public function testSendCVSData($results)
116113
self::assertEquals('https://gateway-test.yipay.com.tw/payment', $response->getRedirectUrl());
117114
self::assertNotEmpty($redirectData['checkCode']);
118115
}
116+
117+
public function testGetATMData()
118+
{
119+
$options = [
120+
'type' => '4',
121+
'amount' => '1500',
122+
'orderNo' => 'YP2016111503353',
123+
'orderDescription' => 'Order Description',
124+
'orderNote1' => 'Order Note 1',
125+
'orderNote2' => 'Order Note 2',
126+
'expirationDay' => '2',
127+
'notificationEmail' => '[email protected]',
128+
'timeout' => 28800,
129+
'validTime' => '202001011330',
130+
'timeoutURL' => 'https://gateway-test.yipay.com.tw/demo/timeout',
131+
];
132+
$request = new PurchaseRequest($this->getHttpClient(), $this->getHttpRequest());
133+
$request->initialize(array_merge([
134+
'merchantId' => '1604000006',
135+
'key' => 'zBaw7bzzD8K1THSGoIbev08xEJp5yzyeuv1MWJDR2L0',
136+
'iv' => 'YeQInQjfelvkBcWuyhWDAw==',
137+
'testMode' => true,
138+
], $options));
139+
$request->setNotifyUrl('https://gateway-test.yipay.com.tw/demo/notify');
140+
$request->setCancelUrl('https://gateway-test.yipay.com.tw/demo/cancel');
141+
$request->setPaymentInfoUrl('https://gateway-test.yipay.com.tw/demo/payment-info');
142+
143+
self::assertEquals(array_merge($options, [
144+
'merchantId' => '1604000006',
145+
'returnURL' => 'https://gateway-test.yipay.com.tw/demo/notify',
146+
'cancelURL' => 'https://gateway-test.yipay.com.tw/demo/cancel',
147+
'backgroundURL' => 'https://gateway-test.yipay.com.tw/demo/payment-info',
148+
]), $request->getData());
149+
150+
return [$request->send(), $options];
151+
}
119152
}

0 commit comments

Comments
 (0)