Skip to content

Commit 7696c97

Browse files
dercoderdercoder
committed
Added LMI_HOLD
1 parent 4097622 commit 7696c97

File tree

7 files changed

+73
-42
lines changed

7 files changed

+73
-42
lines changed

‎.travis.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@ php:
66
- 5.5
77
- 5.6
88
- 7.0
9+
- 7.1
910
- hhvm
1011

11-
matrix:
12-
allow_failures:
13-
- php: 7.0
14-
1512
before_script:
1613
- composer install -n --dev --prefer-source
1714

1815
script: vendor/bin/phpcs --standard=PSR2 src && vendor/bin/phpunit --coverage-text
1916

20-
after_script: vendor/bin/coveralls -v
17+
after_script: vendor/bin/coveralls -v

‎README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
**WebMoney driver for the Omnipay PHP payment processing library**
44

5-
[![Build Status](https://travis-ci.org/dercoder/omnipay-webmoney.png?branch=master)](https://travis-ci.org/dercoder/omnipay-webmoney)
5+
[![Build Status](https://travis-ci.org/dercoder/omnipay-webmoney.svg?branch=master)](https://travis-ci.org/dercoder/omnipay-webmoney)
66
[![Coverage Status](https://coveralls.io/repos/dercoder/omnipay-webmoney/badge.svg?branch=master&service=github)](https://coveralls.io/github/dercoder/omnipay-webmoney?branch=master)
7-
[![Dependency Status](https://www.versioneye.com/user/projects/561d2ed236d0ab0021000009/badge.png)](https://www.versioneye.com/user/projects/561d2ed236d0ab0021000009)
87

98
[![Latest Stable Version](https://poser.pugx.org/dercoder/omnipay-webmoney/v/stable.png)](https://packagist.org/packages/dercoder/omnipay-webmoney)
109
[![Total Downloads](https://poser.pugx.org/dercoder/omnipay-webmoney/downloads.png)](https://packagist.org/packages/dercoder/omnipay-webmoney)

‎src/Message/AbstractRequest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,11 @@ public function setCancelMethod($value)
155155
* Redirect method conversion table.
156156
*/
157157
private static $methodsTable = array(
158-
'1' => '1',
159-
'2' => '2',
160-
'GET' => '0',
161-
'POST' => '1',
162-
'LINK' => '2',
158+
'1' => '1',
159+
'2' => '2',
160+
'GET' => '0',
161+
'POST' => '1',
162+
'LINK' => '2',
163163
);
164164

165165
/**
@@ -171,7 +171,7 @@ public function setCancelMethod($value)
171171
*/
172172
public function formatMethod($method)
173173
{
174-
$method = strtoupper((string)$method);
174+
$method = strtoupper((string) $method);
175175
return isset(self::$methodsTable[$method]) ? self::$methodsTable[$method] : '0';
176176
}
177177

@@ -252,7 +252,7 @@ public function getCurrencyByPurse($purse)
252252
case 'X':
253253
return 'BTC';
254254
default:
255-
return;
255+
return null;
256256
}
257257
}
258258
}

‎src/Message/CompletePurchaseResponse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function getHashType()
8585
case 132:
8686
return 'sign';
8787
default:
88-
return;
88+
return null;
8989
}
9090
}
9191

‎src/Message/PurchaseRequest.php

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,37 @@
99
* https://merchant.wmtransfer.com/conf/guide.asp.
1010
*
1111
* @author Alexander Fedra <[email protected]>
12-
* @copyright 2015 DerCoder
12+
* @copyright 2017 DerCoder
1313
* @license http://opensource.org/licenses/mit-license.php MIT
1414
*/
1515
class PurchaseRequest extends AbstractRequest
1616
{
17+
/**
18+
* @return int
19+
*/
20+
public function getHold()
21+
{
22+
if ($hold = $this->getParameter('hold')) {
23+
return (string) $hold;
24+
}
25+
26+
return '0';
27+
}
28+
29+
/**
30+
* @param int $value
31+
*
32+
* @return $this
33+
*/
34+
public function setHold($value)
35+
{
36+
return $this->setParameter('hold', $value);
37+
}
38+
39+
/**
40+
* @return array
41+
* @throws InvalidRequestException
42+
*/
1743
public function getData()
1844
{
1945
$this->validate(
@@ -32,19 +58,25 @@ public function getData()
3258
}
3359

3460
return array(
35-
'LMI_PAYEE_PURSE' => $this->getMerchantPurse(),
36-
'LMI_PAYMENT_AMOUNT' => $this->getAmount(),
37-
'LMI_PAYMENT_NO' => $this->getTransactionId(),
61+
'LMI_PAYEE_PURSE' => $this->getMerchantPurse(),
62+
'LMI_PAYMENT_AMOUNT' => $this->getAmount(),
63+
'LMI_PAYMENT_NO' => $this->getTransactionId(),
3864
'LMI_PAYMENT_DESC_BASE64' => base64_encode($this->getDescription()),
39-
'LMI_SIM_MODE' => $this->getTestMode() ? '2' : '0',
40-
'LMI_RESULT_URL' => $this->getNotifyUrl(),
41-
'LMI_SUCCESS_URL' => $this->getReturnUrl(),
42-
'LMI_SUCCESS_METHOD' => $this->getReturnMethod(),
43-
'LMI_FAIL_URL' => $this->getCancelUrl(),
44-
'LMI_FAIL_METHOD' => $this->getCancelMethod(),
65+
'LMI_SIM_MODE' => $this->getTestMode() ? '2' : '0',
66+
'LMI_RESULT_URL' => $this->getNotifyUrl(),
67+
'LMI_SUCCESS_URL' => $this->getReturnUrl(),
68+
'LMI_SUCCESS_METHOD' => $this->getReturnMethod(),
69+
'LMI_FAIL_URL' => $this->getCancelUrl(),
70+
'LMI_FAIL_METHOD' => $this->getCancelMethod(),
71+
'LMI_HOLD' => $this->getHold()
4572
);
4673
}
4774

75+
/**
76+
* @param array $data
77+
*
78+
* @return PurchaseResponse
79+
*/
4880
public function sendData($data)
4981
{
5082
return $this->response = new PurchaseResponse($this, $data);

‎tests/Message/PurchaseRequestTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public function testGetData()
5353
$this->assertSame('1', $data['LMI_SUCCESS_METHOD']);
5454
$this->assertSame('https://www.foodstore.com/failure', $data['LMI_FAIL_URL']);
5555
$this->assertSame('2', $data['LMI_FAIL_METHOD']);
56+
$this->assertSame('0', $data['LMI_HOLD']);
5657
}
5758

5859
public function testSendData()

‎tests/Message/PurchaseResponseTest.php

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@ public function setUp()
1414
$this->request = new PurchaseRequest($this->getHttpClient(), $this->getHttpRequest());
1515
$this->request->initialize(array(
1616
'merchantPurse' => 'Z123428476799',
17-
'secretKey' => '226778888',
18-
'returnUrl' => 'https://www.foodstore.com/success',
19-
'cancelUrl' => 'https://www.foodstore.com/failure',
20-
'notifyUrl' => 'https://www.foodstore.com/notify',
21-
'description' => 'Test Transaction',
17+
'secretKey' => '226778888',
18+
'returnUrl' => 'https://www.foodstore.com/success',
19+
'cancelUrl' => 'https://www.foodstore.com/failure',
20+
'notifyUrl' => 'https://www.foodstore.com/notify',
21+
'description' => 'Test Transaction',
2222
'transactionId' => '1234567890',
23-
'amount' => '14.65',
24-
'currency' => 'USD',
25-
'testMode' => true
23+
'amount' => '14.65',
24+
'currency' => 'USD',
25+
'testMode' => true,
26+
'hold' => 2
2627
));
2728
}
2829

@@ -37,16 +38,17 @@ public function testSuccess()
3738
$this->assertSame('POST', $response->getRedirectMethod());
3839
$this->assertSame('https://merchant.wmtransfer.com/lmi/payment.asp', $response->getRedirectUrl());
3940
$this->assertSame(array(
40-
'LMI_PAYEE_PURSE' => 'Z123428476799',
41-
'LMI_PAYMENT_AMOUNT' => '14.65',
42-
'LMI_PAYMENT_NO' => '1234567890',
41+
'LMI_PAYEE_PURSE' => 'Z123428476799',
42+
'LMI_PAYMENT_AMOUNT' => '14.65',
43+
'LMI_PAYMENT_NO' => '1234567890',
4344
'LMI_PAYMENT_DESC_BASE64' => 'VGVzdCBUcmFuc2FjdGlvbg==',
44-
'LMI_SIM_MODE' => '2',
45-
'LMI_RESULT_URL' => 'https://www.foodstore.com/notify',
46-
'LMI_SUCCESS_URL' => 'https://www.foodstore.com/success',
47-
'LMI_SUCCESS_METHOD' => '0',
48-
'LMI_FAIL_URL' => 'https://www.foodstore.com/failure',
49-
'LMI_FAIL_METHOD' => '0'
45+
'LMI_SIM_MODE' => '2',
46+
'LMI_RESULT_URL' => 'https://www.foodstore.com/notify',
47+
'LMI_SUCCESS_URL' => 'https://www.foodstore.com/success',
48+
'LMI_SUCCESS_METHOD' => '0',
49+
'LMI_FAIL_URL' => 'https://www.foodstore.com/failure',
50+
'LMI_FAIL_METHOD' => '0',
51+
'LMI_HOLD' => '2'
5052
), $response->getRedirectData());
5153
}
5254
}

0 commit comments

Comments
 (0)