jacob.eva/monerowp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #44 from cryptochangements34/master

Browse Source 
Fix bug with discount
This commit is contained in:
cryptochangements34 2018-01-30 20:35:35 -05:00 committed by GitHub
commit 8afbecb0bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
monero/include/monero_payments.php
View File

@ -400,11 +400,7 @@ class Monero_Gateway extends WC_Payment_Gateway
$payment_id = $this->set_paymentid_cookie(8); $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;
if (!isset($address)) {
// If there isn't address (merchant missed that field!), $address will be the Monero address for donating :)
$address = "44AFFq5kSiGBoZ4NMDwYtN18obc8AemS33DBLWs3H7otXft3XjrpDtQGv7SqSsaBYBb98uNbr2VBBEt7f2wfn3RVGQBEP3A";
}
$uri = "monero:$address?amount=$amount?payment_id=$payment_id"; $uri = "monero:$address?amount=$amount?payment_id=$payment_id";
$array_integrated_address = $this->monero_daemon->make_integrated_address($payment_id); $array_integrated_address = $this->monero_daemon->make_integrated_address($payment_id);
if (!isset($array_integrated_address)) { if (!isset($array_integrated_address)) {
@ -523,11 +519,20 @@ class Monero_Gateway extends WC_Payment_Gateway
{ {
$xmr_live_price = $this->retriveprice($currency); $xmr_live_price = $this->retriveprice($currency);
$live_for_storing = $xmr_live_price * 100; //This will remove the decimal so that it can easily be stored as an integer $live_for_storing = $xmr_live_price * 100; //This will remove the decimal so that it can easily be stored as an integer
$new_amount = $amount / $xmr_live_price;
$rounded_amount = round($new_amount, 12);
$wpdb->query("INSERT INTO $payment_id (rate) $wpdb->query("INSERT INTO $payment_id (rate) VALUES ($live_for_storing)");
VALUES ($live_for_storing)"); if(isset($this->discount))
{
$new_amount = $amount / $xmr_live_price;
$discount = $new_amount * $this->discount / 100;
$discounted_price = $new_amount - $discount;
$rounded_amount = round($discounted_price, 12);
}
else
{
$new_amount = $amount / $xmr_live_price;
$rounded_amount = round($new_amount, 12);
}
} }
return $rounded_amount; return $rounded_amount;