diff --git a/client.php b/client.php
index 020af70b..60ee3ed2 100644
--- a/client.php
+++ b/client.php
@@ -76,13 +76,6 @@ if(isset($_GET['client_id'])){
-
diff --git a/client_invoices.php b/client_invoices.php
index e1e6f280..8a37b95f 100644
--- a/client_invoices.php
+++ b/client_invoices.php
@@ -71,6 +71,7 @@
diff --git a/dashboard.php b/dashboard.php
index ac6e7cf3..f221c3c1 100644
--- a/dashboard.php
+++ b/dashboard.php
@@ -202,4 +202,5 @@ $sql_latest_expenses = mysqli_query($mysqli,"SELECT * FROM expenses, vendors, ca
+
\ No newline at end of file
diff --git a/footer.php b/footer.php
index 13ee07b6..4d3d82d0 100644
--- a/footer.php
+++ b/footer.php
@@ -27,6 +27,8 @@
+
+
diff --git a/invoices.php b/invoices.php
index 3e02411e..4c8bfcdb 100644
--- a/invoices.php
+++ b/invoices.php
@@ -165,8 +165,9 @@
diff --git a/js/app.js b/js/app.js
index 7a6e40cd..561eb5e7 100644
--- a/js/app.js
+++ b/js/app.js
@@ -1,3 +1,61 @@
+
+ // 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
if ( window.history.replaceState ) {
window.history.replaceState( null, null, window.location.href );
@@ -57,10 +115,4 @@ new EasyMDE({
new EasyMDE({
autoDownloadFontAwesome: false,
element: document.getElementById('editClientNote')
-});
-
-
-$('#selectIt').select2({
- theme: 'bootstrap4',
- dropdownParent: $('#addInvoiceModal')
});
\ No newline at end of file
diff --git a/post.php b/post.php
index 767e8c64..dc3604e4 100644
--- a/post.php
+++ b/post.php
@@ -1328,7 +1328,7 @@ if(isset($_GET['email_invoice'])){
$_SESSION['alert_message'] = "Invoice has been sent";
- header("Location: invoice.php?invoice_id=$invoice_id");
+ header("Location: " . $_SERVER["HTTP_REFERER"]);
} catch (Exception $e) {
diff --git a/top_nav.php b/top_nav.php
index 58f47260..dbbea4e1 100644
--- a/top_nav.php
+++ b/top_nav.php
@@ -22,7 +22,7 @@
diff --git a/uploads/2019-04-30-PittPC-Invoice123.pdf b/uploads/2019-04-30-PittPC-Invoice123.pdf
deleted file mode 100644
index 56ba9aa7..00000000
Binary files a/uploads/2019-04-30-PittPC-Invoice123.pdf and /dev/null differ