Use Short echo tags across the code

This commit is contained in:
johnnyq
2026-07-28 18:47:52 -04:00
parent 0031438bce
commit b3f959ac55
355 changed files with 3113 additions and 3113 deletions

View File

@@ -32,7 +32,7 @@ $monthlyTotals = array_fill(1, 12, 0); // Initialize monthly totals for each mo
while ($row = mysqli_fetch_assoc($sql_expense_years)) {
$expense_year = $row['expense_year'];
?>
<option <?php if ($year == $expense_year) { ?> selected <?php } ?> > <?php echo $expense_year; ?></option>
<option <?php if ($year == $expense_year) { ?> selected <?php } ?> > <?= $expense_year ?></option>
<?php } ?>

View File

@@ -123,7 +123,7 @@ $result = $stmt->get_result();
<div class="card-header bg-dark py-2">
<h3 class="card-title mt-2">
<i class="fas fa-fw fa-life-ring mr-2"></i>
Client Time Detail Audit Report (<?php echo escapeHtml($from); ?> to <?php echo escapeHtml($to); ?>)
Client Time Detail Audit Report (<?= escapeHtml($from) ?> to <?= escapeHtml($to) ?>)
<?php if ($billable_only) { ?>
<span class="badge badge-success ml-2">Billable Only</span>
<?php } ?>
@@ -141,20 +141,20 @@ $result = $stmt->get_result();
<div class="row">
<div class="col-md-3 mb-2">
<label class="mb-1">From</label>
<input type="date" class="form-control" name="from" value="<?php echo escapeHtml($from); ?>">
<input type="date" class="form-control" name="from" value="<?= escapeHtml($from) ?>">
</div>
<div class="col-md-3 mb-2">
<label class="mb-1">To</label>
<input type="date" class="form-control" name="to" value="<?php echo escapeHtml($to); ?>">
<input type="date" class="form-control" name="to" value="<?= escapeHtml($to) ?>">
</div>
<div class="col-md-3 mb-2">
<label class="mb-1">Billing time increment</label>
<select class="form-control" name="billing_increment">
<option value="0.1" <?php echo ($billing_increment_key === '0.1') ? 'selected' : ''; ?>>0.1 hour (6 minutes)</option>
<option value="0.25" <?php echo ($billing_increment_key === '0.25') ? 'selected' : ''; ?>>0.25 hour (15 minutes)</option>
<option value="0.5" <?php echo ($billing_increment_key === '0.5') ? 'selected' : ''; ?>>0.5 hour (30 minutes)</option>
<option value="0.1" <?= ($billing_increment_key === '0.1') ? 'selected' : '' ?>>0.1 hour (6 minutes)</option>
<option value="0.25" <?= ($billing_increment_key === '0.25') ? 'selected' : '' ?>>0.25 hour (15 minutes)</option>
<option value="0.5" <?= ($billing_increment_key === '0.5') ? 'selected' : '' ?>>0.5 hour (30 minutes)</option>
</select>
</div>
@@ -202,9 +202,9 @@ $result = $stmt->get_result();
$ticket_billed = secondsToDecimalHours($ticket_billable_seconds);
?>
<tr class="font-weight-bold">
<td class="text-right pr-3">Ticket Total for <?php echo $ticket_label_html; ?></td>
<td class="text-right"><?php echo formatDuration(secondsToHmsString($ticket_seconds)); ?></td>
<td class="text-right"><?php echo number_format($ticket_billed, 2); ?></td>
<td class="text-right pr-3">Ticket Total for <?= $ticket_label_html ?></td>
<td class="text-right"><?= formatDuration(secondsToHmsString($ticket_seconds)) ?></td>
<td class="text-right"><?= number_format($ticket_billed, 2) ?></td>
</tr>
<?php
return $ticket_billed;
@@ -275,10 +275,10 @@ $result = $stmt->get_result();
?>
<tr class="font-weight-bold">
<td class="text-right">
Total for <?php echo $current_client_name; ?> (<?php echo $client_ticket_count; ?> tickets)
Total for <?= $current_client_name ?> (<?= $client_ticket_count ?> tickets)
</td>
<td class="text-right"><?php echo formatDuration(secondsToHmsString($client_time_seconds)); ?></td>
<td class="text-right"><?php echo number_format(secondsToDecimalHours($client_billable_seconds), 2); ?></td>
<td class="text-right"><?= formatDuration(secondsToHmsString($client_time_seconds)) ?></td>
<td class="text-right"><?= number_format(secondsToDecimalHours($client_billable_seconds), 2) ?></td>
</tr>
<tr><td colspan="3"></td></tr>
<?php
@@ -295,7 +295,7 @@ $result = $stmt->get_result();
$current_client_name = $client_name_html;
?>
<tr class="table-active">
<td colspan="3" class="font-weight-bold"><?php echo $client_name_html; ?></td>
<td colspan="3" class="font-weight-bold"><?= $client_name_html ?></td>
</tr>
<?php
}
@@ -328,7 +328,7 @@ $result = $stmt->get_result();
?>
<tr>
<td class="font-weight-bold"><?php echo $ticket_label_html; ?></td>
<td class="font-weight-bold"><?= $ticket_label_html ?></td>
<td class="text-right text-muted"></td>
<td class="text-right text-muted"></td>
</tr>
@@ -340,13 +340,13 @@ $result = $stmt->get_result();
<tr>
<td class="pl-4 text-muted">
<i class="far fa-clock mr-1"></i>
<?php echo escapeHtml(date('Y-m-d g:i A', strtotime($reply_created_at))); ?>
<?= escapeHtml(date('Y-m-d g:i A', strtotime($reply_created_at))) ?>
<div class="mt-1 text-body" style="white-space: normal;">
<?php echo $reply_content_html; ?>
<?= $reply_content_html ?>
</div>
</td>
<td class="text-right"><?php echo formatDuration($reply_hms); ?></td>
<td class="text-right"><?php echo number_format(secondsToDecimalHours($reply_billable_seconds), 2); ?></td>
<td class="text-right"><?= formatDuration($reply_hms) ?></td>
<td class="text-right"><?= number_format(secondsToDecimalHours($reply_billable_seconds), 2) ?></td>
</tr>
<?php
@@ -380,10 +380,10 @@ $result = $stmt->get_result();
?>
<tr class="font-weight-bold">
<td class="text-right">
Total for <?php echo $current_client_name; ?> (<?php echo $client_ticket_count; ?> tickets)
Total for <?= $current_client_name ?> (<?= $client_ticket_count ?> tickets)
</td>
<td class="text-right"><?php echo formatDuration(secondsToHmsString($client_time_seconds)); ?></td>
<td class="text-right"><?php echo number_format(secondsToDecimalHours($client_billable_seconds), 2); ?></td>
<td class="text-right"><?= formatDuration(secondsToHmsString($client_time_seconds)) ?></td>
<td class="text-right"><?= number_format(secondsToDecimalHours($client_billable_seconds), 2) ?></td>
</tr>
<tr><td colspan="3"></td></tr>
@@ -391,10 +391,10 @@ $result = $stmt->get_result();
<!-- Grand totals -->
<tr class="font-weight-bold">
<td class="text-right">
Grand Total (<?php echo $grand_ticket_count; ?> tickets)
Grand Total (<?= $grand_ticket_count ?> tickets)
</td>
<td class="text-right"><?php echo formatDuration(secondsToHmsString($grand_time_seconds)); ?></td>
<td class="text-right"><?php echo number_format(secondsToDecimalHours($grand_billable_seconds), 2); ?></td>
<td class="text-right"><?= formatDuration(secondsToHmsString($grand_time_seconds)) ?></td>
<td class="text-right"><?= number_format(secondsToDecimalHours($grand_billable_seconds), 2) ?></td>
</tr>
<?php
}
@@ -404,7 +404,7 @@ $result = $stmt->get_result();
<small class="text-muted p-2">
This report shows only ticket replies with time worked within the selected date range.
“Billable (hrs)” is calculated by rounding each reply up to the nearest <?php echo (int)$billing_increment_minutes; ?> minutes (<?php echo escapeHtml($billing_increment_key); ?> hours),
“Billable (hrs)” is calculated by rounding each reply up to the nearest <?= (int)$billing_increment_minutes ?> minutes (<?= escapeHtml($billing_increment_key) ?> hours),
then summing those rounded values for ticket/client/grand totals.
<br>
Reply content is displayed under each reply timestamp.

