Skip to content

Commit 6237c94

Browse files
rafa62rafa62
authored
Sort the bank accounts
Sort the bank accounts that are going to be shown.
1 parent 056ac0c commit 6237c94

10 files changed

+703
-683
lines changed

‎BankAccountBalances.php

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php
2-
/* Shows bank accounts authorised for with balances */
2+
// BankAccountBalances.php
3+
// Shows bank accounts authorised for with balances
34

45
include('includes/session.php');
56
$Title = _('List of bank account balances');
@@ -19,14 +20,18 @@
1920
<th>', _('Balance in functional currency'), '</th>
2021
</tr>';
2122

22-
$SQL = "SELECT DISTINCT bankaccounts.accountcode,
23-
currcode,
24-
bankaccountname
25-
FROM bankaccounts
26-
INNER JOIN bankaccountusers
23+
$SQL = "SELECT DISTINCT
24+
bankaccounts.accountcode,
25+
bankaccounts.bankaccountname,
26+
bankaccounts.currcode
27+
FROM bankaccounts
28+
INNER JOIN bankaccountusers
2729
ON bankaccounts.accountcode=bankaccountusers.accountcode
28-
AND userid='" . $_SESSION['UserID'] . "'";
29-
$Result = DB_query($SQL);
30+
AND userid='" . $_SESSION['UserID'] . "'
31+
ORDER BY bankaccounts.accountcode";
32+
$ErrMsg = _('The bank accounts could not be retrieved because');
33+
$DbgMsg = _('The SQL used to retrieve the bank accounts was');
34+
$Result = DB_query($SQL, $ErrMsg, $DbgMsg);
3035

3136
if (DB_num_rows($Result) == 0) {
3237
echo _('There are no bank accounts defined that you have authority to see');

‎BankAccountUsers.php

+47-47
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php
2-
/* This script maintains table bankaccountusers (Authorized users to work with a bank account in webERP) */
2+
// BankAccountUsers.php
3+
// Maintains table bankaccountusers (Authorized users to work with a bank account in webERP).
34

45
include('includes/session.php');
56
$Title = _('Bank Account Users');
@@ -12,17 +13,17 @@
1213
_('Bank Account Authorised Users') . '" /> ' .// Icon title.
1314
_('Maintenance Of Bank Account Authorised Users') . '</p>';// Page title.
1415

15-
if (isset($_POST['SelectedUser'])){
16+
if (isset($_POST['SelectedUser'])) {
1617
$SelectedUser = mb_strtoupper($_POST['SelectedUser']);
17-
} elseif (isset($_GET['SelectedUser'])){
18+
} elseif (isset($_GET['SelectedUser'])) {
1819
$SelectedUser = mb_strtoupper($_GET['SelectedUser']);
1920
} else {
2021
$SelectedUser='';
2122
}
2223

23-
if (isset($_POST['SelectedBankAccount'])){
24+
if (isset($_POST['SelectedBankAccount'])) {
2425
$SelectedBankAccount = mb_strtoupper($_POST['SelectedBankAccount']);
25-
} elseif (isset($_GET['SelectedBankAccount'])){
26+
} elseif (isset($_GET['SelectedBankAccount'])) {
2627
$SelectedBankAccount = mb_strtoupper($_GET['SelectedBankAccount']);
2728
}
2829

@@ -68,29 +69,29 @@
6869
prnMsg( _('The user') . ' ' . $_POST['SelectedUser'] . ' ' ._('already authorised to use this bank account'),'error');
6970
} else {
7071
// Add new record on submit
71-
$sql = "INSERT INTO bankaccountusers (accountcode,
72+
$SQL = "INSERT INTO bankaccountusers (accountcode,
7273
userid)
7374
VALUES ('" . $_POST['SelectedBankAccount'] . "',
7475
'" . $_POST['SelectedUser'] . "')";
7576

7677
$msg = _('User') . ': ' . $_POST['SelectedUser'].' '._('has been authorised to use') .' '. $_POST['SelectedBankAccount'] . ' ' . _('bank account');
77-
$result = DB_query($sql);
78+
$Result = DB_query($SQL);
7879
prnMsg($msg,'success');
7980
unset($_POST['SelectedUser']);
8081
}
8182
}
8283
} elseif ( isset($_GET['delete']) ) {
83-
$sql="DELETE FROM bankaccountusers
84+
$SQL="DELETE FROM bankaccountusers
8485
WHERE accountcode='".$SelectedBankAccount."'
8586
AND userid='".$SelectedUser."'";
8687

8788
$ErrMsg = _('The bank account user record could not be deleted because');
88-
$result = DB_query($sql,$ErrMsg);
89+
$Result = DB_query($SQL,$ErrMsg);
8990
prnMsg(_('User').' '. $SelectedUser .' '. _('has been un-authorised to use').' '. $SelectedBankAccount .' '. _('bank account') ,'success');
9091
unset($_GET['delete']);
9192
}
9293

