TPV refactor

debian/changelog

@@ -1,4 +1,4 @@
-hedera-web (1.405.55) stable; urgency=low
+hedera-web (1.405.56) stable; urgency=low
 
   * Initial Release.
 

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);

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": {

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']

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))