View File

@@ -56,10 +56,10 @@ $passwords_not_rotated_sql = mysqli_query($mysqli,
?>
<tr>
<td><?php echo $client_name; ?></td>
<td class="text-right"><?php echo $credential_name; ?></td>
<td class="text-right"><?php echo $credential_description; ?></td>
<td class="text-right"><?php echo timeAgo($credential_password_changed) . " (" . $credential_password_changed . ")" ?></td>
<td><?= $client_name ?></td>
<td class="text-right"><?= $credential_name ?></td>
<td class="text-right"><?= $credential_description ?></td>
<td class="text-right"><?= timeAgo($credential_password_changed) . " (" . $credential_password_changed . ")" ?></td>
</tr>
<?php } ?>

View File

@@ -55,7 +55,7 @@ $sql_vendor_expenses = mysqli_query($mysqli, "
while ($row = mysqli_fetch_assoc($sql_payment_years)) {
$payment_year = intval($row['payment_year']);
?>
<option <?php if ($year == $payment_year) { ?> selected <?php } ?> > <?php echo $payment_year; ?></option>
<option <?php if ($year == $payment_year) { ?> selected <?php } ?> > <?= $payment_year ?></option>
<?php
}
@@ -80,8 +80,8 @@ $sql_vendor_expenses = mysqli_query($mysqli, "
$amount_paid = floatval($row['amount_paid']); ?>
<tr>
<td><?php echo $vendor_name; ?></td>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $amount_paid, $session_company_currency); ?></td>
<td><?= $vendor_name ?></td>
<td class="text-right"><?= numfmt_format_currency($currency_format, $amount_paid, $session_company_currency) ?></td>
</tr>
<?php
}