93-
if (!isset($SelectedBankAccount)){
94+
if (!isset($SelectedBankAccount)) {
9495

9596
/* It could still be the second time the page has been run and a record has been selected for modification - SelectedUser will exist because it was sent with the new call. If its the first time the page has been displayed with no parameters
9697
then none of the above are true. These will call the same page again and allow update/input or deletion of the records*/
@@ -102,26 +103,26 @@
102103
<td>' . _('Select Bank Account') . ':</td>
103104
<td><select name="SelectedBankAccount">';
104105

105-
$SQL = "SELECT accountcode,
106-
bankaccountname
107-
FROM bankaccounts";
108-
109-
$result = DB_query($SQL);
106+
$SQL = "SELECT
107+
accountcode,
108+
bankaccountname,
109+
currcode
110+
FROM bankaccounts
111+
ORDER BY accountcode";
112+
$ErrMsg = _('The bank accounts could not be retrieved because');
113+
$DbgMsg = _('The SQL used to retrieve the bank accounts was');
114+
$Result = DB_query($SQL, $ErrMsg, $DbgMsg);
110115
echo '<option value="">' . _('Not Yet Selected') . '</option>';
111-
while ($myrow = DB_fetch_array($result)) {
112-
if (isset($SelectedBankAccount) and $myrow['accountcode']==$SelectedBankAccount) {
113-
echo '<option selected="selected" value="';
114-
} else {
115-
echo '<option value="';
116-
}
117-
echo $myrow['accountcode'] . '">' . $myrow['accountcode'] . ' - ' . $myrow['bankaccountname'] . '</option>';
118-
119-
} //end while loop
120-
121-
echo '</select></td></tr>';
122-
123-
echo '</table>'; // close main table
124-
DB_free_result($result);
116+
while ($MyRow = DB_fetch_array($Result)) {
117+
// Lists bank accounts order by accountcode
118+
echo '<option',
119+
((isset($SelectedBankAccount) and $MyRow['accountcode']==$SelectedBankAccount) ? 'selected="selected"' : ''),
120+
' value="', $MyRow['accountcode'], '">', $MyRow['accountcode'], ' - ', $MyRow['bankaccountname'], ' - ', $MyRow['currcode'], '</option>';
121+
}// End while loop
122+
echo '</select></td>
123+
</tr>
124+
</table>'; // Close main table
125+
DB_free_result($Result);
125126

126127
echo '<br />
127128
<div class="centre">
@@ -131,17 +132,16 @@
131132

132133
echo '</div>
133134
</form>';
134-
135135
}
136136

137137
//end of ifs and buts!
138138
if (isset($_POST['process'])OR isset($SelectedBankAccount)) {
139139
$SQLName = "SELECT bankaccountname
140140
FROM bankaccounts
141141
WHERE accountcode='" .$SelectedBankAccount."'";
142-
$result = DB_query($SQLName);
143-
$myrow = DB_fetch_array($result);
144-
$SelectedBankName = $myrow['bankaccountname'];
142+
$Result = DB_query($SQLName);
143+
$MyRow = DB_fetch_array($Result);
144+
$SelectedBankName = $MyRow['bankaccountname'];
145145

146146
echo '<br /><div class="centre"><a href="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">' . _('Authorised users for') . ' ' .$SelectedBankName . ' ' . _('bank account') .'</a></div>';
147147
echo '<form method="post" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '">';
@@ -150,14 +150,14 @@
150150

151151
echo '<input type="hidden" name="SelectedBankAccount" value="' . $SelectedBankAccount . '" />';
152152

153-
$sql = "SELECT bankaccountusers.userid,
153+
$SQL = "SELECT bankaccountusers.userid,
154154
www_users.realname
155155
FROM bankaccountusers INNER JOIN www_users
156156
ON bankaccountusers.userid=www_users.userid
157157
WHERE bankaccountusers.accountcode='" . $SelectedBankAccount . "'
158158
ORDER BY bankaccountusers.userid ASC";
159159

160-
$result = DB_query($sql);
160+
$Result = DB_query($SQL);
161161

162162
echo '<br />
163163
<table class="selection">';
@@ -167,18 +167,18 @@
167167
<th>' . _('User Name') . '</th>
168168
</tr>';
169169

170-
while ($myrow = DB_fetch_array($result)) {
170+
while ($MyRow = DB_fetch_array($Result)) {
171171
printf('<tr class="striped_row">
172172
<td>%s</td>
173173
<td>%s</td>
174174
<td><a href="%s?SelectedUser=%s&amp;delete=yes&amp;SelectedBankAccount=' . $SelectedBankAccount . '" onclick="return confirm(\'' . _('Are you sure you wish to un-authorise this user?') . '\');">' . _('Un-authorise') . '</a></td>
175175
</tr>',
176-
$myrow['userid'],
177-
$myrow['realname'],
176+
$MyRow['userid'],
177+
$MyRow['realname'],
178178
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'),
179-
$myrow['userid'],
179+
$MyRow['userid'],
180180
htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8'),
181-
$myrow['userid']);
181+
$MyRow['userid']);
182182
}
183183
//END WHILE LIST LOOP
184184
echo '</table>';
@@ -196,24 +196,24 @@
196196
realname
197197
FROM www_users";
198198

199-
$result = DB_query($SQL);
200-
if (!isset($_POST['SelectedUser'])){
199+
$Result = DB_query($SQL);
200+
if (!isset($_POST['SelectedUser'])) {
201201
echo '<option selected="selected" value="">' . _('Not Yet Selected') . '</option>';
202202
}
203-
while ($myrow = DB_fetch_array($result)) {
204-
if (isset($_POST['SelectedUser']) AND $myrow['userid']==$_POST['SelectedUser']) {
203+
while ($MyRow = DB_fetch_array($Result)) {
204+
if (isset($_POST['SelectedUser']) AND $MyRow['userid']==$_POST['SelectedUser']) {
205205
echo '<option selected="selected" value="';
206206
} else {
207207
echo '<option value="';
208208
}
209-
echo $myrow['userid'] . '">' . $myrow['userid'] . ' - ' . $myrow['realname'] . '</option>';
209+
echo $MyRow['userid'] . '">' . $MyRow['userid'] . ' - ' . $MyRow['realname'] . '</option>';
210210

211211
} //end while loop
212212

213213
echo '</select></td></tr>';
214214

215215
echo '</table>'; // close main table
216-
DB_free_result($result);
216+
DB_free_result($Result);
217217

218218
echo '<br /><div class="centre"><input type="submit" name="submit" value="' . _('Accept') . '" />
219219
<input type="submit" name="Cancel" value="' . _('Cancel') . '" /></div>';
@@ -225,4 +225,4 @@
225225
}
226226

227227
include('includes/footer.php');
228-
?>
228+
?>

0 commit comments

Comments
 (0)