Officially moved client nav to the side, moved add new client items to each tavb instead bolded client balance if negative

This commit is contained in:
root
2019-05-04 15:35:24 -04:00
parent bdbbecfc7b
commit b24fa9f3de
19 changed files with 945 additions and 851 deletions
+6 -42
View File
@@ -109,21 +109,8 @@ if(isset($_GET['client_id'])){
<i class="fas fa-ellipsis-h"></i> <i class="fas fa-ellipsis-h"></i>
</button> </button>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton"> <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addClientContactModal">New Contact</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addClientLocationModal">New Location</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addClientAssetModal">New Asset</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addClientVendorModal">New Vendor</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addClientLoginModal">New Login</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addClientNetworkModal">New Network</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addClientDomainModal">New Domain</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addClientApplicationModal">New Application</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addClientInvoiceModal">New Invoice</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addRecurringInvoiceModal">New Recurring</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addQuoteModal">New Quote</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addClientFileModal">Upload File</a>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#addClientNoteModal">New Note</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="client_print.php?client_id=<?php echo $client_id; ?>">Print</a> <a class="dropdown-item" href="client_print.php?client_id=<?php echo $client_id; ?>">Print</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#" data-toggle="modal" data-target="#editClientModal<?php echo $client_id; ?>">Edit</a> <a class="dropdown-item" href="#" data-toggle="modal" data-target="#editClientModal<?php echo $client_id; ?>">Edit</a>
<a class="dropdown-item" href="post.php?delete_client=<?php echo $client_id; ?>">Delete</a> <a class="dropdown-item" href="post.php?delete_client=<?php echo $client_id; ?>">Delete</a>
</div> </div>
@@ -133,37 +120,14 @@ if(isset($_GET['client_id'])){
</div> </div>
</div> </div>
<div class="row"> <?php include("client_routes.php"); ?>
<div class="col-sm-12">
<div class="card">
<div class="card-header">
<?php include("client_nav.php"); ?>
</div>
<div class="card-body">
<?php include("client_routes.php"); ?>
</div>
</div>
</div>
</div>
<?php include("edit_client_modal.php"); ?> <?php include("edit_client_modal.php"); ?>
<?php include("add_client_contact_modal.php"); ?>
<?php include("add_client_location_modal.php"); ?>
<?php include("add_client_asset_modal.php"); ?>
<?php include("add_client_vendor_modal.php"); ?>
<?php include("add_client_login_modal.php"); ?>
<?php include("add_client_network_modal.php"); ?>
<?php include("add_client_domain_modal.php"); ?>
<?php include("add_client_application_modal.php"); ?>
<?php include("add_client_note_modal.php"); ?>
<?php include("add_client_invoice_modal.php"); ?>
<?php include("add_recurring_invoice_modal.php"); ?>
<?php include("add_invoice_payment_modal.php"); ?>
<?php include("add_quote_modal.php"); ?>
<?php include("add_client_file_modal.php"); ?>
<?php
<?php } ?> }
?>
<?php include("footer.php"); <?php include("footer.php");
+11 -1
View File
@@ -1,6 +1,12 @@
<?php $sql = mysqli_query($mysqli,"SELECT * FROM client_applications WHERE client_id = $client_id ORDER BY client_application_id DESC"); ?> <?php $sql = mysqli_query($mysqli,"SELECT * FROM client_applications WHERE client_id = $client_id ORDER BY client_application_id DESC"); ?>
<div class="table-responsive"> <div class="card">
<div class="card-header">
<h6 class="float-left mt-1"><i class="fa fa-box"></i> Applications</h6>
<button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addClientApplicationModal"><i class="fa fa-plus"></i></button>
</div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0"> <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
<thead> <thead>
<tr> <tr>
@@ -78,4 +84,8 @@
</tbody> </tbody>
</table> </table>
</div>
</div>
</div> </div>
<?php include("add_client_application_modal.php"); ?>
+12 -1
View File
@@ -1,6 +1,13 @@
<?php $sql = mysqli_query($mysqli,"SELECT * FROM client_assets WHERE client_id = $client_id ORDER BY client_asset_id DESC"); ?> <?php $sql = mysqli_query($mysqli,"SELECT * FROM client_assets WHERE client_id = $client_id ORDER BY client_asset_id DESC"); ?>
<div class="table-responsive"> <div class="card">
<div class="card-header">
<h6 class="float-left mt-1"><i class="fa fa-tag"></i> Assets</h6>
<button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addClientAssetModal"><i class="fa fa-plus"></i></button>
</div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0"> <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
<thead> <thead>
<tr> <tr>
@@ -96,4 +103,8 @@
</tbody> </tbody>
</table> </table>
</div>
</div>
</div> </div>
<?php include("add_client_asset_modal.php"); ?>
+11 -2
View File
@@ -1,6 +1,11 @@
<?php $sql = mysqli_query($mysqli,"SELECT * FROM client_contacts WHERE client_id = $client_id ORDER BY client_contact_id DESC"); ?> <?php $sql = mysqli_query($mysqli,"SELECT * FROM client_contacts WHERE client_id = $client_id ORDER BY client_contact_id DESC"); ?>
<div class="card">
<div class="table-responsive"> <div class="card-header">
<h6 class="float-left mt-1"><i class="fa fa-users"></i> Contacts</h6>
<button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addClientContactModal"><i class="fa fa-plus"></i></button>
</div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0"> <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
<thead> <thead>
<tr> <tr>
@@ -51,4 +56,8 @@
</tbody> </tbody>
</table> </table>
</div>
</div>
</div> </div>
<?php include("add_client_contact_modal.php"); ?>
+12 -1
View File
@@ -1,6 +1,13 @@
<?php $sql = mysqli_query($mysqli,"SELECT * FROM client_domains WHERE client_id = $client_id ORDER BY client_domain_id DESC"); ?> <?php $sql = mysqli_query($mysqli,"SELECT * FROM client_domains WHERE client_id = $client_id ORDER BY client_domain_id DESC"); ?>
<div class="table-responsive"> <div class="card">
<div class="card-header">
<h6 class="float-left mt-1"><i class="fa fa-globe"></i> Domains</h6>
<button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addClientDomainModal"><i class="fa fa-plus"></i></button>
</div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0"> <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
<thead> <thead>
<tr> <tr>
@@ -48,4 +55,8 @@
</tbody> </tbody>
</table> </table>
</div>
</div>
</div> </div>
<?php include("add_client_domain_modal.php"); ?>
+15 -3
View File
@@ -1,7 +1,15 @@
<?php $sql = mysqli_query($mysqli,"SELECT * FROM files WHERE client_id = $client_id ORDER BY file_id DESC"); ?> <?php $sql = mysqli_query($mysqli,"SELECT * FROM files WHERE client_id = $client_id ORDER BY file_id DESC"); ?>
<h3>Pictures</h3>
<hr> <div class="card">
<div class="row"> <div class="card-header">
<h6 class="float-left mt-1"><i class="fa fa-paperclip"></i> Files</h6>
<button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addClientFileModal"><i class="fa fa-plus"></i></button>
</div>
<div class="card-body">
<h3>Pictures</h3>
<hr>
<div class="row">
<?php <?php
@@ -22,4 +30,8 @@
} }
?> ?>
</div>
</div>
</div> </div>
<?php include("add_client_file_modal.php"); ?>
+12 -1
View File
@@ -4,7 +4,14 @@
?> ?>
<div class="table-responsive"> <div class="card">
<div class="card-header">
<h6 class="float-left mt-1"><i class="fa fa-file"></i> Invoices</h6>
<button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addClientInvoiceModal"><i class="fa fa-plus"></i></button>
</div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="dT" width="100%" cellspacing="0"> <table class="table table-striped table-borderless table-hover" id="dT" width="100%" cellspacing="0">
<thead> <thead>
<tr> <tr>
@@ -89,4 +96,8 @@
</tbody> </tbody>
</table> </table>
</div>
</div>
</div> </div>
<?php include("add_client_invoice_modal.php"); ?>
+13 -2
View File
@@ -1,6 +1,13 @@
<?php $sql = mysqli_query($mysqli,"SELECT * FROM client_locations WHERE client_id = $client_id ORDER BY client_location_id DESC"); ?> <?php $sql = mysqli_query($mysqli,"SELECT * FROM client_locations WHERE client_id = $client_id ORDER BY client_location_id DESC"); ?>
<div class="table-responsive"> <div class="card">
<div class="card-header">
<h6 class="float-left mt-1"><i class="fa fa-map-marker"></i> Locations</h6>
<button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addClientLocationModal"><i class="fa fa-plus"></i></button>
</div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0"> <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
<thead> <thead>
<tr> <tr>
@@ -28,7 +35,7 @@
?> ?>
<tr> <tr>
<td><?php echo "$client_location_name"; ?></td> <td><?php echo "$client_location_name"; ?></td>
<td><a href="//maps.<?php echo $session_map_source; ?>.com?q=<?php echo "$client_location_address $client_location_zip"; ?>" target="_blank"><?php echo "$client_location_address"; ?></td> <td><a href="//maps.<?php echo $session_map_source; ?>.com?q=<?php echo "$client_location_address $client_location_zip"; ?>" target="_blank"><?php echo "$client_location_address"; ?></a></td>
<td><?php echo "$client_location_phone"; ?></td> <td><?php echo "$client_location_phone"; ?></td>
<td> <td>
<div class="dropdown dropleft text-center"> <div class="dropdown dropleft text-center">
@@ -50,4 +57,8 @@
</tbody> </tbody>
</table> </table>
</div>
</div>
</div> </div>
<?php include("add_client_location_modal.php"); ?>
+11 -1
View File
@@ -1,6 +1,12 @@
<?php $sql = mysqli_query($mysqli,"SELECT * FROM client_logins WHERE client_id = $client_id ORDER BY client_login_id DESC"); ?> <?php $sql = mysqli_query($mysqli,"SELECT * FROM client_logins WHERE client_id = $client_id ORDER BY client_login_id DESC"); ?>
<div class="table-responsive"> <div class="card">
<div class="card-header">
<h6 class="float-left mt-1"><i class="fa fa-key"></i> Logins</h6>
<button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addClientLoginModal"><i class="fa fa-plus"></i></button>
</div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0"> <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
<thead> <thead>
<tr> <tr>
@@ -44,4 +50,8 @@
</tbody> </tbody>
</table> </table>
</div>
</div>
</div> </div>
<?php include("add_client_login_modal.php"); ?>
+11 -1
View File
@@ -1,6 +1,12 @@
<?php $sql = mysqli_query($mysqli,"SELECT * FROM client_networks WHERE client_id = $client_id ORDER BY client_network_id DESC"); ?> <?php $sql = mysqli_query($mysqli,"SELECT * FROM client_networks WHERE client_id = $client_id ORDER BY client_network_id DESC"); ?>
<div class="table-responsive"> <div class="card">
<div class="card-header">
<h6 class="float-left mt-1"><i class="fa fa-network-wired"></i> Networks</h6>
<button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addClientNetworkModal"><i class="fa fa-plus"></i></button>
</div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0"> <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
<thead> <thead>
<tr> <tr>
@@ -48,4 +54,8 @@
</tbody> </tbody>
</table> </table>
</div>
</div>
</div> </div>
<?php include("add_client_network_modal.php"); ?>
+13 -1
View File
@@ -1,5 +1,11 @@
<?php $sql = mysqli_query($mysqli,"SELECT * FROM client_notes WHERE client_id = $client_id ORDER BY client_note_id DESC"); ?> <?php $sql = mysqli_query($mysqli,"SELECT * FROM client_notes WHERE client_id = $client_id ORDER BY client_note_id DESC"); ?>
<div class="card">
<div class="card-header">
<h6 class="float-left mt-1"><i class="fa fa-edit"></i> Notes</h6>
<button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addClientNoteModal"><i class="fa fa-plus"></i></button>
</div>
<div class="card-body">
<?php <?php
@@ -39,5 +45,11 @@
<?php <?php
include("view_client_note_modal.php"); include("view_client_note_modal.php");
include("edit_client_note_modal.php"); include("edit_client_note_modal.php");
} ?>
}
?>
</div>
</div>
<?php include("add_client_note_modal.php"); ?>
+11 -1
View File
@@ -4,7 +4,13 @@
?> ?>
<div class="table-responsive"> <div class="card">
<div class="card-header">
<h6 class="float-left mt-1"><i class="fa fa-file"></i> Quotes</h6>
<button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addClientQuoteModal"><i class="fa fa-plus"></i></button>
</div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="dT" width="100%" cellspacing="0"> <table class="table table-striped table-borderless table-hover" id="dT" width="100%" cellspacing="0">
<thead> <thead>
<tr> <tr>
@@ -75,4 +81,8 @@
</tbody> </tbody>
</table> </table>
</div>
</div>
</div> </div>
<?php include("add_client_quote_modal.php"); ?>
+12 -1
View File
@@ -6,7 +6,14 @@
ORDER BY recurring_invoices.recurring_invoice_id DESC"); ORDER BY recurring_invoices.recurring_invoice_id DESC");
?> ?>
<div class="table-responsive"> <div class="card">
<div class="card-header">
<h6 class="float-left mt-1"><i class="fa fa-copy"></i> Recurring Invoices</h6>
<button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addRecurringInvoiceModal"><i class="fa fa-plus"></i></button>
</div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="dT" width="100%" cellspacing="0"> <table class="table table-striped table-borderless table-hover" id="dT" width="100%" cellspacing="0">
<thead> <thead>
<tr> <tr>
@@ -77,4 +84,8 @@
</tbody> </tbody>
</table> </table>
</div>
</div>
</div> </div>
<?php include("add_recurring_invoice_modal.php"); ?>
+11 -1
View File
@@ -1,6 +1,12 @@
<?php $sql = mysqli_query($mysqli,"SELECT * FROM client_vendors WHERE client_id = $client_id ORDER BY client_vendor_id DESC"); ?> <?php $sql = mysqli_query($mysqli,"SELECT * FROM client_vendors WHERE client_id = $client_id ORDER BY client_vendor_id DESC"); ?>
<div class="table-responsive"> <div class="card">
<div class="card-header">
<h6 class="float-left mt-1"><i class="fa fa-building"></i> Vendors</h6>
<button class="btn btn-primary btn-sm float-right" data-toggle="modal" data-target="#addClientVendorModal"><i class="fa fa-plus"></i></button>
</div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0"> <table class="table table-striped table-borderless table-hover" id="dataTable" width="100%" cellspacing="0">
<thead> <thead>
<tr> <tr>
@@ -94,4 +100,8 @@
</tbody> </tbody>
</table> </table>
</div>
</div>
</div> </div>
<?php include("add_client_vendor_modal.php"); ?>
+1 -1
View File
@@ -52,7 +52,7 @@
$balance = $invoice_amounts - $amount_paid; $balance = $invoice_amounts - $amount_paid;
//set Text color on balance //set Text color on balance
if($balance > 0){ if($balance > 0){
$balance_text_color = "text-danger"; $balance_text_color = "text-danger font-weight-bold";
}else{ }else{
$balance_text_color = ""; $balance_text_color = "";
} }
+58
View File
@@ -204,3 +204,61 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, ca
<?php include("footer.php"); ?> <?php include("footer.php"); ?>
<script>
// Set new default font family and font color to mimic Bootstrap's default styling
Chart.defaults.global.defaultFontFamily = '-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif';
Chart.defaults.global.defaultFontColor = '#292b2c';
// Area Chart Example
var ctx = document.getElementById("myAreaChart");
var myLineChart = new Chart(ctx, {
type: 'line',
data: {
labels: ["Mar 1", "Mar 2", "Mar 3", "Mar 4", "Mar 5", "Mar 6", "Mar 7", "Mar 8", "Mar 9", "Mar 10", "Mar 11", "Mar 12", "Mar 13"],
datasets: [{
label: "Sessions",
lineTension: 0.3,
backgroundColor: "rgba(2,117,216,0.2)",
borderColor: "rgba(2,117,216,1)",
pointRadius: 5,
pointBackgroundColor: "rgba(2,117,216,1)",
pointBorderColor: "rgba(255,255,255,0.8)",
pointHoverRadius: 5,
pointHoverBackgroundColor: "rgba(2,117,216,1)",
pointHitRadius: 50,
pointBorderWidth: 2,
data: [10000, 30162, 26263, 18394, 18287, 28682, 31274, 33259, 25849, 24159, 32651, 31984, 38451],
}],
},
options: {
scales: {
xAxes: [{
time: {
unit: 'date'
},
gridLines: {
display: false
},
ticks: {
maxTicksLimit: 7
}
}],
yAxes: [{
ticks: {
min: 0,
max: 40000,
maxTicksLimit: 5
},
gridLines: {
color: "rgba(0, 0, 0, .125)",
}
}],
},
legend: {
display: false
}
}
});
</script>
-2
View File
@@ -25,8 +25,6 @@
<script src="vendor/easy-markdown-editor-2.5.1/dist/easymde.min.js"></script> <script src="vendor/easy-markdown-editor-2.5.1/dist/easymde.min.js"></script>
<script src="vendor/select2/dist/js/select2.min.js"></script>
<script src="vendor/chart.js/Chart.min.js"></script> <script src="vendor/chart.js/Chart.min.js"></script>
<!-- Custom scripts for all pages--> <!-- Custom scripts for all pages-->
-6
View File
@@ -25,12 +25,6 @@
<!-- Page level plugin CSS--> <!-- Page level plugin CSS-->
<link href="vendor/datatables/dataTables.bootstrap4.css" rel="stylesheet" type="text/css"> <link href="vendor/datatables/dataTables.bootstrap4.css" rel="stylesheet" type="text/css">
<!-- Page level plugin CSS-->
<link href="vendor/select2/dist/css/select2.min.css" rel="stylesheet" type="text/css">
<!-- Page level plugin CSS-->
<link href="vendor/select2/dist/css/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
<!-- Custom fonts for this template--> <!-- Custom fonts for this template-->
<link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet" type="text/css"> <link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet" type="text/css">
-58
View File
@@ -1,61 +1,3 @@
// Set new default font family and font color to mimic Bootstrap's default styling
Chart.defaults.global.defaultFontFamily = '-apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif';
Chart.defaults.global.defaultFontColor = '#292b2c';
// Area Chart Example
var ctx = document.getElementById("myAreaChart");
var myLineChart = new Chart(ctx, {
type: 'line',
data: {
labels: ["Mar 1", "Mar 2", "Mar 3", "Mar 4", "Mar 5", "Mar 6", "Mar 7", "Mar 8", "Mar 9", "Mar 10", "Mar 11", "Mar 12", "Mar 13"],
datasets: [{
label: "Sessions",
lineTension: 0.3,
backgroundColor: "rgba(2,117,216,0.2)",
borderColor: "rgba(2,117,216,1)",
pointRadius: 5,
pointBackgroundColor: "rgba(2,117,216,1)",
pointBorderColor: "rgba(255,255,255,0.8)",
pointHoverRadius: 5,
pointHoverBackgroundColor: "rgba(2,117,216,1)",
pointHitRadius: 50,
pointBorderWidth: 2,
data: [10000, 30162, 26263, 18394, 18287, 28682, 31274, 33259, 25849, 24159, 32651, 31984, 38451],
}],
},
options: {
scales: {
xAxes: [{
time: {
unit: 'date'
},
gridLines: {
display: false
},
ticks: {
maxTicksLimit: 7
}
}],
yAxes: [{
ticks: {
min: 0,
max: 40000,
maxTicksLimit: 5
},
gridLines: {
color: "rgba(0, 0, 0, .125)",
}
}],
},
legend: {
display: false
}
}
});
//Prevents resubmit on refresh or back //Prevents resubmit on refresh or back
if ( window.history.replaceState ) { if ( window.history.replaceState ) {
window.history.replaceState( null, null, window.location.href ); window.history.replaceState( null, null, window.location.href );