View File

@@ -37,7 +37,7 @@ $largest_expense_month = 0;
<select onchange="this.form.submit()" class="form-control" name="year">
<?php while ($row = mysqli_fetch_assoc($sql_expense_years)) {
$expense_year = intval($row['expense_year']); ?>
<option <?php if ($year == $expense_year) { ?> selected <?php } ?>><?php echo $expense_year; ?></option>
<option <?php if ($year == $expense_year) { ?> selected <?php } ?>><?= $expense_year ?></option>
<?php } ?>
</select>
</form>
@@ -71,7 +71,7 @@ $largest_expense_month = 0;
$category_id = intval($row['category_id']);
$category_name = escapeHtml($row['category_name']); ?>
<tr>
<td><?php echo $category_name; ?></td>
<td><?= $category_name ?></td>
<?php
$total_expense_for_all_months = 0;
for ($month = 1; $month <= 12; $month++) {
@@ -81,14 +81,14 @@ $largest_expense_month = 0;
$total_expense_for_all_months += $expense_amount_for_month;
?>
<td class="text-right">
<a class="text-dark" href="expenses.php?q=<?php echo $category_name; ?>&dtf=<?php echo "$year-$month"; ?>-01&dtt=<?php echo "$year-$month"; ?>-31">
<?php echo numfmt_format_currency($currency_format, $expense_amount_for_month, $session_company_currency); ?>
<a class="text-dark" href="expenses.php?q=<?= $category_name ?>&dtf=<?= "$year-$month" ?>-01&dtt=<?= "$year-$month" ?>-31">
<?= numfmt_format_currency($currency_format, $expense_amount_for_month, $session_company_currency) ?>
</a>
</td>
<?php } ?>
<th class="text-right">
<a class="text-dark" href="expenses.php?q=<?php echo $category_name; ?>&dtf=<?php echo $year; ?>-01-01&dtt=<?php echo $year; ?>-12-31">
<?php echo numfmt_format_currency($currency_format, $total_expense_for_all_months, $session_company_currency); ?>
<a class="text-dark" href="expenses.php?q=<?= $category_name ?>&dtf=<?= $year ?>-01-01&dtt=<?= $year ?>-12-31">
<?= numfmt_format_currency($currency_format, $total_expense_for_all_months, $session_company_currency) ?>
</a>
</th>
</tr>
@@ -105,14 +105,14 @@ $largest_expense_month = 0;
$grand_total_all_months += $expense_total_amount_for_month;
?>
<th class="text-right">
<a class="text-dark" href="expenses.php?dtf=<?php echo "$year-$month"; ?>-01&dtt=<?php echo "$year-$month"; ?>-31">
<?php echo numfmt_format_currency($currency_format, $expense_total_amount_for_month, $session_company_currency); ?>
<a class="text-dark" href="expenses.php?dtf=<?= "$year-$month" ?>-01&dtt=<?= "$year-$month" ?>-31">
<?= numfmt_format_currency($currency_format, $expense_total_amount_for_month, $session_company_currency) ?>
</a>
</th>
<?php } ?>
<th class="text-right">
<a class="text-dark" href="expenses.php?dtf=<?php echo $year; ?>-01-01&dtt=<?php echo $year; ?>-12-31">
<?php echo numfmt_format_currency($currency_format, $grand_total_all_months, $session_company_currency); ?>
<a class="text-dark" href="expenses.php?dtf=<?= $year ?>-01-01&dtt=<?= $year ?>-12-31">
<?= numfmt_format_currency($currency_format, $grand_total_all_months, $session_company_currency) ?>
</a>
</th>
</tr>

