diff --git a/app/assets/js/custom.js b/app/assets/js/custom.js
index 25747f9..361e4f3 100644
--- a/app/assets/js/custom.js
+++ b/app/assets/js/custom.js
@@ -33,6 +33,10 @@ $(function () {
           type: 'POST',
           dataType: 'json',
           data: { json: json },
+          // for CSRF validation
+          headers: {
+            'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+          },
 
           success: function (res) {
 
@@ -80,7 +84,10 @@ $(function () {
           // Replace input value with SKU
           $(this)
             .val(product.sku)
-            .attr("secondary", product.id);
+            .attr("secondary", product.sku);
+          $('input#product_name')
+            .val(product.product_name)
+            .attr("secondary", product.product_name)
 
           console.log("Input updated with SKU:", product.sku);
 
@@ -90,12 +97,21 @@ $(function () {
 
     })
 
-      // Allow HTML rendering in dropdown
-      .data("ui-autocomplete")._renderItem = function (ul, item) {
-        return $("<li>")
-          .append($("<div>").html(item.label))
-          .appendTo(ul);
-      };
+    // Allow HTML rendering in dropdown
+    .data("ui-autocomplete")._renderItem = function (ul, item) {
+      return $("<li>")
+        .append($("<div>").html(item.label))
+        .appendTo(ul);
+    };
+
+    // Add this ↓
+    $el.on('blur', function () {
+      var secondary = $(this).attr('secondary');
+      if (secondary) {
+        $(this).val(secondary);
+        $('input#product_name').val($('input#product_name').attr('secondary'));
+      }
+    });
 
   });
 
@@ -147,6 +163,7 @@ function prepare_form_data(check_required, raw_data) {
 
     if (!is_valid) {
       alert("Please fill in all mandatory fields.");
+      isAjaxProcessing = false;
       return false;
     }
   }
@@ -178,6 +195,7 @@ function ajax_request(options) {
 
     let payloadJson = prepare_form_data(options.checkRequired ?? 0, true);
     if (payloadJson === false) {
+      isAjaxProcessing = false;
       return Promise.reject("validation_failed");
     }
     
@@ -195,6 +213,7 @@ function ajax_request(options) {
       // add action to JSON
       payloadJson['action'] = options.action;
     }else{
+      isAjaxProcessing = false;
       return Promise.reject("please_define_action");
     }
 
diff --git a/app/ics/add_stock_in.php b/app/ics/add_stock_in.php
index 08d17e4..99b084e 100644
--- a/app/ics/add_stock_in.php
+++ b/app/ics/add_stock_in.php
@@ -28,16 +28,20 @@
               <h2 class="fs-5 mb-4">Add Stock</h2>
               <form class="row gx-5">
                 <!-- Product Name -->
-                <div class="mb-3 col-lg-6">
-                  <label for="product_sku" class="form-label">Product</label>
+                <div class="mb-3 col-lg-3">
+                  <label for="product_sku" class="form-label">SKU</label>
                   <input type="text" id="product_sku" class="form-control product_search"
-                    placeholder="Type product name..." autocomplete="off">
+                    placeholder="Type product sku..." autocomplete="off" required>
+                </div>
+                <div class="mb-3 col-lg-3">
+                  <label for="product_name" class="form-label">Name</label>
+                  <input type="text" id="product_name" class="form-control" autocomplete="off" disabled>
                 </div>
 
                 <!-- SKU or Product Code -->
                 <div class="mb-3 col-lg-6">
                   <label for="quantity" class="form-label">Quantity</label>
-                  <input type="number" class="form-control" id="quantity" placeholder="Enter quantity">
+                  <input type="number" class="form-control" id="quantity" placeholder="Enter quantity" required>
                 </div>
 
 
@@ -45,26 +49,26 @@
                 <!-- Warehouse -->
                 <div class="mb-3 col-lg-6">
                   <label for="warehouse" class="form-label">Warehouse</label>
-                  <select name="warehouse" id="warehouse" class="form-select"></select>
+                  <select name="warehouse" id="warehouse" class="form-select" required></select>
                 </div>
 
                 <div class="mb-3 col-lg-6">
                   <label for="zone" class="form-label">Zone</label>
-                  <select name="zone" id="zone" class="form-select">
+                  <select name="zone" id="zone" class="form-select" required>
                     <option value="">Please select zone</option>
                   </select>
                 </div>
 
                 <div class="mb-3 col-lg-6">
                   <label for="aisle" class="form-label">Aisle</label>
-                  <select name="aisle" id="aisle" class="form-select">
+                  <select name="aisle" id="aisle" class="form-select" required>
                     <option value="">Please select aisle</option>
                   </select>
                 </div>
 
                 <div class="mb-3 col-lg-6">
                   <label for="rack" class="form-label">Rack</label>
-                  <select name="rack" id="rack" class="form-select">
+                  <select name="rack" id="rack" class="form-select" required>
                     <option value="">Please select rack</option>
                   </select>
                 </div>
@@ -106,6 +110,7 @@
       autoPrepare: true,
       checkRequired: 0,
       debugMode: 0,
+      action: 'manage',
       onSuccess: function(res) {
 
         window.location.href = "<?php echo $server_url?>ics/stock_in.php";
@@ -123,6 +128,7 @@
       url: "<?php echo $server_url?>inventory/api/engine/warehouse.php",
       autoPrepare: true,
       checkRequired: 0,
+      action: 'read',
       onSuccess: function(res) {
         var option = `<option value="">Please select warehouse</option>`;
         $.each(res.output, function(key, item) {
@@ -143,6 +149,7 @@
       autoPrepare: true,
       checkRequired: 0,
       noLoading: true,
+      action: 'read',
       onSuccess: function(res) {
         var option = `<option value="">Please select zone</option>`;
         $.each(res.output, function(key, item) {
@@ -163,6 +170,7 @@
       autoPrepare: true,
       checkRequired: 0,
       noLoading: true,
+      action: 'read',
       onSuccess: function(res) {
         var option = `<option value="">Please select aisle</option>`;
         $.each(res.output, function(key, item) {
@@ -183,6 +191,7 @@
       autoPrepare: true,
       checkRequired: 0,
       noLoading: true,
+      action: 'read',
       onSuccess: function(res) {
         var option = `<option value="">Please select rack</option>`;
         $.each(res.output, function(key, item) {
diff --git a/app/inventory/api/engine/manage_warehouse.php b/app/inventory/api/engine/manage_warehouse.php
index 7caeb32..d0425c1 100644
--- a/app/inventory/api/engine/manage_warehouse.php
+++ b/app/inventory/api/engine/manage_warehouse.php
@@ -5,6 +5,8 @@ require '../../../assets/utils/db_auth.php';
 
 $id = (int)($data['id'] ?? 0);
 
+$pdo2->beginTransaction();
+
 // get existing log
 $sql = "SELECT `log`
         FROM md_warehouse
@@ -51,6 +53,7 @@ if ($id > 0) {
     ":status"         => (int)($data["status"] ?? 1),
     ":log"            => json_encode($table_log, JSON_UNESCAPED_UNICODE),
   ]);
+  db_check($sth, $answer);
 
 } else {
 
@@ -70,10 +73,25 @@ if ($id > 0) {
     ":status"         => (int)($data["status"] ?? 1),
     ":log"            => json_encode($table_log, JSON_UNESCAPED_UNICODE),
   ]);
+  db_check($sth, $answer);
+
+
+  
+  if(!empty($data["warehouse_name"])){
+    /**
+     * Create warehouse table
+     */
+    $safe_name = 'td_stock_' . preg_replace('/[^a-zA-Z0-9_]/', '', $data["warehouse_name"]);
+  
+    $sql = "CREATE TABLE `$safe_name` LIKE `td_stock`";
+    $sth = $pdo2->prepare($sql); 
+    $sth->execute();
+    db_check($sth, $answer);
+  }
   
 }
 
-db_check($sth, $answer);
+$pdo2->commit();
 
 $answer["success"] = 1;
 exit(json_encode($answer));
diff --git a/app/inventory/manage_storage.php b/app/inventory/manage_storage.php
index a018887..8185301 100644
--- a/app/inventory/manage_storage.php
+++ b/app/inventory/manage_storage.php
@@ -90,6 +90,7 @@
       autoPrepare: true,
       checkRequired: 0,
       debugMode: 0,
+      action: 'manage',
       onSuccess: function(res) {
 
         window.location.href = "<?php echo $server_url?>inventory/warehouse.php";
@@ -106,6 +107,7 @@
       url: "<?php echo $server_url?>inventory/api/engine/warehouse.php",
       autoPrepare: true,
       checkRequired: 0,
+      action: 'read',
       onSuccess: function(res) {
         var option = ``;
         $.each(res.output, function(key, item) {
@@ -124,6 +126,7 @@
       url: "<?php echo $server_url?>inventory/api/engine/retrieve_storage.php",
       autoPrepare: true,
       checkRequired: 0,
+      action: 'read',
       onSuccess: function(res) {
 
         $.each(res.output, function(key, item) {
diff --git a/app/inventory/manage_warehouse.php b/app/inventory/manage_warehouse.php
index 06ebc43..0b80f35 100644
--- a/app/inventory/manage_warehouse.php
+++ b/app/inventory/manage_warehouse.php
@@ -81,7 +81,7 @@
     return ajax_request({
       url: "<?php echo $server_url?>inventory/api/engine/manage_warehouse.php",
       autoPrepare: true,
-      checkRequired: 0,
+      checkRequired: 1,
       debugMode: 0,
       action: 'manage',
       onSuccess: function(res) {