From ed8950a577b6363878cc9a9495fa8f15ad6e8afd Mon Sep 17 00:00:00 2001 From: "johnny@pittpc.com" Date: Mon, 2 Mar 2020 12:31:07 -0500 Subject: [PATCH] Started adding delete buttons to edit windows and removing the action column on some tables this will allow for more room to display data --- add_contact_modal.php | 2 +- add_invoice_modal.php | 2 +- assets.php | 230 ++++++++++++++++++++++++++++++++++++++++ client_assets.php | 22 +--- client_contacts.php | 24 ++--- client_print.php | 136 +++++++++++++++--------- dashboard.php | 9 +- edit_asset_modal.php | 1 + edit_category_modal.php | 1 + edit_contact_modal.php | 3 +- edit_domain_modal.php | 1 + edit_expense_modal.php | 1 + edit_location_modal.php | 1 + edit_login_modal.php | 1 + edit_network_modal.php | 1 + edit_note_modal.php | 1 + edit_product_modal.php | 1 + edit_revenue_modal.php | 1 + edit_software_modal.php | 1 + edit_transfer_modal.php | 1 + edit_trip_modal.php | 1 + edit_vendor_modal.php | 11 +- post.php | 2 - products.php | 17 +-- side_nav.php | 6 ++ vendors.php | 10 +- 26 files changed, 366 insertions(+), 121 deletions(-) create mode 100644 assets.php diff --git a/add_contact_modal.php b/add_contact_modal.php index ad8e45c7..b8623af5 100644 --- a/add_contact_modal.php +++ b/add_contact_modal.php @@ -108,7 +108,7 @@ -
+
diff --git a/add_invoice_modal.php b/add_invoice_modal.php index eb7b19dc..d79cef4d 100644 --- a/add_invoice_modal.php +++ b/add_invoice_modal.php @@ -4,7 +4,7 @@
New Invoice
diff --git a/assets.php b/assets.php new file mode 100644 index 00000000..b917580e --- /dev/null +++ b/assets.php @@ -0,0 +1,230 @@ + $sb, 'o' => $o))); + +//Paging +if(isset($_GET['p'])){ + $p = intval($_GET['p']); + $record_from = (($p)-1)*10; + $record_to = 10; +}else{ + $record_from = 0; + $record_to = 10; + $p = 1; +} + +//Custom Query Filter +if(isset($_GET['q'])){ + $q = mysqli_real_escape_string($mysqli,$_GET['q']); +}else{ + $q = ""; +} + +//Column Filter +if(!empty($_GET['sb'])){ + $sb = mysqli_real_escape_string($mysqli,$_GET['sb']); +}else{ + $sb = "asset_name"; +} + +//Column Order Filter +if(isset($_GET['o'])){ + if($_GET['o'] == 'ASC'){ + $o = "ASC"; + $disp = "DESC"; + }else{ + $o = "DESC"; + $disp = "ASC"; + } +}else{ + $o = "ASC"; + $disp = "DESC"; +} + +//Date From and Date To Filter +if(!empty($_GET['dtf'])){ + $dtf = $_GET['dtf']; + $dtt = $_GET['dtt']; +}else{ + $dtf = "0000-00-00"; + $dtt = "9999-00-00"; +} + +//Rebuild URL + +$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o))); + +$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM assets WHERE (asset_name LIKE '%$q%' OR asset_type LIKE '%$q%' OR asset_make LIKE '%$q%' OR asset_model LIKE '%$q%' OR asset_serial LIKE '%$q%' OR asset_os LIKE '%$q%' OR asset_ip LIKE '%$q%' OR asset_mac LIKE '%$q%') AND DATE(asset_created_at) BETWEEN '$dtf' AND '$dtt' AND client_id = 0 AND company_id = $session_company_id ORDER BY $sb $o LIMIT $record_from, $record_to"); + +$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); + +?> + +
+
+
Assets
+ +
+
+ +
+ +
+ +
+
+ +
+
+ + "> + + + + + + + + + + + + + + + + + + + + + + + +
TypeNameMakeModelSerialAction
+ + + + + + + + + + + + +
+ +
+ Edit + Delete +
+
+ +
+ + + +
+
+
+ + + + -
+
-
- - "> +
+ "> - @@ -188,20 +186,8 @@ $total_pages = ceil($total_found_rows / 10); - - + diff --git a/client_contacts.php b/client_contacts.php index efa89599..f2796e8b 100644 --- a/client_contacts.php +++ b/client_contacts.php @@ -57,23 +57,22 @@ $total_pages = ceil($total_found_rows / 10); -
+
-
+
-
Type Name Make Model SerialAction
-
- -
- Edit - Delete -
-
- -
- "> +
+ "> - @@ -139,23 +138,12 @@ $total_pages = ceil($total_found_rows / 10); ?> - - diff --git a/client_print.php b/client_print.php index 1467099a..acadad05 100644 --- a/client_print.php +++ b/client_print.php @@ -22,15 +22,15 @@ if(isset($_GET['client_id'])){ $client_net_terms = $row['client_net_terms']; //Query each table and store them in their array - $sql_contacts = mysqli_query($mysqli,"SELECT * FROM contacts WHERE client_id = $client_id ORDER BY contact_id DESC"); + $sql_contacts = mysqli_query($mysqli,"SELECT * FROM contacts WHERE client_id = $client_id ORDER BY contact_name ASC"); $sql_locations = mysqli_query($mysqli,"SELECT * FROM locations WHERE client_id = $client_id ORDER BY location_id DESC"); - $sql_assets = mysqli_query($mysqli,"SELECT * FROM assets WHERE client_id = $client_id ORDER BY asset_id DESC"); - $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE client_id = $client_id ORDER BY vendor_id DESC"); - $sql_logins = mysqli_query($mysqli,"SELECT * FROM logins WHERE client_id = $client_id ORDER BY login_id DESC"); - $sql_networks = mysqli_query($mysqli,"SELECT * FROM networks WHERE client_id = $client_id ORDER BY network_id DESC"); - $sql_domains = mysqli_query($mysqli,"SELECT * FROM domains WHERE client_id = $client_id ORDER BY domain_id DESC"); - $sql_applications = mysqli_query($mysqli,"SELECT * FROM applications WHERE client_id = $client_id ORDER BY application_id DESC"); - $sql_invoices = mysqli_query($mysqli,"SELECT * FROM invoices WHERE client_id = $client_id ORDER BY invoice_id DESC"); + $sql_assets = mysqli_query($mysqli,"SELECT * FROM assets WHERE client_id = $client_id ORDER BY asset_type ASC"); + $sql_vendors = mysqli_query($mysqli,"SELECT * FROM vendors WHERE client_id = $client_id ORDER BY vendor_name ASC"); + $sql_logins = mysqli_query($mysqli,"SELECT *, AES_DECRYPT(login_password, '$config_aes_key') AS login_password FROM logins WHERE client_id = $client_id ORDER BY login_name ASC"); + $sql_networks = mysqli_query($mysqli,"SELECT * FROM networks WHERE client_id = $client_id ORDER BY network_name ASC"); + $sql_domains = mysqli_query($mysqli,"SELECT * FROM domains WHERE client_id = $client_id ORDER BY domain_name ASC"); + $sql_software = mysqli_query($mysqli,"SELECT * FROM software WHERE client_id = $client_id ORDER BY software_name ASC"); + $sql_invoices = mysqli_query($mysqli,"SELECT * FROM invoices WHERE client_id = $client_id ORDER BY invoice_number DESC"); $sql_payments = mysqli_query($mysqli,"SELECT * FROM payments, invoices, accounts WHERE invoices.client_id = $client_id @@ -38,14 +38,14 @@ if(isset($_GET['client_id'])){ AND payments.account_id = accounts.account_id ORDER BY payments.payment_id DESC"); - $sql_quotes = mysqli_query($mysqli,"SELECT * FROM quotes WHERE client_id = $client_id ORDER BY quote_id DESC"); + $sql_quotes = mysqli_query($mysqli,"SELECT * FROM quotes WHERE client_id = $client_id ORDER BY quote_number DESC"); $sql_recurring = mysqli_query($mysqli,"SELECT * FROM recurring_invoices, invoices WHERE invoices.invoice_id = recurring_invoices.invoice_id AND invoices.client_id = $client_id ORDER BY recurring_invoices.recurring_invoice_id DESC"); - $sql_notes = mysqli_query($mysqli,"SELECT * FROM notes WHERE client_id = $client_id ORDER BY note_id DESC"); + $sql_notes = mysqli_query($mysqli,"SELECT * FROM notes WHERE client_id = $client_id ORDER BY note_created_at DESC"); //Get Counts $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('contact_id') AS num FROM contacts WHERE client_id = $client_id")); @@ -62,8 +62,8 @@ if(isset($_GET['client_id'])){ $num_networks = $row['num']; $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('domain_id') AS num FROM domains WHERE client_id = $client_id")); $num_domains = $row['num']; - $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('application_id') AS num FROM applications WHERE client_id = $client_id")); - $num_applications = $row['num']; + $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('software_id') AS num FROM software WHERE client_id = $client_id")); + $num_software = $row['num']; $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE client_id = $client_id")); $num_invoices = $row['num']; @@ -132,20 +132,20 @@ if(isset($_GET['client_id'])){
@@ -154,13 +154,14 @@ if(isset($_GET['client_id'])){ 0){ ?> -

Contacts

+

Contacts

Name Title Email PhoneAction
-
- -
- Edit - Delete -
-
- -
+ @@ -176,6 +177,7 @@ if(isset($_GET['client_id'])){ if(strlen($contact_phone)>2){ $contact_phone = substr($row['contact_phone'],0,3)."-".substr($row['contact_phone'],3,3)."-".substr($row['contact_phone'],6,4); } + $contact_extension = $row['contact_extension']; $contact_mobile = $row['contact_mobile']; if(strlen($contact_mobile)>2){ $contact_mobile = substr($row['contact_mobile'],0,3)."-".substr($row['contact_mobile'],3,3)."-".substr($row['contact_mobile'],6,4); @@ -187,6 +189,7 @@ if(isset($_GET['client_id'])){ + @@ -201,7 +204,7 @@ if(isset($_GET['client_id'])){ 0){ ?> -

Locations

+

Locations

Name Title PhoneExt Mobile Email
@@ -244,7 +247,7 @@ if(isset($_GET['client_id'])){ 0){ ?> -

Assets

+

Assets

@@ -253,6 +256,11 @@ if(isset($_GET['client_id'])){ + + + + + @@ -265,6 +273,11 @@ if(isset($_GET['client_id'])){ $asset_make = $row['asset_make']; $asset_model = $row['asset_model']; $asset_serial = $row['asset_serial']; + $asset_os = $row['asset_os']; + $asset_ip = $row['asset_ip']; + $asset_mac = $row['asset_mac']; + $asset_purchase = $row['asset_purchase']; + $asset_warranty = $row['asset_warranty']; ?> @@ -273,6 +286,11 @@ if(isset($_GET['client_id'])){ + + + + + 0){ ?> -

Vendors

+

Vendors

Make Model SerialOSIPMACPurchase DateWarranty Expire
@@ -294,6 +312,7 @@ if(isset($_GET['client_id'])){ + @@ -311,6 +330,7 @@ if(isset($_GET['client_id'])){ $vendor_phone = substr($row['vendor_phone'],0,3)."-".substr($row['vendor_phone'],3,3)."-".substr($row['vendor_phone'],6,4); } $vendor_email = $row['vendor_email']; + $vendor_website = $row['vendor_website']; ?> @@ -319,6 +339,7 @@ if(isset($_GET['client_id'])){ + @@ -332,13 +353,15 @@ if(isset($_GET['client_id'])){ 0){ ?> -

Logins

+

Logins

Contact Name Phone EmailWebsite Account Number
- + + + @@ -346,15 +369,19 @@ if(isset($_GET['client_id'])){ while($row = mysqli_fetch_array($sql_logins)){ $login_id = $row['login_id']; - $login_description = $row['login_description']; + $login_name = $row['login_name']; + $login_category = $row['login_category']; $login_username = $row['login_username']; $login_password = $row['login_password']; + $login_uri = $row['login_uri']; ?> - + + + 0){ ?> -

Networks

+

Networks

DescriptionCategoryName Username PasswordURL
+ @@ -383,6 +411,7 @@ if(isset($_GET['client_id'])){ while($row = mysqli_fetch_array($sql_networks)){ $network_id = $row['network_id']; $network_name = $row['network_name']; + $network_vlan = $row['network_vlan']; $network = $row['network']; $network_gateway = $row['network_gateway']; $network_dhcp_range = $row['network_dhcp_range']; @@ -391,6 +420,7 @@ if(isset($_GET['client_id'])){ ?> + @@ -406,7 +436,7 @@ if(isset($_GET['client_id'])){ 0){ ?> -

Domains

+

Domains

NamevLAN Network Gateway DHCP Range
@@ -454,12 +484,12 @@ if(isset($_GET['client_id'])){ - 0){ ?> -

Applications

+ 0){ ?> +

Software

- + @@ -467,17 +497,17 @@ if(isset($_GET['client_id'])){ - - - + + + 0){ ?> -

Invoices

+

Invoices

ApplicationSoftware Type License
@@ -534,7 +564,7 @@ if(isset($_GET['client_id'])){ 0){ ?> -

Payments

+

Payments

@@ -589,7 +619,7 @@ if(isset($_GET['client_id'])){ 0){ ?> -

Quotes

+

Quotes

@@ -612,7 +642,7 @@ if(isset($_GET['client_id'])){ ?> - + @@ -630,7 +660,7 @@ if(isset($_GET['client_id'])){ 0){ ?> -

Recurring Invoices

+

Recurring Invoices

QUO- $
@@ -683,7 +713,7 @@ if(isset($_GET['client_id'])){ 0){ ?> -

Notes

+

Notes

-
-
+
@@ -118,7 +117,7 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
-
+
@@ -132,7 +131,7 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
-
+
@@ -146,7 +145,7 @@ $total_recurring_invoice_amount = $row['total_recurring_invoice_amount'];
-
+
diff --git a/edit_asset_modal.php b/edit_asset_modal.php index acbaec83..4a9d9420 100644 --- a/edit_asset_modal.php +++ b/edit_asset_modal.php @@ -285,6 +285,7 @@
+
diff --git a/edit_category_modal.php b/edit_category_modal.php index 57c7925c..f68f8fe6 100644 --- a/edit_category_modal.php +++ b/edit_category_modal.php @@ -28,6 +28,7 @@
+
diff --git a/edit_contact_modal.php b/edit_contact_modal.php index 95a8c2ba..738dfa13 100644 --- a/edit_contact_modal.php +++ b/edit_contact_modal.php @@ -121,7 +121,8 @@
-
+
+
diff --git a/edit_domain_modal.php b/edit_domain_modal.php index 5faa5866..3a05d72a 100644 --- a/edit_domain_modal.php +++ b/edit_domain_modal.php @@ -80,6 +80,7 @@
+
diff --git a/edit_expense_modal.php b/edit_expense_modal.php index 60a5044d..b2c9dc7e 100644 --- a/edit_expense_modal.php +++ b/edit_expense_modal.php @@ -150,6 +150,7 @@
+
diff --git a/edit_location_modal.php b/edit_location_modal.php index 493406b4..d0968df2 100644 --- a/edit_location_modal.php +++ b/edit_location_modal.php @@ -210,6 +210,7 @@
+
diff --git a/edit_login_modal.php b/edit_login_modal.php index 7c7aea5f..91484260 100644 --- a/edit_login_modal.php +++ b/edit_login_modal.php @@ -180,6 +180,7 @@
+
diff --git a/edit_network_modal.php b/edit_network_modal.php index cdef1758..5dd3a7f8 100644 --- a/edit_network_modal.php +++ b/edit_network_modal.php @@ -86,6 +86,7 @@
+
diff --git a/edit_note_modal.php b/edit_note_modal.php index 304b3d7f..18de8c97 100644 --- a/edit_note_modal.php +++ b/edit_note_modal.php @@ -18,6 +18,7 @@
+
diff --git a/edit_product_modal.php b/edit_product_modal.php index 06c8cc37..05f03396 100644 --- a/edit_product_modal.php +++ b/edit_product_modal.php @@ -48,6 +48,7 @@
+
diff --git a/edit_revenue_modal.php b/edit_revenue_modal.php index 237ec72d..7d6fe2b4 100644 --- a/edit_revenue_modal.php +++ b/edit_revenue_modal.php @@ -111,6 +111,7 @@
+
diff --git a/edit_software_modal.php b/edit_software_modal.php index a3ea4049..38963e5c 100644 --- a/edit_software_modal.php +++ b/edit_software_modal.php @@ -98,6 +98,7 @@
+
diff --git a/edit_transfer_modal.php b/edit_transfer_modal.php index 192f6d17..507eb108 100644 --- a/edit_transfer_modal.php +++ b/edit_transfer_modal.php @@ -138,6 +138,7 @@
+
diff --git a/edit_trip_modal.php b/edit_trip_modal.php index a27c4628..f9e8e5da 100644 --- a/edit_trip_modal.php +++ b/edit_trip_modal.php @@ -113,6 +113,7 @@
+
diff --git a/edit_vendor_modal.php b/edit_vendor_modal.php index c1550624..6ca128e2 100644 --- a/edit_vendor_modal.php +++ b/edit_vendor_modal.php @@ -4,7 +4,7 @@
@@ -13,16 +13,16 @@ @@ -176,6 +176,7 @@
+
diff --git a/post.php b/post.php index f24c70d8..fe275405 100644 --- a/post.php +++ b/post.php @@ -1595,8 +1595,6 @@ if(isset($_POST['quote_note'])){ } -header("Location: " . $_SERVER["HTTP_REFERER"]); - if(isset($_POST['edit_quote_item'])){ $quote_id = intval($_POST['quote_id']); diff --git a/products.php b/products.php index b3e6711b..176e27d9 100644 --- a/products.php +++ b/products.php @@ -71,7 +71,6 @@ - @@ -90,21 +89,11 @@ - - + + + Expenses

+
  • + "> + +

    Assets

    +     +
  • "> diff --git a/vendors.php b/vendors.php index 4bfe8baf..a9abde05 100644 --- a/vendors.php +++ b/vendors.php @@ -103,6 +103,10 @@ $vendor_notes = $row['vendor_notes'] ?> + + + +
    • +
    Category Description CostAction
    $ -
    - -
    - Edit - Delete -
    -
    - -     		$
    @@ -152,18 +156,18 @@ Edit Delete - - +