Merge pull request #41 from cryptochangements34/master

Check if payment id is set first
This commit is contained in:
cryptochangements34 2018-01-24 07:38:57 -06:00 committed by GitHub
commit 6b43b53cfe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -312,10 +312,15 @@ class Monero_Gateway extends WC_Payment_Gateway
} }
$uri = "monero:$address?amount=$amount?payment_id=$payment_id"; $uri = "monero:$address?amount=$amount?payment_id=$payment_id";
if($this->verify_non_rpc($payment_id, $amount_xmr2, $order_id) == false); $this->verify_non_rpc($payment_id, $amount_xmr2, $order_id);
if($this->confirmed == false)
{ {
echo "<h4> We are waiting for your transaction to be confirmed </h4>"; echo "<h4> We are waiting for your transaction to be confirmed </h4>";
} }
if($this->confirmed)
{
echo "<h4> Your transaction has been successfully confirmed! </h4>";
}
echo " echo "
<head> <head>
@ -608,6 +613,8 @@ class Monero_Gateway extends WC_Payment_Gateway
while($i <= $tx_count) while($i <= $tx_count)
{ {
$tx_hash = $txs_from_block[$i]['tx_hash']; $tx_hash = $txs_from_block[$i]['tx_hash'];
if(strlen($txs_from_block[$i]['payment_id']) != 0)
{
$result = $tools->check_tx($tx_hash, $this->address, $this->viewKey); $result = $tools->check_tx($tx_hash, $this->address, $this->viewKey);
if($result) if($result)
{ {
@ -615,6 +622,7 @@ class Monero_Gateway extends WC_Payment_Gateway
$block_index = $i; $block_index = $i;
$i = $tx_count; // finish loop $i = $tx_count; // finish loop
} }
}
$i++; $i++;
} }
if(isset($output_found)) if(isset($output_found))