ThaMunsta/itflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'itflow-org:master' into add-client-replied-to-ticket-status-sort

Browse Source
This commit is contained in:
Andrew Malsbury
2023-11-14 19:52:02 -06:00
committed by GitHub
parent 35b709fa18 201860798a
commit a6a49604a8
17 changed files with 425 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client_assets.php
+1 -1
View File
@@ -130,7 +130,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<a href="?<?php echo $url_query_strings_sort; ?>&type=network" class="btn <?php if ($_GET['type'] == 'network') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-network-wired"></i> Network <span class="right badge badge-light"><?php echo $network_count; ?></span></a> <a href="?<?php echo $url_query_strings_sort; ?>&type=network" class="btn <?php if ($_GET['type'] == 'network') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-network-wired"></i> Network <span class="right badge badge-light"><?php echo $network_count; ?></span></a>
<?php <?php
} }
if ($network_count > 0) { ?> if ($other_count > 0) { ?>
<a href="?<?php echo $url_query_strings_sort; ?>&type=other" class="btn <?php if ($_GET['type'] == 'other') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-tag"></i> Other <span class="right badge badge-light"><?php echo $other_count; ?></span></a> <a href="?<?php echo $url_query_strings_sort; ?>&type=other" class="btn <?php if ($_GET['type'] == 'other') { echo 'btn-primary'; } else { echo 'btn-default'; } ?>"><i class="fa fa-fw fa-tag"></i> Other <span class="right badge badge-light"><?php echo $other_count; ?></span></a>
<?php <?php
} ?> } ?>
client_certificates.php
+10 -6
View File
@@ -24,7 +24,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<div class="card-header py-2"> <div class="card-header py-2">
<h3 class="card-title mt-2"><i class="fas fa-fw fa-lock mr-2"></i>Certificates</h3> <h3 class="card-title mt-2"><i class="fas fa-fw fa-lock mr-2"></i>Certificates</h3>
<div class="card-tools"> <div class="card-tools">
<div class="btn-group">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCertificateModal"><i class="fas fa-plus mr-2"></i>New Certificate</button> <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addCertificateModal"><i class="fas fa-plus mr-2"></i>New Certificate</button>
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
<div class="dropdown-menu">
<a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportCertificateModal">
<i class="fa fa-fw fa-download mr-2"></i>Export
</a>
</div>
</div>
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">
@@ -43,11 +51,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<div class="col-md-8"> <div class="col-md-8">
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#exportCertificateModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button> <div class="dropdown" id="multiActionButton" hidden>
</div>
<div class="dropdown float-right" id="multiActionButton" hidden>
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown"> <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
<i class="fas fa-fw fa-list mr-2"></i>Selected (<span id="selectedCount">0</span>) <i class="fas fa-fw fa-list mr-2"></i>Selected (<span id="selectedCount">0</span>)
</button> </button>
@@ -58,7 +62,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
</button> </button>
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>
client_documents.php
+12 -3
View File
@@ -155,10 +155,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<form autocomplete="off"> <form autocomplete="off">
<input type="hidden" name="client_id" value="<?php echo $client_id; ?>"> <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
<input type="hidden" name="folder_id" value="<?php echo $get_folder_id; ?>"> <input type="hidden" name="folder_id" value="<?php echo $get_folder_id; ?>">
<div class="input-group"> <div class="row">
<input type="search" class="form-control " name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Documents"> <div class="col-md-4">
<div class="input-group mb-3 mb-md-0">
<input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Documents">
<div class="input-group-append"> <div class="input-group-append">
<button class="btn btn-secondary"><i class="fa fa-search"></i></button> <button class="btn btn-dark"><i class="fa fa-search"></i></button>
</div>
</div>
</div>
<div class="col-md-8">
<div class="float-right">
</div>
</div> </div>
</div> </div>
</form> </form>
client_domains.php
+8 -3
View File
@@ -25,7 +25,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<div class="card-header py-2"> <div class="card-header py-2">
<h3 class="card-title mt-2"><i class="fa fa-fw fa-globe mr-2"></i>Domains</h3> <h3 class="card-title mt-2"><i class="fa fa-fw fa-globe mr-2"></i>Domains</h3>
<div class="card-tools"> <div class="card-tools">
<div class="btn-group">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDomainModal"><i class="fas fa-plus mr-2"></i>New Domain</button> <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addDomainModal"><i class="fas fa-plus mr-2"></i>New Domain</button>
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
<div class="dropdown-menu">
<a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportDomainModal">
<i class="fa fa-fw fa-download mr-2"></i>Export
</a>
</div>
</div>
</div> </div>
</div> </div>
@@ -33,7 +41,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<form autocomplete="off"> <form autocomplete="off">
<input type="hidden" name="client_id" value="<?php echo $client_id; ?>"> <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<div class="input-group mb-3 mb-md-0"> <div class="input-group mb-3 mb-md-0">
<input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Domains"> <input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Domains">
@@ -45,10 +52,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<div class="col-md-8"> <div class="col-md-8">
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#exportDomainModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
</div> </div>
</div> </div>
</div> </div>
</form> </form>
<hr> <hr>
client_invoices.php
+8 -1
View File
@@ -27,7 +27,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<div class="card-header py-2"> <div class="card-header py-2">
<h3 class="card-title mt-2"><i class="fa fa-fw fa-file-invoice mr-2"></i>Invoices</h3> <h3 class="card-title mt-2"><i class="fa fa-fw fa-file-invoice mr-2"></i>Invoices</h3>
<div class="card-tools"> <div class="card-tools">
<div class="btn-group">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addInvoiceModal"><i class="fas fa-plus mr-2"></i>New Invoice</button> <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addInvoiceModal"><i class="fas fa-plus mr-2"></i>New Invoice</button>
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
<div class="dropdown-menu">
<a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportInvoiceModal">
<i class="fa fa-fw fa-download mr-2"></i>Export
</a>
</div>
</div>
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">
@@ -46,7 +54,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<div class="col-md-8"> <div class="col-md-8">
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#exportInvoiceModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
</div> </div>
</div> </div>
client_networks.php
+10 -1
View File
@@ -28,7 +28,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<div class="card-header py-2"> <div class="card-header py-2">
<h3 class="card-title mt-2"><i class="fas fa-fw fa-network-wired mr-2"></i>Networks</h3> <h3 class="card-title mt-2"><i class="fas fa-fw fa-network-wired mr-2"></i>Networks</h3>
<div class="card-tools"> <div class="card-tools">
<div class="btn-group">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addNetworkModal"><i class="fas fa-plus mr-2"></i>New Network</button> <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addNetworkModal"><i class="fas fa-plus mr-2"></i>New Network</button>
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
<div class="dropdown-menu">
<a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportNetworkModal">
<i class="fa fa-fw fa-download mr-2"></i>Export
</a>
</div>
</div>
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">
@@ -47,7 +56,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<div class="col-md-8"> <div class="col-md-8">
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#exportNetworkModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
</div> </div>
</div> </div>
client_payments.php
+5 -3
View File
@@ -25,8 +25,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
?> ?>
<div class="card card-dark"> <div class="card card-dark">
<div class="card-header py-3"> <div class="card-header py-2">
<h3 class="card-title"><i class="fa fa-fw fa-credit-card mr-2"></i>Payments</h3> <h3 class="card-title mt-2"><i class="fa fa-fw fa-credit-card mr-2"></i>Payments</h3>
<div class="card-tools">
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#exportPaymentModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
</div>
</div> </div>
<div class="card-body"> <div class="card-body">
<form autocomplete="off"> <form autocomplete="off">
@@ -44,7 +47,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<div class="col-md-8"> <div class="col-md-8">
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#exportPaymentModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
</div> </div>
</div> </div>
client_quotes.php
+8 -1
View File
@@ -27,7 +27,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<div class="card-header py-2"> <div class="card-header py-2">
<h3 class="card-title mt-2"><i class="fa fa-fw fa-comment-dollar mr-2"></i>Quotes</h3> <h3 class="card-title mt-2"><i class="fa fa-fw fa-comment-dollar mr-2"></i>Quotes</h3>
<div class="card-tools"> <div class="card-tools">
<div class="btn-group">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addQuoteModal"><i class="fas fa-plus mr-2"></i>New Quote</button> <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addQuoteModal"><i class="fas fa-plus mr-2"></i>New Quote</button>
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
<div class="dropdown-menu">
<a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportQuoteModal">
<i class="fa fa-fw fa-download mr-2"></i>Export
</a>
</div>
</div>
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">
@@ -46,7 +54,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<div class="col-md-8"> <div class="col-md-8">
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#exportQuoteModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
</div> </div>
</div> </div>
client_recurring_invoices.php
+8 -1
View File
@@ -26,7 +26,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<div class="card-header py-2"> <div class="card-header py-2">
<h3 class="card-title mt-2"><i class="fas fa-fw fa-redo-alt mr-2"></i>Recurring Invoices</h3> <h3 class="card-title mt-2"><i class="fas fa-fw fa-redo-alt mr-2"></i>Recurring Invoices</h3>
<div class="card-tools"> <div class="card-tools">
<div class="btn-group">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRecurringModal"><i class="fas fa-plus mr-2"></i>New Recurring</button> <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addRecurringModal"><i class="fas fa-plus mr-2"></i>New Recurring</button>
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
<div class="dropdown-menu">
<a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportRecurringModal">
<i class="fa fa-fw fa-download mr-2"></i>Export
</a>
</div>
</div>
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">
@@ -45,7 +53,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<div class="col-md-8"> <div class="col-md-8">
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#exportRecurringModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
</div> </div>
</div> </div>
client_services.php
+12 -3
View File
@@ -34,10 +34,19 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<form autocomplete="off"> <form autocomplete="off">
<input type="hidden" name="client_id" value="<?php echo $client_id; ?>"> <input type="hidden" name="client_id" value="<?php echo $client_id; ?>">
<div class="input-group"> <div class="row">
<input type="search" class="form-control " name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Services"> <div class="col-md-4">
<div class="input-group mb-3 mb-md-0">
<input type="search" class="form-control" name="q" value="<?php if (isset($q)) { echo stripslashes(nullable_htmlentities($q)); } ?>" placeholder="Search Services">
<div class="input-group-append"> <div class="input-group-append">
<button class="btn btn-secondary"><i class="fa fa-search"></i></button> <button class="btn btn-dark"><i class="fa fa-search"></i></button>
</div>
</div>
</div>
<div class="col-md-8">
<div class="float-right">
</div>
</div> </div>
</div> </div>
</form> </form>
client_trips.php
+9 -1
View File
@@ -27,7 +27,16 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<div class="card-header py-2"> <div class="card-header py-2">
<h3 class="card-title mt-2"><i class="fas fa-route mr-2"></i>Trips</h3> <h3 class="card-title mt-2"><i class="fas fa-route mr-2"></i>Trips</h3>
<div class="card-tools"> <div class="card-tools">
<div class="btn-group">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTripModal"><i class="fas fa-plus mr-2"></i>New Trip</button> <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#addTripModal"><i class="fas fa-plus mr-2"></i>New Trip</button>
<button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown"></button>
<div class="dropdown-menu">
<a class="dropdown-item text-dark" href="#" data-toggle="modal" data-target="#exportTripModal">
<i class="fa fa-fw fa-download mr-2"></i>Export
</a>
</div>
</div>
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">
@@ -46,7 +55,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<div class="col-md-8"> <div class="col-md-8">
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-default" data-toggle="modal" data-target="#exportTripModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
</div> </div>
</div> </div>
expenses.php
+5 -1
View File
@@ -49,7 +49,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
</div> </div>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-default btn-lg" data-toggle="modal" data-target="#exportExpensesModal"><i class="fas fa-fw fa-download mr-2"></i>Export</button>
</div> </div>
</div> </div>
</div> </div>
@@ -83,6 +82,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>"> <input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="float-right">
<button type="button" class="btn btn-default mt-4" data-toggle="modal" data-target="#exportExpensesModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
</div>
</div>
</div> </div>
</div> </div>
</form> </form>
js/ticket_time_tracking.js
+16 -2
View File
@@ -115,6 +115,16 @@
} }
} }
// Function to check status and pause timer
function checkStatusAndPauseTimer() {
var status = document.querySelector('select[name="status"]').value;
if (status.includes("Pending")) {
pauseTimer();
}
}
document.getElementById("hours").addEventListener('change', updateTimeFromInput); document.getElementById("hours").addEventListener('change', updateTimeFromInput);
document.getElementById("minutes").addEventListener('change', updateTimeFromInput); document.getElementById("minutes").addEventListener('change', updateTimeFromInput);
document.getElementById("seconds").addEventListener('change', updateTimeFromInput); document.getElementById("seconds").addEventListener('change', updateTimeFromInput);
@@ -124,6 +134,9 @@
document.getElementById("minutes").addEventListener('focus', handleInputFocus); document.getElementById("minutes").addEventListener('focus', handleInputFocus);
document.getElementById("seconds").addEventListener('focus', handleInputFocus); document.getElementById("seconds").addEventListener('focus', handleInputFocus);
document.querySelector('select[name="status"]').addEventListener('change', checkStatusAndPauseTimer);
document.getElementById("startStopTimer").addEventListener('click', function() { document.getElementById("startStopTimer").addEventListener('click', function() {
if (timerInterval === null) { if (timerInterval === null) {
startTimer(); startTimer();
@@ -144,12 +157,13 @@
try { try {
displayTime(); displayTime();
if (!localStorage.getItem(getLocalStorageKey("startTime")) && !localStorage.getItem(getLocalStorageKey("pausedTime"))) { if (!localStorage.getItem(getLocalStorageKey("startTime")) && !localStorage.getItem(getLocalStorageKey("pausedTime"))) {
// If first time, start the timer automatically
startTimer(); startTimer();
} else if (localStorage.getItem(getLocalStorageKey("startTime"))) { } else if (localStorage.getItem(getLocalStorageKey("startTime"))) {
// Continue timer if it was running before
startTimer(); startTimer();
} }
// Check and pause timer if status is pending
checkStatusAndPauseTimer();
} catch (error) { } catch (error) {
console.error("There was an issue initializing the timer:", error); console.error("There was an issue initializing the timer:", error);
} }
quote.php
+77 -108
View File
@@ -99,7 +99,7 @@ if (isset($_GET['quote_id'])) {
$json_products = json_encode($products); $json_products = json_encode($products);
} }
?> ?>
<ol class="breadcrumb d-print-none"> <ol class="breadcrumb d-print-none">
<li class="breadcrumb-item"> <li class="breadcrumb-item">
@@ -167,8 +167,7 @@ if (isset($_GET['quote_id'])) {
<a class="dropdown-item" href="#" onclick="window.print();"> <a class="dropdown-item" href="#" onclick="window.print();">
<i class="fa fa-fw fa-print text-secondary mr-2"></i>Print <i class="fa fa-fw fa-print text-secondary mr-2"></i>Print
</a> </a>
<a class="dropdown-item" href="#" <a class="dropdown-item" href="#" onclick="pdfMake.createPdf(docDefinition).download('<?php echo strtoAZaz09(html_entity_decode("$quote_date-$company_name-$client_name-Quote-$quote_prefix$quote_number")); ?>');">
onclick="pdfMake.createPdf(docDefinition).download('<?php echo strtoAZaz09(html_entity_decode("$quote_date-$company_name-$client_name-Quote-$quote_prefix$quote_number")); ?>');">
<i class="fa fa-fw fa-download text-secondary mr-2"></i>Download PDF <i class="fa fa-fw fa-download text-secondary mr-2"></i>Download PDF
</a> </a>
<?php if (!empty($config_smtp_host) && !empty($contact_email)) { ?> <?php if (!empty($config_smtp_host) && !empty($contact_email)) { ?>
@@ -207,7 +206,9 @@ if (isset($_GET['quote_id'])) {
<div class="row mb-4"> <div class="row mb-4">
<div class="col"> <div class="col">
<ul class="list-unstyled"> <ul class="list-unstyled">
<li><h4><strong><?php echo $company_name; ?></strong></h4></li> <li>
<h4><strong><?php echo $company_name; ?></strong></h4>
</li>
<li><?php echo $company_address; ?></li> <li><?php echo $company_address; ?></li>
<li><?php echo "$company_city $company_state $company_zip"; ?></li> <li><?php echo "$company_city $company_state $company_zip"; ?></li>
<li><?php echo $company_phone; ?></li> <li><?php echo $company_phone; ?></li>
@@ -216,7 +217,9 @@ if (isset($_GET['quote_id'])) {
</div> </div>
<div class="col"> <div class="col">
<ul class="list-unstyled text-right"> <ul class="list-unstyled text-right">
<li><h4><strong><?php echo $client_name; ?></strong></h4></li> <li>
<h4><strong><?php echo $client_name; ?></strong></h4>
</li>
<li><?php echo $location_address; ?></li> <li><?php echo $location_address; ?></li>
<li><?php echo "$location_city $location_state $location_zip"; ?></li> <li><?php echo "$location_city $location_state $location_zip"; ?></li>
<li><?php echo "$contact_phone $contact_extension"; ?></li> <li><?php echo "$contact_phone $contact_extension"; ?></li>
@@ -271,7 +274,7 @@ if (isset($_GET['quote_id'])) {
$item_name = nullable_htmlentities($row['item_name']); $item_name = nullable_htmlentities($row['item_name']);
$item_description = nullable_htmlentities($row['item_description']); $item_description = nullable_htmlentities($row['item_description']);
$item_order = intval($row['item_order']); $item_order = intval($row['item_order']);
$item_quantity = number_format(floatval($row['item_quantity']),2); $item_quantity = number_format(floatval($row['item_quantity']), 2);
$item_price = floatval($row['item_price']); $item_price = floatval($row['item_price']);
$item_tax = floatval($row['item_tax']); $item_tax = floatval($row['item_tax']);
$item_total = floatval($row['item_total']); $item_total = floatval($row['item_total']);
@@ -299,7 +302,7 @@ if (isset($_GET['quote_id'])) {
$up_hidden = "hidden"; $up_hidden = "hidden";
} else { } else {
$up_hidden = ""; $up_hidden = "";
}?> } ?>
<tr> <tr>
<td class="d-print-none"> <td class="d-print-none">
@@ -314,7 +317,9 @@ if (isset($_GET['quote_id'])) {
<input type="hidden" name="item_id" value="<?php echo $item_id; ?>"> <input type="hidden" name="item_id" value="<?php echo $item_id; ?>">
<input type="hidden" name="item_order" value="<?php echo $item_order; ?>"> <input type="hidden" name="item_order" value="<?php echo $item_order; ?>">
<button class="dropdown-item" type="submit" name="update_quote_item_order" value="up" <?php echo $up_hidden; ?>><i class="fa fa-fw fa-arrow-up mr-2"></i>Move Up</button> <button class="dropdown-item" type="submit" name="update_quote_item_order" value="up" <?php echo $up_hidden; ?>><i class="fa fa-fw fa-arrow-up mr-2"></i>Move Up</button>
<?php if ($up_hidden == "" && $down_hidden == "") { echo '<div class="dropdown-divider"></div>'; }?> <?php if ($up_hidden == "" && $down_hidden == "") {
echo '<div class="dropdown-divider"></div>';
} ?>
<button class="dropdown-item" type="submit" name="update_quote_item_order" value="down" <?php echo $down_hidden; ?>><i class="fa fa-fw fa-arrow-down mr-2"></i>Move Down</button> <button class="dropdown-item" type="submit" name="update_quote_item_order" value="down" <?php echo $down_hidden; ?>><i class="fa fa-fw fa-arrow-down mr-2"></i>Move Down</button>
</form> </form>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
@@ -341,14 +346,14 @@ if (isset($_GET['quote_id'])) {
if ($quote_status !== "Invoiced" && $quote_status !== "Accepted" && $quote_status !== "Declined") { if ($quote_status !== "Invoiced" && $quote_status !== "Accepted" && $quote_status !== "Declined") {
require "item_edit_modal.php"; require "item_edit_modal.php";
} }
} }
?> ?>
<tr class="d-print-none" <?php if ($quote_status == "Invoiced" || $quote_status == "Accepted" || $quote_status == "Declined") { echo "hidden"; } ?>> <tr class="d-print-none" <?php if ($quote_status == "Invoiced" || $quote_status == "Accepted" || $quote_status == "Declined") {
echo "hidden";
} ?>>
<form action="post.php" method="post" autocomplete="off"> <form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="quote_id" value="<?php echo $quote_id; ?>"> <input type="hidden" name="quote_id" value="<?php echo $quote_id; ?>">
<input type="hidden" name="item_order" value="<?php <input type="hidden" name="item_order" value="<?php
@@ -369,7 +374,8 @@ if (isset($_GET['quote_id'])) {
<input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" id="qty" style="text-align: center;" name="qty" placeholder="Quantity"> <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" id="qty" style="text-align: center;" name="qty" placeholder="Quantity">
</td> </td>
<td> <td>
<input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" id="price" style="text-align: right;" name="price" placeholder="Price (<?php echo $quote_currency_code; ?>)"></td> <input type="text" class="form-control" inputmode="numeric" pattern="-?[0-9]*\.?[0-9]{0,2}" id="price" style="text-align: right;" name="price" placeholder="Price (<?php echo $quote_currency_code; ?>)">
</td>
<td> <td>
<select class="form-control select2" id="tax" name="tax_id" required> <select class="form-control select2" id="tax" name="tax_id" required>
<option value="0">No Tax</option> <option value="0">No Tax</option>
@@ -501,7 +507,7 @@ if (isset($_GET['quote_id'])) {
</div> </div>
</div> </div>
<?php <?php
require_once "quote_edit_modal.php"; require_once "quote_edit_modal.php";
require_once "quote_to_invoice_modal.php"; require_once "quote_to_invoice_modal.php";
@@ -509,10 +515,6 @@ if (isset($_GET['quote_id'])) {
require_once "quote_copy_modal.php"; require_once "quote_copy_modal.php";
require_once "quote_note_modal.php"; require_once "quote_note_modal.php";
require_once "category_quick_add_modal.php";
} }
require_once "footer.php"; require_once "footer.php";
@@ -526,11 +528,11 @@ require_once "footer.php";
<script src="plugins/jquery-ui/jquery-ui.min.js"></script> <script src="plugins/jquery-ui/jquery-ui.min.js"></script>
<script> <script>
$(function() { $(function() {
var availableProducts = <?php echo $json_products?>; var availableProducts = <?php echo $json_products ?>;
$("#name").autocomplete({ $("#name").autocomplete({
source: availableProducts, source: availableProducts,
select: function (event, ui) { select: function(event, ui) {
$("#name").val(ui.item.label); // Product name field - this seemingly has to referenced as label $("#name").val(ui.item.label); // Product name field - this seemingly has to referenced as label
$("#desc").val(ui.item.description); // Product description field $("#desc").val(ui.item.description); // Product description field
$("#qty").val(1); // Product quantity field automatically make it a 1 $("#qty").val(1); // Product quantity field automatically make it a 1
@@ -544,7 +546,6 @@ require_once "footer.php";
<script src='plugins/pdfmake/pdfmake.min.js'></script> <script src='plugins/pdfmake/pdfmake.min.js'></script>
<script src='plugins/pdfmake/vfs_fonts.js'></script> <script src='plugins/pdfmake/vfs_fonts.js'></script>
<script> <script>
var docDefinition = { var docDefinition = {
info: { info: {
title: <?php echo json_encode(html_entity_decode($company_name) . "- Quote") ?>, title: <?php echo json_encode(html_entity_decode($company_name) . "- Quote") ?>,
@@ -557,31 +558,26 @@ require_once "footer.php";
// Header // Header
{ {
columns: [ columns: [
<?php if (!empty($company_logo_base64)) { ?> <?php if (!empty($company_logo_base64)) { ?> {
{
image: <?php echo json_encode("data:image;base64,$company_logo_base64") ?>, image: <?php echo json_encode("data:image;base64,$company_logo_base64") ?>,
width: 120 width: 120
}, },
<?php } ?> <?php } ?>
[ [{
{
text: 'Quote', text: 'Quote',
style: 'invoiceTitle', style: 'invoiceTitle',
width: '*' width: '*'
}, }, {
{
text: <?php echo json_encode("$quote_prefix$quote_number") ?>, text: <?php echo json_encode("$quote_prefix$quote_number") ?>,
style: 'invoiceNumber', style: 'invoiceNumber',
width: '*' width: '*'
}, }, ],
],
], ],
}, },
// Billing Headers // Billing Headers
{ {
columns: [ columns: [{
{
text: <?php echo json_encode(html_entity_decode($company_name)) ?>, text: <?php echo json_encode(html_entity_decode($company_name)) ?>,
style: 'invoiceBillingTitle' style: 'invoiceBillingTitle'
}, },
@@ -593,8 +589,7 @@ require_once "footer.php";
}, },
// Billing Address // Billing Address
{ {
columns: [ columns: [{
{
text: <?php echo json_encode(html_entity_decode("$company_address \n $company_city $company_state $company_zip \n $company_phone \n $company_website")) ?>, text: <?php echo json_encode(html_entity_decode("$company_address \n $company_city $company_state $company_zip \n $company_phone \n $company_website")) ?>,
style: 'invoiceBillingAddress' style: 'invoiceBillingAddress'
}, },
@@ -610,20 +605,18 @@ require_once "footer.php";
// headers are automatically repeated if the table spans over multiple pages // headers are automatically repeated if the table spans over multiple pages
// you can declare how many rows should be treated as headers // you can declare how many rows should be treated as headers
headerRows: 0, headerRows: 0,
widths: [ '*',80, 80 ], widths: ['*', 80, 80],
body: [ body: [
// Total // Total
[ [{
{
text: '', text: '',
rowSpan: 3 rowSpan: 3
}, },
{}, {},
{}, {},
], ],
[ [{},
{},
{ {
text: 'Date', text: 'Date',
style: 'invoiceDateTitle' style: 'invoiceDateTitle'
@@ -633,8 +626,7 @@ require_once "footer.php";
style: 'invoiceDateValue' style: 'invoiceDateValue'
}, },
], ],
[ [{},
{},
{ {
text: 'Expire', text: 'Expire',
style: 'invoiceDueDateTitle' style: 'invoiceDueDateTitle'
@@ -656,30 +648,29 @@ require_once "footer.php";
// headers are automatically repeated if the table spans over multiple pages // headers are automatically repeated if the table spans over multiple pages
// you can declare how many rows should be treated as headers // you can declare how many rows should be treated as headers
headerRows: 1, headerRows: 1,
widths: [ '*', 40, 'auto', 'auto', 80 ], widths: ['*', 40, 'auto', 'auto', 80],
body: [ body: [
// Table Header // Table Header
[ [{
{
text: 'Product', text: 'Product',
style: [ 'itemsHeader', 'left'] style: ['itemsHeader', 'left']
}, },
{ {
text: 'Qty', text: 'Qty',
style: [ 'itemsHeader', 'center'] style: ['itemsHeader', 'center']
}, },
{ {
text: 'Price', text: 'Price',
style: [ 'itemsHeader', 'right'] style: ['itemsHeader', 'right']
}, },
{ {
text: 'Tax', text: 'Tax',
style: [ 'itemsHeader', 'right'] style: ['itemsHeader', 'right']
}, },
{ {
text: 'Total', text: 'Total',
style: [ 'itemsHeader', 'right'] style: ['itemsHeader', 'right']
} }
], ],
// Items // Items
@@ -704,8 +695,7 @@ require_once "footer.php";
// Item // Item
[ [
[ [{
{
text: <?php echo json_encode($item_name) ?>, text: <?php echo json_encode($item_name) ?>,
style: 'itemTitle' style: 'itemTitle'
}, },
@@ -713,20 +703,16 @@ require_once "footer.php";
text: <?php echo json_encode($item_description) ?>, text: <?php echo json_encode($item_description) ?>,
style: 'itemDescription' style: 'itemDescription'
} }
], ], {
{
text: <?php echo json_encode($item_quantity) ?>, text: <?php echo json_encode($item_quantity) ?>,
style: 'itemQty' style: 'itemQty'
}, }, {
{
text: <?php echo json_encode(numfmt_format_currency($currency_format, $item_price, $quote_currency_code)) ?>, text: <?php echo json_encode(numfmt_format_currency($currency_format, $item_price, $quote_currency_code)) ?>,
style: 'itemNumber' style: 'itemNumber'
}, }, {
{
text: <?php echo json_encode(numfmt_format_currency($currency_format, $item_tax, $quote_currency_code)) ?>, text: <?php echo json_encode(numfmt_format_currency($currency_format, $item_tax, $quote_currency_code)) ?>,
style: 'itemNumber' style: 'itemNumber'
}, }, {
{
text: <?php echo json_encode(numfmt_format_currency($currency_format, $item_total, $quote_currency_code)) ?>, text: <?php echo json_encode(numfmt_format_currency($currency_format, $item_total, $quote_currency_code)) ?>,
style: 'itemNumber' style: 'itemNumber'
} }
@@ -746,20 +732,18 @@ require_once "footer.php";
// headers are automatically repeated if the table spans over multiple pages // headers are automatically repeated if the table spans over multiple pages
// you can declare how many rows should be treated as headers // you can declare how many rows should be treated as headers
headerRows: 0, headerRows: 0,
widths: [ '*','auto', 80 ], widths: ['*', 'auto', 80],
body: [ body: [
// Total // Total
[ [{
{
text: 'Notes', text: 'Notes',
style: 'notesTitle' style: 'notesTitle'
}, },
{}, {},
{} {}
], ],
[ [{
{
rowSpan: '*', rowSpan: '*',
text: <?php echo json_encode(html_entity_decode($quote_note)) ?>, text: <?php echo json_encode(html_entity_decode($quote_note)) ?>,
style: 'notesText' style: 'notesText'
@@ -773,43 +757,28 @@ require_once "footer.php";
style: 'itemsFooterSubValue' style: 'itemsFooterSubValue'
} }
], ],
<?php if ($quote_discount > 0) { ?> <?php if ($quote_discount > 0) { ?>[{}, {
[
{},
{
text: 'Discount', text: 'Discount',
style: 'itemsFooterSubTitle' style: 'itemsFooterSubTitle'
}, }, {
{
text: <?php echo json_encode(numfmt_format_currency($currency_format, -$quote_discount, $quote_currency_code)) ?>, text: <?php echo json_encode(numfmt_format_currency($currency_format, -$quote_discount, $quote_currency_code)) ?>,
style: 'itemsFooterSubValue' style: 'itemsFooterSubValue'
} }],
],
<?php } ?> <?php } ?>
<?php if ($total_tax > 0) { ?> <?php if ($total_tax > 0) { ?>[{}, {
[
{},
{
text: 'Tax', text: 'Tax',
style: 'itemsFooterSubTitle' style: 'itemsFooterSubTitle'
}, }, {
{
text: <?php echo json_encode(numfmt_format_currency($currency_format, $total_tax, $quote_currency_code)) ?>, text: <?php echo json_encode(numfmt_format_currency($currency_format, $total_tax, $quote_currency_code)) ?>,
style: 'itemsFooterSubValue' style: 'itemsFooterSubValue'
} }],
], <?php } ?>[{}, {
<?php } ?>
[
{},
{
text: 'Total', text: 'Total',
style: 'itemsFooterTotalTitle' style: 'itemsFooterTotalTitle'
}, }, {
{
text: <?php echo json_encode(numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code)) ?>, text: <?php echo json_encode(numfmt_format_currency($currency_format, $quote_amount, $quote_currency_code)) ?>,
style: 'itemsFooterTotalValue' style: 'itemsFooterTotalValue'
} }],
],
] ]
}, // table }, // table
layout: 'lightHorizontalLines' layout: 'lightHorizontalLines'
@@ -824,7 +793,7 @@ require_once "footer.php";
// Document Footer // Document Footer
documentFooterCenter: { documentFooterCenter: {
fontSize: 9, fontSize: 9,
margin: [10,50,10,10], margin: [10, 50, 10, 10],
alignment: 'center' alignment: 'center'
}, },
// Invoice Title // Invoice Title
@@ -832,25 +801,25 @@ require_once "footer.php";
fontSize: 18, fontSize: 18,
bold: true, bold: true,
alignment: 'right', alignment: 'right',
margin: [0,0,0,3] margin: [0, 0, 0, 3]
}, },
// Invoice Number // Invoice Number
invoiceNumber: { invoiceNumber: {
fontSize: 14, fontSize: 14,
alignment:'right' alignment: 'right'
}, },
// Billing Headers // Billing Headers
invoiceBillingTitle: { invoiceBillingTitle: {
fontSize: 14, fontSize: 14,
bold: true, bold: true,
alignment: 'left', alignment: 'left',
margin: [0,20,0,5] margin: [0, 20, 0, 5]
}, },
invoiceBillingTitleClient: { invoiceBillingTitleClient: {
fontSize: 14, fontSize: 14,
bold: true, bold: true,
alignment: 'right', alignment: 'right',
margin: [0,20,0,5] margin: [0, 20, 0, 5]
}, },
// Billing Details // Billing Details
invoiceBillingAddress: { invoiceBillingAddress: {
@@ -861,36 +830,36 @@ require_once "footer.php";
fontSize: 10, fontSize: 10,
lineHeight: 1.2, lineHeight: 1.2,
alignment: 'right', alignment: 'right',
margin: [0,0,0,30] margin: [0, 0, 0, 30]
}, },
// Invoice Dates // Invoice Dates
invoiceDateTitle: { invoiceDateTitle: {
fontSize: 10, fontSize: 10,
alignment: 'left', alignment: 'left',
margin: [0,5,0,5] margin: [0, 5, 0, 5]
}, },
invoiceDateValue: { invoiceDateValue: {
fontSize: 10, fontSize: 10,
alignment: 'right', alignment: 'right',
margin: [0,5,0,5] margin: [0, 5, 0, 5]
}, },
// Invoice Due Dates // Invoice Due Dates
invoiceDueDateTitle: { invoiceDueDateTitle: {
fontSize: 10, fontSize: 10,
bold: true, bold: true,
alignment: 'left', alignment: 'left',
margin: [0,5,0,5] margin: [0, 5, 0, 5]
}, },
invoiceDueDateValue: { invoiceDueDateValue: {
fontSize: 10, fontSize: 10,
bold: true, bold: true,
alignment: 'right', alignment: 'right',
margin: [0,5,0,5] margin: [0, 5, 0, 5]
}, },
// Items Header // Items Header
itemsHeader: { itemsHeader: {
fontSize: 10, fontSize: 10,
margin: [0,5,0,5], margin: [0, 5, 0, 5],
bold: true, bold: true,
alignment: 'right' alignment: 'right'
}, },
@@ -898,62 +867,62 @@ require_once "footer.php";
itemTitle: { itemTitle: {
fontSize: 10, fontSize: 10,
bold: true, bold: true,
margin: [0,5,0,3] margin: [0, 5, 0, 3]
}, },
itemDescription: { itemDescription: {
italics: true, italics: true,
fontSize: 9, fontSize: 9,
lineHeight: 1.1, lineHeight: 1.1,
margin: [0,3,0,5] margin: [0, 3, 0, 5]
}, },
itemQty: { itemQty: {
fontSize: 10, fontSize: 10,
margin: [0,5,0,5], margin: [0, 5, 0, 5],
alignment: 'center' alignment: 'center'
}, },
itemNumber: { itemNumber: {
fontSize: 10, fontSize: 10,
margin: [0,5,0,5], margin: [0, 5, 0, 5],
alignment: 'right' alignment: 'right'
}, },
itemTotal: { itemTotal: {
fontSize: 10, fontSize: 10,
margin: [0,5,0,5], margin: [0, 5, 0, 5],
bold: true, bold: true,
alignment: 'right' alignment: 'right'
}, },
// Items Footer (Subtotal, Total, Tax, etc) // Items Footer (Subtotal, Total, Tax, etc)
itemsFooterSubTitle: { itemsFooterSubTitle: {
fontSize: 10, fontSize: 10,
margin: [0,5,0,5], margin: [0, 5, 0, 5],
alignment: 'right' alignment: 'right'
}, },
itemsFooterSubValue: { itemsFooterSubValue: {
fontSize: 10, fontSize: 10,
margin: [0,5,0,5], margin: [0, 5, 0, 5],
bold: false, bold: false,
alignment: 'right' alignment: 'right'
}, },
itemsFooterTotalTitle: { itemsFooterTotalTitle: {
fontSize: 10, fontSize: 10,
margin: [0,5,0,5], margin: [0, 5, 0, 5],
bold: true, bold: true,
alignment: 'right' alignment: 'right'
}, },
itemsFooterTotalValue: { itemsFooterTotalValue: {
fontSize: 10, fontSize: 10,
margin: [0,5,0,5], margin: [0, 5, 0, 5],
bold: true, bold: true,
alignment: 'right' alignment: 'right'
}, },
notesTitle: { notesTitle: {
fontSize: 10, fontSize: 10,
bold: true, bold: true,
margin: [0,5,0,5] margin: [0, 5, 0, 5]
}, },
notesText: { notesText: {
fontSize: 9, fontSize: 9,
margin: [0,5,50,5] margin: [0, 5, 50, 5]
}, },
left: { left: {
alignment: 'left' alignment: 'left'
recurring_invoice.php
-3
View File
@@ -435,9 +435,6 @@ if (isset($_GET['recurring_id'])) {
require_once "recurring_invoice_note_modal.php"; require_once "recurring_invoice_note_modal.php";
require_once "category_quick_add_modal.php";
} }
require_once "footer.php"; require_once "footer.php";
ticket.php
+20 -17
View File
@@ -297,7 +297,7 @@ if (isset($_GET['ticket_id'])) {
<div class="form-row"> <div class="form-row">
<div class="col-md-3"> <div class="col-md-3">
<div class="form-group"> <div class="form-group">
<div class="input-group"> <div class="input-group input-group-sm">
<div class="input-group-prepend"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span> <span class="input-group-text"><i class="fa fa-fw fa-thermometer-half"></i></span>
</div> </div>
@@ -316,40 +316,43 @@ if (isset($_GET['ticket_id'])) {
</div> </div>
<!-- Time Tracking: Hours --> <!-- Time Tracking: Hours -->
<div class="col-md-2"> <div class="col-sm-2">
<div class="input-group mb-3"> <div class="input-group input-group-sm mb-3">
<input type="number" class="form-control" id="hours" name="hours" placeholder="Hours" min="0" max="23"> <div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-clock"></i></span>
</div>
<input type="text" class="form-control" inputmode="numeric" id="hours" name="hours" placeholder="Hrs" min="0" max="23" pattern="0?[0-9]|1[0-9]|2[0-3]">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">Hrs</span> <span class="input-group-text">H</span>
</div> </div>
</div> </div>
</div> </div>
<!-- Time Tracking: Minutes --> <!-- Time Tracking: Minutes -->
<div class="col-md-2"> <div class="col-sm-1">
<div class="input-group mb-3"> <div class="input-group input-group-sm mb-3">
<input type="number" class="form-control" id="minutes" name="minutes" placeholder="Minutes" min="0" max="59"> <input type="text" class="form-control" inputmode="numeric" id="minutes" name="minutes" placeholder="Mins" min="0" max="59" pattern="[0-5]?[0-9]">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">Mins</span> <span class="input-group-text">M</span>
</div> </div>
</div> </div>
</div> </div>
<!-- Time Tracking: Seconds --> <!-- Time Tracking: Seconds -->
<div class="col-md-2"> <div class="col-sm-1">
<div class="input-group mb-3"> <div class="input-group input-group-sm mb-3">
<input type="number" class="form-control" id="seconds" name="seconds" placeholder="Seconds" min="0" max="59"> <input type="text" class="form-control" inputmode="numeric" id="seconds" name="seconds" placeholder="Secs" min="0" max="59" pattern="[0-5]?[0-9]">
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">Secs</span> <span class="input-group-text">S</span>
</div> </div>
</div> </div>
</div> </div>
<!-- Timer Controls --> <!-- Timer Controls -->
<div class="col-md-2"> <div class="col-sm-1">
<div class="btn-group mt-2" role="group"> <div class="btn-group" role="group">
<button type="button" class="btn btn-success" id="startStopTimer">Pause</button> <button type="button" class="btn btn-success btn-sm" id="startStopTimer"><i class="fas fa-fw fa-pause"></i></button>
<button type="button" class="btn btn-danger" id="resetTimer">Reset</button> <button type="button" class="btn btn-danger btn-sm" id="resetTimer"><i class="fas fa-fw fa-redo-alt"></i></button>
</div> </div>
</div> </div>
trips.php
+6 -1
View File
@@ -47,7 +47,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
</div> </div>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="float-right"> <div class="float-right">
<button type="button" class="btn btn-default btn-lg" data-toggle="modal" data-target="#exportTripsModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
</div> </div>
</div> </div>
</div> </div>
@@ -81,6 +80,12 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>"> <input type="date" class="form-control" name="dtt" max="2999-12-31" value="<?php echo nullable_htmlentities($dtt); ?>">
</div> </div>
</div> </div>
<div class="col-md-6">
<div class="float-right">
<br>
<button type="button" class="btn btn-default mt-2" data-toggle="modal" data-target="#exportTripsModal"><i class="fa fa-fw fa-download mr-2"></i>Export</button>
</div>
</div>
</div> </div>
</div> </div>
</form> </form>