From 62b088e79dba0276e049f4115f0a7d9ef318354c Mon Sep 17 00:00:00 2001 From: "johnny@pittpc.com" Date: Sat, 14 Sep 2019 20:40:22 -0400 Subject: [PATCH] GUI Touchups in Invoice, Quote, clients, vendors, client. Added 2 new fields to client mobile and contact_name, added more pictyure extension in file jpeg anb JPEG and other fixesincluding a new DB dump --- add_client_modal.php | 42 ++-- client.php | 21 ++ client_files.php | 2 +- client_vendors.php | 14 +- clients.php | 53 ++++- db.sql | 28 +-- edit_client_modal.php | 30 ++- guest_view_invoice.php | 14 +- invoice.php | 113 +++++------ invoice_old.php | 439 +++++++++++++++++++++++++++++++++++++++++ login.php | 33 ++-- login_new.php | 162 +++++++++++++++ login_old.php | 151 ++++++++++++++ post.php | 10 +- quote.php | 109 +++++----- recurring.php | 2 +- settings-user.php | 70 ++++--- users.php | 12 +- vendors.php | 17 +- 19 files changed, 1103 insertions(+), 219 deletions(-) create mode 100644 invoice_old.php create mode 100644 login_new.php create mode 100644 login_old.php diff --git a/add_client_modal.php b/add_client_modal.php index 75dc6df8..d83dc61d 100644 --- a/add_client_modal.php +++ b/add_client_modal.php @@ -12,16 +12,16 @@ @@ -29,7 +29,7 @@
-
+
@@ -58,7 +58,7 @@
-
+
@@ -109,6 +109,16 @@
+
+ +
+
+ +
+ +
+
+
@@ -118,6 +128,16 @@
+ +
+ +
+
+ +
+ +
+
@@ -128,7 +148,11 @@
- + +
+ +
+
@@ -138,10 +162,6 @@
- -
- -
diff --git a/client.php b/client.php index 887ed6a2..663d03a7 100644 --- a/client.php +++ b/client.php @@ -20,11 +20,16 @@ if(isset($_GET['client_id'])){ $client_city = $row['client_city']; $client_state = $row['client_state']; $client_zip = $row['client_zip']; + $client_contact = $row['client_contact']; $client_email = $row['client_email']; $client_phone = $row['client_phone']; if(strlen($client_phone)>2){ $client_phone = substr($row['client_phone'],0,3)."-".substr($row['client_phone'],3,3)."-".substr($row['client_phone'],6,4); } + $client_mobile = $row['client_mobile']; + if(strlen($client_mobile)>2){ + $client_mobile = substr($row['client_mobile'],0,3)."-".substr($row['client_mobile'],3,3)."-".substr($row['client_mobile'],6,4); + } $client_website = $row['client_website']; $client_net_terms = $row['client_net_terms']; if($client_net_terms == 0){ @@ -108,6 +113,14 @@ if(isset($_GET['client_id'])){

Contact

+ +
+ + @@ -124,6 +137,14 @@ if(isset($_GET['client_id'])){ } ?> + +
+ + diff --git a/client_files.php b/client_files.php index 47cea191..70f1f08c 100644 --- a/client_files.php +++ b/client_files.php @@ -1,4 +1,4 @@ - + diff --git a/client_vendors.php b/client_vendors.php index 8ef15711..6d869858 100644 --- a/client_vendors.php +++ b/client_vendors.php @@ -74,7 +74,6 @@ $total_pages = ceil($total_found_rows / 10); Vendor Description Contact - Account Number Action @@ -108,7 +107,17 @@ $total_pages = ceil($total_found_rows / 10); ?> - + + + +
+ + + - "> - Name "> - Type - Email - Phone - Balance - Action + Name "> + Type + Contact + Balance + Action @@ -85,10 +84,15 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $client_city = $row['client_city']; $client_state = $row['client_state']; $client_zip = $row['client_zip']; + $client_contact = $row['client_contact']; $client_phone = $row['client_phone']; if(strlen($client_phone)>2){ $client_phone = substr($row['client_phone'],0,3)."-".substr($row['client_phone'],3,3)."-".substr($row['client_phone'],6,4); } + $client_mobile = $row['client_mobile']; + if(strlen($client_mobile)>2){ + $client_mobile = substr($row['client_mobile'],0,3)."-".substr($row['client_mobile'],3,3)."-".substr($row['client_mobile'],6,4); + } $client_email = $row['client_email']; $client_website = $row['client_website']; $client_net_terms = $row['client_net_terms']; @@ -117,8 +121,39 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); - - + + + +
+ + + +
+ + + +
+ + + + + $
diff --git a/db.sql b/db.sql index 7c98db10..4aaaee6e 100644 --- a/db.sql +++ b/db.sql @@ -1,8 +1,8 @@ --- MariaDB dump 10.17 Distrib 10.4.7-MariaDB, for debian-linux-gnu (x86_64) +-- MariaDB dump 10.17 Distrib 10.4.8-MariaDB, for debian-linux-gnu (x86_64) -- -- Host: localhost Database: admin_crm -- ------------------------------------------------------ --- Server version 10.4.7-MariaDB-1:10.4.7+maria~bionic +-- Server version 10.4.8-MariaDB-1:10.4.8+maria~bionic /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -43,9 +43,9 @@ DROP TABLE IF EXISTS `alerts`; CREATE TABLE `alerts` ( `alert_id` int(11) NOT NULL AUTO_INCREMENT, `alert_type` varchar(200) NOT NULL, - `alert_message` varchar(200) NOT NULL, + `alert_message` varchar(255) NOT NULL, `alert_date` datetime NOT NULL, - `alert_ack_date` datetime NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), + `alert_ack_date` datetime DEFAULT NULL, `company_id` int(11) NOT NULL, PRIMARY KEY (`alert_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; @@ -135,7 +135,9 @@ CREATE TABLE `clients` ( `client_city` varchar(200) DEFAULT NULL, `client_state` varchar(200) DEFAULT NULL, `client_zip` varchar(200) DEFAULT NULL, + `client_contact` varchar(200) DEFAULT NULL, `client_phone` varchar(200) DEFAULT NULL, + `client_mobile` varchar(200) DEFAULT NULL, `client_email` varchar(200) DEFAULT NULL, `client_website` varchar(200) DEFAULT NULL, `client_net_terms` int(10) NOT NULL, @@ -334,6 +336,7 @@ DROP TABLE IF EXISTS `invoices`; CREATE TABLE `invoices` ( `invoice_id` int(11) NOT NULL AUTO_INCREMENT, `invoice_number` varchar(20) NOT NULL, + `invoice_scope` varchar(255) DEFAULT NULL, `invoice_status` varchar(200) NOT NULL, `invoice_date` date NOT NULL, `invoice_due` date NOT NULL, @@ -408,13 +411,14 @@ DROP TABLE IF EXISTS `logs`; CREATE TABLE `logs` ( `log_id` int(11) NOT NULL AUTO_INCREMENT, `log_type` varchar(200) NOT NULL, - `log_description` varchar(200) NOT NULL, + `log_action` varchar(255) NOT NULL, + `log_description` varchar(255) NOT NULL, `log_created_at` datetime NOT NULL, `invoice_id` int(11) DEFAULT NULL, `quote_id` int(11) DEFAULT NULL, `recurring_id` int(11) DEFAULT NULL, `user_id` int(11) DEFAULT NULL, - `company_id` int(11) NOT NULL, + `company_id` int(11) DEFAULT NULL, PRIMARY KEY (`log_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; @@ -512,6 +516,7 @@ DROP TABLE IF EXISTS `quotes`; CREATE TABLE `quotes` ( `quote_id` int(11) NOT NULL AUTO_INCREMENT, `quote_number` varchar(200) NOT NULL, + `quote_scope` varchar(255) DEFAULT NULL, `quote_status` varchar(200) NOT NULL, `quote_date` date NOT NULL, `quote_amount` decimal(15,2) DEFAULT NULL, @@ -535,6 +540,7 @@ DROP TABLE IF EXISTS `recurring`; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `recurring` ( `recurring_id` int(11) NOT NULL AUTO_INCREMENT, + `recurring_scope` varchar(255) DEFAULT NULL, `recurring_frequency` varchar(200) NOT NULL, `recurring_last_sent` date DEFAULT NULL, `recurring_next_date` date NOT NULL, @@ -591,7 +597,6 @@ CREATE TABLE `settings` ( `config_default_transfer_to_account` int(11) DEFAULT NULL, `config_default_calendar` int(11) DEFAULT NULL, `config_default_net_terms` int(11) DEFAULT NULL, - `config_start_page` varchar(200) DEFAULT NULL, `config_company_name` varchar(200) DEFAULT NULL, `config_company_address` varchar(200) DEFAULT NULL, `config_company_city` varchar(200) DEFAULT NULL, @@ -609,10 +614,6 @@ CREATE TABLE `settings` ( `config_invoice_logo` varchar(200) DEFAULT NULL, `config_invoice_footer` text DEFAULT NULL, `config_quote_footer` text DEFAULT NULL, - `config_invoice_email_subject` varchar(200) DEFAULT NULL, - `config_invoice_email_body` text DEFAULT NULL, - `config_quote_email_subject` varchar(200) DEFAULT NULL, - `config_quote_email_body` varchar(200) DEFAULT NULL, `config_invoice_next_number` int(11) DEFAULT NULL, `config_recurring_auto_send_invoice` int(1) DEFAULT NULL, `config_api_key` varchar(200) DEFAULT NULL, @@ -626,6 +627,9 @@ CREATE TABLE `settings` ( `config_enable_cron` int(1) DEFAULT NULL, `enable_alert_domain_expire` int(1) DEFAULT NULL, `enable_alert_low_balance` int(1) DEFAULT NULL, + `config_stripe_enable` int(1) DEFAULT NULL, + `config_stripe_publishable` varchar(255) DEFAULT NULL, + `config_stripe_secret` varchar(255) DEFAULT NULL, `config_base_url` varchar(200) DEFAULT NULL, PRIMARY KEY (`company_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; @@ -814,4 +818,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2019-08-24 22:12:13 +-- Dump completed on 2019-09-14 20:38:23 diff --git a/edit_client_modal.php b/edit_client_modal.php index 548b1086..ebbf8a5c 100644 --- a/edit_client_modal.php +++ b/edit_client_modal.php @@ -114,6 +114,16 @@
+
+ +
+
+ +
+ +
+
+
@@ -123,6 +133,16 @@
+ +
+ +
+
+ +
+ +
+
@@ -133,7 +153,11 @@
- + +
+ +
+
@@ -143,10 +167,6 @@
- -
- -
diff --git a/guest_view_invoice.php b/guest_view_invoice.php index e7a5edbb..a6bea186 100644 --- a/guest_view_invoice.php +++ b/guest_view_invoice.php @@ -108,13 +108,10 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){ ?>
-
-

Invoice

-
-
+
Print - Download PDF + Download @@ -124,12 +121,15 @@ if(isset($_GET['invoice_id'], $_GET['url_key'])){
-
+
-
+
+
+

Invoice

+
diff --git a/invoice.php b/invoice.php index e16b532d..94967afd 100644 --- a/invoice.php +++ b/invoice.php @@ -97,7 +97,7 @@ if(isset($_GET['invoice_id'])){
- +
@@ -120,54 +120,52 @@ if(isset($_GET['invoice_id'])){
-
+
+ +
+
+
+ +
+
+

Invoice

+
+
-
-
- From -
-
-
    -
    • -
    • -
    • -
    • -
    • -
-
-
+
    +

    • +
    • +
    • +
  • P:
    • +
    • +
-
-
- Bill To -
-
-
    -
    • -
    • -
    • -
    • -
    • -
-
-
+
    +

    • +
    • +
    • +
  • P:
    • +
  • E:
    • +
-
-
-
- Details -
-
-
    -
  • Invoice Number:
    • -
  • Invoice Date:
    • -
  • Payment Due:
    • -
-
-
+
+
+
+
+
+ + + + + + + + + +
Invoice Date
Due Date
@@ -176,10 +174,6 @@ if(isset($_GET['invoice_id'])){
-
- Items -
- @@ -210,7 +204,7 @@ if(isset($_GET['invoice_id'])){ ?> - + @@ -228,10 +222,10 @@ if(isset($_GET['invoice_id'])){ - - - - + + + +
- - +
+
@@ -296,8 +285,8 @@ if(isset($_GET['invoice_id'])){ -
-
+
+
History diff --git a/invoice_old.php b/invoice_old.php new file mode 100644 index 00000000..e16b532d --- /dev/null +++ b/invoice_old.php @@ -0,0 +1,439 @@ + + +

Nothing to see here

"; + }else{ + + $row = mysqli_fetch_array($sql); + $invoice_id = $row['invoice_id']; + $invoice_number = $row['invoice_number']; + $invoice_status = $row['invoice_status']; + $invoice_date = $row['invoice_date']; + $invoice_due = $row['invoice_due']; + $invoice_amount = $row['invoice_amount']; + $invoice_note = $row['invoice_note']; + $invoice_url_key = $row['invoice_url_key']; + $category_id = $row['category_id']; + $client_id = $row['client_id']; + $client_name = $row['client_name']; + $client_address = $row['client_address']; + $client_city = $row['client_city']; + $client_state = $row['client_state']; + $client_zip = $row['client_zip']; + $client_email = $row['client_email']; + $client_phone = $row['client_phone']; + if(strlen($client_phone)>2){ + $client_phone = substr($row['client_phone'],0,3)."-".substr($row['client_phone'],3,3)."-".substr($row['client_phone'],6,4); + } + $client_website = $row['client_website']; + $client_net_terms = $row['client_net_terms']; + if($client_net_terms == 0){ + $client_net_terms = $config_default_net_terms; + } + + $sql_history = mysqli_query($mysqli,"SELECT * FROM history WHERE invoice_id = $invoice_id ORDER BY history_id DESC"); + + $sql_payments = mysqli_query($mysqli,"SELECT * FROM payments, accounts WHERE payments.account_id = accounts.account_id AND payments.invoice_id = $invoice_id ORDER BY payments.payment_id DESC"); + + //Add up all the payments for the invoice and get the total amount paid to the invoice + $sql_amount_paid = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS amount_paid FROM payments WHERE invoice_id = $invoice_id"); + $row = mysqli_fetch_array($sql_amount_paid); + $amount_paid = $row['amount_paid']; + + $balance = $invoice_amount - $amount_paid; + + //check to see if overdue + if($invoice_status !== "Paid" AND $invoice_status !== "Draft" AND $invoice_status !== "Cancelled"){ + $unixtime_invoice_due = strtotime($invoice_due) + 86400; + if($unixtime_invoice_due < time()){ + $invoice_overdue = "Overdue"; + } + } + + //Set Badge color based off of invoice status + if($invoice_status == "Sent"){ + $invoice_badge_color = "warning text-white"; + }elseif($invoice_status == "Viewed"){ + $invoice_badge_color = "info"; + }elseif($invoice_status == "Partial"){ + $invoice_badge_color = "primary"; + }elseif($invoice_status == "Paid"){ + $invoice_badge_color = "success"; + }elseif($invoice_status == "Cancelled"){ + $invoice_badge_color = "danger"; + }else{ + $invoice_badge_color = "secondary"; + } + +?> + +
    +
  1. + Invoices +
    2. +
  2. + +
    3. +
    4. + + + + +
+ +
+ +
+
+ +
+
+
+ +
+ Edit + Copy + Create Recurring + Send + Mark Sent + Add Payment + Print + ">Guest URL + PDF + + Cancel + +
+
+
+
+ +
+
+
+
+ From +
+
+
    +
    • +
    • +
    • +
    • +
    • +
+
+
+
+
+
+
+ Bill To +
+
+
    +
    • +
    • +
    • +
    • +
    • +
+
+
+
+
+
+
+ Details +
+
+
    +
  • Invoice Number:
    • +
  • Invoice Date:
    • +
  • Payment Due:
    • +
+
+
+
+
+ + + +
+
+
+
+ Items +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ProductDescriptionQtyPriceTaxTotal
$$$
+ +
+
+ + + +
+
+
+
+ Notes +
+
+
+ + + +
+
+
+
+ + + + + + + 0){ ?> + + + + + + 0){ ?> + + + + + + 0){ ?> + + + + + + + + + + +
Subtotal$
Discount$
Tax$
Paid to Date
$
Balance Due$
+
+
+ + + +
+
+
+
+ History +
+
+ + + + + + + + + + + + + + + + + + +
DateStatusDescription
+
+
+
+
+
+
+ Payments +
+
+ + + + + + + + + + + + + + + + + + + +
DateAmountAccountAction
$
+
+
+
+
+ + + + + + + + + + \ No newline at end of file diff --git a/login.php b/login.php index 40f77aa4..7e899bae 100644 --- a/login.php +++ b/login.php @@ -102,29 +102,40 @@ if(isset($_POST['login'])){
+
+ +
-
-
-
- From -
-
-
    -
    • -
    • -
    • -
    • -
    • -
-
-
+
+
-
-
-
- Quote To -
-
-
    -
    • -
    • -
    • -
    • -
    • -
-
-
-
-
-
-
- Details -
-
-
    -
  • Quote Number:
    • -
  • Quote Date:
    • -
-
-
+
+

Quote

+
+
+
    +

    • +
    • +
    • +
  • P:
    • +
    • +
+
+
+
    +

    • +
    • +
    • +
  • P:
    • +
  • E:
    • +
+
+
+
+
+
+
+ + + + + +
Quote Date
+
+
-
- Items -
@@ -180,7 +172,7 @@ if(isset($_GET['quote_id'])){ ?> - + @@ -198,10 +190,10 @@ if(isset($_GET['quote_id'])){ - - - - + + + + - + diff --git a/settings-user.php b/settings-user.php index 938ff390..51ba4373 100644 --- a/settings-user.php +++ b/settings-user.php @@ -3,11 +3,11 @@ @@ -73,34 +73,6 @@ $sql_recent_logs = mysqli_query($mysqli,"SELECT * FROM logs -
-
Recent Logs
- -
+
+
diff --git a/recurring.php b/recurring.php index a21db554..389af3b2 100644 --- a/recurring.php +++ b/recurring.php @@ -107,7 +107,7 @@ ?>
lyly
- - - - - - - - - - -
-
-
Recent Logins
@@ -125,6 +97,44 @@ $sql_recent_logs = mysqli_query($mysqli,"SELECT * FROM logs
+ +
+
Recent Logs
+ + + + + + + + + + + +
+
+
diff --git a/users.php b/users.php index 5655bbd9..35d99087 100644 --- a/users.php +++ b/users.php @@ -72,6 +72,7 @@ Email Type Status + Last Login Action @@ -86,7 +87,15 @@ $avatar = $row['avatar']; $client_id = $row['client_id']; $initials = initials($name); - + + $sql_last_login = mysqli_query($mysqli,"SELECT * FROM logs + WHERE user_id = $user_id AND log_type = 'Login' + ORDER BY log_id DESC LIMIT 1" + ); + $row = mysqli_fetch_array($sql_last_login); + $log_created_at = $row['log_created_at']; + $log_description = $row['log_description']; + ?> @@ -107,6 +116,7 @@ Client Status +