|
27 | 27 | $InputError = 1; |
28 | 28 | prnMsg(__('The grade title must not be empty'), 'error'); |
29 | 29 | } |
| 30 | + if (empty($_POST['CurrencyCode'])) { |
| 31 | + $InputError = 1; |
| 32 | + prnMsg(__('Please select a currency code'), 'error'); |
| 33 | + } |
30 | 34 |
|
31 | 35 | if ($InputError != 1) { |
| 36 | + $CurrencyCode = DB_escape_string($_POST['CurrencyCode']); |
32 | 37 | if (isset($_POST['GradeID']) && $_POST['GradeID'] > 0) { |
33 | 38 | // Update existing grade |
34 | 39 | $SQL = "UPDATE hrpaygrades SET |
35 | 40 | paygradecode = '" . $_POST['GradeCode'] . "', |
36 | 41 | paygradename = '" . $_POST['GradeTitle'] . "', |
| 42 | + currencycode = '" . $CurrencyCode . "', |
37 | 43 | minsalary = " . filter_var($_POST['MinAnnualSalary'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION) . ", |
38 | 44 | midsalary = " . filter_var($_POST['MidAnnualSalary'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION) . ", |
39 | 45 | maxsalary = " . filter_var($_POST['MaxAnnualSalary'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION) . ", |
|
47 | 53 | } else { |
48 | 54 | // Insert new grade |
49 | 55 | $SQL = "INSERT INTO hrpaygrades ( |
50 | | - paygradecode, paygradename, |
| 56 | + paygradecode, paygradename, currencycode, |
51 | 57 | minsalary, midsalary, maxsalary, |
52 | 58 | active |
53 | 59 | ) VALUES ( |
54 | 60 | '" . $_POST['GradeCode'] . "', |
55 | 61 | '" . $_POST['GradeTitle'] . "', |
| 62 | + '" . $CurrencyCode . "', |
56 | 63 | " . filter_var($_POST['MinAnnualSalary'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION) . ", |
57 | 64 | " . filter_var($_POST['MidAnnualSalary'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION) . ", |
58 | 65 | " . filter_var($_POST['MaxAnnualSalary'], FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION) . ", |
|
135 | 142 | $GradeID = isset($_GET['edit']) ? (int)$_GET['edit'] : 0; |
136 | 143 | $GradeCode = ''; |
137 | 144 | $GradeTitle = ''; |
| 145 | + $CurrencyCode = $_SESSION['CompanyRecord']['currencydefault']; |
138 | 146 | $MinAnnualSalary = 0; |
139 | 147 | $MidAnnualSalary = 0; |
140 | 148 | $MaxAnnualSalary = 0; |
|
147 | 155 | $Row = DB_fetch_array($Result); |
148 | 156 | $GradeCode = $Row['paygradecode']; |
149 | 157 | $GradeTitle = $Row['paygradename']; |
| 158 | + $CurrencyCode = $Row['currencycode']; |
150 | 159 | $MinAnnualSalary = $Row['minsalary']; |
151 | 160 | $MidAnnualSalary = $Row['midsalary']; |
152 | 161 | $MaxAnnualSalary = $Row['maxsalary']; |
|
173 | 182 | <input type="text" name="GradeTitle" value="' . $GradeTitle . '" size="50" maxlength="100" required="required" /> |
174 | 183 | </field> |
175 | 184 |
|
| 185 | + <field> |
| 186 | + <label for="CurrencyCode">' . __('Currency') . ':</label> |
| 187 | + <select name="CurrencyCode" required="required">'; |
| 188 | + |
| 189 | + $SQL = "SELECT currabrev, currency FROM currencies ORDER BY currency"; |
| 190 | + $Result = DB_query($SQL); |
| 191 | + while ($CurrencyRow = DB_fetch_array($Result)) { |
| 192 | + echo '<option value="' . htmlspecialchars($CurrencyRow['currabrev'], ENT_QUOTES, 'UTF-8') . '"' . |
| 193 | + ($CurrencyCode == $CurrencyRow['currabrev'] ? ' selected="selected"' : '') . |
| 194 | + '>' . htmlspecialchars($CurrencyRow['currency'], ENT_QUOTES, 'UTF-8') . ' (' . htmlspecialchars($CurrencyRow['currabrev'], ENT_QUOTES, 'UTF-8') . ')</option>'; |
| 195 | + } |
| 196 | + |
| 197 | + echo '</select> |
| 198 | + </field> |
| 199 | +
|
176 | 200 | <field> |
177 | 201 | <label for="MinAnnualSalary">' . __('Minimum Annual Salary') . ':</label> |
178 | 202 | <input type="number" name="MinAnnualSalary" value="' . $MinAnnualSalary . '" step="0.01" /> |
|
208 | 232 | <tr> |
209 | 233 | <th>' . __('Grade Code') . '</th> |
210 | 234 | <th>' . __('Grade Title') . '</th> |
| 235 | + <th>' . __('Currency') . '</th> |
211 | 236 | <th>' . __('Min Salary') . '</th> |
212 | 237 | <th>' . __('Mid Salary') . '</th> |
213 | 238 | <th>' . __('Max Salary') . '</th> |
|
219 | 244 | echo '<tr class="striped_row"> |
220 | 245 | <td>' . $Row['paygradecode'] . '</td> |
221 | 246 | <td>' . $Row['paygradename'] . '</td> |
| 247 | + <td>' . htmlspecialchars((string)$Row['currencycode'], ENT_QUOTES, 'UTF-8') . '</td> |
222 | 248 | <td class="number">' . locale_number_format($Row['minsalary'], $_SESSION['CompanyRecord']['decimalplaces']) . '</td> |
223 | 249 | <td class="number">' . locale_number_format($Row['midsalary'], $_SESSION['CompanyRecord']['decimalplaces']) . '</td> |
224 | 250 | <td class="number">' . locale_number_format($Row['maxsalary'], $_SESSION['CompanyRecord']['decimalplaces']) . '</td> |
|
0 commit comments