diff --git a/add_expense_copy_modal.php b/add_expense_copy_modal.php index c37502f2..1b1bfa41 100644 --- a/add_expense_copy_modal.php +++ b/add_expense_copy_modal.php @@ -41,8 +41,19 @@ while($row = mysqli_fetch_array($sql2)){ $account_id2 = $row['account_id']; $account_name = $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"); + $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"); + $row = mysqli_fetch_array($sql_expenses); + $total_expenses = $row['total_expenses']; + + $balance = $opening_balance + $total_payments - $total_expenses; ?> - + Description -
- - +
+ +
diff --git a/add_expense_refund_modal.php b/add_expense_refund_modal.php index caa45039..6c409e1d 100644 --- a/add_expense_refund_modal.php +++ b/add_expense_refund_modal.php @@ -36,9 +36,9 @@
-
- - +
+ +
diff --git a/add_invoice_modal.php b/add_invoice_modal.php index 19df88a5..8a6a30f3 100644 --- a/add_invoice_modal.php +++ b/add_invoice_modal.php @@ -15,7 +15,7 @@
- -
+
New vendor
@@ -17,6 +17,43 @@
+
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
diff --git a/css/style.css b/css/style.css index f8cc9f0c..efe82b20 100644 --- a/css/style.css +++ b/css/style.css @@ -1,3 +1,10 @@ body { font-size: .875rem; -} \ No newline at end of file + + table.dT thead .sorting, + table.dT thead .sorting_asc, + table.dT thead .sorting_desc { + background : none; + } +} + diff --git a/db.sql b/db.sql index 21d4c906..26a75e2a 100644 --- a/db.sql +++ b/db.sql @@ -47,6 +47,39 @@ CREATE TABLE `alerts` ( ) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `calendar_events` +-- + +DROP TABLE IF EXISTS `calendar_events`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `calendar_events` ( + `calendar_event_id` int(11) NOT NULL AUTO_INCREMENT, + `calendar_event_title` varchar(200) NOT NULL, + `calendar_event_start` datetime NOT NULL, + `calendar_event_end` datetime NOT NULL, + `client_id` int(11) NOT NULL, + `client_location_id` int(11) NOT NULL, + `calendar_id` int(11) NOT NULL, + PRIMARY KEY (`calendar_event_id`) +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table structure for table `calendars` +-- + +DROP TABLE IF EXISTS `calendars`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `calendars` ( + `calendar_id` int(11) NOT NULL AUTO_INCREMENT, + `calendar_name` varchar(200) NOT NULL, + PRIMARY KEY (`calendar_id`) +) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `categories` -- @@ -253,10 +286,11 @@ CREATE TABLE `clients` ( `client_email` varchar(200) NOT NULL, `client_website` varchar(200) NOT NULL, `client_net_terms` int(10) NOT NULL, + `client_reference` varchar(200) NOT NULL, `client_created_at` int(11) NOT NULL, `client_updated_at` int(11) NOT NULL, PRIMARY KEY (`client_id`) -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=47 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -276,7 +310,7 @@ CREATE TABLE `expenses` ( `category_id` int(11) NOT NULL, `account_id` int(11) NOT NULL, PRIMARY KEY (`expense_id`) -) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -332,7 +366,7 @@ CREATE TABLE `invoice_items` ( `invoice_id` int(11) NOT NULL, `quote_id` int(11) NOT NULL, PRIMARY KEY (`invoice_item_id`) -) ENGINE=InnoDB AUTO_INCREMENT=51 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=49 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -531,11 +565,18 @@ CREATE TABLE `vendors` ( `vendor_id` int(11) NOT NULL AUTO_INCREMENT, `vendor_name` varchar(200) NOT NULL, `vendor_description` varchar(200) NOT NULL, + `vendor_address` varchar(200) NOT NULL, + `vendor_city` varchar(200) NOT NULL, + `vendor_state` varchar(200) NOT NULL, + `vendor_zip` varchar(200) NOT NULL, + `vendor_phone` varchar(200) NOT NULL, + `vendor_email` varchar(200) NOT NULL, + `vendor_website` varchar(200) NOT NULL, `vendor_account_number` varchar(200) NOT NULL, `vendor_created_at` int(11) NOT NULL, `vendor_updated_at` int(11) NOT NULL, PRIMARY KEY (`vendor_id`) -) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4; /*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; @@ -547,4 +588,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2019-04-23 15:11:59 +-- Dump completed on 2019-04-27 12:08:54 diff --git a/edit_expense_modal.php b/edit_expense_modal.php index 6d5e8d0f..cd174dd2 100644 --- a/edit_expense_modal.php +++ b/edit_expense_modal.php @@ -113,9 +113,9 @@
-
- - +
+ +
diff --git a/edit_vendor_modal.php b/edit_vendor_modal.php index e5b26823..84fc6e48 100644 --- a/edit_vendor_modal.php +++ b/edit_vendor_modal.php @@ -1,5 +1,5 @@