View File

@@ -1,7 +1,7 @@
<!-- Main Sidebar Container -->
<aside class="main-sidebar sidebar-dark-primary d-print-none">
<a class="pb-1 mt-1 brand-link" href="/agent/<?php echo $config_start_page ?>">
<a class="pb-1 mt-1 brand-link" href="/agent/<?= $config_start_page ?>">
<p class="h5"><i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i>
<span class="brand-text ">Back | <strong>Reports</strong>
</p>
@@ -144,9 +144,9 @@
?>
<li class="nav-item">
<a href="<?php echo $custom_link_uri; ?>" <?php echo $target; ?> class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == basename($custom_link_uri)) { echo "active"; } ?>">
<i class="fas fa-<?php echo $custom_link_icon; ?> nav-icon"></i>
<p><?php echo $custom_link_name; ?></p>
<a href="<?= $custom_link_uri ?>" <?= $target ?> class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == basename($custom_link_uri)) { echo "active"; } ?>">
<i class="fas fa-<?= $custom_link_icon ?> nav-icon"></i>
<p><?= $custom_link_name ?></p>
<i class="fas fa-angle-right nav-icon float-right"></i>
</a>
</li>

View File

@@ -37,7 +37,7 @@ $sql_payment_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(payment_date) A
while ($row = mysqli_fetch_assoc($sql_payment_years)) {
$payment_year = intval($row['payment_year']);
?>
<option <?php if ($year == $payment_year) { ?> selected <?php } ?> > <?php echo $payment_year; ?></option>
<option <?php if ($year == $payment_year) { ?> selected <?php } ?> > <?= $payment_year ?></option>
<?php } ?>
@@ -77,8 +77,8 @@ $sql_payment_years = mysqli_query($mysqli, "SELECT DISTINCT YEAR(payment_date) A
?>
<tr>
<td><a href="../../agent/client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $amount_paid, $session_company_currency); ?></td>
<td><a href="../../agent/client_overview.php?client_id=<?= $client_id ?>"><?= $client_name ?></a></td>
<td class="text-right"><?= numfmt_format_currency($currency_format, $amount_paid, $session_company_currency) ?></td>
</tr>
<?php
}

View File

@@ -39,7 +39,7 @@ $largest_income_month = 0;
<select onchange="this.form.submit()" class="form-control" name="year">
<?php while ($row = mysqli_fetch_assoc($sql_payment_years)) {
$payment_year = intval($row['payment_year']); ?>
<option <?php if ($year == $payment_year) { ?> selected <?php } ?>><?php echo $payment_year; ?></option>
<option <?php if ($year == $payment_year) { ?> selected <?php } ?>><?= $payment_year ?></option>
<?php } ?>
</select>
</form>
@@ -75,7 +75,7 @@ $largest_income_month = 0;
$category_id = intval($row['category_id']);
$category_name = escapeHtml($row['category_name']); ?>
<tr>
<td><?php echo $category_name; ?></td>
<td><?= $category_name ?></td>
<?php
$total_payment_for_all_months = 0;
for ($month = 1; $month <= 12; $month++) {
@@ -92,9 +92,9 @@ $largest_income_month = 0;
$payment_amount_for_month = $payment_amount_for_month + $revenues_amount_for_month;
$total_payment_for_all_months += $payment_amount_for_month;
?>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $payment_amount_for_month, $session_company_currency); ?></td>
<td class="text-right"><?= numfmt_format_currency($currency_format, $payment_amount_for_month, $session_company_currency) ?></td>
<?php } ?>
<td class="text-right text-bold"><?php echo numfmt_format_currency($currency_format, $total_payment_for_all_months, $session_company_currency); ?></td>
<td class="text-right text-bold"><?= numfmt_format_currency($currency_format, $total_payment_for_all_months, $session_company_currency) ?></td>
</tr>
<?php } ?>
@@ -114,9 +114,9 @@ $largest_income_month = 0;
$payment_total_amount_for_month += $revenues_total_amount_for_month;
$grand_total_all_months += $payment_total_amount_for_month;
?>
<th class="text-right"><?php echo numfmt_format_currency($currency_format, $payment_total_amount_for_month, $session_company_currency); ?></th>
<th class="text-right"><?= numfmt_format_currency($currency_format, $payment_total_amount_for_month, $session_company_currency) ?></th>
<?php } ?>
<th class="text-right"><?php echo numfmt_format_currency($currency_format, $grand_total_all_months, $session_company_currency); ?></th>
<th class="text-right"><?= numfmt_format_currency($currency_format, $grand_total_all_months, $session_company_currency) ?></th>
</tr>
</tbody>
</table>

