abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More tweaking with grids that need to be reloaded immediately after page load. Fixed a bug with the statement_entry balance field, as there were two of them.

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716/site@534 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-08-11 15:56:40 +00:00
parent 1b0d752a55
commit 6e03664f28
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
controllers/statement_entries_controller.php
View File

@@ -64,7 +64,8 @@ class StatementEntriesController extends AppController {
function gridDataTables(&$params, &$model) { function gridDataTables(&$params, &$model) {
$tables = $this->gridDataCountTables($params, $model); $tables = $this->gridDataCountTables($params, $model);
if (in_array('applied', $params['post']['fields'])) { if (in_array('applied', $params['post']['fields']) ||
isset($params['post']['custom']['statement_entry_id'])) {
$tables['link']['DisbursementEntry'] = array(); $tables['link']['DisbursementEntry'] = array();
$tables['link']['ChargeEntry'] = array(); $tables['link']['ChargeEntry'] = array();
} }
@@ -80,11 +81,13 @@ class StatementEntriesController extends AppController {
" SUM(COALESCE(DisbursementEntry.amount,0))," . " SUM(COALESCE(DisbursementEntry.amount,0))," .
" SUM(COALESCE(ChargeEntry.amount,0)))" . " SUM(COALESCE(ChargeEntry.amount,0)))" .
" AS 'applied'"); " AS 'applied'");
}
if (in_array('unapplied', $params['post']['fields'])) {
$fields[] = ("StatementEntry.amount - (" . $fields[] = ("StatementEntry.amount - (" .
"IF(StatementEntry.type = 'CHARGE'," . "IF(StatementEntry.type = 'CHARGE'," .
" SUM(COALESCE(DisbursementEntry.amount,0))," . " SUM(COALESCE(DisbursementEntry.amount,0))," .
" SUM(COALESCE(ChargeEntry.amount,0)))" . " SUM(COALESCE(ChargeEntry.amount,0)))" .
") AS 'balance'"); ") AS 'unapplied'");
} }
$fields = array_merge($fields, $fields = array_merge($fields,

5
views/accounts/collected.ctp
View File

@@ -15,7 +15,7 @@ echo '<div class="account collected">' . "\n";
// Reset the form // Reset the form
function resetForm() { function resetForm() {
<?php /* REVISIT <AP>: 20090810; Hate to do this, but first data is wrong... */ ?> // Kick off the grid
updateEntriesGrid(); updateEntriesGrid();
} }
@@ -45,6 +45,7 @@ function updateEntriesGrid() {
.setGridParam({ page: 1 }) .setGridParam({ page: 1 })
.trigger("reloadGrid"); .trigger("reloadGrid");
//$('#debug').html("<PRE>\n"+htmlEncode(dump($('#collected-entries-jqGrid').getGridParam()))+"\n</PRE>")
var gridstate = $('#collected-entries-jqGrid').getGridParam('gridstate'); var gridstate = $('#collected-entries-jqGrid').getGridParam('gridstate');
if (gridstate == 'hidden') if (gridstate == 'hidden')
$('#collected-entries .HeaderButton').click(); $('#collected-entries .HeaderButton').click();
@@ -204,5 +205,3 @@ echo '</div>' . "\n";
echo '</div>' . "\n"; echo '</div>' . "\n";
?> ?>
<a href="#" onClick="$('#debug').html(''); return false;">Clear Debug Output</a>

7
views/customers/receipt.ctp
View File

@@ -222,6 +222,10 @@ function updateChargesGrid(idlist) {
$('#charge-entries-jqGrid') $('#charge-entries-jqGrid')
.setGridParam({ page: 1 }) .setGridParam({ page: 1 })
.trigger("reloadGrid"); .trigger("reloadGrid");
var gridstate = $('#charge-entries-jqGrid').getGridParam('gridstate');
if (gridstate == 'hidden')
$('#charge-entries .HeaderButton').click();
} }
function updateCharges(id) { function updateCharges(id) {
@@ -308,10 +312,11 @@ echo $this->element('statement_entries', array
( (
'grid_div_id' => 'charge-entries', 'grid_div_id' => 'charge-entries',
'grid_div_class' => 'text-below', 'grid_div_class' => 'text-below',
'grid_setup' => array('hiddengrid' => true),
'caption' => '<SPAN id="receipt-charges-caption"></SPAN>', 'caption' => '<SPAN id="receipt-charges-caption"></SPAN>',
'action' => 'idlist', 'action' => 'idlist',
'exclude' => array('Customer', 'Unit', 'Type', 'Debit', 'Credit'), 'exclude' => array('Customer', 'Unit', 'Type', 'Debit', 'Credit'),
'include' => array('Amount', 'Applied', 'Balance'), 'include' => array('Applied', 'Balance'),
'remap' => array('Applied' => 'Paid'), 'remap' => array('Applied' => 'Paid'),
'limit' => 8, 'limit' => 8,
), ),

4
views/elements/statement_entries.ctp
View File

@@ -23,7 +23,9 @@ $cols['Credit'] = array('index' => 'disbursement', 'formatter' =>
$cols['Amount'] = array('index' => "StatementEntry.amount", 'formatter' => 'currency'); $cols['Amount'] = array('index' => "StatementEntry.amount", 'formatter' => 'currency');
$cols['Applied'] = array('index' => "applied", 'formatter' => 'currency'); $cols['Applied'] = array('index' => "applied", 'formatter' => 'currency');
$cols['Balance'] = array('index' => "balance", 'formatter' => 'currency'); // 'balance' is already in use as part of charge/disbursement/balance.
// 'unapplied' isn't quite the right term, but it's not customer visible.
$cols['Balance'] = array('index' => "unapplied", 'formatter' => 'currency');
$cols['Sub-Total'] = array('index' => 'subtotal-balance', 'formatter' => 'currency', 'sortable' => false); $cols['Sub-Total'] = array('index' => 'subtotal-balance', 'formatter' => 'currency', 'sortable' => false);