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

UI Cleanups

This commit is contained in:
root 2019-06-13 23:32:35 -04:00
parent 98532b0c7d
commit 3d3bcff09e
15 changed files with 524 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
add_client_modal.php
View File

@ -160,7 +160,6 @@
<span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
</div>
<select class="form-control selectpicker show-tick" name="net_terms">
<option value="">- Net Terms -</option>
<?php foreach($net_terms_array as $net_term_value => $net_term_name) { ?>
<option value="<?php echo $net_term_value; ?>"><?php echo $net_term_name; ?></option>
<?php } ?>

87
add_expense_copy_modal.php
View File

@ -10,6 +10,7 @@
<form action="post.php" method="post" autocomplete="off">
<div class="modal-body bg-white">
<div class="form-row">
<div class="form-group col-md">
<label>Date</label>
<div class="input-group">
@ -19,6 +20,7 @@
<input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
</div>
</div>
<div class="form-group col-md">
<label>Amount</label>
<div class="input-group">
@ -28,6 +30,11 @@
<input type="number" class="form-control" step="0.01" name="amount" value="<?php echo $expense_amount; ?>" required>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md">
<label>Account</label>
<div class="input-group">
@ -37,23 +44,23 @@
<select class="form-control selectpicker show-tick" name="account" required>
<?php
$sql2 = mysqli_query($mysqli,"SELECT * FROM accounts");
while($row = mysqli_fetch_array($sql2)){
$account_id2 = $row['account_id'];
$account_name = $row['account_name'];
$sql_accounts = mysqli_query($mysqli,"SELECT * FROM accounts");
while($row = mysqli_fetch_array($sql_accounts)){
$account_id_select = $row['account_id'];
$account_name_select = $row['account_name'];
$opening_balance = $row['opening_balance'];
$sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE account_id = $account_id2");
$sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE account_id = $account_id_select");
$row = mysqli_fetch_array($sql_payments);
$total_payments = $row['total_payments'];
$sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE account_id = $account_id2");
$sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE account_id = $account_id_select");
$row = mysqli_fetch_array($sql_expenses);
$total_expenses = $row['total_expenses'];
$balance = $opening_balance + $total_payments - $total_expenses;
?>
<option <?php if($account_id == $account_id2){ ?> selected <?php } ?> value="<?php echo $account_id2; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
<option <?php if($account_id == $account_id_select){ ?> selected <?php } ?> value="<?php echo $account_id_select; ?>"><?php echo $account_name_select; ?> [$<?php echo number_format($balance,2); ?>]</option>
<?php
}
@ -61,8 +68,7 @@
</select>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md">
<label>Vendor</label>
<div class="input-group">
@ -72,34 +78,12 @@
<select class="form-control selectpicker show-tick" data-live-search="true" name="vendor" required>
<?php
$sql2 = mysqli_query($mysqli,"SELECT * FROM vendors");
while($row = mysqli_fetch_array($sql2)){
$vendor_id2 = $row['vendor_id'];
$vendor_name = $row['vendor_name'];
$sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors");
while($row = mysqli_fetch_array($sql_vendors)){
$vendor_id_select = $row['vendor_id'];
$vendor_name_select = $row['vendor_name'];
?>
<option <?php if($vendor_id == $vendor_id2){ ?> selected <?php } ?> value="<?php echo $vendor_id2; ?>"><?php echo $vendor_name; ?></option>
<?php
}
?>
</select>
</div>
</div>
<div class="form-group col-md">
<label>Category</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
</div>
<select class="form-control selectpicker show-tick" name="category" required>
<?php
$sql2 = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense'");
while($row = mysqli_fetch_array($sql2)){
$category_id2 = $row['category_id'];
$category_name = $row['category_name'];
?>
<option <?php if($category_id == $category_id2){ ?> selected <?php } ?> value="<?php echo $category_id2; ?>"><?php echo $category_name; ?></option>
<option <?php if($vendor_id == $vendor_id_select){ ?> selected <?php } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
<?php
}
@ -107,12 +91,38 @@
</select>
</div>
</div>
</div>
<div class="form-group">
<label>Description</label>
<textarea class="form-control" rows="4" name="description" required><?php echo $expense_description; ?></textarea>
</div>
<div class="form-group">
<div class="form-group col-md">
<label>Category</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-list"></i></span>
</div>
<select class="form-control selectpicker show-tick" name="category" required>
<?php
$sql_categories = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense'");
while($row = mysqli_fetch_array($sql_categories)){
$category_id_select = $row['category_id'];
$category_name_select = $row['category_name'];
?>
<option <?php if($category_id == $category_id_select){ ?> selected <?php } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name_select; ?></option>
<?php
}
?>
</select>
</div>
</div>
<div class="form-group col-md">
<label>Reference</label>
<div class="input-group">
<div class="input-group-prepend">
@ -121,11 +131,14 @@
<input type="text" class="form-control" name="reference" placeholder="Enter a reference" value="<?php $expense_reference; ?>">
</div>
</div>
<div class="form-group">
<label>Receipt</label>
<input type="file" class="form-control-file" name="file">
</div>
</div>
<div class="modal-footer bg-white">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
<button type="submit" name="add_expense" class="btn btn-primary">Save</button>

38
add_expense_modal.php
View File

@ -19,6 +19,7 @@
<input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
</div>
</div>
<div class="form-group col-md">
<label>Amount</label>
<div class="input-group">
@ -28,6 +29,10 @@
<input type="number" class="form-control" step="0.01" name="amount" placeholder="Enter amount" autofocus required>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md">
<label>Account</label>
<div class="input-group">
@ -63,8 +68,7 @@
</select>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md">
<label>Vendor</label>
<div class="input-group">
@ -88,6 +92,15 @@
</select>
</div>
</div>
</div>
<div class="form-group">
<label>Description</label>
<textarea class="form-control" rows="4" name="description" required></textarea>
</div>
<div class="form-row">
<div class="form-group col-md">
<label>Category</label>
<div class="input-group">
@ -111,20 +124,19 @@
</select>
</div>
</div>
</div>
<div class="form-group">
<label>Description</label>
<textarea class="form-control" rows="4" name="description" required></textarea>
</div>
<div class="form-group">
<label>Reference</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
<div class="form-group col-md">
<label>Reference</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
</div>
<input type="text" class="form-control" name="reference" placeholder="Enter a reference">
</div>
<input type="text" class="form-control" name="reference" placeholder="Enter a reference">
</div>
</div>
<div class="form-group">
<label>Receipt</label>
<input type="file" class="form-control-file" name="file">

2
add_expense_refund_modal.php
View File

@ -2,7 +2,7 @@
<div class="modal-dialog modal-lg">
<div class="modal-content bg-dark">
<div class="modal-header text-white">
<h5 class="modal-title"><i class="fa fa-fw fa-recycle mr-2"></i>New Refund</h5>
<h5 class="modal-title"><i class="fa fa-fw fa-recycle mr-2"></i>Refund</h5>
<button type="button" class="close text-white" data-dismiss="modal">
<span aria-hidden="true">&times;</span>
</button>

2
add_invoice_copy_modal.php
View File

@ -9,7 +9,7 @@
</div>
<form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="invoice_id" value="<?php echo $invoice_id; ?>">
<input type="hidden" name="client_net_terms" value="<?php echo $client_net_terms; ?>">
<div class="modal-body bg-white">
<div class="form-group">

1
add_invoice_modal.php
View File

@ -8,7 +8,6 @@
</button>
</div>
<form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="client_net_terms" value="<?php echo $client_net_terms; ?>">
<div class="modal-body bg-white">
<?php if(isset($_GET['client_id'])){ ?>

12
add_quote_modal.php
View File

@ -8,10 +8,12 @@
</button>
</div>
<form action="post.php" method="post" autocomplete="off">
<?php if(isset($_GET['client_id'])){ ?>
<input type="hidden" name="client" value="<?php echo $client_id; ?>">
<?php } ?>
<div class="modal-body bg-white">
<?php if(isset($_GET['client_id'])){ ?>
<input type="hidden" name="client" value="<?php echo $client_id; ?>">
<?php }else{ ?>
<div class="form-group">
<label>Client</label>
@ -19,7 +21,7 @@
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
</div>
<select class="form-control selectpicker show-tick" data-live-search="true" name="client" required <?php if(isset($_GET['client_id'])){ echo "disabled"; } ?>>
<select class="form-control selectpicker show-tick" data-live-search="true" name="client" required>
<option value="">- Client -</option>
<?php
@ -36,6 +38,8 @@
</select>
</div>
</div>
<?php } ?>
<div class="form-group">
<label>Date</label>

12
add_recurring_modal.php
View File

@ -8,19 +8,19 @@
</button>
</div>
<form action="post.php" method="post" autocomplete="off">
<?php if(isset($_GET['client_id'])){ ?>
<input type="hidden" name="client" value="<?php echo $client_id; ?>">
<?php } ?>
<div class="modal-body bg-white">
<?php if(isset($_GET['client_id'])){ ?>
<input type="hidden" name="client" value="<?php echo $client_id; ?>">
<?php }else{ ?>
<div class="form-group">
<label>Client</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
</div>
<select class="form-control selectpicker show-tick" data-live-search="true" name="client" required <?php if(isset($_GET['client_id'])){ echo "disabled"; } ?>>
<select class="form-control selectpicker show-tick" data-live-search="true" name="client" required>
<option value="">- Client -</option>
<?php
@ -37,6 +37,8 @@
</select>
</div>
</div>
<?php } ?>
<div class="form-group">
<label>Start Date</label>

188
add_trip_copy_modal.php Normal file
View File

@ -0,0 +1,188 @@
<div class="modal" id="addTripCopyModal<?php echo $trip_id; ?>" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content bg-dark">
<div class="modal-header">
<h5 class="modal-title text-white"><i class="fa fa-fw fa-bicycle mr-2"></i>Copy Trip</h5>
<button type="button" class="close text-white" data-dismiss="modal">
<span aria-hidden="true">&times;</span>
</button>
</div>
<form action="post.php" method="post" autocomplete="off">
<div class="modal-body bg-white">
<ul class="nav nav-pills nav-justified mb-3" id="pills-tabCopy<?php echo $trip_id; ?>" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="pills-basic-tabCopy<?php echo $trip_id; ?>" data-toggle="pill" href="#pills-basicCopy<?php echo $trip_id; ?>" role="tab" aria-controls="pills-basic" aria-selected="true">Basic</a>
</li>
<li class="nav-item">
<a class="nav-link" id="pills-link-tabCopy<?php echo $trip_id; ?>" data-toggle="pill" href="#pills-linkCopy<?php echo $trip_id; ?>" role="tab" aria-controls="pills-link" aria-selected="false">Link</a>
</li>
</ul>
<hr>
<div class="tab-content" id="pills-tabContentCopy<?php echo $trip_id; ?>">
<div class="tab-pane fade show active" id="pills-basicCopy<?php echo $trip_id; ?>" role="tabpanel" aria-labelledby="pills-basic-tab">
<div class="form-row">
<div class="form-group col">
<label>Date</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
</div>
<input type="date" class="form-control" name="date" required>
</div>
</div>
<div class="form-group col">
<label>Miles</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
</div>
<input type="number" class="form-control" name="miles" value="<?php echo $trip_miles; ?>" required>
</div>
</div>
</div>
<div class="form-group">
<label>Location</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-map-marker-alt"></i></span>
</div>
<input type="text" class="form-control" name="starting_location" value="<?php echo $trip_starting_location; ?>" required>
</div>
</div>
<div class="form-group">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-arrow-right"></i></span>
</div>
<input type="text" class="form-control" name="destination" value="<?php echo $trip_destination; ?>" required>
</div>
</div>
<div class="form-group">
<label>Purpose</label>
<textarea rows="4" class="form-control" name="purpose" required><?php echo $trip_purpose; ?></textarea>
</div>
</div>
<div class="tab-pane fade" id="pills-linkCopy<?php echo $trip_id; ?>" role="tabpanel" aria-labelledby="pills-link-tab">
<div class="form-group">
<label>Invoice</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
</div>
<select class="form-control selectpicker show-tick" data-live-search="true" name="invoice">
<option value="">- Invoice -</option>
<?php
$sql_invoices = mysqli_query($mysqli,"SELECT * FROM clients, invoices WHERE invoices.client_id = clients.client_id ORDER BY invoice_number DESC");
while($row = mysqli_fetch_array($sql_invoices)){
$client_id_select = $row['client_id'];
$client_name_select = $row['client_name'];
$invoice_id_select = $row['invoice_id'];
$invoice_number_select = $row['invoice_number'];
$invoice_status_select = $row['invoice_status'];
?>
<option <?php if($invoice_id == $invoice_id_select){ echo "selected"; } ?> value="<?php echo $invoice_id_select; ?>"><?php echo "$invoice_number_select - $invoice_status_select - $client_name_select"; ?></option>
<?php
}
?>
</select>
</div>
</div>
<div class="form-group">
<label>Client</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
</div>
<select class="form-control selectpicker show-tick" data-live-search="true" name="client">
<option value="">- Client -</option>
<?php
$sql_clients = mysqli_query($mysqli,"SELECT * FROM clients");
while($row = mysqli_fetch_array($sql_clients)){
$client_id_select = $row['client_id'];
$client_name_select = $row['client_name'];
?>
<option <?php if($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name_select; ?></option>
<?php
}
?>
</select>
</div>
</div>
<div class="form-group">
<label>Location</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
</div>
<select class="form-control selectpicker show-tick" data-live-search="true" name="location">
<option value="">- Location -</option>
<?php
$sql_locations = mysqli_query($mysqli,"SELECT * FROM locations, clients WHERE locations.client_id = clients.client_id ORDER BY clients.client_id DESC");
while($row = mysqli_fetch_array($sql_locations)){
$location_id_select = $row['location_id'];
$location_name_select = $row['location_name'];
$client_name_select = $row['client_name'];
?>
<option <?php if($location_id == $location_id_select){ echo "selected"; } ?> value="<?php echo $location_id_select; ?>"><?php echo "$client_name_select - $location_name_select"; ?></option>
<?php
}
?>
</select>
</div>
</div>
<div class="form-group">
<label>Vendor</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
</div>
<select class="form-control selectpicker show-tick" data-live-search="true" name="vendor">
<option value="">- Vendor -</option>
<?php
$sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE client_id = 0 ORDER BY vendor_name ASC");
while($row = mysqli_fetch_array($sql_vendors)){
$vendor_id_select = $row['vendor_id'];
$vendor_name_select = $row['vendor_name'];
?>
<option <?php if($vendor_id == $vendor_id_select){ echo "selected"; } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
<?php
}
?>
</select>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer bg-white">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
<button type="submit" name="add_trip" class="btn btn-primary">Save</button>
</div>
</form>
</div>
</div>
</div>

6
add_trip_modal.php
View File

@ -9,6 +9,7 @@
</div>
<form action="post.php" method="post" autocomplete="off">
<div class="modal-body bg-white">
<ul class="nav nav-pills nav-justified mb-3" id="pills-tab" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="pills-basic-tab" data-toggle="pill" href="#pills-basic" role="tab" aria-controls="pills-basic" aria-selected="true">Basic</a>
@ -24,9 +25,8 @@
<div class="tab-pane fade show active" id="pills-basic" role="tabpanel" aria-labelledby="pills-basic-tab">
<div class="form-row">
<div class="form-group col-7">
<div class="form-group col">
<label>Date</label>
<div class="input-group">
<div class="input-group-prepend">
@ -35,7 +35,7 @@
<input type="date" class="form-control" name="date" value="<?php echo date("Y-m-d"); ?>" required>
</div>
</div>
<div class="form-group col-5">
<div class="form-group col">
<label>Miles</label>
<div class="input-group">
<div class="input-group-prepend">

2
cron.php
View File

@ -200,7 +200,7 @@ while($row = mysqli_fetch_array($sql_recurring)){
mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Sent', history_description = 'Auto Emailed Invoice!', history_created_at = NOW(), invoice_id = $new_invoice_id");
//Update Invoice Status to Sent
mysqli_query($mysqli,"UPDATE invoices SET invoice_status = 'Sent', client_id = $client_id WHERE invoice_id = $new_invoice_id");
mysqli_query($mysqli,"UPDATE invoices SET invoice_status = 'Sent', invoice_updated_at = NOW(), client_id = $client_id WHERE invoice_id = $new_invoice_id");
}catch (Exception $e) {
echo "Message could not be sent. Mailer Error: {$mail->ErrorInfo}";

78
edit_expense_modal.php
View File

@ -2,7 +2,7 @@
<div class="modal-dialog modal-lg">
<div class="modal-content bg-dark">
<div class="modal-header">
<h5 class="modal-title text-white"><i class="fa fa-fw fa-edit"></i></h5>
<h5 class="modal-title text-white"><i class="fa fa-fw fa-edit mr-2"></i>Edit Expense</h5>
<button type="button" class="close text-white" data-dismiss="modal">
<span aria-hidden="true">&times;</span>
</button>
@ -11,7 +11,9 @@
<div class="modal-body bg-white">
<input type="hidden" name="expense_id" value="<?php echo $expense_id; ?>">
<input type="hidden" name="expense_receipt" value="<?php echo $expense_receipt; ?>">
<div class="form-row">
<div class="form-group col-md">
<label>Date</label>
<div class="input-group">
@ -21,6 +23,7 @@
<input type="date" class="form-control" name="date" value="<?php echo $expense_date; ?>" required>
</div>
</div>
<div class="form-group col-md">
<label>Amount</label>
<div class="input-group">
@ -30,6 +33,10 @@
<input type="number" class="form-control" step="0.01" name="amount" value="<?php echo $expense_amount; ?>" required>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md">
<label>Account</label>
<div class="input-group">
@ -39,23 +46,23 @@
<select class="form-control selectpicker show-tick" name="account" required>
<?php
$sql2 = mysqli_query($mysqli,"SELECT * FROM accounts");
while($row = mysqli_fetch_array($sql2)){
$account_id2 = $row['account_id'];
$account_name = $row['account_name'];
$sql_select = mysqli_query($mysqli,"SELECT * FROM accounts");
while($row = mysqli_fetch_array($sql_select)){
$account_id_select = $row['account_id'];
$account_name_select = $row['account_name'];
$opening_balance = $row['opening_balance'];
$sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE account_id = $account_id2");
$sql_payments = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS total_payments FROM payments WHERE account_id = $account_id_select");
$row = mysqli_fetch_array($sql_payments);
$total_payments = $row['total_payments'];
$sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE account_id = $account_id2");
$sql_expenses = mysqli_query($mysqli,"SELECT SUM(expense_amount) AS total_expenses FROM expenses WHERE account_id = $account_id_select");
$row = mysqli_fetch_array($sql_expenses);
$total_expenses = $row['total_expenses'];
$balance = $opening_balance + $total_payments - $total_expenses;
?>
<option <?php if($account_id == $account_id2){ ?> selected <?php } ?> value="<?php echo $account_id2; ?>"><?php echo $account_name; ?> [$<?php echo number_format($balance,2); ?>]</option>
<option <?php if($account_id == $account_id_select){ ?> selected <?php } ?> value="<?php echo $account_id_select; ?>"><?php echo $account_name_select; ?> [$<?php echo number_format($balance,2); ?>]</option>
<?php
}
@ -63,8 +70,7 @@
</select>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md">
<label>Vendor</label>
<div class="input-group">
@ -74,12 +80,12 @@
<select class="form-control selectpicker show-tick" data-live-search="true" name="vendor" required>
<?php
$sql2 = mysqli_query($mysqli,"SELECT * FROM vendors WHERE client_id = 0 ORDER BY vendor_name ASC");
while($row = mysqli_fetch_array($sql2)){
$vendor_id2 = $row['vendor_id'];
$vendor_name = $row['vendor_name'];
$sql_select = mysqli_query($mysqli,"SELECT * FROM vendors WHERE client_id = 0 ORDER BY vendor_name ASC");
while($row = mysqli_fetch_array($sql_select)){
$vendor_id_select = $row['vendor_id'];
$vendor_name_select = $row['vendor_name'];
?>
<option <?php if($vendor_id == $vendor_id2){ ?> selected <?php } ?> value="<?php echo $vendor_id2; ?>"><?php echo $vendor_name; ?></option>
<option <?php if($vendor_id == $vendor_id_select){ ?> selected <?php } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
<?php
}
@ -87,6 +93,16 @@
</select>
</div>
</div>
</div>
<div class="form-group">
<label>Description</label>
<textarea class="form-control" rows="4" name="description" required><?php echo $expense_description; ?></textarea>
</div>
<div class="form-row">
<div class="form-group col-md">
<label>Category</label>
<div class="input-group">
@ -96,12 +112,12 @@
<select class="form-control selectpicker show-tick" name="category" required>
<?php
$sql2 = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense'");
while($row = mysqli_fetch_array($sql2)){
$category_id2 = $row['category_id'];
$category_name = $row['category_name'];
$sql_select = mysqli_query($mysqli,"SELECT * FROM categories WHERE category_type = 'Expense'");
while($row = mysqli_fetch_array($sql_select)){
$category_id_select = $row['category_id'];
$category_name_select = $row['category_name'];
?>
<option <?php if($category_id == $category_id2){ ?> selected <?php } ?> value="<?php echo $category_id2; ?>"><?php echo $category_name; ?></option>
<option <?php if($category_id == $category_id_select){ ?> selected <?php } ?> value="<?php echo $category_id_select; ?>"><?php echo $category_name_select; ?></option>
<?php
}
@ -109,24 +125,24 @@
</select>
</div>
</div>
</div>
<div class="form-group">
<label>Description</label>
<textarea class="form-control" rows="4" name="description" required><?php echo $expense_description; ?></textarea>
</div>
<div class="form-group">
<label>Reference</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
<div class="form-group col-md">
<label>Reference</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-file-alt"></i></span>
</div>
<input type="text" class="form-control" name="reference" placeholder="Enter a reference" value="<?php echo $expense_reference; ?>">
</div>
<input type="text" class="form-control" name="reference" placeholder="Enter a reference" value="<?php echo $expense_reference; ?>">
</div>
</div>
<div class="form-group">
<label>Receipt</label>
<input type="file" class="form-control-file" name="file">
</div>
</div>
<div class="modal-footer bg-white">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>

201
edit_trip_modal.php
View File

@ -1,4 +1,4 @@
<div class="modal" id="editTripModal<?php echo $mileage_id; ?>" tabindex="-1">
<div class="modal" id="editTripModal<?php echo $trip_id; ?>" tabindex="-1">
<div class="modal-dialog">
<div class="modal-content bg-dark">
<div class="modal-header">
@ -10,48 +10,179 @@
<form action="post.php" method="post" autocomplete="off">
<div class="modal-body bg-white">
<input type="hidden" name="trip_id" value="<?php echo $trip_id; ?>">
<div class="form-row">
<div class="form-group col-7">
<label>Date</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
<ul class="nav nav-pills nav-justified mb-3" id="pills-tab<?php echo $trip_id; ?>" role="tablist">
<li class="nav-item">
<a class="nav-link active" id="pills-basic-tab<?php echo $trip_id; ?>" data-toggle="pill" href="#pills-basic<?php echo $trip_id; ?>" role="tab" aria-controls="pills-basic" aria-selected="true">Basic</a>
</li>
<li class="nav-item">
<a class="nav-link" id="pills-link-tab<?php echo $trip_id; ?>" data-toggle="pill" href="#pills-link<?php echo $trip_id; ?>" role="tab" aria-controls="pills-link" aria-selected="false">Link</a>
</li>
</ul>
<hr>
<div class="tab-content" id="pills-tabContent<?php echo $trip_id; ?>">
<div class="tab-pane fade show active" id="pills-basic<?php echo $trip_id; ?>" role="tabpanel" aria-labelledby="pills-basic-tab">
<div class="form-row">
<div class="form-group col">
<label>Date</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-calendar"></i></span>
</div>
<input type="date" class="form-control" name="date" value="<?php echo $trip_date; ?>" required>
</div>
</div>
<input type="date" class="form-control" name="date" value="<?php echo $trip_date; ?>" required>
</div>
</div>
<div class="form-group col-5">
<label>Miles</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
<div class="form-group col">
<label>Miles</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-bicycle"></i></span>
</div>
<input type="number" class="form-control" name="miles" value="<?php echo $trip_miles; ?>" required>
</div>
</div>
<input type="number" class="form-control" name="miles" value="<?php echo $trip_miles; ?>" required>
</div>
</div>
</div>
<div class="form-group">
<label>Location</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-map-marker-alt"></i></span>
<div class="form-group">
<label>Location</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-map-marker-alt"></i></span>
</div>
<input type="text" class="form-control" name="starting_location" value="<?php echo $trip_starting_location; ?>" required>
</div>
</div>
<input type="text" class="form-control" name="starting_location" value="<?php echo $trip_starting_location; ?>" required>
</div>
</div>
<div class="form-group">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-arrow-right"></i></span>
<div class="form-group">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-arrow-right"></i></span>
</div>
<input type="text" class="form-control" name="destination" value="<?php echo $trip_destination; ?>" required>
</div>
</div>
<input type="text" class="form-control" name="destination" value="<?php echo $trip_destination; ?>" required>
<div class="form-group">
<label>Purpose</label>
<textarea rows="4" class="form-control" name="purpose" required><?php echo $trip_purpose; ?></textarea>
</div>
</div>
<div class="tab-pane fade" id="pills-link<?php echo $trip_id; ?>" role="tabpanel" aria-labelledby="pills-link-tab">
<div class="form-group">
<label>Invoice</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-file"></i></span>
</div>
<select class="form-control selectpicker show-tick" data-live-search="true" name="invoice">
<option value="">- Invoice -</option>
<?php
$sql_invoices = mysqli_query($mysqli,"SELECT * FROM clients, invoices WHERE invoices.client_id = clients.client_id ORDER BY invoice_number DESC");
while($row = mysqli_fetch_array($sql_invoices)){
$client_id_select = $row['client_id'];
$client_name_select = $row['client_name'];
$invoice_id_select = $row['invoice_id'];
$invoice_number_select = $row['invoice_number'];
$invoice_status_select = $row['invoice_status'];
?>
<option <?php if($invoice_id == $invoice_id_select){ echo "selected"; } ?> value="<?php echo $invoice_id_select; ?>"><?php echo "$invoice_number_select - $invoice_status_select - $client_name_select"; ?></option>
<?php
}
?>
</select>
</div>
</div>
<div class="form-group">
<label>Client</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-user"></i></span>
</div>
<select class="form-control selectpicker show-tick" data-live-search="true" name="client">
<option value="">- Client -</option>
<?php
$sql_clients = mysqli_query($mysqli,"SELECT * FROM clients");
while($row = mysqli_fetch_array($sql_clients)){
$client_id_select = $row['client_id'];
$client_name_select = $row['client_name'];
?>
<option <?php if($client_id == $client_id_select) { echo "selected"; } ?> value="<?php echo $client_id_select; ?>"><?php echo $client_name_select; ?></option>
<?php
}
?>
</select>
</div>
</div>
<div class="form-group">
<label>Location</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-map-marker-alt"></i></span>
</div>
<select class="form-control selectpicker show-tick" data-live-search="true" name="location">
<option value="">- Location -</option>
<?php
$sql_locations = mysqli_query($mysqli,"SELECT * FROM locations, clients WHERE locations.client_id = clients.client_id ORDER BY clients.client_id DESC");
while($row = mysqli_fetch_array($sql_locations)){
$location_id_select = $row['location_id'];
$location_name_select = $row['location_name'];
$client_name_select = $row['client_name'];
?>
<option <?php if($location_id == $location_id_select){ echo "selected"; } ?> value="<?php echo $location_id_select; ?>"><?php echo "$client_name_select - $location_name_select"; ?></option>
<?php
}
?>
</select>
</div>
</div>
<div class="form-group">
<label>Vendor</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-building"></i></span>
</div>
<select class="form-control selectpicker show-tick" data-live-search="true" name="vendor">
<option value="">- Vendor -</option>
<?php
$sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE client_id = 0 ORDER BY vendor_name ASC");
while($row = mysqli_fetch_array($sql_vendors)){
$vendor_id_select = $row['vendor_id'];
$vendor_name_select = $row['vendor_name'];
?>
<option <?php if($vendor_id == $vendor_id_select){ echo "selected"; } ?> value="<?php echo $vendor_id_select; ?>"><?php echo $vendor_name_select; ?></option>
<?php
}
?>
</select>
</div>
</div>
</div>
<div class="form-group">
<label>Purpose</label>
<textarea rows="4" class="form-control" name="purpose" required><?php echo $trip_purpose; ?></textarea>
</div>
</div>
<div class="modal-footer bg-white">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
<button type="submit" name="edit_trip" class="btn btn-primary">Save</button>

24
post.php
View File

@ -509,8 +509,12 @@ if(isset($_POST['edit_trip'])){
$destination = strip_tags(mysqli_real_escape_string($mysqli,$_POST['destination']));
$miles = intval($_POST['miles']);
$purpose = strip_tags(mysqli_real_escape_string($mysqli,$_POST['purpose']));
$client_id = intval($_POST['client']);
$invoice_id = intval($_POST['invoice']);
$location_id = intval($_POST['location']);
$vendor_id = intval($_POST['vendor']);
mysqli_query($mysqli,"UPDATE trips SET trip_date = '$date', trip_starting_location = '$starting_location', trip_destination = '$destination', trip_miles = $miles, trip_purpose = '$purpose' trip_updated_at = NOW() WHERE trip_id = $trip_id");
mysqli_query($mysqli,"UPDATE trips SET trip_date = '$date', trip_starting_location = '$starting_location', trip_destination = '$destination', trip_miles = $miles, trip_purpose = '$purpose', trip_updated_at = NOW(), client_id = $client_id, invoice_id = $invoice_id, location_id = $location_id, vendor_id = $vendor_id WHERE trip_id = $trip_id");
$_SESSION['alert_message'] = "Trip modified";
@ -775,9 +779,13 @@ if(isset($_GET['delete_transfer'])){
if(isset($_POST['add_invoice'])){
$client = intval($_POST['client']);
$date = strip_tags(mysqli_real_escape_string($mysqli,$_POST['date']));
$client_net_terms = intval($_POST['client_net_terms']);
$category = intval($_POST['category']);
//Get Net Terms
$sql = mysqli_query($mysqli,"SELECT client_net_terms FROM clients WHERE client_id = $client");
$row = mysqli_fetch_array($sql);
$client_net_terms = $row['client_net_terms'];
//Get the last Invoice Number and add 1 for the new invoice number
$sql = mysqli_query($mysqli,"SELECT invoice_number FROM invoices ORDER BY invoice_number DESC LIMIT 1");
$row = mysqli_fetch_array($sql);
@ -786,7 +794,7 @@ if(isset($_POST['add_invoice'])){
//Generate a unique URL key for clients to access
$url_key = keygen();
mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = $invoice_number, invoice_date = '$date', invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), category_id = $category, invoice_status = 'Draft', invoice_url_key = '$url_key', invoice_created_at = NOW(), client_id = $client");
mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = $invoice_number, invoice_date = '$date', invoice_due = DATE_ADD('$date', INTERVAL $client_net_terms day), category_id = $category, invoice_status = 'Draft', invoice_url_key = '$url_key', invoice_created_at = NOW(), client_id = $client");
$invoice_id = mysqli_insert_id($mysqli);
mysqli_query($mysqli,"INSERT INTO history SET history_date = CURDATE(), history_status = 'Draft', history_description = 'INVOICE added!', history_created_at = NOW(), invoice_id = $invoice_id");
@ -814,8 +822,12 @@ if(isset($_POST['add_invoice_copy'])){
$invoice_id = intval($_POST['invoice_id']);
$date = strip_tags(mysqli_real_escape_string($mysqli,$_POST['date']));
$client_net_terms = intval($_POST['client_net_terms']);
//Get Net Terms
$sql = mysqli_query($mysqli,"SELECT client_net_terms FROM clients, invoices WHERE clients.client_id = invoices.client_id AND invoices.invoice_id = $invoice_id");
$row = mysqli_fetch_array($sql);
$client_net_terms = $row['client_net_terms'];
//Get the last Invoice Number and add 1 for the new invoice number
$sql = mysqli_query($mysqli,"SELECT invoice_number FROM invoices ORDER BY invoice_number DESC LIMIT 1");
$row = mysqli_fetch_array($sql);
@ -828,7 +840,7 @@ if(isset($_POST['add_invoice_copy'])){
$client_id = $row['client_id'];
$category_id = $row['category_id'];
mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = $invoice_number, invoice_date = '$date', invoice_due = DATE_ADD(CURDATE(), INTERVAL $client_net_terms day), category_id = $category_id, invoice_status = 'Draft', invoice_amount = '$invoice_amount', invoice_note = '$invoice_note', invoice_created_at = NOW(), client_id = $client_id");
mysqli_query($mysqli,"INSERT INTO invoices SET invoice_number = $invoice_number, invoice_date = '$date', invoice_due = DATE_ADD('$date', INTERVAL $client_net_terms day), category_id = $category_id, invoice_status = 'Draft', invoice_amount = '$invoice_amount', invoice_note = '$invoice_note', invoice_created_at = NOW(), client_id = $client_id");
$new_invoice_id = mysqli_insert_id($mysqli);

12
trips.php
View File

@ -2,7 +2,6 @@
<?php $sql = mysqli_query($mysqli,"SELECT * FROM trips ORDER BY trip_id DESC"); ?>
<div class="card mb-3">
<div class="card-header">
<h6 class="float-left mt-1"><i class="fa fa-fw fa-bicycle mr-2"></i>Trips</h6>
@ -31,6 +30,10 @@
$trip_starting_location = $row['trip_starting_location'];
$trip_destination = $row['trip_destination'];
$trip_miles = $row['trip_miles'];
$client_id = $row['client_id'];
$invoice_id = $row['invoice_id'];
$location_id = $row['location_id'];
$vendor_id = $row['vendor_id'];
?>
<tr>
@ -45,11 +48,14 @@
<i class="fas fa-ellipsis-h"></i>
</button>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTripModal<?php echo $mileage_id; ?>">Edit</a>
<a class="dropdown-item" href="//maps.google.com?q=<?php echo $trip_starting_location; ?> to <?php echo $trip_destination; ?>" target="_blank">Map it</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#editTripModal<?php echo $trip_id; ?>">Edit</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addTripCopyModal<?php echo $trip_id; ?>">Copy</a>
<a class="dropdown-item" href="post.php?delete_trip=<?php echo $trip_id; ?>">Delete</a>
</div>
</div>
<?php include("edit_trip_modal.php"); ?>
<?php include("edit_trip_modal.php"); ?>
<?php include("add_trip_copy_modal.php"); ?>
</td>
</tr>