From f4372f8f5cdd011601984cec0126653146e064a0 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan.ferrer.toribio@gmail.com>
Date: Wed, 20 Dec 2017 15:47:46 +0100
Subject: [PATCH] TPV refactor

---
 debian/changelog         | 2 +-
 js/hedera/tpv.js         | 6 +++---
 package.json             | 2 +-
 rest/tpv/tpv.php         | 2 +-
 rest/tpv/transaction.php | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ffa34278..a8002a0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (1.405.55) stable; urgency=low
+hedera-web (1.405.56) stable; urgency=low
 
   * Initial Release.
 
diff --git a/js/hedera/tpv.js b/js/hedera/tpv.js
index 717e041b..82358c9f 100644
--- a/js/hedera/tpv.js
+++ b/js/hedera/tpv.js
@@ -17,7 +17,7 @@ module.exports = new Class
 			batch.addValue ('transaction', this.tpvOrder);
 			batch.addValue ('status', this.tpvStatus);
 		
-			var query = 'CALL transactionEnd (#transaction, #status)';
+			var query = 'CALL tpvTransactionEnd (#transaction, #status)';
 			this.conn.execQuery (query, null, batch);
 		}
 		
@@ -82,8 +82,8 @@ module.exports = new Class
 		batch.addValue ('transaction', parseInt (this.tpvOrder));
 
 		var query = 'SELECT t.amount, m.companyFk '
-			+'FROM tpv_transaction_view t '
-			+'JOIN tpvMerchant m ON m.id = t.merchant_id '
+			+'FROM myTpvTransaction t '
+			+'JOIN tpvMerchant m ON m.id = t.merchantFk '
 				+'WHERE t.id = #transaction';
 		this.conn.execQuery (query,
 			this._onRetryPayDone.bind (this), batch);
diff --git a/package.json b/package.json
index f381da7d..41ca0a0f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "1.405.55",
+  "version": "1.405.56",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {
diff --git a/rest/tpv/tpv.php b/rest/tpv/tpv.php
index 99ac4fb9..e5b63cd2 100644
--- a/rest/tpv/tpv.php
+++ b/rest/tpv/tpv.php
@@ -20,7 +20,7 @@ class Tpv
 			$error = NULL;
 	
 		return $db->query (
-			'CALL transactionConfirm (#, #, #, #, #, #)',
+			'CALL tpvTransactionConfirm (#, #, #, #, #, #)',
 			[
 				 $params['Ds_Amount']
 				,$params['Ds_Order']
diff --git a/rest/tpv/transaction.php b/rest/tpv/transaction.php
index 5a158898..293edf65 100644
--- a/rest/tpv/transaction.php
+++ b/rest/tpv/transaction.php
@@ -12,7 +12,7 @@ class Transaction extends Vn\Web\JsonRequest
 		$amount = (int) $_REQUEST['amount'];
 		$companyId = empty ($_REQUEST['company']) ? NULL : $_REQUEST['company'];
 			
-		$row = $db->getObject ('CALL transactionStart (#, #)',
+		$row = $db->getObject ('CALL tpvTransactionStart (#, #)',
 			[$amount, $companyId]);
 		
 		if (!isset ($row))