AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Fix-collections-link

This commit is contained in:
Andrew Malsbury 2023-11-22 12:22:57 -06:00 committed by GitHub
parent fe86d3982c 2adb500612
commit 5653518f50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
guest_view_invoice.php
View File

@ -302,6 +302,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
<td><strong>Balance</strong></td>
<td class="text-right"><strong><?php echo numfmt_format_currency($currency_format, $balance, $invoice_currency_code); ?></strong></td>
</tr>
</tbody>
</table>
</div>

11
report_collections.php
View File

@ -57,6 +57,9 @@
ORDER BY
months_behind DESC;";
$result_client_balance_report = mysqli_query($mysqli, $sql_client_balance_report);
//get currency format from settings
$config_currency_code = getSettingValue($mysqli, "company_currency");
?>
<div class="card card-dark">
@ -97,11 +100,11 @@
echo "<tr>";
echo "<td><a href='client_overview.php?client_id=$client_id'>$client_name</a></td>";
echo "<td class='text-right'>$formatted_balance</td>";
echo "<td>$formatted_balance</td>";
echo "<td>$billing_contact_phone</td>";
echo "<td class='text-right'>$formatted_recurring_monthly_total</td>";
echo "<td class='text-right'>$formatted_behind_amount</td>";
echo "<td class='text-right'>$months_behind</td>";
echo "<td>$formatted_recurring_monthly_total</td>";
echo "<td>$formatted_behind_amount</td>";
echo "<td>$months_behind</td>";
echo "</tr>";
}
?>

9
trip_add_modal.php
View File

@ -56,21 +56,20 @@
<select class="form-control select2" name="destination" data-tags="true" data-placeholder="- Select / Input Destination -" required>
<option value=""></option>
<?php
$sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
if (isset($_GET['client_id'])) {
$client_id = intval($_GET['client_id']);
$sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
while ($row = mysqli_fetch_array($sql_locations)) {
$location_name = nullable_htmlentities($row['location_name']);
$location_address = nullable_htmlentities($row['location_address']);
$location_city = nullable_htmlentities($row['location_city']);
$location_state = nullable_htmlentities($row['location_state']);
$location_zip = nullable_htmlentities($row['location_zip']);
?>
<option><?php echo "$location_address $location_city $location_state $location_zip"; ?></option>
<?php
}
?>
} ?>
</select>
</div>
</div>