Skip to content

Commit f58707c

Browse files
recca0120recca0120
committed
payment invalid
1 parent 99488f4 commit f58707c

File tree

7 files changed

+139
-15
lines changed

7 files changed

+139
-15
lines changed

‎src/Hasher.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ class Hasher
88
* @var string
99
*/
1010
private $customerId;
11+
1112
/**
1213
* @var string
1314
*/

‎src/Message/AcceptNotificationRequest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public function getData()
2222
*/
2323
public function sendData($data)
2424
{
25-
$data = array_merge($data, ['Amount' => (int) $this->getAmount()]);
25+
$data = array_merge(['Amount' => (int) $this->getAmount()], $data);
2626

2727
if (! hash_equals($this->makeHash($data), $data['str_check'])) {
2828
throw new InvalidResponseException('Invalid hash');

‎src/Message/CompletePurchaseRequest.php‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ public function getData()
2121
*/
2222
public function sendData($data)
2323
{
24-
$data = array_merge($data, ['Amount' => (int) $this->getAmount()]);
24+
$data = array_merge(['Amount' => (int) $this->getAmount()], $data);
25+
26+
if (! array_key_exists('e_orderno', $data)) {
27+
throw new InvalidResponseException($data['ret_msg']);
28+
}
2529

2630
if (! hash_equals($this->makeHash($data), $data['str_check'])) {
2731
throw new InvalidResponseException('Invalid hash');

‎src/Message/GetPaymentInfoRequest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public function getData()
2121
*/
2222
public function sendData($data)
2323
{
24-
$data = array_merge($data, ['Amount' => (int) $this->getAmount()]);
24+
$data = array_merge(['Amount' => (int) $this->getAmount()], $data);
2525

2626
if (! hash_equals($this->makeHash($data), $data['str_check'])) {
2727
throw new InvalidResponseException('Invalid hash');

‎src/Message/PurchaseRequest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ public function getCvsData()
414414
'CustomerId' => $this->getCustomerId(),
415415
'Order_No' => $this->getOrderNo(),
416416
'Amount' => (int) $this->getAmount(),
417-
'StoreType' => $this->getStoreType(),
417+
'StoreType' => $this->getStoreType() ?: 3,
418418
'Buyer_Name' => $this->getBuyerName(),
419419
'Buyer_Telm' => $this->getBuyerTelm(),
420420
'Buyer_Mail' => $this->getBuyerMail(),

‎tests/GatewayTest.php‎

Lines changed: 117 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
namespace Omnipay\Gomypay\Tests;
44

5+
use Omnipay\Common\Message\NotificationInterface;
56
use Omnipay\Gomypay\Gateway;
7+
use Omnipay\Gomypay\PaymentMethod;
68
use Omnipay\Tests\GatewayTestCase;
79

810
class GatewayTest extends GatewayTestCase
@@ -18,27 +20,131 @@ public function setUp(): void
1820

1921
$this->gateway = new Gateway($this->getHttpClient(), $this->getHttpRequest());
2022
$this->gateway->initialize([
21-
'CustomerId' => '2020050701',
23+
'CustomerId' => '80013554',
2224
'Str_Check' => '2b1bef9d8ab6a81e9a2739c6ecc64ef8',
2325
'testMode' => true,
2426
]);
27+
}
28+
29+
public function testPurchase()
30+
{
31+
$response = $this->gateway->purchase([
32+
'transaction_id' => '2020050701',
33+
'amount' => '1000',
34+
'description' => 'good to drink',
35+
'payment_method' => PaymentMethod::CREDIT_CARD,
36+
'return_url' => 'https://foo.bar/return_url',
37+
'notify_url' => 'https://foo.bar/callback_url',
2538

26-
$this->options = [
27-
'amount' => '10.00',
28-
'card' => $this->getValidCard(),
29-
];
39+
'buyer_name' => 'foo',
40+
'buyer_telm' => '0912345678',
41+
'buyer_mail' => 'foo@bar.com',
42+
])->send();
43+
44+
$this->assertFalse($response->isSuccessful());
45+
$this->assertEquals('https://n.gomypay.asia/TestShuntClass.aspx', $response->getRedirectUrl());
46+
$this->assertEquals('POST', $response->getRedirectMethod());
47+
$this->assertEquals('2020050701', $response->getTransactionId());
48+
49+
$this->assertEquals([
50+
'Send_Type' => PaymentMethod::CREDIT_CARD,
51+
'Pay_Mode_No' => 2,
52+
'CustomerId' => '80013554',
53+
'Order_No' => '2020050701',
54+
'Amount' => '1000',
55+
'TransCode' => '00',
56+
'Buyer_Name' => 'foo',
57+
'Buyer_Telm' => '0912345678',
58+
'Buyer_Mail' => 'foo@bar.com',
59+
'Buyer_Memo' => 'good to drink',
60+
'TransMode' => 1,
61+
'Installment' => 0,
62+
'Return_url' => 'https://foo.bar/return_url',
63+
'Callback_Url' => 'https://foo.bar/callback_url',
64+
], $response->getData());
3065
}
3166

32-
public function testAuthorize()
67+
public function testCompletePurchase()
3368
{
34-
$this->markTestSkipped();
69+
$this->getHttpRequest()->query->replace([
70+
'Send_Type' => '0',
71+
'result' => '1',
72+
'ret_msg' => '授權成功',
73+
'OrderID' => '2020050700000000001',
74+
'e_orderno' => '2020050701',
75+
'AvCode' => '012345',
76+
'str_check' => 'bf577c7a76d440a797c1716aff9c01c9',
77+
'Invoice_No' => '12345',
78+
'CardLastNum' => '2222',
79+
]);
3580

36-
$this->setMockHttpResponse('AuthorizeSuccess.txt');
81+
$response = $this->gateway->completePurchase(['amount' => '50'])->send();
3782

38-
$response = $this->gateway->purchase($this->options)->send();
83+
$this->assertTrue($response->isSuccessful());
84+
$this->assertEquals('授權成功', $response->getMessage());
85+
$this->assertEquals('1', $response->getCode());
86+
$this->assertEquals('2020050701', $response->getTransactionId());
87+
$this->assertEquals('2020050700000000001', $response->getTransactionReference());
88+
}
89+
90+
public function testAcceptNotification()
91+
{
92+
$this->getHttpRequest()->request->replace([
93+
'Send_Type' => '6',
94+
'StoreType' => '3',
95+
'result' => '1',
96+
'ret_msg' => '已繳費',
97+
'OrderID' => '2020050700000000001',
98+
'e_money' => '100',
99+
'PayAmount' => '50',
100+
'e_date' => '20200507',
101+
'e_time' => '12:30:59',
102+
'e_orderno' => '2020050701',
103+
'PinCode' => 'GMPA2018383076',
104+
'Barcode2' => '123456',
105+
'Market_ID' => 'SE',
106+
'Shop_Store_Name' => '7-11(地址)',
107+
'str_check' => 'bf577c7a76d440a797c1716aff9c01c9',
108+
]);
109+
110+
$request = $this->gateway->acceptNotification(['amount' => '50']);
111+
112+
$this->assertEquals(NotificationInterface::STATUS_COMPLETED, $request->getTransactionStatus());
113+
$this->assertEquals('已繳費', $request->getMessage());
114+
$this->assertEquals('2020050701', $request->getTransactionId());
115+
$this->assertEquals('2020050700000000001', $request->getTransactionReference());
116+
}
117+
118+
public function testFetchTransaction()
119+
{
120+
$this->setMockHttpResponse('FetchTransactionSuccess.txt');
121+
$response = $this->gateway->fetchTransaction(['transaction_id' => 'AH15482399052114'])->send();
39122

40123
$this->assertTrue($response->isSuccessful());
41-
$this->assertEquals('1234', $response->getTransactionReference());
42-
$this->assertNull($response->getMessage());
124+
$this->assertEquals('已繳費', $response->getMessage());
125+
$this->assertEquals('1', $response->getCode());
126+
$this->assertEquals('AH15482399052114', $response->getTransactionId());
127+
$this->assertEquals('2019012300000000569', $response->getTransactionReference());
128+
}
129+
130+
public function testGetPaymentInfo()
131+
{
132+
$this->getHttpRequest()->query->replace([
133+
'Send_Type' => '4',
134+
'result' => '1',
135+
'OrderID' => '2020050700000000001',
136+
'e_orderno' => '2020050701',
137+
'e_payaccount' => '013 - 國泰世華 - 0055600701508856',
138+
'LimitDate' => '2020/07/01',
139+
'ret_msg' => '取號成功',
140+
'str_check' => 'bf577c7a76d440a797c1716aff9c01c9',
141+
]);
142+
$response = $this->gateway->getPaymentInfo(['amount' => '50'])->send();
143+
144+
$this->assertFalse($response->isSuccessful());
145+
$this->assertEquals('取號成功', $response->getMessage());
146+
$this->assertEquals('1', $response->getCode());
147+
$this->assertEquals('2020050701', $response->getTransactionId());
148+
$this->assertEquals('2020050700000000001', $response->getTransactionReference());
43149
}
44150
}

‎tests/Message/CompletePurchaseRequestTest.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace Omnipay\Gomypay\Tests\Message;
44

5+
use Omnipay\Common\Exception\InvalidResponseException;
56
use Omnipay\Gomypay\Message\CompletePurchaseRequest;
67
use Omnipay\Tests\TestCase;
78

@@ -67,4 +68,16 @@ public function testGetUnionPayData()
6768
$this->assertEquals('2020050701', $response->getTransactionId());
6869
$this->assertEquals('2020050700000000001', $response->getTransactionReference());
6970
}
71+
72+
public function testInvalidResponse()
73+
{
74+
$this->expectException(InvalidResponseException::class);
75+
$this->expectExceptionMessage('此特店未啟用信用卡交易功能');
76+
$this->getHttpRequest()->query->replace([
77+
'result' => '0',
78+
'ret_msg' => '此特店未啟用信用卡交易功能',
79+
]);
80+
81+
$this->request->send();
82+
}
7083
}

0 commit comments

Comments
 (0)