diff --git a/admin/database_updates.php b/admin/database_updates.php index 6a5b1d16..40532484 100644 --- a/admin/database_updates.php +++ b/admin/database_updates.php @@ -3828,6 +3828,26 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.8'"); } + if (CURRENT_DATABASE_VERSION == '2.2.8') { + + mysqli_query($mysqli, "ALTER TABLE `products` ADD `product_type` ENUM('service', 'product') NOT NULL DEFAULT 'service' AFTER `product_name`"); + mysqli_query($mysqli, "ALTER TABLE `products` ADD `product_code` VARCHAR(200) DEFAULT NULL AFTER `product_description`"); + mysqli_query($mysqli, "ALTER TABLE `products` ADD `product_location` VARCHAR(250) DEFAULT NULL AFTER `product_code`"); + + mysqli_query($mysqli, "CREATE TABLE `product_stock` ( + `stock_id` INT(11) NOT NULL AUTO_INCREMENT, + `stock_qty` INT(11) NOT NULL, + `stock_note` TEXT DEFAULT NULL, + `stock_created_at` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP(), + `stock_expense_id` INT(11) DEFAULT NULL, + `stock_item_id` INT(11) DEFAULT NULL, + `stock_product_id` INT(11) NOT NULL, + PRIMARY KEY (`stock_id`) + )"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.2.9'"); + } + /* 2025-07-21 - JQ For next release Pauyment Provider Switch Over if (CURRENT_DATABASE_VERSION == '2.2.4') { diff --git a/db.sql b/db.sql index 9df0f868..467db9d7 100644 --- a/db.sql +++ b/db.sql @@ -1457,6 +1457,25 @@ CREATE TABLE `payments` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; /*!40101 SET character_set_client = @saved_cs_client */; +-- +-- Table structure for table `product_stock` +-- + +DROP TABLE IF EXISTS `product_stock`; +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8mb4 */; +CREATE TABLE `product_stock` ( + `stock_id` int(11) NOT NULL AUTO_INCREMENT, + `stock_qty` int(11) NOT NULL, + `stock_note` text DEFAULT NULL, + `stock_created_at` datetime NOT NULL DEFAULT current_timestamp(), + `stock_expense_id` int(11) DEFAULT NULL, + `stock_item_id` int(11) DEFAULT NULL, + `stock_product_id` int(11) NOT NULL, + PRIMARY KEY (`stock_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci; +/*!40101 SET character_set_client = @saved_cs_client */; + -- -- Table structure for table `products` -- @@ -1467,7 +1486,10 @@ DROP TABLE IF EXISTS `products`; CREATE TABLE `products` ( `product_id` int(11) NOT NULL AUTO_INCREMENT, `product_name` varchar(200) NOT NULL, + `product_type` enum('service','product') NOT NULL DEFAULT 'service', `product_description` text DEFAULT NULL, + `product_code` varchar(200) DEFAULT NULL, + `product_location` varchar(250) DEFAULT NULL, `product_price` decimal(15,2) NOT NULL, `product_currency_code` varchar(200) NOT NULL, `product_created_at` datetime NOT NULL DEFAULT current_timestamp(), @@ -2766,4 +2788,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-08-05 13:30:24 +-- Dump completed on 2025-08-11 18:18:59 diff --git a/includes/database_version.php b/includes/database_version.php index 9036675e..15a4db2d 100644 --- a/includes/database_version.php +++ b/includes/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "2.2.8"); +DEFINE("LATEST_DATABASE_VERSION", "2.2.9"); diff --git a/user/clients.php b/user/clients.php index 47df720f..52558949 100644 --- a/user/clients.php +++ b/user/clients.php @@ -130,7 +130,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));