tothbt/code-cegled
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Zoli requests

Browse Source
This commit is contained in:
Tóth Richárd
2018-09-03 18:19:21 +02:00
parent a50eab7528
commit 180e9af3ff
9 changed files with 134 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
_include/include_diary.php
View File

@@ -128,12 +128,23 @@ order by object_date ASC;
}
//itt csak hivatkozással adjuk át a tömböt, a calculate_balance kiszámolja, belerakja és visszadja
$user->calculate_balance($de_array, $user);
//var_dump($de_array);
//$smarty->assign('actions', $actions);
//itt csak hivatkozással adjuk át a tömböt, a calculate_balance kiszámolja, belerakja és visszadja
$user->calculate_balance($de_array, $user);
//lekérjük az áthozatot, és felvesszük entryként
$balance_transfer = $user->get_uk_balance_transfer();
if (null == $balance_transfer) {
$balance_transfer = 0;
}
$de_array = array_reverse($de_array);
$smarty->assign('actions', $de_array);
//$de_array[] = $first_entry;
//var_dump($de_array);
//var_dump($de_array);
//$smarty->assign('actions', $actions);
$smarty->assign('actions', $de_array);
$smarty->assign('balance_transfer', $balance_transfer);
//$smarty->assign('balance', $balance);
$smarty->display('user_diary.tpl');

9
_include/include_stats.php
View File

@@ -20,15 +20,22 @@ if ($this->is_id()) {
$in_cash_query = "SELECT sum(mi_sum) FROM money_income WHERE mi_deleted = 0 AND mi_payment_type_pt_id = 1";
$in_transfer_query = "SELECT sum(mi_sum) FROM money_income WHERE mi_deleted = 0 AND mi_payment_type_pt_id = 2";
$cash_previous_query = "SELECT setv_int FROM setting_value JOIN setting on set_id = setv_setting_set_id WHERE set_name = 'Áthozat (kp)';";
$out_cash_query = "SELECT sum(mox_sum) FROM money_expense WHERE mox_deleted = 0 AND mox_payment_type_pt_id = 1";
$out_transfer_query = "SELECT sum(mox_sum) FROM money_expense WHERE mox_deleted = 0 AND mox_payment_type_pt_id = 2";
$transfer_previous_query = "SELECT setv_int FROM setting_value JOIN setting on set_id = setv_setting_set_id WHERE set_name = 'Áthozat (utalás)';";
$in_cash = $sql->single_variable($in_cash_query);
$out_cash = $sql->single_variable($out_cash_query);
$in_transfer = $sql->single_variable($in_transfer_query);
$out_transfer = $sql->single_variable($out_transfer_query);
$cash_previous = $sql->single_variable($cash_previous_query);
$transfer_previous = $sql->single_variable($transfer_previous_query);
$balance_query = "
select
(select
@@ -43,6 +50,8 @@ if ($this->is_id()) {
$balance = $sql->single_variable($balance_query);
$smarty->assign('cash_previous',$cash_previous);
$smarty->assign('transfer_previous',$transfer_previous);
$smarty->assign('in_cash',$in_cash);
$smarty->assign('out_cash',$out_cash);
$smarty->assign('in_transfer',$in_transfer);