Commit f3e595f1 authored by Chris Graham's avatar Chris Graham
Browse files

Fixed MANTIS-5043 (Errors in accounting charts)

parent 69ff7bf3

adminzone/pages/modules/admin_ecommerce_logs.php

+3 −13
Original line number Diff line number Diff line
@@ -578,29 +578,19 @@ class Module_admin_ecommerce_logs 


        $transactions = $GLOBALS['SITE_DB']->query('SELECT * FROM ' . $GLOBALS['SITE_DB']->get_table_prefix() . 'transactions WHERE t_time<' . strval($to) . ' AND ' . db_string_equal_to('t_status', 'Completed') . ' ORDER BY t_time');

        foreach ($transactions as $transaction) {

            if ($transaction['t_time'] > $from) {

                $types['TRANS']['AMOUNT'] += get_transaction_fee(floatval($transaction['t_amount']), $transaction['t_via']);

            }



            if ($unpaid_invoices_count) {

                foreach ($products as $type_code => $details) {

                    if (($transaction['t_type_code'] == $type_code) && ($details[0] == PRODUCT_INVOICE)) {

                        continue 2;

                    }

                }

            }



            $type_code = $transaction['t_type_code'];



            $transaction['t_amount'] = currency_convert(floatval($transaction['t_amount']), $transaction['t_currency'], get_option('currency'));



            $types['CLOSING']['AMOUNT'] += floatval($transaction['t_amount']);

            $types['CLOSING']['AMOUNT'] += floatval($transaction['t_amount']) - get_transaction_fee(floatval($transaction['t_amount']), $transaction['t_via']);



            if ($transaction['t_time'] < $from) {

                $types['OPENING']['AMOUNT'] += floatval($transaction['t_amount']) - get_transaction_fee(floatval($transaction['t_amount']), $transaction['t_via']);

                continue;

            }



            $types['TRANS']['AMOUNT'] -= get_transaction_fee(floatval($transaction['t_amount']), $transaction['t_via']);



            if (($transaction['t_type_code'] == 'OTHER') && (floatval($transaction['t_amount']) < 0.0)) {

                $types['COST']['AMOUNT'] += floatval($transaction['t_amount']);

            } elseif ($transaction['t_type_code'] == 'TAX') {