View File

@@ -67,8 +67,8 @@ enforceUserPermission('module_financial');
?>
<tr>
<td><a href="../../agent/invoices.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $balance, $session_company_currency); ?></td>
<td><a href="../../agent/invoices.php?client_id=<?= $client_id ?>"><?= $client_name ?></a></td>
<td class="text-right"><?= numfmt_format_currency($currency_format, $balance, $session_company_currency) ?></td>
</tr>
<?php
}

View File

@@ -39,7 +39,7 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
while ($row = mysqli_fetch_assoc($sql_all_years)) {
$all_years = intval($row['all_years']);
?>
<option <?php if ($year == $all_years) { ?> selected <?php } ?> > <?php echo $all_years; ?></option>
<option <?php if ($year == $all_years) { ?> selected <?php } ?> > <?= $all_years ?></option>
<?php
}
@@ -71,7 +71,7 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<tr>
<td><?php echo $category_name; ?></td>
<td><?= $category_name ?></td>
<?php
@@ -93,7 +93,7 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $payment_amount_for_quarter_one, $session_company_currency); ?></td>
<td class="text-right"><?= numfmt_format_currency($currency_format, $payment_amount_for_quarter_one, $session_company_currency) ?></td>
<?php
@@ -115,7 +115,7 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $payment_amount_for_quarter_two, $session_company_currency); ?></td>
<td class="text-right"><?= numfmt_format_currency($currency_format, $payment_amount_for_quarter_two, $session_company_currency) ?></td>
<?php
@@ -136,7 +136,7 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $payment_amount_for_quarter_three, $session_company_currency); ?></td>
<td class="text-right"><?= numfmt_format_currency($currency_format, $payment_amount_for_quarter_three, $session_company_currency) ?></td>
<?php
@@ -159,9 +159,9 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $payment_amount_for_quarter_four, $session_company_currency); ?></td>
<td class="text-right"><?= numfmt_format_currency($currency_format, $payment_amount_for_quarter_four, $session_company_currency) ?></td>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $total_payments_for_all_four_quarters, $session_company_currency); ?></td>
<td class="text-right"><?= numfmt_format_currency($currency_format, $total_payments_for_all_four_quarters, $session_company_currency) ?></td>
</tr>
<?php
@@ -194,7 +194,7 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<th class="text-right"><?php echo numfmt_format_currency($currency_format, $payment_total_amount_for_quarter_one, $session_company_currency); ?></th>
<th class="text-right"><?= numfmt_format_currency($currency_format, $payment_total_amount_for_quarter_one, $session_company_currency) ?></th>
<?php
@@ -216,7 +216,7 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<th class="text-right"><?php echo numfmt_format_currency($currency_format, $payment_total_amount_for_quarter_two, $session_company_currency); ?></th>
<th class="text-right"><?= numfmt_format_currency($currency_format, $payment_total_amount_for_quarter_two, $session_company_currency) ?></th>
<?php
@@ -238,7 +238,7 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<th class="text-right"><?php echo numfmt_format_currency($currency_format, $payment_total_amount_for_quarter_three, $session_company_currency); ?></th>
<th class="text-right"><?= numfmt_format_currency($currency_format, $payment_total_amount_for_quarter_three, $session_company_currency) ?></th>
<?php
@@ -262,9 +262,9 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<th class="text-right"><?php echo numfmt_format_currency($currency_format, $payment_total_amount_for_quarter_four, $session_company_currency); ?></th>
<th class="text-right"><?= numfmt_format_currency($currency_format, $payment_total_amount_for_quarter_four, $session_company_currency) ?></th>
<th class="text-right"><?php echo numfmt_format_currency($currency_format, $total_payments_for_all_four_quarters, $session_company_currency); ?></th>
<th class="text-right"><?= numfmt_format_currency($currency_format, $total_payments_for_all_four_quarters, $session_company_currency) ?></th>
</tr>
<tr>
@@ -278,7 +278,7 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<tr>
<td><?php echo $category_name; ?></td>
<td><?= $category_name ?></td>
<?php
@@ -292,7 +292,7 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $expense_amount_for_quarter_one, $session_company_currency); ?></td>
<td class="text-right"><?= numfmt_format_currency($currency_format, $expense_amount_for_quarter_one, $session_company_currency) ?></td>
<?php
@@ -306,7 +306,7 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $expense_amount_for_quarter_two, $session_company_currency); ?></td>
<td class="text-right"><?= numfmt_format_currency($currency_format, $expense_amount_for_quarter_two, $session_company_currency) ?></td>
<?php
@@ -320,7 +320,7 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $expense_amount_for_quarter_three, $session_company_currency); ?></td>
<td class="text-right"><?= numfmt_format_currency($currency_format, $expense_amount_for_quarter_three, $session_company_currency) ?></td>
<?php
@@ -336,9 +336,9 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $expense_amount_for_quarter_four, $session_company_currency); ?></td>
<td class="text-right"><?= numfmt_format_currency($currency_format, $expense_amount_for_quarter_four, $session_company_currency) ?></td>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $total_expenses_for_all_four_quarters, $session_company_currency); ?></td>
<td class="text-right"><?= numfmt_format_currency($currency_format, $total_expenses_for_all_four_quarters, $session_company_currency) ?></td>
</tr>
<?php
@@ -363,7 +363,7 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<th class="text-right"><?php echo numfmt_format_currency($currency_format, $expense_total_amount_for_quarter_one, $session_company_currency); ?></th>
<th class="text-right"><?= numfmt_format_currency($currency_format, $expense_total_amount_for_quarter_one, $session_company_currency) ?></th>
<?php
@@ -377,7 +377,7 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<th class="text-right"><?php echo numfmt_format_currency($currency_format, $expense_total_amount_for_quarter_two, $session_company_currency); ?></th>
<th class="text-right"><?= numfmt_format_currency($currency_format, $expense_total_amount_for_quarter_two, $session_company_currency) ?></th>
<?php
@@ -391,7 +391,7 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<th class="text-right"><?php echo numfmt_format_currency($currency_format, $expense_total_amount_for_quarter_three, $session_company_currency); ?></th>
<th class="text-right"><?= numfmt_format_currency($currency_format, $expense_total_amount_for_quarter_three, $session_company_currency) ?></th>
<?php
@@ -407,9 +407,9 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<th class="text-right"><?php echo numfmt_format_currency($currency_format, $expense_total_amount_for_quarter_four, $session_company_currency); ?></th>
<th class="text-right"><?= numfmt_format_currency($currency_format, $expense_total_amount_for_quarter_four, $session_company_currency) ?></th>
<th class="text-right"><?php echo numfmt_format_currency($currency_format, $total_expenses_for_all_four_quarters, $session_company_currency); ?></th>
<th class="text-right"><?= numfmt_format_currency($currency_format, $total_expenses_for_all_four_quarters, $session_company_currency) ?></th>
</tr>
<tr>
<?php
@@ -421,11 +421,11 @@ $sql_categories_expense = mysqli_query($mysqli, "SELECT * FROM categories WHERE
?>
<th>Net Profit</th>
<th class="text-right"><?php echo numfmt_format_currency($currency_format, $net_profit_quarter_one, $session_company_currency); ?></th>
<th class="text-right"><?php echo numfmt_format_currency($currency_format, $net_profit_quarter_two, $session_company_currency); ?></th>
<th class="text-right"><?php echo numfmt_format_currency($currency_format, $net_profit_quarter_three, $session_company_currency); ?></th>
<th class="text-right"><?php echo numfmt_format_currency($currency_format, $net_profit_quarter_four, $session_company_currency); ?></th>
<th class="text-right"><?php echo numfmt_format_currency($currency_format, $net_profit_year, $session_company_currency); ?></th>
<th class="text-right"><?= numfmt_format_currency($currency_format, $net_profit_quarter_one, $session_company_currency) ?></th>
<th class="text-right"><?= numfmt_format_currency($currency_format, $net_profit_quarter_two, $session_company_currency) ?></th>
<th class="text-right"><?= numfmt_format_currency($currency_format, $net_profit_quarter_three, $session_company_currency) ?></th>
<th class="text-right"><?= numfmt_format_currency($currency_format, $net_profit_quarter_four, $session_company_currency) ?></th>
<th class="text-right"><?= numfmt_format_currency($currency_format, $net_profit_year, $session_company_currency) ?></th>
</tr>
</tbody>
</table>

View File

@@ -46,8 +46,8 @@ $sql = mysqli_query($mysqli, "
<tr>
<td><a href="../../agent/client_overview.php?client_id=<?php echo $client_id; ?>"><?php echo $client_name; ?></a></td>
<td class="text-right"><?php echo numfmt_format_currency($currency_format, $recurring_monthly_total, $session_company_currency); ?></td>
<td><a href="../../agent/client_overview.php?client_id=<?= $client_id ?>"><?= $client_name ?></a></td>
<td class="text-right"><?= numfmt_format_currency($currency_format, $recurring_monthly_total, $session_company_currency) ?></td>
</tr>
<?php
}
@@ -55,7 +55,7 @@ $sql = mysqli_query($mysqli, "
?>
<tr>
<th>Total Monthly Income</th>
<th class="text-right"><?php echo numfmt_format_currency($currency_format, $recurring_total, $session_company_currency); ?></th>
<th class="text-right"><?= numfmt_format_currency($currency_format, $recurring_total, $session_company_currency) ?></th>
</tr>
</tbody>
</table>

View File

@@ -33,7 +33,7 @@ $sql_tax = mysqli_query($mysqli, "SELECT `tax_name` FROM `taxes`");
while ($row = mysqli_fetch_assoc($sql_all_years)) {
$all_years = intval($row['all_years']);
?>
<option <?php if ($year == $all_years) { echo "selected"; } ?> > <?php echo $all_years; ?></option>
<option <?php if ($year == $all_years) { echo "selected"; } ?> > <?= $all_years ?></option>
<?php
}

View File

@@ -35,7 +35,7 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients
<?php
while ($row = mysqli_fetch_assoc($sql_ticket_years)) {
$ticket_year = intval($row['ticket_year']); ?>
<option <?php if ($year == $ticket_year) { ?> selected <?php } ?> > <?php echo $ticket_year; ?></option>
<option <?php if ($year == $ticket_year) { ?> selected <?php } ?> > <?= $ticket_year ?></option>
<?php } ?>
</select>
<select onchange="this.form.submit()" class="form-control" name="month">
@@ -56,7 +56,7 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients
<div class="card card-dark mb-3">
<div class="card-header">
<h3 class="card-title"><i class="fas fa-fw fa-chart-area mr-2"></i>Yearly (<?php echo $year; ?>)</h3>
<h3 class="card-title"><i class="fas fa-fw fa-chart-area mr-2"></i>Yearly (<?= $year ?>)</h3>
</div>
<div class="card-body">
<div class="table-responsive-sm">
@@ -153,15 +153,15 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients
?>
<tr>
<td><?php echo $client_name; ?></td>
<td class="text-right"><?php echo $ticket_raised_count; ?></td>
<td class="text-right"><?php echo $low_ticket_count; ?></td>
<td class="text-right"><?php echo $med_ticket_count; ?></td>
<td class="text-right"><?php echo $high_ticket_count; ?></td>
<td class="text-right"><?php echo $ticket_resolved_count; ?></td>
<td class="text-right"><?php echo $ticket_total_time_worked; ?></td>
<td class="text-right"><?php echo $avg_time_to_respond; ?></td>
<td class="text-right"><?php echo $avg_time_to_resolve; ?></td>
<td><?= $client_name ?></td>
<td class="text-right"><?= $ticket_raised_count ?></td>
<td class="text-right"><?= $low_ticket_count ?></td>
<td class="text-right"><?= $med_ticket_count ?></td>
<td class="text-right"><?= $high_ticket_count ?></td>
<td class="text-right"><?= $ticket_resolved_count ?></td>
<td class="text-right"><?= $ticket_total_time_worked ?></td>
<td class="text-right"><?= $avg_time_to_respond ?></td>
<td class="text-right"><?= $avg_time_to_resolve ?></td>
</tr>
<?php
}
@@ -177,7 +177,7 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients
<div class="card card-dark mb-3">
<div class="card-header">
<h3 class="card-title"><i class="fas fa-fw fa-chart-area mr-2"></i>Monthly (<?php echo date("F", mktime(1, 1, 1, $month, 1)) . ' ' . $year; ?>)</h3>
<h3 class="card-title"><i class="fas fa-fw fa-chart-area mr-2"></i>Monthly (<?= date("F", mktime(1, 1, 1, $month, 1)) . ' ' . $year ?>)</h3>
</div>
<div class="card-body">
<div class="table-responsive-sm">
@@ -274,15 +274,15 @@ $sql_clients = mysqli_query($mysqli, "SELECT client_id, client_name FROM clients
?>
<tr>
<td><?php echo $client_name; ?></td>
<td class="text-right"><?php echo $ticket_raised_count; ?></td>
<td class="text-right"><?php echo $low_ticket_count; ?></td>
<td class="text-right"><?php echo $med_ticket_count; ?></td>
<td class="text-right"><?php echo $high_ticket_count; ?></td>
<td class="text-right"><?php echo $ticket_resolved_count; ?></td>
<td class="text-right"><?php echo $ticket_total_time_worked; ?></td>
<td class="text-right"><?php echo $avg_time_to_respond; ?></td>
<td class="text-right"><?php echo $avg_time_to_resolve; ?></td>
<td><?= $client_name ?></td>
<td class="text-right"><?= $ticket_raised_count ?></td>
<td class="text-right"><?= $low_ticket_count ?></td>
<td class="text-right"><?= $med_ticket_count ?></td>
<td class="text-right"><?= $high_ticket_count ?></td>
<td class="text-right"><?= $ticket_resolved_count ?></td>
<td class="text-right"><?= $ticket_total_time_worked ?></td>
<td class="text-right"><?= $avg_time_to_respond ?></td>
<td class="text-right"><?= $avg_time_to_resolve ?></td>
</tr>
<?php
}

View File

@@ -38,7 +38,7 @@ $largest_ticket_month = 0;
<?php
while ($row = mysqli_fetch_assoc($sql_ticket_years)) {
$ticket_year = intval($row['ticket_year']); ?>
<option <?php if ($year == $ticket_year) { ?> selected <?php } ?>><?php echo $ticket_year; ?></option>
<option <?php if ($year == $ticket_year) { ?> selected <?php } ?>><?= $ticket_year ?></option>
<?php } ?>
</select>
</form>
@@ -84,10 +84,10 @@ $largest_ticket_month = 0;
}
$total_tickets_for_all_months += $tickets_for_month; ?>
<td class="text-right"><?php echo $tickets_for_month; ?></td>
<td class="text-right"><?= $tickets_for_month ?></td>
<?php } ?>
<td class="text-right"><b><?php echo $total_tickets_for_all_months; ?></b></td>
<td class="text-right"><b><?= $total_tickets_for_all_months ?></b></td>
</tbody>
</table>

