phyks/bouffeatulm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug correction in global paybacks

Browse Source 
Known bug : Bad values in index table after a global payback (remaining
cents) - it's *just* a display bug
This commit is contained in:
Phyks 2014-01-08 20:00:41 +01:00
parent 4ea828de54
commit 500befcae8
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
index.php
View File

@ -1031,7 +1031,7 @@
} }
} }
$global_payback->setUsersIn($users_in); $global_payback->setUsersIn($simplified_balances);
if($global_payback->getUsersIn()->isEmpty()) { if($global_payback->getUsersIn()->isEmpty()) {
$global_payback->setClosed(true); $global_payback->setClosed(true);
@ -1130,7 +1130,7 @@
$balances[$user1->getId()][$user2->getId()] = '-'; $balances[$user1->getId()][$user2->getId()] = '-';
} }
else { else {
$balances[$user1->getId()][$user2->getId()] = -$balances[$user2->getId()][$user1->getId()]; $balances[$user1->getId()][$user2->getId()] = -round($balances[$user2->getId()][$user1->getId()], 2);
$balances[$user2->getId()][$user1->getId()] = '-'; $balances[$user2->getId()][$user1->getId()] = '-';
} }
} }
@ -1145,12 +1145,12 @@
if($invoices_list_balances !== false) { if($invoices_list_balances !== false) {
foreach($invoices_list_balances as $invoice) { foreach($invoices_list_balances as $invoice) {
if($invoice->getUsersIn()->inUsersIn($user1->getId())) { if($invoice->getUsersIn()->inUsersIn($user1->getId())) {
$balances[$user1->getId()][$user2->getId()] += $invoice->getAmountPerPerson($user1->getId()); $balances[$user1->getId()][$user2->getId()] = round($balances[$user1->getId()][$user2->getId()] + $invoice->getAmountPerPerson($user1->getId()), 2);
$payback_balance = new Payback(); $payback_balance = new Payback();
$payback_balance = $payback_balance->load(array('invoice_id'=>$invoice->getId(), 'from_user'=>$user1->getId(), 'to_user'=>$user2->getId()), true); $payback_balance = $payback_balance->load(array('invoice_id'=>$invoice->getId(), 'from_user'=>$user1->getId(), 'to_user'=>$user2->getId()), true);
if($payback_balance !== false) if($payback_balance !== false)
$balances[$user1->getId()][$user2->getId()] -= $payback_balance->getAmount(); $balances[$user1->getId()][$user2->getId()] = round($balances[$user1->getId()][$user2->getId()] - $payback_balance->getAmount(), 2);
} }
} }
} }
@ -1161,12 +1161,12 @@
if($invoices_list_balances !== false) { if($invoices_list_balances !== false) {
foreach($invoices_list_balances as $invoice) { foreach($invoices_list_balances as $invoice) {
if($invoice->getUsersIn()->inUsersIn($user2->getId())) { if($invoice->getUsersIn()->inUsersIn($user2->getId())) {
$balances[$user1->getId()][$user2->getId()] -= $invoice->getAmountPerPerson($user2->getId()); $balances[$user1->getId()][$user2->getId()] = round($balances[$user1->getId()][$user2->getId()] - $invoice->getAmountPerPerson($user2->getId()), 2);
$payback_balance = new Payback(); $payback_balance = new Payback();
$payback_balance = $payback_balance->load(array('invoice_id'=>$invoice->getId(), 'from_user'=>$user2->getId(), 'to_user'=>$user1->getId()), true); $payback_balance = $payback_balance->load(array('invoice_id'=>$invoice->getId(), 'from_user'=>$user2->getId(), 'to_user'=>$user1->getId()), true);
if($payback_balance !== false) if($payback_balance !== false)
$balances[$user1->getId()][$user2->getId()] += $payback_balance->getAmount(); $balances[$user1->getId()][$user2->getId()] = round($balances[$user1->getId()][$user2->getId()] + $payback_balance->getAmount(), 2);
} }
} }
} }
@ -1182,8 +1182,8 @@
if(!$current_user->getAdmin()) { if(!$current_user->getAdmin()) {
$user_balance = 0; $user_balance = 0;
foreach($users_list as $user1) { foreach($users_list as $user1) {
$user_balance -= $balances[$current_user->getId()][$user1->getId()]; $user_balance = round($user_balance - $balances[$current_user->getId()][$user1->getId()], 2);
$user_balance += $balances[$user1->getId()][$current_user->getId()]; $user_balance = round($user_balance + $balances[$user1->getId()][$current_user->getId()], 2);
} }
$tpl->assign('user_balance', $user_balance); $tpl->assign('user_balance', $user_balance);
} }

0
tmp/index.html
View File