diff --git a/src/bb-modules/Invoice/ServiceTransaction.php b/src/bb-modules/Invoice/ServiceTransaction.php
index b38164e82..bee5c62bc 100644
--- a/src/bb-modules/Invoice/ServiceTransaction.php
+++ b/src/bb-modules/Invoice/ServiceTransaction.php
@@ -403,12 +403,12 @@ class ServiceTransaction implements InjectionAwareInterface
$payGatewayService = $this->di['mod_service']('Invoice', 'PayGateway');
$adapter = $payGatewayService->getPaymentAdapter($gtw);
- if(!method_exists($adapter, 'process')) {
+ if(!method_exists($adapter, 'processTransaction')) {
throw new \Box_Exception('Payment adapter :adapter does not support action :action', array(':adapter'=>$gtw->name, ':action'=>'processTransaction'), 705);
}
$ipn = json_decode($tx->ipn, 1);
- return $adapter->process($this->di['api_admin'], $id, $ipn, $tx->gateway_id);
+ return $adapter->processTransaction($this->di['api_admin'], $id, $ipn, $tx->gateway_id);
}
public function getReceived()
@@ -496,7 +496,7 @@ class ServiceTransaction implements InjectionAwareInterface
return false;
}
- $res = $this->di['db']->findOne('Transaction', 'status = processed and txn_id = ?', array($tx->txn_id));
+ $res = $this->di['db']->findOne('Transaction', 'status = "processed" and txn_id = ?', array($tx->txn_id));
return empty($res);
}
@@ -553,6 +553,10 @@ class ServiceTransaction implements InjectionAwareInterface
$tx->output = $adapter->getOutput();
}
+ if(!method_exists($adapter, 'getTransaction')) {
+ throw new \Box_Exception('Payment adapter :adapter does not support action :action', array(':adapter'=>$gtw->name, ':action'=>'getTransaction'), 705);
+ }
+
$response = $adapter->getTransaction($ipn, $mpi);
if(!$response instanceof \Payment_Transaction) {
throw new \Box_Exception('Payment gateway :id method getTransaction should return Payment_Transaction object', array(':id'=>$gtw->gateway), 705);
diff --git a/tests/bb-modules/Invoice/ServiceTransactionTest.php b/tests/bb-modules/Invoice/ServiceTransactionTest.php
index debc1e4f9..280349d68 100644
--- a/tests/bb-modules/Invoice/ServiceTransactionTest.php
+++ b/tests/bb-modules/Invoice/ServiceTransactionTest.php
@@ -525,7 +525,73 @@ class ServiceTransactionTest extends \PHPUnit_Framework_TestCase {
$serviceMock->preProcessTransaction($transactionModel);
}
- public function testprocessTransaction()
+ public function paymentsAdapterProvider_withoutProcessTransaction()
+ {
+ return array(
+ array('\Payment_Adapter_AlertPay'),
+ array('\Payment_Adapter_AliPay'),
+ array('\Payment_Adapter_AuthorizeNet'),
+ array('\Payment_Adapter_Interkassa'),
+ array('\Payment_Adapter_Onebip'),
+ array('\Payment_Adapter_Payza'),
+ array('\Payment_Adapter_WebToPay'),
+ array('\Payment_Adapter_Custom'),
+ );
+ }
+
+ /**
+ * @dataProvider paymentsAdapterProvider_withoutProcessTransaction
+ */
+ public function testprocessTransactionWithPayment_Adapter($adapter)
+ {
+ $id = 1;
+ $transactionModel = new \Model_Transaction();
+ $transactionModel->loadBean(new \RedBeanPHP\OODBBean());
+ $transactionModel->gateway_id = 2;
+ $transactionModel->ipn = '{}';
+
+ $payGatewayModel = new \Model_PayGateway();
+ $payGatewayModel->loadBean(new \RedBeanPHP\OODBBean());
+ $payGatewayModel->name = substr($adapter, strpos($adapter, '\Payment_Adapter_')+1);
+
+ $dbMock = $this->getMockBuilder('\Box_Database')->getMock();
+ $dbMock->expects($this->atLeastOnce())
+ ->method('load')
+ ->will($this->onConsecutiveCalls($transactionModel, $payGatewayModel));
+
+ $paymentAdapterMock = $this->getMockBuilder('\Payment_Adapter_Custom')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $payGatewayService = $this->getMockBuilder('\Box\Mod\Invoice\ServicePayGateway')->getMock();
+ $payGatewayService->expects($this->atLeastOnce())
+ ->method('getPaymentAdapter')
+ ->will($this->returnValue($paymentAdapterMock));
+
+ $di = new \Box_Di();
+ $di['db'] = $dbMock;
+ $di['mod_service'] = $di->protect(function() use($payGatewayService) {return $payGatewayService;});
+ $di['api_admin'] = new \Api_Handler(new \Model_Admin());
+ $this->service->setDi($di);
+
+ $this->setExpectedException('\Box_Exception', sprintf("Payment adapter %s does not support action %s", $payGatewayModel->name, 'processTransaction'));
+ $this->service->processTransaction($id);
+ }
+
+ public function paymentsAdapterProvider_withprocessTransaction()
+ {
+ return array(
+ array('\Payment_Adapter_BluePay'),
+ array('\Payment_Adapter_PayPalEmail'),
+ array('\Payment_Adapter_TwoCheckout'),
+ array('\Payment_Adapter_WebMoney'),
+ );
+ }
+
+ /**
+ * @dataProvider paymentsAdapterProvider_withprocessTransaction
+ */
+ public function testprocessTransaction_supportProcessTransaction($adapter)
{
$id = 1;
$transactionModel = new \Model_Transaction();
@@ -541,11 +607,12 @@ class ServiceTransactionTest extends \PHPUnit_Framework_TestCase {
->method('load')
->will($this->onConsecutiveCalls($transactionModel, $payGatewayModel));
- $paymentAdapterMock = $this->getMockBuilder('\Payment_Adapter_Custom')
+ $paymentAdapterMock = $this->getMockBuilder($adapter)
->disableOriginalConstructor()
->getMock();
+
$paymentAdapterMock->expects($this->atLeastOnce())
- ->method('process');
+ ->method('processTransaction');
$payGatewayService = $this->getMockBuilder('\Box\Mod\Invoice\ServicePayGateway')->getMock();
$payGatewayService->expects($this->atLeastOnce())
diff --git a/tests/fixtures/transactions.xml b/tests/fixtures/transactions.xml
index b7902b118..426285822 100644
--- a/tests/fixtures/transactions.xml
+++ b/tests/fixtures/transactions.xml
@@ -31,11 +31,11 @@
-
-
+
+
-
+