diff --git a/admin_inventory_locations.php b/admin_inventory_locations.php new file mode 100644 index 000000000..9ee2521ff --- /dev/null +++ b/admin_inventory_locations.php @@ -0,0 +1,108 @@ + + +
+
+

Inventory Locations

+
+ +
+
+
+
+ + "> + + + + + + + + + + + + + + + + + + + No Records Here"; + } + + ?> + + +
NameDescriptionUser AssignedCityAction
+
+ +
+ + Edit + + + Archive + +
+
+
+ +
+
+
+ + +
+
+
+
New Location
+ +
+
+ + +
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
+
+ + +
+
+
+
+ \ No newline at end of file diff --git a/admin_inventory_locations_edit_modal.php b/admin_inventory_locations_edit_modal.php new file mode 100644 index 000000000..18c7cfb16 --- /dev/null +++ b/admin_inventory_locations_edit_modal.php @@ -0,0 +1,76 @@ + \ No newline at end of file diff --git a/admin_side_nav.php b/admin_side_nav.php index 863e24545..6415de905 100644 --- a/admin_side_nav.php +++ b/admin_side_nav.php @@ -80,6 +80,15 @@ +
  • + "> + +

    Inventory Locations

    +     +
    • +
  • TEMPLATES
  • diff --git a/client_tickets.php b/client_tickets.php index e44ce7769..6b6030585 100644 --- a/client_tickets.php +++ b/client_tickets.php @@ -160,17 +160,7 @@ } $ticket_closed_at = nullable_htmlentities($row['ticket_closed_at']); - if ($ticket_status == "New") { - $ticket_status_color = "danger"; - } elseif ($ticket_status == "Open") { - $ticket_status_color = "primary"; - } elseif ($ticket_status == "On Hold") { - $ticket_status_color = "success"; - } elseif ($ticket_status == "Auto Close") { - $ticket_status_color = "dark"; - } elseif ($ticket_status == "Closed") { - $ticket_status_color = "dark"; - } + $ticket_status_color = getTicketStatusColor($ticket_status); if ($ticket_priority == "High") { $ticket_priority_display = "$ticket_priority"; diff --git a/credits.php b/credits.php new file mode 100644 index 000000000..a9c372bb9 --- /dev/null +++ b/credits.php @@ -0,0 +1,197 @@ + + +
    +
    +

    Credits

    +
    + +
    +
    +
    +
    +
    + +
    + + +
    +
    +
    +
    +
    " + id="advancedFilter"> +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + + "> + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Client NameAccount + Name"> + Amount + Date + Reference + Origin + Actions
    + "> + + + + +
    +
    +
    +
    + + \ No newline at end of file diff --git a/cron.php b/cron.php index f0290f0e0..416def9de 100644 --- a/cron.php +++ b/cron.php @@ -485,13 +485,14 @@ $client_name = sanitizeInput($row['client_name']); $contact_name = sanitizeInput($row['contact_name']); $contact_email = sanitizeInput($row['contact_email']); + $invoice_balance = calculateInvoiceBalance($mysqli, $invoice_id); // Late Charges if ($config_invoice_late_fee_enable == 1) { $todays_date = date('Y-m-d'); - $late_fee_amount = ($invoice_amount * $config_invoice_late_fee_percent) / 100; + $late_fee_amount = ($invoice_balance * $config_invoice_late_fee_percent) / 100; $new_invoice_amount = $invoice_amount + $late_fee_amount; mysqli_query($mysqli, "UPDATE invoices SET invoice_amount = $new_invoice_amount WHERE invoice_id = $invoice_id"); diff --git a/dashboard.php b/dashboard.php index 5e25cf83c..3da1f143c 100644 --- a/dashboard.php +++ b/dashboard.php @@ -796,17 +796,7 @@ $contact_id = intval($row['ticket_contact_id']); $contact_name = nullable_htmlentities($row['contact_name']); - if ($ticket_status == "New") { - $ticket_status_color = "danger"; - } elseif ($ticket_status == "Open") { - $ticket_status_color = "primary"; - } elseif ($ticket_status == "On Hold") { - $ticket_status_color = "success"; - } elseif ($ticket_status == "Auto Close") { - $ticket_status_color = "dark"; - } elseif ($ticket_status == "Closed") { - $ticket_status_color = "dark"; - } + $ticket_status_color = getTicketStatusColor($ticket_status); if ($ticket_priority == "High") { $ticket_priority_color = "danger"; diff --git a/database_updates.php b/database_updates.php index 3bd5a3ed8..9376071a0 100644 --- a/database_updates.php +++ b/database_updates.php @@ -1616,6 +1616,8 @@ } if (CURRENT_DATABASE_VERSION == '1.0.7') { + // // Insert queries here required to update to DB version 1.0.8 + mysqli_query($mysqli, "ALTER TABLE `user_settings` DROP `user_config_remember_me_token`"); mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.0.8'"); @@ -1637,6 +1639,7 @@ } if (CURRENT_DATABASE_VERSION == '1.1.0') { + mysqli_query($mysqli, "ALTER TABLE `files` ADD `file_description` TEXT DEFAULT NULL AFTER `file_name`"); mysqli_query($mysqli, "ALTER TABLE `files` ADD `file_important` TINYINT(1) NOT NULL DEFAULT '0' AFTER `file_hash`"); @@ -1687,11 +1690,55 @@ mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.3'"); } - // if (CURRENT_DATABASE_VERSION == '1.1.3') { - // // Insert queries here required to update to DB version 1.1.4 - // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.4'"); - // } + if (CURRENT_DATABASE_VERSION == '1.1.3') { + // Insert queries here required to update to DB version 1.1.4 + mysqli_query($mysqli, "CREATE TABLE `inventory` ( + `inventory_id` int(11) NOT NULL AUTO_INCREMENT, + `inventory_product_id` int(11) NOT NULL, + `inventory_location_id` int(11) NOT NULL, + `inventory_client_id` int(11) DEFAULT NULL, + `inventory_ticket_id` int(11) DEFAULT NULL, + `inventory_notes` text DEFAULT NULL, + `inventory_vendor_id` int(11) DEFAULT NULL, + `inventory_quantity` int(11) NOT NULL DEFAULT 0, + `inventory_cost` decimal(15,2) NOT NULL DEFAULT 0.00, + `inventory_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `inventory_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `inventory_archived_at` datetime DEFAULT NULL, + PRIMARY KEY (`inventory_id`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci;"); + + mysqli_query($mysqli, "CREATE TABLE `inventory_locations` ( + `inventory_location_id` int(11) NOT NULL AUTO_INCREMENT, + `inventory_location_name` varchar(200) NOT NULL, + `inventory_location_description` text DEFAULT NULL, + `inventory_location_address` varchar(200) DEFAULT NULL, + `inventory_location_city` varchar(200) DEFAULT NULL, + `inventory_location_state` varchar(200) DEFAULT NULL, + `inventory_location_zip` varchar(200) DEFAULT NULL, + `inventory_location_country` varchar(200) DEFAULT NULL, + `inventory_location_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `inventory_location_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `inventory_location_archived_at` datetime DEFAULT NULL, + `inventory_location_user_id` int(11) NOT NULL DEFAULT 0, + PRIMARY KEY (`inventory_location_id`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + "); + + mysqli_query($mysqli, "CREATE TABLE `ticket_products` ( + `ticket_product_id` int(11) NOT NULL AUTO_INCREMENT, + `ticket_product_product_id` int(11) NOT NULL, + `ticket_product_ticket_id` int(11) NOT NULL, + `ticket_product_quantity` int(11) NOT NULL, + PRIMARY KEY (`ticket_product_id`) + ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci"); + + mysqli_query($mysqli, "CREATE TABLE `credits` (`credit_id` int(11) NOT NULL AUTO_INCREMENT,`credit_amount` decimal(15,2) NOT NULL,`credit_currency_code` varchar(200) NOT NULL,`credit_date` date NOT NULL,`credit_reference` text DEFAULT NULL,`credit_created_at` datetime NOT NULL DEFAULT current_timestamp(),`credit_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(),`credit_archived_at` datetime DEFAULT NULL, `credit_client_id` int(11) NOT NULL,`credit_payment_id` int(11) NOT NULL,`credit_account_id` int(11) NOT NULL, PRIMARY KEY (`credit_id`))"); + + // Then, update the database to the next sequential version + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '1.1.4'"); + } + } else { // Up-to-date diff --git a/database_version.php b/database_version.php index 1760e835c..62e7c7065 100644 --- a/database_version.php +++ b/database_version.php @@ -5,5 +5,5 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "1.1.3"); +DEFINE("LATEST_DATABASE_VERSION", "1.1.4"); diff --git a/db.sql b/db.sql index efe7b6e8f..6d6172198 100644 --- a/db.sql +++ b/db.sql @@ -404,6 +404,29 @@ CREATE TABLE `contacts` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `credits` +-- + +DROP TABLE IF EXISTS `credits`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `credits` ( + `credit_id` int(11) NOT NULL AUTO_INCREMENT, + `credit_amount` decimal(15,2) NOT NULL DEFAULT 0.00, + `credit_currency_code` varchar(200) NOT NULL, + `credit_date` date NOT NULL, + `credit_reference` varchar(200) DEFAULT NULL, + `credit_payment_method` varchar(200) DEFAULT NULL, + `credit_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `credit_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `credit_archived_at` datetime DEFAULT NULL, + `credit_client_id` int(11) NOT NULL DEFAULT 0, + `credit_payment_id` int(11) NOT NULL DEFAULT 0, + `credit_account_id` int(11) DEFAULT NULL, + PRIMARY KEY (`credit_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; + -- -- Table structure for table `custom_fields` -- @@ -692,6 +715,54 @@ CREATE TABLE `interfaces` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `inventory` +-- + +DROP TABLE IF EXISTS `inventory`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `inventory` ( + `inventory_id` int(11) NOT NULL AUTO_INCREMENT, + `inventory_product_id` int(11) NOT NULL, + `inventory_location_id` int(11) NOT NULL, + `inventory_client_id` int(11) DEFAULT NULL, + `inventory_serial` varchar(200) DEFAULT NULL, + `inventory_barcode` varchar(200) DEFAULT NULL, + `inventory_vendor_id` int(11) NOT NULL, + `inventory_notes` text DEFAULT NULL, + `inventory_quantity` int(11) NOT NULL DEFAULT 0, + `inventory_cost` decimal(15,2) NOT NULL DEFAULT 0.00, + `inventory_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `inventory_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `inventory_archived_at` datetime DEFAULT NULL, + PRIMARY KEY (`inventory_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + +-- +-- Table Structure for `inventory_locations` +-- +DROP TABLE IF EXISTS `inventory_locations`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `inventory_locations` ( + `inventory_location_id` int(11) NOT NULL AUTO_INCREMENT, + `inventory_location_name` varchar(200) NOT NULL, + `inventory_location_description` text DEFAULT NULL, + `inventory_location_address` varchar(200) DEFAULT NULL, + `inventory_location_city` varchar(200) DEFAULT NULL, + `inventory_location_state` varchar(200) DEFAULT NULL, + `inventory_location_zip` varchar(200) DEFAULT NULL, + `inventory_location_country` varchar(200) DEFAULT NULL, + `inventory_location_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `inventory_location_updated_at` datetime DEFAULT NULL ON UPDATE current_timestamp(), + `inventory_location_archived_at` datetime DEFAULT NULL, + `inventory_location_user_id` int(11) NOT NULL DEFAULT 0, + PRIMARY KEY (`inventory_location_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `invoice_items` -- @@ -906,6 +977,28 @@ CREATE TABLE `payments` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `purchase_orders` +-- + +DROP TABLE IF EXISTS `purchase_orders`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `purchase_orders` ( + `purchase_order_id` int(11) NOT NULL AUTO_INCREMENT, + `purchase_order_prefix` varchar(200) DEFAULT NULL, + `purchase_order_number` int(11) NOT NULL, + `purchase_order_date` date NOT NULL, + `purchase_order_client_id` int(11) NOT NULL DEFAULT 0, + `purchase_order_vendor_id` int(11) NOT NULL DEFAULT 0, + `purchase_order_status` varchar(200) NOT NULL, + `purchase_order_shipping` decimal(15,2) NOT NULL DEFAULT 0.00, + `purchase_order_tax` decimal(15,2) NOT NULL DEFAULT 0.00, + `purchase_order_discount` decimal(15,2) NOT NULL DEFAULT 0.00, + PRIMARY KEY (`purchase_order_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `products` -- @@ -1539,6 +1632,20 @@ CREATE TABLE `ticket_attachments` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `ticket_products` +-- +DROP TABLE IF EXISTS `ticket_products`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `ticket_products` ( + `ticket_product_id` int(11) NOT NULL AUTO_INCREMENT, + `ticket_product_product_id` int(11) NOT NULL, + `ticket_product_ticket_id` int(11) NOT NULL, + `ticket_product_quantity` int(11) NOT NULL, + PRIMARY KEY (`ticket_product_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_general_ci; + -- -- Table structure for table `ticket_replies` -- diff --git a/expense_add_modal.php b/expense_add_modal.php index 6238759d3..63e58c7f5 100644 --- a/expense_add_modal.php +++ b/expense_add_modal.php @@ -117,7 +117,45 @@
    +
    + +
    +
    + +
    + +
    + +
    +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    diff --git a/functions.php b/functions.php index f8a974a3a..f1843dc75 100644 --- a/functions.php +++ b/functions.php @@ -1138,3 +1138,56 @@ function createiCalStrCancel($originaliCalStr) { return $cal_event->export(); } + +function getClientBalance($mysqli, $client_id, $credits = false) { + //Add up all the payments for the invoice and get the total amount paid to the invoice + $sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled'"); + $row = mysqli_fetch_array($sql_invoice_amounts); + + $invoice_amounts = floatval($row['invoice_amounts']); + + $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id"); + $row = mysqli_fetch_array($sql_amount_paid); + + $amount_paid = floatval($row['amount_paid']); + + if ($credits) { + $sql_credits = mysqli_query($mysqli, "SELECT SUM(credit_amount) AS credit_amounts FROM credits WHERE credit_client_id = $client_id"); + $row = mysqli_fetch_array($sql_credits); + $credit_amounts = floatval($row['credit_amounts']); + + return $invoice_amounts - ($amount_paid + $credit_amounts); + } else { + return $invoice_amounts - $amount_paid; + } +} + + +function getTicketStatusColor($status) { + switch ($status) { + + case 'New': + return 'danger'; + + case 'Assigned': + return 'danger'; + + case 'Open': + return 'warning'; + + case 'On Hold': + return 'success'; + + case 'Closed': + return 'dark'; + + case 'Auto Close': + return 'dark'; + + case 'In-Progress': + return 'primary'; + + default: + return 'secondary'; + } +} \ No newline at end of file diff --git a/inc_all_client.php b/inc_all_client.php index 4ebc4ffb5..437dae99a 100644 --- a/inc_all_client.php +++ b/inc_all_client.php @@ -86,19 +86,14 @@ } $client_tags_display = implode('', $client_tag_name_display_array); - //Add up all the payments for the invoice and get the total amount paid to the invoice - $sql_invoice_amounts = mysqli_query($mysqli, "SELECT SUM(invoice_amount) AS invoice_amounts FROM invoices WHERE invoice_client_id = $client_id AND invoice_status NOT LIKE 'Draft' AND invoice_status NOT LIKE 'Cancelled'"); - $row = mysqli_fetch_array($sql_invoice_amounts); - - $invoice_amounts = floatval($row['invoice_amounts']); + // Get Balance + $balance = getClientBalance($mysqli, $client_id, $credits = true); + // Get Amount Paid $sql_amount_paid = mysqli_query($mysqli, "SELECT SUM(payment_amount) AS amount_paid FROM payments, invoices WHERE payment_invoice_id = invoice_id AND invoice_client_id = $client_id"); $row = mysqli_fetch_array($sql_amount_paid); - $amount_paid = floatval($row['amount_paid']); - $balance = $invoice_amounts - $amount_paid; - //Get Monthly Recurring Total $sql_recurring_monthly_total = mysqli_query($mysqli, "SELECT SUM(recurring_amount) AS recurring_monthly_total FROM recurring WHERE recurring_status = 1 AND recurring_frequency = 'month' AND recurring_client_id = $client_id"); $row = mysqli_fetch_array($sql_recurring_monthly_total); diff --git a/inventory.php b/inventory.php new file mode 100644 index 000000000..d8aec02e8 --- /dev/null +++ b/inventory.php @@ -0,0 +1,135 @@ + + +
    +
    +

    Inventory

    +
    + +
    +
    +
    +
    +
    + +
    + + +
    +
    +
    +
    +
    + Locations + +
    +
    +
    +
    +
    +
    +
    + + "> + + + + + + + + + + + + + + + + + + + + + +
    +
    + +
    +     		Product NameQuantityLocationsManage product
    +
    + +
    +     		+
    + +
    +
    +
    + +
    + +
    +
    + + + +" tabindex="-1"> +
    +
    +
    +
    Move Inventory
    + +
    +
    + + +
    +
    +
    + + + Choose the location to move the inventory to +
    +
    +
    +
    + + + Enter the quantity to move +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + diff --git a/inventory_locations.php b/inventory_locations.php new file mode 100644 index 000000000..80a56e32f --- /dev/null +++ b/inventory_locations.php @@ -0,0 +1,138 @@ + + +
    +
    +

    Inventory locations

    +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + Back to full inventory + +
    +
    +
    +
    +
    +
    +
    + + "> + + + + + + + + + + + + + + + + + + + + + + + +
    +
    + +
    +     		NameDescriptionUser ResponsibleTotal QuantityManage Inventory
    +
    + +
    +     		+
    + +
    +
    +
    + +
    + +
    +
    + + + + + +
    +
    +

    Inventory location:

    +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + Back to inventory locations + +
    +
    +
    +
    +
    +
    +
    + + "> + + + + + + + + + + + + + + + + + + + + + + +
    +
    + +
    +     		Item NameQuantityUnit CostLocationManage product
    +
    + + +
    +     		+
    + + + +
    +
    +
    + +
    + +
    +
    + + + + + +
    +
    +

    Inventory product:

    +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + Back to full inventory + +
    +
    +
    +
    +
    +
    +
    + + "> + + + + + + + + + + + + + + + + + + + + + +
    +
    + +
    +     		LocationQuantityUnit CostManage location
    +
    + + +
    +     		+
    + +
    +
    +
    + +
    + +
    +
    + + + + -
    -
    -

    Payments

    -
    +
    +
    +

    Payments

    +
    -
    -
    -
    -
    -
    - -
    - - -
    +
    + +
    +
    +
    + +
    + +
    -
    " id="advancedFilter"> -
    -
    -
    - - -
    +
    +
    + + Credits | + + +
    +
    +
    +
    " + id="advancedFilter"> +
    +
    +
    + +
    -
    -
    - - -
    +
    +
    +
    + +
    -
    -
    - - -
    +
    +
    +
    + +
    - -
    -
    - - "> + + +
    +
    +
    + "> - - - - - - - - + + + + + + + + - - + + - - - - - - - - - - + + + + + + + + + + - -
    Payment DateInvoice DateInvoiceClientAmountPayment MethodReferenceAccountPayment + DateInvoice + DateInvoice + Client + Amount + Payment + MethodReference + Account +
    + + + +
    -
    - + +
    +
    +
    + ?> \ No newline at end of file diff --git a/post.php b/post.php index 40a878d09..978d7d474 100644 --- a/post.php +++ b/post.php @@ -43,6 +43,8 @@ require_once "post/file.php"; +require_once "post/inventory.php"; + require_once "post/invoice.php"; require_once "post/location.php"; diff --git a/post/expense.php b/post/expense.php index 0ff648a20..f2bcac440 100644 --- a/post/expense.php +++ b/post/expense.php @@ -8,13 +8,34 @@ require_once 'post/expense_model.php'; + $extended_alert_description = ''; + + + if (!empty($product)) { + $product_id = $product; + $product = 1; + + $cost = $amount / $product_quantity; + + // Insert into inventory qty times + for ($i = 0; $i < $product_quantity; $i++) { + if (!is_null($client)) { + mysqli_query($mysqli,"INSERT INTO inventory SET inventory_product_id = $product_id, inventory_quantity = 1, inventory_vendor_id = $vendor, inventory_location_id = 1, inventory_cost = $cost, inventory_client_id = $client"); + } else { + mysqli_query($mysqli,"INSERT INTO inventory SET inventory_product_id = $product_id, inventory_quantity = 1, inventory_vendor_id = $vendor, inventory_location_id = 1, inventory_cost = $cost"); + } + + } + $extended_alert_description = '. Product added to inventory'; + } + + mysqli_query($mysqli,"INSERT INTO expenses SET expense_date = '$date', expense_amount = $amount, expense_currency_code = '$session_company_currency', expense_account_id = $account, expense_vendor_id = $vendor, expense_client_id = $client, expense_category_id = $category, expense_description = '$description', expense_reference = '$reference'"); $expense_id = mysqli_insert_id($mysqli); // Check for and process attachment - $extended_alert_description = ''; if ($_FILES['file']['tmp_name'] != '') { if ($new_file_name = checkFileUpload($_FILES['file'], array('jpg', 'jpeg', 'gif', 'png', 'pdf'))) { @@ -26,10 +47,10 @@ move_uploaded_file($file_tmp_path, $dest_path); mysqli_query($mysqli,"UPDATE expenses SET expense_receipt = '$new_file_name' WHERE expense_id = $expense_id"); - $extended_alert_description = '. File successfully uploaded.'; + $extended_alert_description = $extended_alert_description . '. File successfully uploaded'; } else { $_SESSION['alert_type'] = "error"; - $extended_alert_description = '. Error uploading file. Check upload directory is writable/correct file type/size'; + $extended_alert_description = $extended_alert_description . '. Error uploading file. Check upload directory is writable/correct file type/size'; } } diff --git a/post/expense_model.php b/post/expense_model.php index 7224ebcf5..0061a3442 100644 --- a/post/expense_model.php +++ b/post/expense_model.php @@ -7,3 +7,5 @@ $category = intval($_POST['category']); $description = sanitizeInput($_POST['description']); $reference = sanitizeInput($_POST['reference']); +$product = intval($_POST['product']); +$product_quantity = intval($_POST['product_quantity']); diff --git a/post/inventory.php b/post/inventory.php new file mode 100644 index 000000000..ac77573ab --- /dev/null +++ b/post/inventory.php @@ -0,0 +1,97 @@ +"; + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_POST['add_inventory_locations'])) { + + validateAdminRole(); + + require_once("inventory_model.php"); + + // Add Inventory Location + $sql = mysqli_query( + $mysqli, + "INSERT INTO inventory_locations SET inventory_location_name = '$inventory_location_name', inventory_location_description = '$inventory_location_description', inventory_location_address = '$inventory_location_address', inventory_location_city = '$inventory_location_city', inventory_location_state = '$inventory_location_state', inventory_location_zip = '$inventory_location_zip', inventory_location_country = '$inventory_location_country', inventory_location_user_id = $inventory_location_user_id" + ); + + // Logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Inventory', log_action = 'Create', log_description = '$session_name created inventory location $inventory_location_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); + + $_SESSION["alert_message"] = "Inventory location $inventory_location_name added successfully"; + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_POST['edit_inventory_locations'])) { + + validateAdminRole(); + + require_once("inventory_model.php"); + + // Edit Inventory Location + $sql = mysqli_query( + $mysqli, + "UPDATE inventory_locations SET inventory_location_name = '$inventory_location_name', inventory_location_description = '$inventory_location_description', inventory_location_address = '$inventory_location_address', inventory_location_city = '$inventory_location_city', inventory_location_state = '$inventory_location_state', inventory_location_zip = '$inventory_location_zip', inventory_location_country = '$inventory_location_country', inventory_location_user_id = $inventory_location_user_id WHERE inventory_location_id = $inventory_location_id" + ); + + // Logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Inventory', log_action = 'Edit', log_description = '$session_name edited inventory location $inventory_location_name', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); + + $_SESSION["alert_message"] = "Inventory location $inventory_location_name edited successfully"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_GET['archive_inventory_location'])) { + + validateAdminRole(); + + $inventory_location_id = intval($_GET['archive_inventory_location']); + + // Archive Inventory Location + $sql = mysqli_query( + $mysqli, + "UPDATE inventory_locations SET inventory_location_archived_at = NOW(), inventory_location_user_id = 0 WHERE inventory_location_id = $inventory_location_id" + ); + + // Move all inventory to default location + $sql = mysqli_query( + $mysqli, + "UPDATE inventory SET inventory_location_id = 1 WHERE inventory_location_id = $inventory_location_id" + ); + $num_rows = mysqli_affected_rows($mysqli); + + if ($num_rows > 0) { + $items_moved_message = ", $num_rows items moved to default location"; + } else { + $items_moved_message = ", No items were in archived location"; + } + + // Logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Inventory', log_action = 'Archive', log_description = '$session_name archived inventory location $inventory_location_id', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); + + $_SESSION["alert_message"] = "Inventory location $inventory_location_id archived successfully$items_moved_message"; + header("Location: " . $_SERVER["HTTP_REFERER"]); +} \ No newline at end of file diff --git a/post/inventory_model.php b/post/inventory_model.php new file mode 100644 index 000000000..1d13eeefa --- /dev/null +++ b/post/inventory_model.php @@ -0,0 +1,16 @@ + $balance) { - $_SESSION['alert_message'] = "Payment is more than the balance"; - header("Location: " . $_SERVER["HTTP_REFERER"]); + $payment_is_credit = true; + + // Calculate the overpayment amount + $credit_amount = $amount - $balance; + + // Set the payment amount to the invoice balance + $amount = $balance; } else { - mysqli_query($mysqli,"INSERT INTO payments SET payment_date = '$date', payment_amount = $amount, payment_currency_code = '$currency_code', payment_account_id = $account, payment_method = '$payment_method', payment_reference = '$reference', payment_invoice_id = $invoice_id"); + $payment_is_credit = false; + } - // Get Payment ID for reference - $payment_id = mysqli_insert_id($mysqli); - //Add up all the payments for the invoice and get the total amount paid to the invoice - $sql_total_payments_amount = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS payments_amount FROM payments WHERE payment_invoice_id = $invoice_id"); - $row = mysqli_fetch_array($sql_total_payments_amount); - $total_payments_amount = floatval($row['payments_amount']); + mysqli_query($mysqli,"INSERT INTO payments SET payment_date = '$date', payment_amount = $amount, payment_currency_code = '$currency_code', payment_account_id = $account, payment_method = '$payment_method', payment_reference = '$reference', payment_invoice_id = $invoice_id"); - //Get the invoice total - $sql = mysqli_query($mysqli,"SELECT * FROM invoices - LEFT JOIN clients ON invoice_client_id = client_id - LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1 - WHERE invoice_id = $invoice_id" - ); + // Get payment ID for reference + $payment_id = mysqli_insert_id($mysqli); - $row = mysqli_fetch_array($sql); - $invoice_amount = floatval($row['invoice_amount']); - $invoice_prefix = sanitizeInput($row['invoice_prefix']); - $invoice_number = intval($row['invoice_number']); - $invoice_url_key = sanitizeInput($row['invoice_url_key']); - $invoice_currency_code = sanitizeInput($row['invoice_currency_code']); - $client_id = intval($row['client_id']); - $client_name = sanitizeInput($row['client_name']); - $contact_name = sanitizeInput($row['contact_name']); - $contact_email = sanitizeInput($row['contact_email']); - $contact_phone = sanitizeInput(formatPhoneNumber($row['contact_phone'])); - $contact_extension = preg_replace("/[^0-9]/", '',$row['contact_extension']); - $contact_mobile = sanitizeInput(formatPhoneNumber($row['contact_mobile'])); + if($payment_is_credit) { + //Create a credit for the overpayment + mysqli_query($mysqli,"INSERT INTO credits SET credit_amount = $credit_amount, credit_currency_code = '$currency_code', credit_date = '$date', credit_reference = 'Overpayment: $reference', credit_client_id = (SELECT invoice_client_id FROM invoices WHERE invoice_id = $invoice_id), credit_payment_id = $payment_id, credit_account_id = $account"); + // Get credit ID for reference + $credit_id = mysqli_insert_id($mysqli); + + //Logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Credit', log_action = 'Create', log_description = 'Credit for Overpayment', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); + } - $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); - $row = mysqli_fetch_array($sql); + //Add up all the payments for the invoice and get the total amount paid to the invoice + $sql_total_payments_amount = mysqli_query($mysqli,"SELECT SUM(payment_amount) AS payments_amount FROM payments WHERE payment_invoice_id = $invoice_id"); + $row = mysqli_fetch_array($sql_total_payments_amount); + $total_payments_amount = floatval($row['payments_amount']); - $company_name = sanitizeInput($row['company_name']); - $company_country = sanitizeInput($row['company_country']); - $company_address = sanitizeInput($row['company_address']); - $company_city = sanitizeInput($row['company_city']); - $company_state = sanitizeInput($row['company_state']); - $company_zip = sanitizeInput($row['company_zip']); - $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'])); - $company_email = sanitizeInput($row['company_email']); - $company_website = sanitizeInput($row['company_website']); - $company_logo = sanitizeInput($row['company_logo']); + //Get the invoice total + $sql = mysqli_query($mysqli,"SELECT * FROM invoices + LEFT JOIN clients ON invoice_client_id = client_id + LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1 + WHERE invoice_id = $invoice_id" + ); - // Sanitize Config vars from get_settings.php - $config_invoice_from_name = sanitizeInput($config_invoice_from_name); - $config_invoice_from_email = sanitizeInput($config_invoice_from_email); + $row = mysqli_fetch_array($sql); + $invoice_amount = floatval($row['invoice_amount']); + $invoice_prefix = sanitizeInput($row['invoice_prefix']); + $invoice_number = intval($row['invoice_number']); + $invoice_url_key = sanitizeInput($row['invoice_url_key']); + $invoice_currency_code = sanitizeInput($row['invoice_currency_code']); + $client_id = intval($row['client_id']); + $client_name = sanitizeInput($row['client_name']); + $contact_name = sanitizeInput($row['contact_name']); + $contact_email = sanitizeInput($row['contact_email']); + $contact_phone = sanitizeInput(formatPhoneNumber($row['contact_phone'])); + $contact_extension = preg_replace("/[^0-9]/", '',$row['contact_extension']); + $contact_mobile = sanitizeInput(formatPhoneNumber($row['contact_mobile'])); - //Calculate the Invoice balance - $invoice_balance = $invoice_amount - $total_payments_amount; + $sql = mysqli_query($mysqli,"SELECT * FROM companies WHERE company_id = 1"); + $row = mysqli_fetch_array($sql); - $email_data = []; + $company_name = sanitizeInput($row['company_name']); + $company_country = sanitizeInput($row['company_country']); + $company_address = sanitizeInput($row['company_address']); + $company_city = sanitizeInput($row['company_city']); + $company_state = sanitizeInput($row['company_state']); + $company_zip = sanitizeInput($row['company_zip']); + $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'])); + $company_email = sanitizeInput($row['company_email']); + $company_website = sanitizeInput($row['company_website']); + $company_logo = sanitizeInput($row['company_logo']); + + // Sanitize Config vars from get_settings.php + $config_invoice_from_name = sanitizeInput($config_invoice_from_name); + $config_invoice_from_email = sanitizeInput($config_invoice_from_email); - //Determine if invoice has been paid then set the status accordingly - if ($invoice_balance == 0) { + //Calculate the Invoice balance + $invoice_balance = $invoice_amount - $total_payments_amount; + + $email_data = []; + + //Determine if invoice has been paid then set the status accordingly + if ($invoice_balance == 0) { - $invoice_status = "Paid"; - if ($email_receipt == 1) { + $invoice_status = "Paid"; + - $subject = "$company_name Payment Received - Invoice $invoice_prefix$invoice_number"; - $body = "Hello $contact_name,

    We have received your payment in the amount of " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . " for invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "
    Balance: " . numfmt_format_currency($currency_format, $invoice_balance, $invoice_currency_code) . "

    Thank you for your business!


    --
    $company_name - Billing Department
    $config_invoice_from_email
    $company_phone"; - // Queue Mail - $email = [ - 'from' => $config_invoice_from_email, - 'from_name' => $config_invoice_from_name, - 'recipient' => $contact_email, - 'recipient_name' => $contact_name, - 'subject' => $subject, - 'body' => $body - ]; + if ($email_receipt == 1) { - $email_data[] = $email; + $subject = "$company_name Payment Received - Invoice $invoice_prefix$invoice_number"; + $body = "Hello $contact_name,

    We have received your payment in the amount of " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . " for invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "
    Balance: " . numfmt_format_currency($currency_format, $invoice_balance, $invoice_currency_code) . "

    Thank you for your business!


    --
    $company_name - Billing Department
    $config_invoice_from_email
    $company_phone"; + // Queue Mail + $email = [ + 'from' => $config_invoice_from_email, + 'from_name' => $config_invoice_from_name, + 'recipient' => $contact_email, + 'recipient_name' => $contact_name, + 'subject' => $subject, + 'body' => $body + ]; - // Get Email ID for reference - $email_id = mysqli_insert_id($mysqli); + $email_data[] = $email; - // Email Logging + // Get Email ID for reference + $email_id = mysqli_insert_id($mysqli); - $_SESSION['alert_message'] = "Email receipt sent "; + // Email Logging - mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Emailed Receipt!', history_invoice_id = $invoice_id"); + $_SESSION['alert_message'] = "Email receipt sent "; - } + mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Emailed Receipt!', history_invoice_id = $invoice_id"); - } else { + } - $invoice_status = "Partial"; + } else { - if ($email_receipt == 1) { + + $invoice_status = "Partial"; + + if ($email_receipt == 1) { $subject = "$company_name Partial Payment Received - Invoice $invoice_prefix$invoice_number"; $body = "Hello $contact_name,

    We have received partial payment in the amount of " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . " and it has been applied to invoice $invoice_prefix$invoice_number. Please keep this email as a receipt for your records.

    Amount: " . numfmt_format_currency($currency_format, $amount, $invoice_currency_code) . "
    Balance: " . numfmt_format_currency($currency_format, $invoice_balance, $invoice_currency_code) . "

    Thank you for your business!


    ~
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; - // Queue Mail - $email = [ - 'from' => $config_invoice_from_email, - 'from_name' => $config_invoice_from_name, - 'recipient' => $contact_email, - 'recipient_name' => $contact_name, - 'subject' => $subject, - 'body' => $body - ]; - - $email_data[] = $email; - // Get Email ID for reference - $email_id = mysqli_insert_id($mysqli); + // Queue Mail + $email = [ + 'from' => $config_invoice_from_email, + 'from_name' => $config_invoice_from_name, + 'recipient' => $contact_email, + 'recipient_name' => $contact_name, + 'subject' => $subject, + 'body' => $body + ]; - // Email Logging + $email_data[] = $email; - $_SESSION['alert_message'] .= "Email receipt sent "; + // Get Email ID for reference + $email_id = mysqli_insert_id($mysqli); - mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Payment Receipt sent to mail queue ID: $email_id!', history_invoice_id = $invoice_id"); + // Email Logging - } + $_SESSION['alert_message'] .= "Email receipt sent "; - } + mysqli_query($mysqli,"INSERT INTO history SET history_status = 'Sent', history_description = 'Payment Receipt sent to mail queue ID: $email_id!', history_invoice_id = $invoice_id"); - // Add emails to queue - if (!empty($email)) { - addToMailQueue($mysqli, $email_data); } - //Update Invoice Status - mysqli_query($mysqli,"UPDATE invoices SET invoice_status = '$invoice_status' WHERE invoice_id = $invoice_id"); + } - //Add Payment to History - mysqli_query($mysqli,"INSERT INTO history SET history_status = '$invoice_status', history_description = 'Payment added', history_invoice_id = $invoice_id"); + // Add emails to queue + if (!empty($email)) { + addToMailQueue($mysqli, $email_data); + } - //Logging - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Payment', log_action = 'Create', log_description = '$payment_amount', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $payment_id"); + //Update Invoice Status + mysqli_query($mysqli,"UPDATE invoices SET invoice_status = '$invoice_status' WHERE invoice_id = $invoice_id"); - if ($email_receipt == 1) { - mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Payment', log_action = 'Email', log_description = 'Payment receipt for invoice $invoice_prefix$invoice_number queued to $contact_email Email ID: $email_id', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $payment_id"); - } + //Add Payment to History + mysqli_query($mysqli,"INSERT INTO history SET history_status = '$invoice_status', history_description = 'Payment added', history_invoice_id = $invoice_id"); - $_SESSION['alert_message'] .= "Payment added"; + //Logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Payment', log_action = 'Create', log_description = '$payment_amount', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $payment_id"); - header("Location: " . $_SERVER["HTTP_REFERER"]); + if ($email_receipt == 1) { + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Payment', log_action = 'Email', log_description = 'Payment receipt for invoice $invoice_prefix$invoice_number queued to $contact_email Email ID: $email_id', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id, log_entity_id = $payment_id"); } + + $_SESSION['alert_message'] .= "Payment added"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); } + if (isset($_POST['add_bulk_payment'])) { $client_id = intval($_POST['client_id']); $date = sanitizeInput($_POST['date']); $bulk_payment_amount = floatval($_POST['amount']); $bulk_payment_amount_static = floatval($_POST['amount']); - $total_account_balance = floatval($_POST['balance']); + $total_client_balance = floatval($_POST['balance']); $account = intval($_POST['account']); $currency_code = sanitizeInput($_POST['currency_code']); $payment_method = sanitizeInput($_POST['payment_method']); @@ -772,11 +796,15 @@ $email_receipt = intval($_POST['email_receipt']); // Check if bulk_payment_amount exceeds total_account_balance - if ($bulk_payment_amount > $total_account_balance) { - $_SESSION['alert_type'] = "error"; - $_SESSION['alert_message'] = "Payment exceeds Client Balance."; - header("Location: " . $_SERVER["HTTP_REFERER"]); - exit; + if ($bulk_payment_amount > $total_client_balance) { + // Create new credit for the overpayment + $credit_amount = $bulk_payment_amount - $total_client_balance; + $bulk_payment_amount = $total_client_balance; + + // Add Credit + $credit_query = "INSERT INTO credits SET credit_amount = $credit_amount, credit_currency_code = '$currency_code', credit_date = '$date', credit_reference = 'Overpayment: $reference', credit_client_id = $client_id, credit_account_id = $account"; + mysqli_query($mysqli, $credit_query); + $credit_id = mysqli_insert_id($mysqli); } // Get Invoices @@ -1428,3 +1456,159 @@ header("Location: post.php?add_ticket_to_invoice=$invoice_id"); } + +if (isset($_GET['apply_credit'])) { + $credit_id = intval($_GET['apply_credit']); + + $credit_sql = mysqli_query($mysqli,"SELECT * FROM credits WHERE credit_id = $credit_id"); + $credit_row = mysqli_fetch_array($credit_sql); + + $client_id = intval($credit_row['credit_client_id']); + $credit_amount = floatval($credit_row['credit_amount']); + $credit_currency_code = sanitizeInput($credit_row['credit_currency_code']); + + $client_balance = getClientBalance($mysqli, $client_id); + + if ($client_balance < $credit_amount) { + //create a new credit for the remaining amount + $new_credit_amount = $credit_amount - $client_balance; + $new_credit_query = "INSERT INTO credits credit_date = CURDATE(), credit_amount = $new_credit_amount, credit_client_id = $client_id, credit_currency_code = '$credit_currency_code', credit_reference = 'Credit Applied'"; + mysqli_query($mysqli, $new_credit_query); + $new_credit_id = mysqli_insert_id($mysqli); + } + // Delete the original credit + mysqli_query($mysqli,"DELETE FROM credits WHERE credit_id = $credit_id"); + + // Apply payments similar to add bulk payment + + // Get Invoices + $sql_invoices = "SELECT * FROM invoices + WHERE invoice_status != 'Draft' + AND invoice_status != 'Paid' + AND invoice_status != 'Cancelled' + AND invoice_client_id = $client_id + ORDER BY invoice_number ASC"; + $result_invoices = mysqli_query($mysqli, $sql_invoices); + $invoice_applied_count = 0; + + // Loop Through Each Invoice + while ($row = mysqli_fetch_array($result_invoices)) { + $invoice_id = intval($row['invoice_id']); + $invoice_prefix = sanitizeInput($row['invoice_prefix']); + $invoice_number = intval($row['invoice_number']); + $invoice_amount = floatval($row['invoice_amount']); + $invoice_url_key = sanitizeInput($row['invoice_url_key']); + $invoice_balance_query = "SELECT SUM(payment_amount) AS amount_paid FROM payments WHERE payment_invoice_id = $invoice_id"; + $result_amount_paid = mysqli_query($mysqli, $invoice_balance_query); + $row_amount_paid = mysqli_fetch_array($result_amount_paid); + $amount_paid = floatval($row_amount_paid['amount_paid']); + $invoice_balance = $invoice_amount - $amount_paid; + + + if ($credit_amount <= 0) { + break; // Exit the loop if no credit amount is left + } + + if ($invoice_balance <= 0) { + continue; // Skip the invoice if it's already paid + } + + if ($credit_amount >= $invoice_balance) { + $payment_amount = $invoice_balance; + $invoice_status = "Paid"; + } else { + $payment_amount = $credit_amount; + $invoice_status = "Partial"; + } + + $invoice_applied_count++; + + // Subtract the payment amount from the credit amount + $credit_amount -= $payment_amount; + + // Get Invoice Remain Balance + $remaining_invoice_balance = $invoice_balance - $payment_amount; + + // Add Payment + $payment_query = "INSERT INTO payments SET payment_date = CURDATE(), payment_amount = $payment_amount, payment_invoice_id = $invoice_id, payment_account_id = 1, payment_currency_code = '{$credit_row['credit_currency_code']}', payment_reference = 'Credit Applied'"; + mysqli_query($mysqli, $payment_query); + $payment_id = mysqli_insert_id($mysqli); + + // Update Invoice Status + $update_invoice_query = "UPDATE invoices SET invoice_status = '{$invoice_status}' WHERE invoice_id = {$invoice_id}"; + mysqli_query($mysqli, $update_invoice_query); + + // Add Payment to History + $history_description = "Payment added"; + $add_history_query = "INSERT INTO history (history_status, history_description, history_invoice_id) VALUES ('{$invoice_status}', '{$history_description}', {$invoice_id})"; + mysqli_query($mysqli, $add_history_query); + + // Add to Email Body Invoice Portion + + $email_body_invoices .= "
    Invoice $invoice_prefix$invoice_number - Outstanding Amount: " . numfmt_format_currency($currency_format, $invoice_balance, $currency_code) . " - Payment Applied: " . numfmt_format_currency($currency_format, $payment_amount, $currency_code) . " - New Balance: " . numfmt_format_currency($currency_format, $remaining_invoice_balance, $currency_code); + + } // End Invoice Loop + + //Todo add option to send receipts + $email_receipt = 1; + + // Send Email + if ($email_receipt == 1) { + + // Get Client / Contact Info + $sql_client = mysqli_query($mysqli,"SELECT * FROM clients + LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id + AND contact_primary = 1 + WHERE client_id = $client_id" + ); + + $row = mysqli_fetch_array($sql_client); + $client_name = sanitizeInput($row['client_name']); + $contact_name = sanitizeInput($row['contact_name']); + $contact_email = sanitizeInput($row['contact_email']); + + $sql_company = mysqli_query($mysqli,"SELECT company_name, company_phone FROM companies WHERE company_id = 1"); + $row = mysqli_fetch_array($sql_company); + + $company_name = sanitizeInput($row['company_name']); + $company_phone = sanitizeInput(formatPhoneNumber($row['company_phone'])); + + // Sanitize Config vars from get_settings.php + $config_invoice_from_name = sanitizeInput($config_invoice_from_name); + $config_invoice_from_email = sanitizeInput($config_invoice_from_email); + + $subject = "Payment Received - Multiple Invoices"; + $body = "Hello $contact_name,

    Thank you for your payment of " . numfmt_format_currency($currency_format, $bulk_payment_amount_static, $currency_code) . " We\'ve applied your payment to the following invoices, updating their balances accordingly:

    $email_body_invoices


    We appreciate your continued business!

    Sincerely,
    $company_name - Billing
    $config_invoice_from_email
    $company_phone"; + + // Queue Mail + mysqli_query($mysqli, "INSERT INTO email_queue SET email_recipient = '$contact_email', email_recipient_name = '$contact_name', email_from = '$config_invoice_from_email', email_from_name = '$config_invoice_from_name', email_subject = '$subject', email_content = '$body'"); + + // Get Email ID for reference + $email_id = mysqli_insert_id($mysqli); + + // Email Logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Payment', log_action = 'Email', log_description = 'Bulk Payment receipt for multiple Invoices queued to $contact_email Email ID: $email_id', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session"); + + $_SESSION['alert_message'] .= "Email receipt sent and "; + + } // End Email + + // Logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Payment', log_action = 'Create', log_description = 'Bulk Payment of $bulk_payment_amount_static', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_client_id = $client_id, log_user_id = $session_user_id"); + + $_SESSION['alert_message'] .= "Credit applied to $credit_applied_count invoices"; + + header("Location: " . $_SERVER["HTTP_REFERER"]); +} + +if (isset($_GET['delete_credit'])) { + $credit_id = intval($_GET['delete_credit']); + + mysqli_query($mysqli,"DELETE FROM credits WHERE credit_id = $credit_id"); + + //Logging + mysqli_query($mysqli,"INSERT INTO logs SET log_type = 'Credit', log_action = 'Delete', log_description = 'Credit $credit_id deleted', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); + + $_SESSION['alert_message'] = "Credit deleted"; + header("Location: " . $_SERVER["HTTP_REFERER"]); +} \ No newline at end of file diff --git a/post/ticket.php b/post/ticket.php index e24168bf8..320350aab 100644 --- a/post/ticket.php +++ b/post/ticket.php @@ -1252,6 +1252,43 @@ mysqli_query($mysqli, "INSERT INTO invoice_items SET item_name = '$item_name', item_description = '$item_description', item_quantity = $qty, item_price = $price, item_subtotal = $subtotal, item_tax = $tax_amount, item_total = $total, item_order = 1, item_tax_id = $tax_id, item_invoice_id = $invoice_id"); + + // Check for products in db and add to invoice + $ticket_products_sql = mysqli_query($mysqli, "SELECT * FROM ticket_products WHERE ticket_product_ticket_id = $ticket_id"); + while ($row = mysqli_fetch_array($ticket_products_sql)) { + $product_id = intval($row['ticket_product_product_id']); + $product_qty = floatval($row['ticket_product_quantity']); + + $sql = mysqli_query($mysqli, "SELECT * FROM products WHERE product_id = $product_id"); + $row = mysqli_fetch_array($sql); + $product_name = sanitizeInput($row['product_name']); + $product_description = sanitizeInput($row['product_description']); + $product_price = floatval($row['product_price']); + $product_tax_id = intval($row['product_tax_id']); + + $product_subtotal = $product_price * $product_qty; + + if ($product_tax_id > 0) { + $sql = mysqli_query($mysqli, "SELECT * FROM taxes WHERE tax_id = $product_tax_id"); + $row = mysqli_fetch_array($sql); + $product_tax_percent = floatval($row['tax_percent']); + $product_tax_amount = $product_subtotal * $product_tax_percent / 100; + } else { + $product_tax_amount = 0; + } + + $product_total = $product_subtotal + $product_tax_amount; + + $total = $total + $product_total; + + mysqli_query($mysqli, "INSERT INTO invoice_items SET item_name = '$product_name', item_description = '$product_description', item_quantity = $product_qty, item_price = $product_price, item_subtotal = $product_subtotal, item_tax = $product_tax_amount, item_total = $product_total, item_order = 1, item_tax_id = $product_tax_id, item_invoice_id = $invoice_id"); + + // Add product to string for internal note + $product_ticket_note .= ".
    $product_qty x $product_name added to invoice"; + } + + + //Update Invoice Balances $sql = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_id = $invoice_id"); @@ -1264,9 +1301,10 @@ mysqli_query($mysqli, "INSERT INTO history SET history_status = 'Draft', history_description = 'Invoice created from Ticket $ticket_prefix$ticket_number', history_invoice_id = $invoice_id"); // Add internal note to ticket, and link to invoice in database - mysqli_query($mysqli, "INSERT INTO ticket_replies SET ticket_reply = 'Created invoice $config_invoice_prefix$invoice_number for this ticket.', ticket_reply_type = 'Internal', ticket_reply_time_worked = '00:01:00', ticket_reply_by = $session_user_id, ticket_reply_ticket_id = $ticket_id"); + mysqli_query($mysqli, "INSERT INTO ticket_replies SET ticket_reply = 'Created invoice $config_invoice_prefix$invoice_number for this ticket$product_ticket_note.', ticket_reply_type = 'Internal', ticket_reply_time_worked = '00:01:00', ticket_reply_by = $session_user_id, ticket_reply_ticket_id = $ticket_id"); mysqli_query($mysqli, "UPDATE tickets SET ticket_invoice_id = $invoice_id WHERE ticket_id = $ticket_id"); + // Logging mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Invoice', log_action = 'Create', log_description = '$config_invoice_prefix$invoice_number created from Ticket $ticket_prefix$ticket_number', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id"); @@ -1764,3 +1802,90 @@ header("Location: " . $_SERVER["HTTP_REFERER"]); } + + +if (isset($_POST['add_ticket_products'])) { + + validateTechRole(); + + $ticket_id = intval($_POST['ticket_id']); + $product_id = intval($_POST['product_id']); + $qty = intval($_POST['quantity']); + + //find user inventory location + $sql = mysqli_query($mysqli, "SELECT * FROM inventory_locations WHERE inventory_location_user_id = $session_user_id"); + $num_rows = mysqli_num_rows($sql); + + if ($num_rows == 1) { + $row = mysqli_fetch_array($sql); + $session_location_id = intval($row['inventory_location_id']); + } elseif ($num_rows > 1) { + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "You have more than one inventory location set. Please contact your administrator"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit; + } else { + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "You do not have an inventory location set. Please contact your administrator"; + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit; + } + + //check qty against inventory + $sql = mysqli_query($mysqli, "SELECT SUM(inventory_quantity) as inventory_quantity FROM inventory WHERE inventory_product_id = $product_id AND inventory_location_id = $session_location_id GROUP BY inventory_product_id, inventory_location_id;"); + $row = mysqli_fetch_array($sql); + $inventory_qty = intval($row['inventory_quantity']); + if ($qty > $inventory_qty) { + $_SESSION['alert_type'] = "error"; + $_SESSION['alert_message'] = "You do not have enough inventory to add that quantity, QTY: $qty, Inventory: $inventory_qty in location $session_location_id, $num_rows rows found."; + header("Location: " . $_SERVER["HTTP_REFERER"]); + exit; + } + + + + // Add to DB + mysqli_query($mysqli, "INSERT INTO ticket_products SET ticket_product_ticket_id = $ticket_id, ticket_product_product_id = $product_id, ticket_product_quantity = $qty"); + + // Delete one item per qty + mysqli_query($mysqli, "UPDATE inventory SET inventory_quantity = inventory_quantity - 1 WHERE inventory_product_id = $product_id AND inventory_location_id = $session_location_id AND inventory_quantity > 0 LIMIT $qty"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket', log_action = 'Modify', log_description = '$session_name added product to ticket', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $ticket_id"); + + $_SESSION['alert_message'] = "Product added to ticket"; + header("Location: ". $_SERVER["HTTP_REFERER"]); + +} + +if (isset($_GET['delete_ticket_product'])) { + + validateTechRole(); + + $ticket_product_id = intval($_GET['delete_ticket_product']); + $ticket_id = intval($_GET['ticket_id']); + + // Get product ID + $sql = mysqli_query($mysqli, "SELECT * FROM ticket_products WHERE ticket_product_id = $ticket_product_id"); + $row = mysqli_fetch_array($sql); + $product_id = intval($row['ticket_product_product_id']); + $qty = intval($row['ticket_product_quantity']); + + // Delete + mysqli_query($mysqli, "DELETE FROM ticket_products WHERE ticket_product_id = $ticket_product_id"); + + //find user's inventory location + $sql = mysqli_query($mysqli, "SELECT * FROM inventory_locations WHERE inventory_location_user_id = $session_user_id"); + $row = mysqli_fetch_array($sql); + $session_location_id = intval($row['inventory_location_id']); + + // Restore inventory quantity + mysqli_query($mysqli, "UPDATE inventory SET inventory_quantity = inventory_quantity + 1 WHERE inventory_product_id = $product_id AND inventory_location_id = $session_location_id AND inventory_quantity = 0 LIMIT $qty"); + + // Logging + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Ticket', log_action = 'Modify', log_description = '$session_name deleted product from ticket', log_ip = '$session_ip', log_user_agent = '$session_user_agent', log_user_id = $session_user_id, log_entity_id = $ticket_id"); + + $_SESSION['alert_message'] = "Product removed from ticket. Please see administrator to return inventory"; + header("Location: ". $_SERVER["HTTP_REFERER"]); + +} diff --git a/products.php b/products.php index f8cd081ef..d3d2c7a69 100644 --- a/products.php +++ b/products.php @@ -43,6 +43,11 @@
    +
    +
    + Inventory +
    +
    diff --git a/ticket.php b/ticket.php index 076d22370..8f0dedd61 100644 --- a/ticket.php +++ b/ticket.php @@ -75,19 +75,11 @@ $ticket_priority_display = "-"; } $ticket_feedback = nullable_htmlentities($row['ticket_feedback']); - + + // Ticket Status Display $ticket_status = nullable_htmlentities($row['ticket_status']); - if ($ticket_status == "New") { - $ticket_status_display = "$ticket_status"; - } elseif ($ticket_status == "Open") { - $ticket_status_display = "$ticket_status"; - } elseif ($ticket_status == "On Hold") { - $ticket_status_display = "$ticket_status"; - } elseif ($ticket_status == "Auto Close" || $ticket_status == "Closed") { - $ticket_status_display = "$ticket_status"; - } else { - $ticket_status_display = "$ticket_status"; // To be removed - } + $ticket_status_color = getTicketStatusColor($ticket_status); + $ticket_status_display = "$ticket_status"; $ticket_vendor_ticket_number = nullable_htmlentities($row['ticket_vendor_ticket_number']); $ticket_created_at = nullable_htmlentities($row['ticket_created_at']); @@ -234,157 +226,191 @@ AND ticket_attachment_ticket_id = $ticket_id" ); + // Get Products in inventory attached to this ticket + $sql_ticket_products = mysqli_query( + $mysqli, + "SELECT * FROM ticket_products + LEFT JOIN products ON ticket_products.ticket_product_product_id = products.product_id + WHERE ticket_product_ticket_id = $ticket_id" + ); + + $ticket_products_display = ''; + while ($row = mysqli_fetch_array($sql_ticket_products)) { + $ticket_product_id = intval($row['ticket_product_id']); + $product_id = intval($row['product_id']); + $product_name = nullable_htmlentities($row['product_name']); + $product_quantity = intval($row['ticket_product_quantity']); + + + $ticket_products_display .= "
    $product_name x$product_quantity✘
    "; + } + ?> - -
      -
    1. - Tickets -
      2. -
    2. - -
      3. -
    3. Ticket Details
      4. -
    -
    -
    -
    -

    Ticket

    -
    - -
    -
    - -
    - - Edit - - - Merge - - - Change Client - - -
    - - Delete - - -
    -
    -
    - + +
      +
    1. + Tickets +
      2. +
    2. + +
      3. +
    3. Ticket Details
      4. +
    +
    +
    +
    +

    Ticket +

    +
    + +
    +
    + +
    + + Edit + + + Merge + + + Change Client + + +
    + + Delete + + +
    + +
    +
    -
    +
    -
    -
    -
    +
    +
    +
    -
    -

    -
    +
    +

    +
    -
    - +
    + - $name | Download | View"; } ?> -
    +
    -
    +
    - - -
    - - -
    - -
    - -
    + + + + + +
    + +
    + +
    -
    - - -
    - -
    - -
    - +
    + + +
    + +
    + +
    + +
    +
    +
    +
    +
    +
    -
    -
    -
    -
    - -
    - -
    -
    - - + + +
    +
    -
    - -
    -
    -
    -
    - -
    +
    -
    - -
    + +
    +
    +
    -
    - -
    +
    + +
    -
    -
    +
    +
    - -
    -
    - - -
    +
    +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    - -
    -
    -
    - > - -
    -
    -
    +
    +
    +
    + > + +
    +
    +
    -
    - -
    +
    + +
    -
    +
    -

    +

    - - - + + + -
    Responses ()
    +
    Responses ()
    - - + -
    mb-3"> -
    -

    -
    - - User Avatar - - - - - - - -
    - -
    - +

    +
    + + User Avatar + + + + + + + +
    + +
    + + -
    - -
    - Time worked: -
    - -
    -
    -

    - - -
    -
    - -
    - - Edit - - -
    - - Archive - - -
    -
    -
    +
    + +
    + Time worked: + +
    +
    +
    +

    + +
    +
    + +
    + + Edit + + +
    + + Archive + +
    +
    +
    + -
    - +
    - + + + $name | Download | View"; } ?> -
    +
    -
    +
    - -
    -
    +
    +
    -
    -
    +
    +
    - -
    -
    - +
    +
    + -
    - -
    - +
    + +
    + - -
    - -
    - +
    + +
    + - -
    -
    Contact
    + +
    +
    Contact
    - + -
    - - -
    +
    + + +
    - -
    - -
    - + +
    + -
    - -
    - + +
    + -
    - -
    - + +
    + -
    - -
    - +
    + +
    + - -
    -
    - Previous ticket: - -
    -
    - Status: - -
    - +
    +
    + Previous ticket: + +
    +
    + Status: + +
    + - -
    - Add a Contact -
    - -
    - + +
    + Add a Contact +
    + +
    + - - + 0) { ?> -
    -
    Watchers
    +
    +
    Watchers
    - -
    - Add a Watcher -
    - + +
    + Add a Watcher +
    + - -
    - - - - - - -
    +
    + + + + + + +
    - -
    - - - -
    -
    Details
    -
    - -
    -
    - Created: -
    -
    - Updated: -
    +
    + + + +
    +
    Details
    +
    + +
    +
    + Created: + +
    +
    + Updated: + +
    - - + -
    - Closed by: -
    -
    - Feedback: -
    - - +
    + Closed by: + +
    +
    + Feedback: + +
    + + - -
    - Scheduled: -
    - + Scheduled: + +
    + -
    - Total time worked: -
    - + Total time worked: + +
    + -
    - Billable: - - + Billable: + + $"; } else { echo "X"; } ?> - -
    - -
    - + +
    + +
    + - -
    -
    Asset
    + +
    +
    Asset
    - + -
    - Add an Asset -
    +
    + Add an Asset +
    - + -
    - -
    +
    + +
    - -
    - -
    - +
    + +
    + -
    - -
    - + +
    + -
    - Model: -
    - + Model: + +
    + -
    - Service Tag: -
    - + Service Tag: + +
    + -
    - Warranty expires: -
    - + Warranty expires: + +
    + -
    - -
    - + +
    + 0) { ?> - - - +
    - - -
    - - - -
    -
    Vendor
    - -
    - Add a Vendor -
    - -
    - -
    - + + + +
    +
    Vendor
    + +
    + Add a Vendor +
    + +
    + +
    + -
    - -
    - + +
    + -
    - -
    - + +
    + -
    - -
    - + +
    + -
    - -
    - + +
    + -
    - -
    - +
    + +
    + - -
    - +
    + -
    - - -
    - -
    -
    - -
    - + +
    + +
    +
    + +
    + -
    - -
    -
    + } ?>>
    - +
    +
    + -
    - - - Invoice Ticket - - + + + Invoice Ticket + + - - Close Ticket - - -
    - -
    + + Close Ticket + +
    - + + + + - - + + - - - + + + - + \ No newline at end of file diff --git a/ticket_add_product_modal.php b/ticket_add_product_modal.php new file mode 100644 index 000000000..a015989b6 --- /dev/null +++ b/ticket_add_product_modal.php @@ -0,0 +1,43 @@ + diff --git a/tickets.php b/tickets.php index 140fa26b1..b8ffc2053 100644 --- a/tickets.php +++ b/tickets.php @@ -358,17 +358,7 @@ $contact_extension = nullable_htmlentities($row['contact_extension']); $contact_mobile = formatPhoneNumber($row['contact_mobile']); - if ($ticket_status == "New") { - $ticket_status_color = "danger"; - } elseif ($ticket_status == "Open") { - $ticket_status_color = "primary"; - } elseif ($ticket_status == "On Hold") { - $ticket_status_color = "success"; - } elseif ($ticket_status == "Auto Close") { - $ticket_status_color = "dark"; - } elseif ($ticket_status == "Closed") { - $ticket_status_color = "dark"; - } + $ticket_status_color = getTicketStatusColor($ticket_status); if ($ticket_priority == "High") { $ticket_priority_color = "danger";