View File

@@ -32,7 +32,7 @@ $rows = 0;
<?php
while ($row = mysqli_fetch_assoc($sql_ticket_years)) {
$ticket_year = intval($row['ticket_year']); ?>
<option <?php if ($year == $ticket_year) { ?> selected <?php } ?> > <?php echo $ticket_year; ?></option>
<option <?php if ($year == $ticket_year) { ?> selected <?php } ?> > <?= $ticket_year ?></option>
<?php } ?>
</select>
</form>
@@ -114,11 +114,11 @@ $rows = 0;
<tr>
<td>
<a href="../../agent/tickets.php?client_id=<?php echo $client_id; ?>&billable=1&unbilled"><?php echo $client_name; ?></a>
<a href="../../agent/tickets.php?client_id=<?= $client_id ?>&billable=1&unbilled"><?= $client_name ?></a>
</td>
<td class="text-right"><?php echo $ticket_raised_count; ?></td>
<td class="text-right"><?php echo $ticket_closed_count; ?></td>
<td class="text-right"><?php echo $ticket_unbilled_count; ?></td>
<td class="text-right"><?= $ticket_raised_count ?></td>
<td class="text-right"><?= $ticket_closed_count ?></td>
<td class="text-right"><?= $ticket_unbilled_count ?></td>
</tr>
<?php
}

