always use integrated addresses
This commit is contained in:
parent
34eac09175
commit
8ff6da2d52
@ -343,7 +343,7 @@ class Monero_Gateway extends WC_Payment_Gateway
|
|||||||
echo "<noscript><h1>You must enable javascript in order to confirm your order</h1></noscript>";
|
echo "<noscript><h1>You must enable javascript in order to confirm your order</h1></noscript>";
|
||||||
$order = wc_get_order($order_id);
|
$order = wc_get_order($order_id);
|
||||||
$amount = floatval(preg_replace('#[^\d.]#', '', $order->get_total()));
|
$amount = floatval(preg_replace('#[^\d.]#', '', $order->get_total()));
|
||||||
$payment_id = $this->set_paymentid_cookie(32);
|
$payment_id = $this->set_paymentid_cookie(8);
|
||||||
$currency = $order->get_currency();
|
$currency = $order->get_currency();
|
||||||
$amount_xmr2 = $this->changeto($amount, $currency, $payment_id);
|
$amount_xmr2 = $this->changeto($amount, $currency, $payment_id);
|
||||||
$address = $this->address;
|
$address = $this->address;
|
||||||
@ -356,6 +356,12 @@ class Monero_Gateway extends WC_Payment_Gateway
|
|||||||
// If there isn't address (merchant missed that field!), $address will be the Monero address for donating :)
|
// If there isn't address (merchant missed that field!), $address will be the Monero address for donating :)
|
||||||
$address = "44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A";
|
$address = "44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A";
|
||||||
}
|
}
|
||||||
|
$decoded_address = $this->cryptonote->decode_address($address);
|
||||||
|
$pub_spendKey = $decoded_address['spendKey'];
|
||||||
|
$pub_viewKey = $decoded_address['viewKey'];
|
||||||
|
|
||||||
|
$integrated_addr = $this->cryptonote->integrated_addr_from_keys($pub_spendKey, $pub_viewKey, $payment_id);
|
||||||
|
|
||||||
$uri = "monero:$address?tx_payment_id=$payment_id";
|
$uri = "monero:$address?tx_payment_id=$payment_id";
|
||||||
|
|
||||||
if($this->zero_confirm){
|
if($this->zero_confirm){
|
||||||
@ -375,7 +381,6 @@ class Monero_Gateway extends WC_Payment_Gateway
|
|||||||
|
|
||||||
echo "
|
echo "
|
||||||
<head>
|
<head>
|
||||||
<p>*don't forget to include the payment ID in your transaction</p>
|
|
||||||
<!--Import Google Icon Font-->
|
<!--Import Google Icon Font-->
|
||||||
<link href='https://fonts.googleapis.com/icon?family=Material+Icons' rel='stylesheet'>
|
<link href='https://fonts.googleapis.com/icon?family=Material+Icons' rel='stylesheet'>
|
||||||
<link href='https://fonts.googleapis.com/css?family=Montserrat:400,800' rel='stylesheet'>
|
<link href='https://fonts.googleapis.com/css?family=Montserrat:400,800' rel='stylesheet'>
|
||||||
@ -399,12 +404,10 @@ class Monero_Gateway extends WC_Payment_Gateway
|
|||||||
<div class='xmr-amount-send'>
|
<div class='xmr-amount-send'>
|
||||||
<span class='xmr-label'>Send:</span>
|
<span class='xmr-label'>Send:</span>
|
||||||
<div class='xmr-amount-box'>".$amount_xmr2."</div>
|
<div class='xmr-amount-box'>".$amount_xmr2."</div>
|
||||||
<span class='xmr-label'>Payment ID:</span>
|
|
||||||
<div class='xmr-integrated-address-box'>".$payment_id."</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div class='xmr-address'>
|
<div class='xmr-address'>
|
||||||
<span class='xmr-label'>To this address:</span>
|
<span class='xmr-label'>To this address:</span>
|
||||||
<div class='xmr-address-box'>".$address."</div>
|
<div class='xmr-address-box'>".$integrated_addr."</div>
|
||||||
</div>
|
</div>
|
||||||
<div class='xmr-qr-code'>
|
<div class='xmr-qr-code'>
|
||||||
<span class='xmr-label'>Or scan QR:</span>
|
<span class='xmr-label'>Or scan QR:</span>
|
||||||
|
Loading…
Reference in New Issue
Block a user