From dbf2f9df4e760387c62a456a1f0173d4b9063ecb Mon Sep 17 00:00:00 2001 From: luis daniel lucio quiroz Date: Tue, 5 Aug 2014 22:27:12 +0000 Subject: [PATCH] billing needs to convert to billing currency always! --- app/extensions/extension_edit.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php index 14db4172fd..76e5a5e711 100644 --- a/app/extensions/extension_edit.php +++ b/app/extensions/extension_edit.php @@ -480,14 +480,16 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $db2->result = $db2->execute(); $default_currency = (strlen($_SESSION['billing']['currency']['text'])?$_SESSION['billing']['currency']['text']:'USD'); $billing_currency = (strlen($db2->result[0]['currency'])?$db2->result[0]['currency']:$default_currency); - $destination_sell_current_currency = currency_convert($destination_sell,$billing_currency,$currency); $billing_uuid = $db2->result[0]['billing_uuid']; $balance = $db2->result[0]['balance']; unset($db2->sql, $db2->result); $default_extension_pricing = (strlen($_SESSION['billing']['extension.pricing']['numeric'])?$_SESSION['billing']['extension.pricing']['numeric']:'0'); $total_price = $default_extension_pricing * $j; - $balance -= $total_price; + $total_price_current_currency = currency_convert($total_price,$billing_currency,$default_currency); + $balance -= $total_price_current_currency; + $total_price_current_currency *= -1; + $db2->sql = "UPDATE v_billings SET balance = $balance, old_balance = $balance WHERE type_value='$destination_accountcode'"; $db2->result = $db2->execute(); unset($db2->sql, $db2->result); @@ -495,7 +497,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $billing_invoice_uuid = uuid(); $user_uuid = check_str($_SESSION['user_uuid']); $settled=1; - $mc_gross = $total_price; + $mc_gross = $total_price_current_currency; $post_payload = serialize($_POST); $db2->sql = "INSERT INTO v_billing_invoices (billing_invoice_uuid, billing_uuid, payer_uuid, billing_payment_date, settled, amount, debt, post_payload,plugin_used, domain_uuid) VALUES ('$billing_invoice_uuid', '$billing_uuid', '$user_uuid', NOW(), $settled, $mc_gross, $balance, '$post_payload', '$j extension(s) created', '".$_SESSION['domain_uuid']."' )"; $db2->result = $db2->execute();