View File

@@ -45,14 +45,14 @@ $sql_users = mysqli_query($mysqli, "
<?php
while ($row = mysqli_fetch_assoc($sql_ticket_years)) {
$ticket_year = intval($row['ticket_year']); ?>
<option <?php if ($year == $ticket_year) { ?> selected <?php } ?> > <?php echo $ticket_year; ?></option>
<option <?php if ($year == $ticket_year) { ?> selected <?php } ?> > <?= $ticket_year ?></option>
<?php } ?>
</select>
</form>
<div class="card card-dark mb-3">
<div class="card-header">
<h3 class="card-title"><i class="fas fa-fw fa-chart-area mr-2"></i>Yearly (<?php echo $year; ?>)</h3>
<h3 class="card-title"><i class="fas fa-fw fa-chart-area mr-2"></i>Yearly (<?= $year ?>)</h3>
</div>
<div class="card-body">
<div class="table-responsive-sm">
@@ -115,10 +115,10 @@ $sql_users = mysqli_query($mysqli, "
?>
<tr>
<td><?php echo $user_name; ?></td>
<td class="text-right"><?php echo $ticket_raised_count; ?></td>
<td class="text-right"><?php echo $tickets_touched; ?></td>
<td class="text-right"><?php echo $ticket_total_time_worked; ?></td>
<td><?= $user_name ?></td>
<td class="text-right"><?= $ticket_raised_count ?></td>
<td class="text-right"><?= $tickets_touched ?></td>
<td class="text-right"><?= $ticket_total_time_worked ?></td>
</tr>
<?php