From ce2a741450c90484693294dfcce1c8b40dc4af80 Mon Sep 17 00:00:00 2001
From: ArifHilmi <arifhilmi007@gmail.com>
Date: Mon, 10 Mar 2025 22:28:46 +0800
Subject: [PATCH] Update Qr

---
 Areas/Inventory/Models/RequestModel.cs        |    2 +
 .../Views/InventoryMaster/ItemMovement.cshtml |    2 +-
 .../InventoryMaster/ItemRegistration.cshtml   |   42 +-
 .../InventoryMaster/ItemRequestMaster.cshtml  |  956 +++++++++------
 .../ManifacturerRegistration.cshtml           |    2 +-
 .../ProductRegistration.cshtml                |    2 +-
 .../StationRegistration.cshtml                |    2 +-
 .../SupplierRegistration.cshtml               |    2 +-
 .../Views/ItemMovement/ItemRequest.cshtml     |    2 +-
 Controllers/API/Inventory/InvMainAPI.cs       |   88 ++
 ...50310054721_UpdateTableRequest.Designer.cs | 1059 +++++++++++++++++
 .../20250310054721_UpdateTableRequest.cs      |   68 ++
 .../CentralSystemContextModelSnapshot.cs      |   18 +-
 appsettings.json                              |    2 +-
 14 files changed, 1874 insertions(+), 373 deletions(-)
 create mode 100644 Migrations/20250310054721_UpdateTableRequest.Designer.cs
 create mode 100644 Migrations/20250310054721_UpdateTableRequest.cs

diff --git a/Areas/Inventory/Models/RequestModel.cs b/Areas/Inventory/Models/RequestModel.cs
index 66b6628..fdacce9 100644
--- a/Areas/Inventory/Models/RequestModel.cs
+++ b/Areas/Inventory/Models/RequestModel.cs
@@ -26,6 +26,8 @@ namespace PSTW_CentralSystem.Areas.Inventory.Models
         public DateTime? approvalDate { get; set; }
         public int? RequestQuantity { get; set; }
         public string? Document {  get; set; }
+        public string? fromStoreItem { get; set; }
+        public string? assignStoreItem { get; set; }
 
     }
 }
diff --git a/Areas/Inventory/Views/InventoryMaster/ItemMovement.cshtml b/Areas/Inventory/Views/InventoryMaster/ItemMovement.cshtml
index 12bf185..da045ee 100644
--- a/Areas/Inventory/Views/InventoryMaster/ItemMovement.cshtml
+++ b/Areas/Inventory/Views/InventoryMaster/ItemMovement.cshtml
@@ -49,7 +49,7 @@
         margin-left: auto !important; /* Push Complete/Incomplete to right */
     }
 </style>
-@await Html.PartialAsync("~/Areas/Inventory/Views/_InventoryPartial.cshtml");
+@await Html.PartialAsync("~/Areas/Inventory/Views/_InventoryPartial.cshtml")
 <div id="registerItem" class="row">
     <div class="row mb-3" >
         <h2 for="sortSelect" class="col-sm-1 col-form-h2" style="min-width:140px;">Sort by:</h2>
diff --git a/Areas/Inventory/Views/InventoryMaster/ItemRegistration.cshtml b/Areas/Inventory/Views/InventoryMaster/ItemRegistration.cshtml
index f91c0dc..5f0e183 100644
--- a/Areas/Inventory/Views/InventoryMaster/ItemRegistration.cshtml
+++ b/Areas/Inventory/Views/InventoryMaster/ItemRegistration.cshtml
@@ -638,18 +638,27 @@
                         ],
                         responsive: true,
                         drawCallback: function (settings) {
-                            // Generate QR codes after rows are rendered
-                            const api = this.api();
-                            api.rows().every(function () {
-                                const data = this.data(); // Row data
-                                const containerId = `qr${data.uniqueID}`;
-                                const container = $(`#${containerId}`);
-                                container.empty();
-                                container.append(`${data.uniqueID}`);
-                                // console.log(container[0]);
-                                if (container) {
-                                    // Generate QR code only if not already generated
-                                    new QRCode(container[0], {
+                            setTimeout(() => {
+                                const api = this.api();
+                                api.rows().every(function () {
+                                    const data = this.data();
+                                    const containerId = `qr${data.uniqueID}`;
+                                    const container = document.getElementById(containerId);
+
+                                    if (!container) {
+                                        return;
+                                    }
+
+                                    container.innerHTML = ""; 
+                                    container.append(data.uniqueID); 
+
+                                    // Ensure qrString is valid before generating QR code
+                                    if (!data.qrString) {
+                                        return;
+                                    }
+
+                                    // Generate QR Code
+                                    new QRCode(container, {
                                         text: data.qrString,
                                         width: 100,
                                         height: 100,
@@ -657,12 +666,9 @@
                                         colorLight: "#ffffff",
                                         correctLevel: QRCode.CorrectLevel.M
                                     });
-                                }
-                                // container.on('click', function() {
-                                //     window.open(data.qrString, '_blank');
-                                // });
-                            });
-                        },
+                                });
+                            }, 100); // Small delay to ensure elements exist
+                        }
                     })
 
                     // Attach click event listener to the delete buttons
diff --git a/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml b/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml
index f06f6c9..8625b70 100644
--- a/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml
+++ b/Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml
@@ -2,36 +2,129 @@
     ViewData["Title"] = "Product Request";
     Layout = "~/Views/Shared/_Layout.cshtml";
 }
-@await Html.PartialAsync("~/Areas/Inventory/Views/_InventoryPartial.cshtml");
+@await Html.PartialAsync("~/Areas/Inventory/Views/_InventoryPartial.cshtml")
+
+<style>
+    .dropdown {
+        position: relative;
+        width: 100%;
+    }
+
+    .dropdown-toggle-box {
+        display: flex;
+        align-items: center;
+        border: 1px solid #ddd;
+        border-radius: 5px;
+        overflow: hidden;
+    }
+
+        .dropdown-toggle-box input {
+            flex: 1;
+            border: none;
+            padding: 8px;
+        }
+
+    .dropdown-btn {
+        border: none;
+        background-color: #007bff;
+        color: white;
+        padding: 8px 12px;
+        cursor: pointer;
+    }
+
+    .dropdown-content {
+        position: absolute;
+        width: 100%;
+        max-height: 200px;
+        overflow-y: auto;
+        background: #fff;
+        border: 1px solid #ddd;
+        z-index: 10;
+    }
+
+        .dropdown-content option {
+            padding: 10px;
+            cursor: pointer;
+            display: block;
+        }
+
+            .dropdown-content option:hover {
+                background-color: #f1f1f1;
+            }
+
+    .modal-body img {
+        max-width: 100%; /* Ensure it fits the modal */
+        max-height: 150px; /* Adjust max height */
+        display: block;
+        margin: auto;
+    }
+
+</style>
 <div id="requestProduct" class="row">
-    <div class="row card">
-        <div class="card-header">
-            <h2>Pending Request</h2>
-            @* <button id="addRequestBtn" class="btn btn-success col-md-3 col-lg-3 m-1 col-12"><i class="fa fa-plus"></i>&nbsp;Add Request</button> *@
-        </div>
-        <div class="card-body">
-            @*  <div v-if="loading">
-                <div class="spinner-border text-info" role="status">
-                    <span class="visually-hidden">Loading...</span>
-                </div>
-            </div> *@
-            <table class="table table-bordered table-hover table-striped no-wrap" id="requestDatatable" style=" width:100%;border-style: solid; border-width: 1px"></table>
+    <div class="row mb-3">
+        <h2 for="sortSelect" class="col-sm-1 col-form-h2" style="min-width:150px;">Sort by:</h2>
+        <div class="col-sm-4">
+            <select id="sortSelect" class="form-control" v-model="sortBy" v-on:change="handleSorting">
+                <option value="tech">Technician</option>
+                <option value="master">Inventory Master</option>
+            </select>
         </div>
     </div>
-    <div class="row card">
-        <div class="card-header">
-            <h2>Complete Request</h2>
-            @* <button id="addRequestBtn" class="btn btn-success col-md-3 col-lg-3 m-1 col-12"><i class="fa fa-plus"></i>&nbsp;Add Request</button> *@
+
+    <div v-show="sortBy === 'master'">
+        <div class="row card">
+            <div class="card-header">
+                <h2>Pending Request Master</h2>
+                <button id="addRequestBtn" class="btn btn-success col-md-3 col-lg-3 m-1 col-12"
+                        v-on:click="showRequestModal = true">
+                    <i class="fa fa-plus"></i>&nbsp;Add Request
+                </button>
+
+            </div>
+            <div class="card-body">
+                <table class="table table-bordered table-hover table-striped no-wrap" id="requestMasterDatatable" style=" width:100%;border-style: solid; border-width: 1px"></table>
+            </div>
         </div>
-        <div class="card-body">
-            @*  <div v-if="loading">
-                <div class="spinner-border text-info" role="status">
-                    <span class="visually-hidden">Loading...</span>
-                </div>
-            </div> *@
-            <table class="table table-bordered table-hover table-striped no-wrap" id="settledrequestDatatable" style=" width:100%;border-style: solid; border-width: 1px"></table>
+
+        <div class="row card">
+            <div class="card-header">
+                <h2>Pending Approval Request (Your Item)</h2>
+            </div>
+            <div class="card-body">
+                <table class="table table-bordered table-hover table-striped no-wrap" id="requestOtherMasterDatatable" style=" width:100%;border-style: solid; border-width: 1px"></table>
+            </div>
+        </div>
+
+        <div class="row card">
+            <div class="card-header">
+                <h2>Complete Request Master</h2>
+            </div>
+            <div class="card-body">
+                <table class="table table-bordered table-hover table-striped no-wrap" id="settledrequestMasterDatatable" style=" width:100%;border-style: solid; border-width: 1px"></table>
+            </div>
         </div>
     </div>
+
+    <div v-show="sortBy === 'tech'">
+        <div class="row card">
+            <div class="card-header">
+                <h2>Pending Request</h2>
+            </div>
+            <div class="card-body">
+                <table class="table table-bordered table-hover table-striped no-wrap" id="requestDatatable" style=" width:100%;border-style: solid; border-width: 1px"></table>
+            </div>
+        </div>
+
+        <div class="row card">
+            <div class="card-header">
+                <h2>Complete Request</h2>
+            </div>
+            <div class="card-body">
+                <table class="table table-bordered table-hover table-striped no-wrap" id="settledrequestDatatable" style=" width:100%;border-style: solid; border-width: 1px"></table>
+            </div>
+        </div>
+    </div>
+
     <div class="modal fade" id="rejectModal" tabindex="-1" role="dialog" aria-labelledby="rejectRequestModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
             <div class="modal-content">
@@ -94,6 +187,165 @@
         </div>
     </div>
 
+    <div class="modal fade" id="requestModal" tabindex="-1" role="dialog" aria-labelledby="addRequestModalLabel" aria-hidden="true" >
+        <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="addRequestModalLabel">Add Request</h5>
+                    <button type="button" class="closeModal" data-dismiss="modal" aria-label="Close" v-on:click="showRequestModal=false">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <div class="container-fluid">
+                        <form v-on:submit.prevent="addRequestMaster" data-aos="fade-right">
+                            <div class="register" data-aos="fade-right">
+                                <div class="row" data-aos="fade-right">
+
+                                    <div class="col-md-12">
+                                        <div class="tab-content" id="myTabContent">
+                                            <div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">
+                                                <h3 class="register-heading">PRODUCT REQUEST</h3>
+                                                <div class="row register-form">
+                                                    <div class="col-md-13">
+
+                                                        <!-- Product Name -->
+                                                        <div class="form-group row">
+                                                            <label class="col-sm-2 col-form-label">Product</label>
+                                                            <div class="col-sm-8">
+                                                                <div class="dropdown" v-click-outside="closeDropdown">
+                                                                    <!-- Button + Input dalam satu box -->
+                                                                    <div class="dropdown-toggle-box" v-on:click="dropdownOpen = !dropdownOpen">
+                                                                        <input type="text" class="form-control" v-model="searchQuery"
+                                                                               placeholder="Search product..." v-on:focus="dropdownOpen = true" v-on:click.stop />
+                                                                        <button type="button" class="btn btn-primary dropdown-btn" v-on:click.stop="dropdownOpen = !dropdownOpen">
+                                                                            ▼
+                                                                        </button>
+                                                                    </div>
+
+                                                                    <!-- Dropdown list -->
+                                                                    <div v-if="dropdownOpen" class="dropdown-content" v-on:click.stop>
+                                                                        <div v-for="(item, index) in filteredProducts"
+                                                                             :key="index" class="dropdown-item" v-on:mousedown.prevent="selectProduct(item)">
+                                                                            {{ item.productName + ' (' + item.modelNo + ')' }}
+                                                                        </div>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+
+                                                        <!-- Category Dropdown -->
+                                                        <div class="form-group row">
+                                                            <label class="col-sm-2 col-form-label">Category:</label>
+                                                            <div class="col-sm-8">
+                                                                <input type="text" id="category" name="category" v-model="showProduct.category" class="form-control" readonly />
+                                                            </div>
+                                                        </div>
+
+                                                        <!-- Image Product Dropdown-->
+                                                        <div class="form-group row align-items-center">
+                                                            <label for="imageProduct" class="col-sm-2 col-form-label">Product Image: </label>
+                                                            <div class="col-sm-8">
+                                                                <img v-if="showProduct.imageProduct" :src="showProduct.imageProduct" alt="Product Image" class="img-fluid" data-toggle="modal" data-target="#imageModal" />
+                                                                <input type="hidden" id="imageProduct" name="imageProduct" v-model="showProduct">
+                                                            </div>
+                                                        </div>
+
+                                                        <!-- Modal -->
+                                                        <div class="modal fade" id="imageModal" tabindex="-1" role="dialog" aria-labelledby="imageModalLabel" aria-hidden="true">
+                                                            <div class="modal-dialog modal-lg" role="document">
+                                                                <div class="modal-content">
+                                                                    <div class="modal-header">
+                                                                        <h5 class="modal-title" id="imageModalLabel">Product Image</h5>
+                                                                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                                                            <span aria-hidden="true">&times;</span>
+                                                                        </button>
+                                                                    </div>
+                                                                    <div class="modal-body">
+                                                                        <img :src="showProduct.imageProduct" alt="Product Image" class="img-fluid">
+                                                                    </div>
+                                                                    <div class="modal-footer">
+                                                                        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                                                                    </div>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+
+                                                        <!-- Quantity Input -->
+                                                        <div class="form-group row d-flex align-items-center">
+                                                            <label class="col-sm-2 col-form-label">Quantity:</label>
+                                                            <div class="col-sm-8">
+                                                                <input type="number" class="form-control" v-model="quantity" required />
+                                                            </div>
+                                                        </div>
+
+                                                        @* Get the Item from who store *@
+                                                        <div class="form-group row">
+                                                            <label class="col-sm-2 col-form-label">Request From Store : </label>
+                                                            <div class="col-sm-8">
+                                                                <div class="dropdown">
+                                                                    <select class="btn btn-primary dropdown-toggle col-md-12" v-model="fromStoreItem" required>
+                                                                        <option class="btn-light" value="" selected disabled>Select Store</option>
+                                                                        <option class="btn-light" v-for="(item, index) in stores" :key="item" :value="item.id">{{ item.storeName ?? 'Select Store'  }}</option>
+                                                                    </select>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+
+                                                        <!-- Give Item to where store -->
+                                                        <div class="form-group row">
+                                                            <label class="col-sm-2 col-form-label">Send To Store : </label>
+                                                            <div class="col-sm-8">
+                                                                <div class="dropdown">
+                                                                    <select class="btn btn-primary dropdown-toggle col-md-12" data-toggle="dropdown" aria-expanded="false" v-model="assignStoreItem" required>
+                                                                        <option class="btn-light" value="" disabled selected>Select Store</option>
+                                                                        <option v-if="storeUser.length === 0" class="btn-light" disabled>No Store Assigned to You</option>
+                                                                        <option class="btn-light" v-for="(item, index) in storeUser" :key="index" :value="item.id">
+                                                                            {{ item.storeName }}
+                                                                        </option>
+                                                                    </select>
+                                                                </div>
+                                                            </div>
+                                                        </div>
+
+                                                        <!-- Remark Input (Wider) -->
+                                                        <div class="form-group row d-flex align-items-center">
+                                                            <label class="col-sm-2 col-form-label">Remark:</label>
+                                                            <div class="col-sm-8">
+                                                                <input type="text" class="form-control col-md-10" v-model="remark" />
+                                                            </div>
+                                                        </div>
+
+                                                        <!-- Document/Picture Input -->
+                                                        <div class="form-group row d-flex align-items-center">
+                                                            <label class="col-sm-2 col-form-label">Document/Picture:</label>
+                                                            <div class="col-sm-8">
+                                                                <input type="file" id="document" name="document" class="form-control-file" v-on:change="handleFileUpload" accept="image/png, image/jpeg, application/pdf" />
+                                                            </div>
+                                                        </div>
+
+
+                                                        @* Submit and Reset Buttons *@
+                                                        <div class="form-group row">
+                                                            <div class="col-sm-8 offset-sm-3">
+                                                                <button type="button" v-on:click="resetForm" class="btn btn-secondary m-1">Reset</button>
+                                                                <button type="submit" class="btn btn-primary m-1">Submit</button>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
     <div class="modal fade" id="approveModal" tabindex="-1" role="dialog" aria-labelledby="approveRequestModalLabel" aria-hidden="true">
         <div class="modal-dialog modal-dialog-centered modal-xl" role="document">
             <div class="modal-content">
@@ -167,7 +419,7 @@
 
             // Attach a click event listener to elements with the class 'btn-success'.
             $('#addRequestBtn').on('click', function () {
-                // Show the modal 
+                // Show the modal
                 $('#requestModal').modal('show');
             });
             $('.closeModal').on('click', function () {
@@ -194,50 +446,139 @@
                     requestDate : null,
                     approvalDate : null,
                     productCategory: "",
+                    fromStoreItem : "",
+                    assignStoreItem : "",
+                    stores: null,
+                    sortBy: "tech",
                     productName: null,
                     productCategory: null,
                     stations: [],
                     selectedProduct: "",
                     selectedStation: "",
                     selectedCategory: "",
+                    selectedStore: "",
                     showRequestModal: false,
                     showRejectModal: false,
                     showApproveModal: false,
                     loading: false,
                     request: [],
                     currentUser: null,
+                    currentUserId: null,
                     currentrequestID: "",
                     rejectremark: "",
                     approveremark: "",
+                    storeUser: "",
+                    searchQuery: "",
+                    dropdownOpen: false, 
+                    showRequestModal: false,
                 }
             },
-            mounted() {
+            async mounted() {
                 this.fetchRequest();
-                this.fetchUser();
                 this.fetchProducts();
                 this.fetchStation();
+                await this.fetchUser();
+                await Promise.all([
+                    this.fetchStoreSpecific(this.currentUserId),
+                    this.fetchStore(),
+                ]);
+            },
+            watch: {
+                showRequestModal(newVal) {
+                    if (newVal) {
+                        $('#requestModal').modal('show');
+                    } else {
+                        $('#requestModal').modal('hide');
+                    }
+                }
             },
             computed: {
-                // filteredDepartments() {
-                //     if (!this.selectedCompany) {
-                //         return []; No company selected, return empty list
-                //     }
-                //     const company = this.companies.find(c => c.companyId === this.selectedCompany);
-                //     this.selectedDepartment = '';
-                //     return company ? company.departments : [];
-                // },
-                // showProduct() {
-                //     if (!this.selectedProduct) {
-                //         return []; No company selected, return empty list
-                //     }
-                //     const product = this.products.find(c => c.productId === this.selectedProduct);
-                //     return product ? product : {};
-                // },
+                showProduct() {
+                    if (!this.productId) {
+                        return []; // No company selected, return empty list
+                    }
+                    const product = this.products.find(c => c.productId === this.productId);
+
+                    this.productCategory = product.category;
+
+                    return product ? product : {};
+                },
+                filteredProducts() {
+                    return this.products.filter(item =>
+                        item.productName.toLowerCase().includes(this.searchQuery.toLowerCase()) ||
+                        item.modelNo.toLowerCase().includes(this.searchQuery.toLowerCase())
+                    );
+                }
             },
             methods: {
-                resetForm() {
-                    this.rejectremark = "";
+
+                async addRequestMaster() {
+                    try {
+                        const requiredFields = ['productId', 'quantity', 'fromStoreItem', 'assignStoreItem'];
+
+                        // Loop through required fields and check if any are null or empty
+                        for (let field of requiredFields) {
+                            if (this[field] === null || this[field] === '') {
+                                alert('Request Error', `Please fill in required fields: ${field}.`, 'warning');
+                                return; // Exit early if validation fails
+                            }
+                        }
+
+                        this.userId = this.currentUser.id;
+                        this.status = "Requested";
+
+                        const now = new Date();
+                        this.requestDate = new Date(now.getTime() + 8 * 60 * 60 * 1000).toISOString();
+
+
+                        // Prepare data as JSON (No file upload)
+                        const requestData = {
+                            ProductId: this.productId,
+                            StationId: null,
+                            UserId: this.userId,
+                            ProductCategory: this.productCategory,
+                            RequestQuantity: this.quantity,
+                            remarkUser: this.remark || '',
+                            remarkMasterInv: '',
+                            status: this.status,
+                            requestDate: this.requestDate,
+                            approvalDate: null,
+                            fromStoreItem: this.fromStoreItem,
+                            assignStoreItem: this.assignStoreItem,
+                            Document: this.document
+                        };
+
+                        $('.modal').modal('hide');
+
+                        // Proceed to send the data to the API
+                        const response = await fetch('/InvMainAPI/AddRequestMaster', {
+                            method: 'POST',
+                            headers: {
+                                'Content-Type': 'application/json',
+                                // 'Authorization': `Bearer ${this.token}`
+                            },
+                            body: JSON.stringify(formData)
+                        });
+                        if (response.ok) {
+                            // If the form submission was successful, display a success message
+                            alert('Success!', 'Request form has been successfully submitted.', 'success');
+                            const requestItem = await response.json();
+                            this.items.push(requestItem);
+
+                            this.fetchRequest();
+
+                        } else {
+                            throw new Error('Failed to submit form.');
+                        }
+
+                    } catch (error) {
+                        console.error('Error:', error);
+
+                        // Displaying error message
+                        alert('Inventory PSTW Error', `An error occurred: ${error.message}`, 'error');
+                    }
                 },
+
                 async addRequest() {
                     try {
                             const requiredFields = ['stationId', 'productId', 'quantity', 'productCategory'];
@@ -284,315 +625,161 @@
 
                 initiateTable() {
                     self = this;
+
+                    function renderActionButtons(data, type, row) {
+                        var actiontButtons = `<div class="row" style="padding: 5px;"> <button type="button" class="btn btn-success approve-btn" data-id="${data}">Approve</button></div> <div class="row" style="padding: 5px;"><button type="button" class="btn btn-danger reject-btn" data-id="${data}">Reject</button></div>`;
+                        return actiontButtons;
+                    }
+
+                    function renderDocument(data, type, full, meta) {
+                        if (!data) {
+                            return "No Document";
+                        }
+
+                        var imageSrc = full.productImage;
+                        // Check if the document is an image based on file extension
+                        var isImage = /\.(jpeg|jpg|png|gif)$/i.test(imageSrc);
+                        var isPdf = /\.pdf$/i.test(imageSrc);
+                        // var imageSrc = full.productImage;  Fallback to data if imgsrc is unavailable
+
+                        if (isImage) {
+                            return `    <div class="row"><td>${data}</td></div>
+                                                                        <a href="${imageSrc}" target="_blank" data-lightbox="image-1">
+                                                                            <img src="${imageSrc}" alt="Image" class="img-thumbnail" style="width: 100px; height: 100px;" />
+                                                                        </a>`;
+                        }
+                        else if (isPdf) {
+                            return `<div class="row"><td>${data}</td></div>
+                                                                <a href="${imageSrc}" target="_blank">
+                                                                    <img src="https://upload.wikimedia.org/wikipedia/commons/8/87/PDF_file_icon.svg"
+                                                                        alt="PDF Document" class="img-thumbnail"
+                                                                        style="width: 50px; height: 50px;" />
+                                                                    <br>View PDF
+                                                                </a>`;
+                        }
+                    }
+
                     this.requestDatatable = $('#requestDatatable').DataTable({
-                        "data": this.items.filter(item => item.status == "Requested"),
+                        "data": this.items.filter(item => item.status === "Requested" && item.assignStoreItem == null),
                         "columns": [
-                            {
-                                "title": "Request ID",
-                                "data": "requestID",
-                            },
-                            {
-                                "title": "Action",
-                                "data" :"requestID",
-                                "render": function (data, type, row) {
-                                    var actiontButtons = `<div class="row" style="padding: 5px;"> <button type="button" class="btn btn-success approve-btn" data-id="${data}">Approve</button></div> <div class="row" style="padding: 5px;"><button type="button" class="btn btn-danger reject-btn" data-id="${data}">Reject</button></div>`;
-                                    return actiontButtons
-                                },
-                                "className": "align-middle",
-                            },
-                            {
-                                "title": "Product",
-                                "data": "productName",
-                                "render": function (data, type, full, meta) {
-                                    if (!data) {
-                                        return "No Document";
-                                    }
-
-                                    var imageSrc = full.productImage;
-                                    // Check if the document is an image based on file extension
-                                    var isImage = /\.(jpeg|jpg|png|gif)$/i.test(imageSrc);
-                                    var isPdf = /\.pdf$/i.test(imageSrc);
-                                    // var imageSrc = full.productImage;  Fallback to data if imgsrc is unavailable
-                                    console.log(full);
-
-                                    if (isImage) {
-                                            return `    <div class="row"><td>${data}</td></div>
-                                                        <a href="${imageSrc}" target="_blank" data-lightbox="image-1">
-                                                            <img src="${imageSrc}" alt="Image" class="img-thumbnail" style="width: 100px; height: 100px;" />
-                                                        </a>`;
-                                    }
-                                    else if (isPdf) {
-                                        return `<div class="row"><td>${data}</td></div>
-                                                <a href="${imageSrc}" target="_blank">
-                                                    <img src="https://upload.wikimedia.org/wikipedia/commons/8/87/PDF_file_icon.svg"
-                                                        alt="PDF Document" class="img-thumbnail"
-                                                        style="width: 50px; height: 50px;" />
-                                                    <br>View PDF
-                                                </a>`;
-                                    }
-                                    // else {
-                                    //     return `<a href="${imageSrc}" target="_blank">Download File</a>`;
-                                    // }
-                                },
-                            },
-                            {
-                                "title": "Requested by User",
-                                "data": "userName",
-                            },
-                            {
-                                "title": "Requested by Station",
-                                "data": "stationName",
-                            },
-                            {
-                                "title": "Product Category",
-                                "data": "productCategory",
-                            },
-                            {
-                                "title": "Request Quantity",
-                                "data": "requestQuantity",
-                            },
-                            {
-                                "title": "Document/Picture",
-                                "data": "document",
-                                "render": function (data, type, full, meta) {
-                                    if (!data) {
-                                        return "No Document";
-                                    }
-
-                                    // Check if the document is an image based on file extension
-                                    var isImage = /\.(jpeg|jpg|png|gif)$/i.test(data);
-                                    var isPdf = /\.pdf$/i.test(data);
-
-                                    if (isImage) {
-                                            return `<a href="${data}" target="_blank" data-lightbox="image-1">
-                                                            <img src="${data}" alt="Image" class="img-thumbnail" style="width: 100px; height: 100px;" />
-                                                        </a>`;
-                                    }
-                                    else if (isPdf) {
-                                        return `<a href="${data}" target="_blank">
-                                                    <img src="https://upload.wikimedia.org/wikipedia/commons/8/87/PDF_file_icon.svg"
-                                                        alt="PDF Document" class="img-thumbnail"
-                                                        style="width: 50px; height: 50px;" />
-                                                    <br>View PDF
-                                                </a>`;
-                                    } else {
-                                        return `<a href="${data}" target="_blank">Download File</a>`;
-                                    }
-                                },
-                            },
-                            {
-                                "title": "User Remark",
-                                "data": "remarkUser",
-                            },
-                            // {
-                            //     "title": "InvMaster Remark",
-                            //     "data": "remarkMasterInv",
-                            // },
-                            {
-                                "title": "Status",
-                                "data": "status",
-                                },
-                            {
-                                "title": "Request Date",
-                                "data": "requestDate",
-                            },
-                            {
-                                "title": "Approval Date",
-                                "data": "approvalDate",
-                            },
-                            // {
-                            //     "title": "Reject",
-                            //     "data" :"requestID",
-                            //     "render": function (data, type, row) {
-                            //         var rejectButton = `<button type="button" class="btn btn-danger reject-btn" data-id="${data}">Reject</button>`;
-                            //         return rejectButton
-                            //     },
-                            //     "className": "align-middle",
-                            // },
-                            // {
-                            //     "title": "Approve",
-                            //     "data": "requestID",
-                            //     "render": function (data) {
-                            //         var approveButton = `<button type="button" class="btn btn-success approve-btn" data-id="${data}">Approve</button>`;
-                            //         return approveButton;
-                            //     },
-                            //     "className": "align-middle",
-                            // }
+                            { "title": "Request ID", "data": "requestID" },
+                            { "title": "Action", "data": "requestID", "render": renderActionButtons, "className": "align-middle" },
+                            { "title": "Product", "data": "productName", "render": renderDocument },
+                            { "title": "Requested by User", "data": "userName" },
+                            { "title": "Requested by Station", "data": "stationName" },
+                            { "title": "Product Category", "data": "productCategory" },
+                            { "title": "Request Quantity", "data": "requestQuantity" },
+                            { "title": "Document/Picture", "data": "document", "render": renderDocument },
+                            { "title": "User Remark", "data": "remarkUser" },
+                            { "title": "Status", "data": "status" },
+                            { "title": "Request Date", "data": "requestDate" },
+                            { "title": "Approval Date", "data": "approvalDate" }
                         ],
                         responsive: true,
-                        drawCallback: function (settings) {
-                            // Generate QR codes after rows are rendered
-                            // const api = this.api();
-                            // api.rows().every(function () {
-                            //     const data = this.data(); Row data
-                            //     const containerId = `qr${data.requestID}`;
-                            //     const container = $(`#${containerId}`);
-                            //     container.empty();
-                            //         container.append(`${data.requestID}`);
-                            //     console.log(container[0]);
-                            //     if (container) {
-                            //         Generate QR code only if not already generated
-                            //         new QRCode(container[0], {
-                            //             text: data.qrString,
-                            //             width: 100,
-                            //             height: 100,
-                            //             colorDark: "#000000",
-                            //             colorLight: "#ffffff",
-                            //             correctLevel: QRCode.CorrectLevel.M
-                            //         });
-                            //     }
-                                // container.on('click', function() {
-                                //     window.open(data.qrString, '_blank');
-                                // });
-                            // });
-                        },
+                        drawCallback: function (settings) { }
                     });
 
                     this.settledrequestDatatable = $('#settledrequestDatatable').DataTable({
-                        "data": this.items.filter(item => item.status !== "Requested"),
+                        "data": this.items.filter(item => item.status !== "Requested" && item.assignStoreItem == null),
                         "columns": [
-                            {
-                                "title": "Request ID",
-                                "data": "requestID",
-                            },
-                            {
-                                "title": "Product",
-                                "data": "productName",
-                                "render": function (data, type, full, meta) {
-                                    if (!data) {
-                                        return "No Document";
-                                    }
-
-                                    var imageSrc = full.productImage;
-                                    // Check if the document is an image based on file extension
-                                    var isImage = /\.(jpeg|jpg|png|gif)$/i.test(imageSrc);
-                                    var isPdf = /\.pdf$/i.test(imageSrc);
-                                    // var imageSrc = full.productImage;  Fallback to data if imgsrc is unavailable
-
-                                    if (isImage) {
-                                            return `    <div class="row"><td>${data}</td></div>
-                                                        <a href="${imageSrc}" target="_blank" data-lightbox="image-1">
-                                                            <img src="${imageSrc}" alt="Image" class="img-thumbnail" style="width: 100px; height: 100px;" />
-                                                        </a>`;
-                                    }
-                                    else if (isPdf) {
-                                        return `<div class="row"><td>${data}</td></div>
-                                                <a href="${imageSrc}" target="_blank">
-                                                    <img src="https://upload.wikimedia.org/wikipedia/commons/8/87/PDF_file_icon.svg"
-                                                        alt="PDF Document" class="img-thumbnail"
-                                                        style="width: 50px; height: 50px;" />
-                                                    <br>View PDF
-                                                </a>`;
-                                    } 
-                                    // else {
-                                    //     return `<a href="${imageSrc}" target="_blank">Download File</a>`;
-                                    // }
-                                },
-                            },
-                            {
-                                "title": "Requested by User",
-                                "data": "userName",
-                            },
-                            {
-                                "title": "Requested by Station",
-                                "data": "stationName",
-                            },
-                            {
-                                "title": "Product Category",
-                                "data": "productCategory",
-                            },
-                            {
-                                "title": "Request Quantity",
-                                "data": "requestQuantity",
-                            },
-                            {
-                                "title": "Document/Picture",
-                                "data": "document",
-                                "render": function (data, type, full, meta) {
-                                    if (!data) {
-                                        return "No Document";
-                                    }
-
-                                    // Check if the document is an image based on file extension
-                                    var isImage = /\.(jpeg|jpg|png|gif)$/i.test(data);
-                                    var isPdf = /\.pdf$/i.test(data);
-
-                                    if (isImage) {
-                                            return `<a href="${data}" target="_blank" data-lightbox="image-1">
-                                                            <img src="${data}" alt="Image" class="img-thumbnail" style="width: 100px; height: 100px;" />
-                                                        </a>`;
-                                    }
-                                    else if (isPdf) {
-                                        return `<a href="${data}" target="_blank">
-                                                    <img src="https://upload.wikimedia.org/wikipedia/commons/8/87/PDF_file_icon.svg"
-                                                        alt="PDF Document" class="img-thumbnail"
-                                                        style="width: 50px; height: 50px;" />
-                                                    <br>View PDF
-                                                </a>`;
-                                    } else {
-                                        return `<a href="${data}" target="_blank">Download File</a>`;
-                                    }
-                                },
-                            },
-                            {
-                                "title": "User Remark",
-                                "data": "remarkUser",
-                            },
-                            {
-                                "title": "InvMaster Remark",
-                                "data": "remarkMasterInv",
-                            },
-                            {
-                                "title": "Status",
-                                "data": "status",
-                                },
-                            {
-                                "title": "Request Date",
-                                "data": "requestDate",
-                            },
-                            {
-                                "title": "Approval Date",
-                                "data": "approvalDate",
-                            },
-                            // {
-                            //     "title": "Reject",
-                            //     "data" :null,
-                            //     "render": function (data, type, row) {
-                            //     return `<button type="button" class="btn btn-danger reject-btn"
-                            //                 data-id="${row.requestID}"
-                            //                 data-remark="${row.remark || ''}">
-                            //                 Reject
-                            //             </button>`;
-                            //     },
-                            //     "className": "align-middle",
-                            // },
-                            // {
-                            //     "title": "Approve",
-                            //     "data": "requestID",
-                            //     "render": function (data) {
-                            //         var approveButton = `<button type="button" class="btn btn-success approve-btn" data-id="${data}">Approve</button>`;
-                            //         return approveButton;
-                            //     },
-                            //     "className": "align-middle",
-                            // }
+                            { "title": "Request ID", "data": "requestID" },
+                            { "title": "Product", "data": "productName", "render": renderDocument },
+                            { "title": "Requested by User", "data": "userName" },
+                            { "title": "Requested by Station", "data": "stationName" },
+                            { "title": "Product Category", "data": "productCategory" },
+                            { "title": "Request Quantity", "data": "requestQuantity" },
+                            { "title": "Document/Picture", "data": "document", "render": renderDocument },
+                            { "title": "User Remark", "data": "remarkUser" },
+                            { "title": "InvMaster Remark", "data": "remarkMasterInv" },
+                            { "title": "Status", "data": "status" },
+                            { "title": "Request Date", "data": "requestDate" },
+                            { "title": "Approval Date", "data": "approvalDate" }
                         ],
-                        responsive: true,
-                       
+                        responsive: true
                     });
 
+                    this.requestMasterDatatable = $('#requestMasterDatatable').DataTable({
+                        "data": this.items.filter(item => item.assignStoreItem != null && item.status == "Requested" && item.userId == this.currentUserId),
+                        "columns": [
+                            { "title": "Request ID", "data": "requestID" },
+                            { "title": "Action", "data": "requestID", "render": renderActionButtons, "className": "align-middle" },
+                            { "title": "Product", "data": "productName", "render": renderDocument },
+                            { "title": "Requested by User", "data": "userName" },
+                            { "title": "Requested by Station", "data": "stationName" },
+                            { "title": "Product Category", "data": "productCategory" },
+                            { "title": "Request Quantity", "data": "requestQuantity" },
+                            { "title": "Document/Picture", "data": "document", "render": renderDocument },
+                            { "title": "User Remark", "data": "remarkUser" },
+                            { "title": "Status", "data": "status" },
+                            { "title": "Request Date", "data": "requestDate" },
+                            { "title": "Approval Date", "data": "approvalDate" }
+                        ],
+                        responsive: true,
+                        drawCallback: function (settings) { }
+                    });
 
+                    this.requestOtherMasterDatatable = $('#requestOtherMasterDatatable').DataTable({
+                        "data": this.items.filter(item => item.status != "Requested" && item.assignStoreItem != null && item.userId != this.currentUserId),
+                        "columns": [
+                            { "title": "Request ID", "data": "requestID" },
+                            { "title": "Action", "data": "requestID", "render": renderActionButtons, "className": "align-middle" },
+                            { "title": "Product", "data": "productName", "render": renderDocument },
+                            { "title": "Requested by User", "data": "userName" },
+                            { "title": "Requested by Station", "data": "stationName" },
+                            { "title": "Product Category", "data": "productCategory" },
+                            { "title": "Request Quantity", "data": "requestQuantity" },
+                            { "title": "Document/Picture", "data": "document", "render": renderDocument },
+                            { "title": "User Remark", "data": "remarkUser" },
+                            { "title": "Status", "data": "status" },
+                            { "title": "Request Date", "data": "requestDate" },
+                            { "title": "Approval Date", "data": "approvalDate" }
+                        ],
+                        responsive: true
+                    });
 
-                    // Attach click event listener to the delete buttons
+                    this.settledrequestMasterDatatable = $('#settledrequestMasterDatatable').DataTable({
+                        "data": this.items.filter(item => item.status != "Requested" && item.assignStoreItem != null && item.userId != this.currentUserId),
+                        "columns": [
+                            { "title": "Request ID", "data": "requestID" },
+                            { "title": "Action", "data": "requestID", "render": renderActionButtons, "className": "align-middle" },
+                            { "title": "Product", "data": "productName", "render": renderDocument },
+                            { "title": "Requested by User", "data": "userName" },
+                            { "title": "Requested by Station", "data": "stationName" },
+                            { "title": "Product Category", "data": "productCategory" },
+                            { "title": "Request Quantity", "data": "requestQuantity" },
+                            { "title": "Document/Picture", "data": "document", "render": renderDocument },
+                            { "title": "User Remark", "data": "remarkUser" },
+                            { "title": "Status", "data": "status" },
+                            { "title": "Request Date", "data": "requestDate" },
+                            { "title": "Approval Date", "data": "approvalDate" }
+                        ],
+                        responsive: true
+                    });
+
+                    // Attach event listeners
                     $('#requestDatatable tbody').on('click', '.reject-btn', function () {
                         const requestID = $(this).data('id');
-                            self.rejectRequestModal(requestID);
+                        self.rejectRequestModal(requestID);
                     });
 
                     $('#requestDatatable tbody').on('click', '.approve-btn', function () {
                         const requestID = $(this).data('id');
-                            self.approveRequestModal(requestID);
+                        self.approveRequestModal(requestID);
                     });
 
+                    $('#requestDatatable tbody').on('click', '.print-btn', function () {
+                        const $button = $(this);
+                        const $row = $button.closest('tr');
+                        const itemId = $button.data('id');
+                        let imageSrc = $row.hasClass('child') ? $row.prev('tr').find('td:nth-child(1) img').attr('src') : $row.find('td:nth-child(1) img').attr('src');
+                        if (imageSrc) {
+                            self.printItem(itemId, imageSrc);
+                        } else {
+                            console.error("Image source not found.");
+                        }
+                    });
+
+
                     $('#requestDatatable tbody').on('click', '.print-btn', function () {
                         const $button = $(this); // The clicked button
                         const $row = $button.closest('tr'); // The parent row of the button
@@ -603,7 +790,7 @@
                         // Check if the table is collapsed
                         if ($row.hasClass('child')) {
                             // For collapsed view: Look for the closest `.dtr-data` that contains the img
-                                imageSrc = $row.prev('tr').find('td:nth-child(1) img').attr('src');
+                            imageSrc = $row.prev('tr').find('td:nth-child(1) img').attr('src');
                         } else {
                             // For expanded view: Find the img in the first column of the current row
                             imageSrc = $row.find('td:nth-child(1) img').attr('src');
@@ -617,16 +804,17 @@
                     });
 
                     $('#itemDatatable tbody').on('click', '.reject-btn', function () {
-                    const $button = $(this); // The clicked button
-                    const $row = $button.closest('tr'); // The parent row of the button
-                    const itemId = $button.data('id'); // Get the item ID from the button's data attribute
+                        const $button = $(this); // The clicked button
+                        const $row = $button.closest('tr'); // The parent row of the button
+                        const itemId = $button.data('id'); // Get the item ID from the button's data attribute
 
-                    
-                    self.printItem(itemId, imageSrc); // Call the print function with the itemId and imageSrc
-                    
-                });
+
+                        self.printItem(itemId, imageSrc); // Call the print function with the itemId and imageSrc
+
+                    });
 
                     this.loading = false;
+
                 },
 
                 async fetchRequest() {
@@ -648,6 +836,18 @@
                         if (this.requestDatatable) {
                             this.requestDatatable.clear().destroy();
                         }
+                        if (this.settledrequestDatatable) {
+                            this.settledrequestDatatable.clear().destroy();
+                        }
+                        if (this.requestMasterDatatable) {
+                            this.requestMasterDatatable.clear().destroy();
+                        }
+                        if (this.requestOtherMasterDatatable) {
+                            this.requestOtherMasterDatatable.clear().destroy();
+                        }
+                        if (this.settledrequestMasterDatatable) {
+                            this.settledrequestMasterDatatable.clear().destroy();
+                        }
                         this.initiateTable();
                     }
                     catch (error) {
@@ -705,7 +905,26 @@
                         if (!response.ok) {
                             throw new Error('Failed to fetch suppliers');
                         }
-                        this.stores = await response.json(); // Get the full response object
+
+                        const data = await response.json();
+                        this.stores = data.filter(stores => stores.id !== this.storeUser.storeId); 
+
+                    } catch (error) {
+                        console.error('Error fetching suppliers:', error);
+                    }
+                },
+                async fetchStoreSpecific(currentUserId) {
+                    try {
+                        const response = await fetch('/InvMainAPI/StoreSpecificMasterList/' + currentUserId, {
+                            method: 'POST', // Specify the HTTP method
+                            headers: {
+                                'Content-Type': 'application/json'
+                            }
+                        });
+                        if (!response.ok) {
+                            throw new Error('Failed to fetch store');
+                        }
+                        this.storeUser = await response.json(); // Get the full response object
 
                     } catch (error) {
                         console.error('Error fetching suppliers:', error);
@@ -928,6 +1147,7 @@
                             this.currentUserCompanyDept = companyDeptData;
                             this.selectedCompany = companyDeptData?.companyId || "";
                             this.selectedDepartment = companyDeptData?.departmentId || "";
+                            this.currentUserId = this.currentUser.id;
                         }
                         else {
                             console.error(`Failed to fetch user: ${response.statusText}`);
@@ -938,10 +1158,62 @@
                     }
                 },
 
-                 
+                closeDropdown() {
+                    this.dropdownOpen = false; // Tutup dropdown
+                },
 
+                selectProduct(item) {
+                    this.selectedProduct = item;
+                    this.productId = item.productId;
+                    this.searchQuery = item.productName + " (" + item.modelNo + ")";
+                    this.dropdownOpen = false;
+                },
 
+                closeModal() {
+                    this.showRequestModal = false;
+                },
+
+                handleFileUpload(event) {
+                    const file = event.target.files[0];
+
+                    if (file) {
+                        const reader = new FileReader();
+                        reader.onload = (e) => {
+                            this.document = e.target.result.split(',')[1]; // Get Base64 string (remove metadata)
+                        };
+                        reader.readAsDataURL(file);
+                    } else {
+                        this.document = null;
+                    }
+                },
+
+                resetForm() {
+                    this.rejectremark = "";
+                },
+
+                handleSorting() {
+                    this.fetchRequest();
+                },
             },
+            directives: {
+                clickOutside: {
+                    beforeMount(el, binding) {
+                        el.clickOutsideEvent = (event) => {
+                            // Make sure the click is outside the element
+                            if (!el.contains(event.target) && el !== event.target) {
+                                binding.value?.(); // Call the function to close the modal
+                            }
+                        };
+                        setTimeout(() => {
+                            document.body.addEventListener("click", el.clickOutsideEvent);
+                        }, 0); // Delay to avoid triggering immediately when opening
+                    },
+                    beforeUnmount(el) {
+                        document.body.removeEventListener("click", el.clickOutsideEvent);
+                    }
+                }
+            }
+
         });
     </script>
 }
\ No newline at end of file
diff --git a/Areas/Inventory/Views/InventoryMaster/ManifacturerRegistration.cshtml b/Areas/Inventory/Views/InventoryMaster/ManifacturerRegistration.cshtml
index c0de4db..2b43e03 100644
--- a/Areas/Inventory/Views/InventoryMaster/ManifacturerRegistration.cshtml
+++ b/Areas/Inventory/Views/InventoryMaster/ManifacturerRegistration.cshtml
@@ -3,7 +3,7 @@
     Layout = "~/Views/Shared/_Layout.cshtml";
 }
 
-@await Html.PartialAsync("~/Areas/Inventory/Views/_InventoryPartial.cshtml");
+@await Html.PartialAsync("~/Areas/Inventory/Views/_InventoryPartial.cshtml")
 <div id="app">
     <div class="row card">
         <div class="card-header">
diff --git a/Areas/Inventory/Views/InventoryMaster/ProductRegistration.cshtml b/Areas/Inventory/Views/InventoryMaster/ProductRegistration.cshtml
index 28fcb41..ae53ba4 100644
--- a/Areas/Inventory/Views/InventoryMaster/ProductRegistration.cshtml
+++ b/Areas/Inventory/Views/InventoryMaster/ProductRegistration.cshtml
@@ -4,7 +4,7 @@
     string userId = ViewBag.UserId;
 }
 
-@await Html.PartialAsync("~/Areas/Inventory/Views/_InventoryPartial.cshtml");
+@await Html.PartialAsync("~/Areas/Inventory/Views/_InventoryPartial.cshtml")
 <div class="row">
     <div id="registerProduct" class="card m-1">
         <div class="row" v-if="addSection == true">
diff --git a/Areas/Inventory/Views/InventoryMaster/StationRegistration.cshtml b/Areas/Inventory/Views/InventoryMaster/StationRegistration.cshtml
index 5988894..45bfc6d 100644
--- a/Areas/Inventory/Views/InventoryMaster/StationRegistration.cshtml
+++ b/Areas/Inventory/Views/InventoryMaster/StationRegistration.cshtml
@@ -3,7 +3,7 @@
     Layout = "~/Views/Shared/_Layout.cshtml";
 }
 
-@await Html.PartialAsync("~/Areas/Inventory/Views/_InventoryPartial.cshtml");
+@await Html.PartialAsync("~/Areas/Inventory/Views/_InventoryPartial.cshtml")
 <div id="registerStation">
     <form v-on:submit.prevent="addStation" data-aos="fade-right" id="registerStationForm" v-if="registerStationForm">
         <div class="container register" data-aos="fade-right">
diff --git a/Areas/Inventory/Views/InventoryMaster/SupplierRegistration.cshtml b/Areas/Inventory/Views/InventoryMaster/SupplierRegistration.cshtml
index 422308b..4763b05 100644
--- a/Areas/Inventory/Views/InventoryMaster/SupplierRegistration.cshtml
+++ b/Areas/Inventory/Views/InventoryMaster/SupplierRegistration.cshtml
@@ -3,7 +3,7 @@
     Layout = "~/Views/Shared/_Layout.cshtml";
 }
 
-@await Html.PartialAsync("~/Areas/Inventory/Views/_InventoryPartial.cshtml");
+@await Html.PartialAsync("~/Areas/Inventory/Views/_InventoryPartial.cshtml")
 <div id="registerSupplier">
     <form v-on:submit.prevent="addSupplier" data-aos="fade-right" id="registerSupplierForm" v-if="registerSupplierForm">
         <div class="container register" data-aos="fade-right">
diff --git a/Areas/Inventory/Views/ItemMovement/ItemRequest.cshtml b/Areas/Inventory/Views/ItemMovement/ItemRequest.cshtml
index 9402849..680e829 100644
--- a/Areas/Inventory/Views/ItemMovement/ItemRequest.cshtml
+++ b/Areas/Inventory/Views/ItemMovement/ItemRequest.cshtml
@@ -297,7 +297,7 @@
                 requestDate : null,
                 approvalDate : null,
                 productCategory: "",
-                assign: "",
+                assign: "", 
 
                 productName: null,
                 searchQuery: "",
diff --git a/Controllers/API/Inventory/InvMainAPI.cs b/Controllers/API/Inventory/InvMainAPI.cs
index 4afb06a..ee34041 100644
--- a/Controllers/API/Inventory/InvMainAPI.cs
+++ b/Controllers/API/Inventory/InvMainAPI.cs
@@ -969,6 +969,76 @@ namespace PSTW_CentralSystem.Controllers.API.Inventory
         #endregion
 
         #region ItemRequestAdmin
+
+        [HttpPost("AddRequestMaster")]
+        public async Task<IActionResult> AddRequestMaster([FromBody] RequestModel request)
+        {
+            if (!ModelState.IsValid)
+            {
+                return BadRequest(ModelState);
+            }
+            try
+            {
+                var findUniqueCode = _centralDbContext.Products.FirstOrDefault(r => r.ProductId == request.ProductId);
+                var findUniqueUser = _centralDbContext.Users.FirstOrDefault(r => r.Id == request.UserId);
+
+                if (!string.IsNullOrEmpty(request.Document))
+                {
+
+                    var bytes = Convert.FromBase64String(request.Document);
+                    string filePath = "";
+
+                    var uniqueAbjad = new string(Enumerable.Range(0, 8).Select(_ => "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"[new Random().Next(36)]).ToArray());
+
+
+                    if (IsImage(bytes))
+                    {
+                        filePath = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot/media/inventory/request", findUniqueUser.FullName + " " + findUniqueCode.ModelNo + "(" + uniqueAbjad + ") Request.jpg");
+                        request.Document = "/media/inventory/request/" + findUniqueUser.FullName + " " + findUniqueCode.ModelNo + "(" + uniqueAbjad + ") Request.jpg";
+                    }
+                    else if (IsPdf(bytes))
+                    {
+                        filePath = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot/media/inventory/request", findUniqueUser.FullName + " " + findUniqueCode.ModelNo + "_Request.pdf");
+                        request.Document = "/media/inventory/request/" + findUniqueUser.FullName + " " + findUniqueCode.ModelNo + "(" + uniqueAbjad + ") Request.pdf";
+                    }
+                    else
+                    {
+                        return BadRequest("Unsupported file format.");
+                    }
+
+                    await System.IO.File.WriteAllBytesAsync(filePath, bytes);
+                }
+
+                _centralDbContext.Requests.Add(request);
+                await _centralDbContext.SaveChangesAsync();
+
+                var updatedList = await _centralDbContext.Requests
+                                        .Where(r => r.UserId == request.UserId)
+                                        .ToListAsync();
+
+                return Json(updatedList.Select(i => new
+                {
+                    i.ProductId,
+                    i.UserId,
+                    i.status,
+                    i.StationId,
+                    i.RequestQuantity,
+                    i.requestDate,
+                    i.ProductCategory,
+                    i.Document,
+                    i.approvalDate,
+                    i.remarkMasterInv,
+                    i.remarkUser,
+                    i.fromStoreItem,
+                    i.assignStoreItem,
+                }));
+            }
+            catch (Exception ex)
+            {
+                return BadRequest(ex.Message);
+            }
+        }
+
         [HttpGet("ItemRequestList")]
         public async Task<IActionResult> ItemRequestList()
         {
@@ -991,6 +1061,8 @@ namespace PSTW_CentralSystem.Controllers.API.Inventory
                 i.approvalDate,
                 i.remarkMasterInv,
                 i.remarkUser,
+                i.assignStoreItem,
+                i.fromStoreItem,
                
             }));
 
@@ -1188,6 +1260,22 @@ namespace PSTW_CentralSystem.Controllers.API.Inventory
             return Json(storeList);
         }
 
+        [HttpPost("StoreSpecificMasterList/{userId}")]
+        public async Task<IActionResult> StoreSpecificMasterList(int userId)
+        {
+            var storeList = await _centralDbContext.InventoryMasters
+                .Where(i => i.UserId == userId)
+                .Select(i => i.StoreId) // Extract only StoreIds
+                .Distinct() // Avoid duplicate queries
+                .ToListAsync();
+
+            var storeSpecific = await _centralDbContext.Stores
+                .Where(s => storeList.Contains(s.Id)) // Fetch all relevant stores at once
+                .ToListAsync();
+
+            return Json(storeSpecific);
+        }
+
         #endregion Store
 
         #region AllUser
diff --git a/Migrations/20250310054721_UpdateTableRequest.Designer.cs b/Migrations/20250310054721_UpdateTableRequest.Designer.cs
new file mode 100644
index 0000000..0904201
--- /dev/null
+++ b/Migrations/20250310054721_UpdateTableRequest.Designer.cs
@@ -0,0 +1,1059 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using PSTW_CentralSystem.DBContext;
+
+#nullable disable
+
+namespace PSTW_CentralSystem.Migrations
+{
+    [DbContext(typeof(CentralSystemContext))]
+    [Migration("20250310054721_UpdateTableRequest")]
+    partial class UpdateTableRequest
+    {
+        /// <inheritdoc />
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder
+                .HasAnnotation("ProductVersion", "8.0.11")
+                .HasAnnotation("Relational:MaxIdentifierLength", 64);
+
+            MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<int>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("RoleId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetRoleClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<int>", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ClaimType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ClaimValue")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("UserId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserClaims", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<int>", b =>
+                {
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderKey")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("ProviderDisplayName")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("UserId")
+                        .HasColumnType("int");
+
+                    b.HasKey("LoginProvider", "ProviderKey");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("AspNetUserLogins", (string)null);
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<int>", b =>
+                {
+                    b.Property<int>("UserId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("RoleId")
+                        .HasColumnType("int");
+
+                    b.HasKey("UserId", "RoleId");
+
+                    b.HasIndex("RoleId");
+
+                    b.ToTable("AspNetUserRoles", (string)null);
+
+                    b.HasData(
+                        new
+                        {
+                            UserId = 1,
+                            RoleId = 1
+                        },
+                        new
+                        {
+                            UserId = 2,
+                            RoleId = 2
+                        });
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<int>", b =>
+                {
+                    b.Property<int>("UserId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("LoginProvider")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Name")
+                        .HasColumnType("varchar(255)");
+
+                    b.Property<string>("Value")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("UserId", "LoginProvider", "Name");
+
+                    b.ToTable("AspNetUserTokens", (string)null);
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Areas.Inventory.Models.InventoryMasterModel", b =>
+                {
+                    b.Property<int>("StoreId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("UserId")
+                        .HasColumnType("int");
+
+                    b.HasKey("StoreId");
+
+                    b.HasIndex("UserId")
+                        .IsUnique();
+
+                    b.ToTable("InventoryMasters");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Areas.Inventory.Models.ItemModel", b =>
+                {
+                    b.Property<int>("ItemID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("ItemID"));
+
+                    b.Property<int>("CompanyId")
+                        .HasColumnType("int");
+
+                    b.Property<float>("ConvertPrice")
+                        .HasColumnType("float");
+
+                    b.Property<int>("CreatedByUserId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Currency")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<float>("CurrencyRate")
+                        .HasColumnType("float");
+
+                    b.Property<DateTime?>("DODate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("DONo")
+                        .HasColumnType("longtext");
+
+                    b.Property<float>("DefaultPrice")
+                        .HasColumnType("float");
+
+                    b.Property<int>("DepartmentId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("EndWDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime?>("InvoiceDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("InvoiceNo")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("ItemStatus")
+                        .HasColumnType("int")
+                        .HasComment("1 = In stock; 2 = Item Moving; 3 = Item Out; 4 = Item Broken; 5 = Item Lost; 6 = Item Stolen; 7 = Item Damaged; 8 = Item Discarded; 9 = Item Destroyed; 10 = Item Finished;");
+
+                    b.Property<int?>("MovementId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("PONo")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PartNumber")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("ProductId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime>("PurchaseDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int>("Quantity")
+                        .HasColumnType("int");
+
+                    b.Property<string>("SerialNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Supplier")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("TeamType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("UniqueID")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("Warranty")
+                        .HasColumnType("int");
+
+                    b.HasKey("ItemID");
+
+                    b.HasIndex("CompanyId");
+
+                    b.HasIndex("CreatedByUserId");
+
+                    b.HasIndex("DepartmentId");
+
+                    b.HasIndex("MovementId");
+
+                    b.HasIndex("ProductId");
+
+                    b.ToTable("Items");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Areas.Inventory.Models.ItemMovementModel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("Action")
+                        .HasColumnType("longtext")
+                        .HasComment("Register, StockIn, Stock Out");
+
+                    b.Property<string>("ConsignmentNote")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("Date")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<int?>("ItemId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("LastStation")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("LastStore")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("LastUser")
+                        .HasColumnType("int");
+
+                    b.Property<string>("LatestStatus")
+                        .HasColumnType("longtext")
+                        .HasComment("Repair, Calibration, Faulty, Ready To Deploy, On Delivery");
+
+                    b.Property<bool>("MovementComplete")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int?>("Quantity")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Remark")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ToOther")
+                        .HasColumnType("longtext")
+                        .HasComment("Repair, Calibration, Faulty, Ready To Deploy, On Delivery");
+
+                    b.Property<int?>("ToStation")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("ToStore")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("ToUser")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("receiveDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<DateTime?>("sendDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("ItemId");
+
+                    b.HasIndex("LastStation");
+
+                    b.HasIndex("LastStore");
+
+                    b.HasIndex("LastUser");
+
+                    b.HasIndex("ToStation");
+
+                    b.HasIndex("ToStore");
+
+                    b.HasIndex("ToUser");
+
+                    b.ToTable("ItemMovements");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Areas.Inventory.Models.ManufacturerModel", b =>
+                {
+                    b.Property<int>("ManufacturerId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("ManufacturerId"));
+
+                    b.Property<string>("ManufacturerName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("ManufacturerId");
+
+                    b.ToTable("Manufacturers");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Areas.Inventory.Models.ProductModel", b =>
+                {
+                    b.Property<int>("ProductId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("ProductId"));
+
+                    b.Property<string>("Category")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ImageProduct")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("ManufacturerId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ModelNo")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ProductName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ProductShortName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<int?>("QuantityProduct")
+                        .HasColumnType("int");
+
+                    b.HasKey("ProductId");
+
+                    b.HasIndex("ManufacturerId");
+
+                    b.ToTable("Products");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Areas.Inventory.Models.RequestModel", b =>
+                {
+                    b.Property<int>("requestID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("requestID"));
+
+                    b.Property<string>("Document")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("ProductCategory")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("ProductId")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("RequestQuantity")
+                        .HasColumnType("int");
+
+                    b.Property<int?>("StationId")
+                        .HasColumnType("int");
+
+                    b.Property<int>("UserId")
+                        .HasColumnType("int");
+
+                    b.Property<DateTime?>("approvalDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("assignStoreItem")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("fromStoreItem")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("remarkMasterInv")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("remarkUser")
+                        .HasColumnType("longtext");
+
+                    b.Property<DateTime>("requestDate")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("status")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("requestID");
+
+                    b.HasIndex("ProductId");
+
+                    b.HasIndex("StationId");
+
+                    b.HasIndex("UserId");
+
+                    b.ToTable("request");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Areas.Inventory.Models.StationModel", b =>
+                {
+                    b.Property<int>("StationId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("StationId"));
+
+                    b.Property<int>("DepartmentId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("StationName")
+                        .HasColumnType("longtext");
+
+                    b.Property<int>("StationPicID")
+                        .HasColumnType("int");
+
+                    b.HasKey("StationId");
+
+                    b.HasIndex("DepartmentId");
+
+                    b.HasIndex("StationPicID");
+
+                    b.ToTable("Stations");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Areas.Inventory.Models.StoreModel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("CompanyId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("StoreName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("CompanyId");
+
+                    b.ToTable("Stores");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Areas.Inventory.Models.SupplierModel", b =>
+                {
+                    b.Property<int>("SupplierId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("SupplierId"));
+
+                    b.Property<string>("SupplierAddress")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("SupplierCompName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("SupplierEmail")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("SupplierPIC")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("SupplierPhoneNo")
+                        .HasColumnType("longtext");
+
+                    b.HasKey("SupplierId");
+
+                    b.ToTable("Suppliers");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Models.CompanyModel", b =>
+                {
+                    b.Property<int>("CompanyId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("CompanyId"));
+
+                    b.Property<string>("CompanyName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("CompanyId");
+
+                    b.ToTable("Companies");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Models.DepartmentModel", b =>
+                {
+                    b.Property<int>("DepartmentId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("DepartmentId"));
+
+                    b.Property<int>("CompanyId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("DepartmentCode")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("DepartmentName")
+                        .IsRequired()
+                        .HasColumnType("longtext");
+
+                    b.HasKey("DepartmentId");
+
+                    b.HasIndex("CompanyId");
+
+                    b.ToTable("Departments");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Models.ModuleSettingModel", b =>
+                {
+                    b.Property<int>("SettingId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("SettingId"));
+
+                    b.Property<string>("AllowedUserType")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("MethodAllowedUserType")
+                        .HasColumnType("json");
+
+                    b.Property<string>("ModuleName")
+                        .IsRequired()
+                        .HasMaxLength(50)
+                        .HasColumnType("varchar(50)");
+
+                    b.Property<int>("ModuleStatus")
+                        .HasColumnType("int");
+
+                    b.HasKey("SettingId");
+
+                    b.ToTable("ModuleSettings");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Models.RoleModel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Description")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Name")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedName")
+                        .IsUnique()
+                        .HasDatabaseName("RoleNameIndex");
+
+                    b.ToTable("AspNetRoles", (string)null);
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            Description = "Can access all pages",
+                            Name = "SuperAdmin",
+                            NormalizedName = "SUPERADMIN"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            Description = "Can access some admin pages",
+                            Name = "SystemAdmin",
+                            NormalizedName = "SYSTEMADMIN"
+                        },
+                        new
+                        {
+                            Id = 3,
+                            Description = "Can access operation pages",
+                            Name = "Engineer",
+                            NormalizedName = "ENGINEER"
+                        },
+                        new
+                        {
+                            Id = 4,
+                            Description = "Can access data viewer pages",
+                            Name = "Observer",
+                            NormalizedName = "OBSERVER"
+                        },
+                        new
+                        {
+                            Id = 5,
+                            Description = "Handle inventory module",
+                            Name = "Inventory Master",
+                            NormalizedName = "INVENTORY MASTER"
+                        },
+                        new
+                        {
+                            Id = 6,
+                            Description = "Involve in inventory transaction",
+                            Name = "Finance",
+                            NormalizedName = "FINANCE"
+                        });
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Models.UserModel", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    MySqlPropertyBuilderExtensions.UseMySqlIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("AccessFailedCount")
+                        .HasColumnType("int");
+
+                    b.Property<string>("ConcurrencyStamp")
+                        .IsConcurrencyToken()
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("Email")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<bool>("EmailConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("FullName")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("LockoutEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<DateTimeOffset?>("LockoutEnd")
+                        .HasColumnType("datetime(6)");
+
+                    b.Property<string>("NormalizedEmail")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("NormalizedUserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<string>("PasswordHash")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("PhoneNumber")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("PhoneNumberConfirmed")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<string>("SecurityStamp")
+                        .HasColumnType("longtext");
+
+                    b.Property<bool>("TwoFactorEnabled")
+                        .HasColumnType("tinyint(1)");
+
+                    b.Property<int?>("UserInfoStatus")
+                        .HasColumnType("int");
+
+                    b.Property<string>("UserName")
+                        .HasMaxLength(256)
+                        .HasColumnType("varchar(256)");
+
+                    b.Property<int?>("departmentId")
+                        .HasColumnType("int");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("NormalizedEmail")
+                        .HasDatabaseName("EmailIndex");
+
+                    b.HasIndex("NormalizedUserName")
+                        .IsUnique()
+                        .HasDatabaseName("UserNameIndex");
+
+                    b.HasIndex("departmentId");
+
+                    b.ToTable("AspNetUsers", (string)null);
+
+                    b.HasData(
+                        new
+                        {
+                            Id = 1,
+                            AccessFailedCount = 0,
+                            ConcurrencyStamp = "407727d8-2266-45f2-9b48-ef3a450f09c6",
+                            Email = "admin@pstw.com.my",
+                            EmailConfirmed = true,
+                            FullName = "MAAdmin",
+                            LockoutEnabled = false,
+                            NormalizedEmail = "ADMIN@PSTW.COM.MY",
+                            NormalizedUserName = "ADMIN@PSTW.COM.MY",
+                            PasswordHash = "AQAAAAIAAYagAAAAEDc91vi8/AJwNGigDpnzFh7Iplvlph0VGj9GfG1zI6tY/jM/4f3P0CWVQZ/0oetzVg==",
+                            PhoneNumberConfirmed = false,
+                            SecurityStamp = "2faceaca-f491-455a-9f10-3f641a5a7e0d",
+                            TwoFactorEnabled = false,
+                            UserInfoStatus = 1,
+                            UserName = "admin@pstw.com.my"
+                        },
+                        new
+                        {
+                            Id = 2,
+                            AccessFailedCount = 0,
+                            ConcurrencyStamp = "8065f043-f8ed-4733-aa42-6ee6a1ebb636",
+                            Email = "sysadmin@pstw.com.my",
+                            EmailConfirmed = true,
+                            FullName = "SysAdmin",
+                            LockoutEnabled = false,
+                            NormalizedEmail = "SYSADMIN@PSTW.COM.MY",
+                            NormalizedUserName = "SYSADMIN@PSTW.COM.MY",
+                            PasswordHash = "AQAAAAIAAYagAAAAEOmfi3vsFMnCUitXZqLgUaq5+Jqmigy8HrXwNqd8IELW2yvFQAMrfHLvJM5h0c+lfQ==",
+                            PhoneNumberConfirmed = false,
+                            SecurityStamp = "46a8accc-305f-42e6-a4a2-376bfec07e84",
+                            TwoFactorEnabled = false,
+                            UserInfoStatus = 1,
+                            UserName = "sysadmin@pstw.com.my"
+                        });
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<int>", b =>
+                {
+                    b.HasOne("PSTW_CentralSystem.Models.RoleModel", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<int>", b =>
+                {
+                    b.HasOne("PSTW_CentralSystem.Models.UserModel", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<int>", b =>
+                {
+                    b.HasOne("PSTW_CentralSystem.Models.UserModel", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<int>", b =>
+                {
+                    b.HasOne("PSTW_CentralSystem.Models.RoleModel", null)
+                        .WithMany()
+                        .HasForeignKey("RoleId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("PSTW_CentralSystem.Models.UserModel", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<int>", b =>
+                {
+                    b.HasOne("PSTW_CentralSystem.Models.UserModel", null)
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Areas.Inventory.Models.InventoryMasterModel", b =>
+                {
+                    b.HasOne("PSTW_CentralSystem.Areas.Inventory.Models.StoreModel", "Store")
+                        .WithMany()
+                        .HasForeignKey("StoreId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("PSTW_CentralSystem.Models.UserModel", "User")
+                        .WithOne("Store")
+                        .HasForeignKey("PSTW_CentralSystem.Areas.Inventory.Models.InventoryMasterModel", "UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Store");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Areas.Inventory.Models.ItemModel", b =>
+                {
+                    b.HasOne("PSTW_CentralSystem.Models.CompanyModel", "Company")
+                        .WithMany()
+                        .HasForeignKey("CompanyId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("PSTW_CentralSystem.Models.UserModel", "CreatedBy")
+                        .WithMany()
+                        .HasForeignKey("CreatedByUserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("PSTW_CentralSystem.Models.DepartmentModel", "Department")
+                        .WithMany()
+                        .HasForeignKey("DepartmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("PSTW_CentralSystem.Areas.Inventory.Models.ItemMovementModel", "Movement")
+                        .WithMany()
+                        .HasForeignKey("MovementId");
+
+                    b.HasOne("PSTW_CentralSystem.Areas.Inventory.Models.ProductModel", "Product")
+                        .WithMany("Items")
+                        .HasForeignKey("ProductId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Company");
+
+                    b.Navigation("CreatedBy");
+
+                    b.Navigation("Department");
+
+                    b.Navigation("Movement");
+
+                    b.Navigation("Product");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Areas.Inventory.Models.ItemMovementModel", b =>
+                {
+                    b.HasOne("PSTW_CentralSystem.Areas.Inventory.Models.ItemModel", "Item")
+                        .WithMany()
+                        .HasForeignKey("ItemId");
+
+                    b.HasOne("PSTW_CentralSystem.Areas.Inventory.Models.StationModel", "FromStation")
+                        .WithMany()
+                        .HasForeignKey("LastStation");
+
+                    b.HasOne("PSTW_CentralSystem.Areas.Inventory.Models.StoreModel", "FromStore")
+                        .WithMany()
+                        .HasForeignKey("LastStore");
+
+                    b.HasOne("PSTW_CentralSystem.Models.UserModel", "FromUser")
+                        .WithMany()
+                        .HasForeignKey("LastUser");
+
+                    b.HasOne("PSTW_CentralSystem.Areas.Inventory.Models.StationModel", "NextStation")
+                        .WithMany()
+                        .HasForeignKey("ToStation");
+
+                    b.HasOne("PSTW_CentralSystem.Areas.Inventory.Models.StoreModel", "NextStore")
+                        .WithMany()
+                        .HasForeignKey("ToStore");
+
+                    b.HasOne("PSTW_CentralSystem.Models.UserModel", "NextUser")
+                        .WithMany()
+                        .HasForeignKey("ToUser");
+
+                    b.Navigation("FromStation");
+
+                    b.Navigation("FromStore");
+
+                    b.Navigation("FromUser");
+
+                    b.Navigation("Item");
+
+                    b.Navigation("NextStation");
+
+                    b.Navigation("NextStore");
+
+                    b.Navigation("NextUser");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Areas.Inventory.Models.ProductModel", b =>
+                {
+                    b.HasOne("PSTW_CentralSystem.Areas.Inventory.Models.ManufacturerModel", "Manufacturer")
+                        .WithMany()
+                        .HasForeignKey("ManufacturerId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Manufacturer");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Areas.Inventory.Models.RequestModel", b =>
+                {
+                    b.HasOne("PSTW_CentralSystem.Areas.Inventory.Models.ProductModel", "Product")
+                        .WithMany()
+                        .HasForeignKey("ProductId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("PSTW_CentralSystem.Areas.Inventory.Models.StationModel", "Station")
+                        .WithMany()
+                        .HasForeignKey("StationId");
+
+                    b.HasOne("PSTW_CentralSystem.Models.UserModel", "User")
+                        .WithMany()
+                        .HasForeignKey("UserId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Product");
+
+                    b.Navigation("Station");
+
+                    b.Navigation("User");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Areas.Inventory.Models.StationModel", b =>
+                {
+                    b.HasOne("PSTW_CentralSystem.Models.DepartmentModel", "Department")
+                        .WithMany()
+                        .HasForeignKey("DepartmentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.HasOne("PSTW_CentralSystem.Models.UserModel", "StationPic")
+                        .WithMany()
+                        .HasForeignKey("StationPicID")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Department");
+
+                    b.Navigation("StationPic");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Areas.Inventory.Models.StoreModel", b =>
+                {
+                    b.HasOne("PSTW_CentralSystem.Models.CompanyModel", "Company")
+                        .WithMany()
+                        .HasForeignKey("CompanyId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Company");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Models.DepartmentModel", b =>
+                {
+                    b.HasOne("PSTW_CentralSystem.Models.CompanyModel", "Company")
+                        .WithMany("Departments")
+                        .HasForeignKey("CompanyId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Company");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Models.UserModel", b =>
+                {
+                    b.HasOne("PSTW_CentralSystem.Models.DepartmentModel", "Department")
+                        .WithMany()
+                        .HasForeignKey("departmentId");
+
+                    b.Navigation("Department");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Areas.Inventory.Models.ProductModel", b =>
+                {
+                    b.Navigation("Items");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Models.CompanyModel", b =>
+                {
+                    b.Navigation("Departments");
+                });
+
+            modelBuilder.Entity("PSTW_CentralSystem.Models.UserModel", b =>
+                {
+                    b.Navigation("Store");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/Migrations/20250310054721_UpdateTableRequest.cs b/Migrations/20250310054721_UpdateTableRequest.cs
new file mode 100644
index 0000000..055e1f4
--- /dev/null
+++ b/Migrations/20250310054721_UpdateTableRequest.cs
@@ -0,0 +1,68 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace PSTW_CentralSystem.Migrations
+{
+    /// <inheritdoc />
+    public partial class UpdateTableRequest : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "assignStoreItem",
+                table: "request",
+                type: "longtext",
+                nullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.AddColumn<string>(
+                name: "fromStoreItem",
+                table: "request",
+                type: "longtext",
+                nullable: true)
+                .Annotation("MySql:CharSet", "utf8mb4");
+
+            migrationBuilder.UpdateData(
+                table: "AspNetUsers",
+                keyColumn: "Id",
+                keyValue: 1,
+                columns: new[] { "ConcurrencyStamp", "PasswordHash", "SecurityStamp" },
+                values: new object[] { "407727d8-2266-45f2-9b48-ef3a450f09c6", "AQAAAAIAAYagAAAAEDc91vi8/AJwNGigDpnzFh7Iplvlph0VGj9GfG1zI6tY/jM/4f3P0CWVQZ/0oetzVg==", "2faceaca-f491-455a-9f10-3f641a5a7e0d" });
+
+            migrationBuilder.UpdateData(
+                table: "AspNetUsers",
+                keyColumn: "Id",
+                keyValue: 2,
+                columns: new[] { "ConcurrencyStamp", "PasswordHash", "SecurityStamp" },
+                values: new object[] { "8065f043-f8ed-4733-aa42-6ee6a1ebb636", "AQAAAAIAAYagAAAAEOmfi3vsFMnCUitXZqLgUaq5+Jqmigy8HrXwNqd8IELW2yvFQAMrfHLvJM5h0c+lfQ==", "46a8accc-305f-42e6-a4a2-376bfec07e84" });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "assignStoreItem",
+                table: "request");
+
+            migrationBuilder.DropColumn(
+                name: "fromStoreItem",
+                table: "request");
+
+            migrationBuilder.UpdateData(
+                table: "AspNetUsers",
+                keyColumn: "Id",
+                keyValue: 1,
+                columns: new[] { "ConcurrencyStamp", "PasswordHash", "SecurityStamp" },
+                values: new object[] { "d801514b-2c36-4df7-9bb5-1c7e351ed27e", "AQAAAAIAAYagAAAAEBSoDiGEYlobLgzVcffYwvTtm1WnXpqrBBT1yYP+kruV4OTtizW7Sel94qAfqUjGcw==", "6132b0af-6a7f-4f38-8959-d049ed486e8f" });
+
+            migrationBuilder.UpdateData(
+                table: "AspNetUsers",
+                keyColumn: "Id",
+                keyValue: 2,
+                columns: new[] { "ConcurrencyStamp", "PasswordHash", "SecurityStamp" },
+                values: new object[] { "14f11e89-bb92-49dd-a8df-ec5b0d49df2d", "AQAAAAIAAYagAAAAEEvcS1SY+9pxZKH/P1l4TaodgW3SFSRfcZ+PnjB3MiMmEUSyYoo64AQtX0bOxFSX2g==", "6dca2498-5150-4369-9923-6f19a48258d4" });
+        }
+    }
+}
diff --git a/Migrations/CentralSystemContextModelSnapshot.cs b/Migrations/CentralSystemContextModelSnapshot.cs
index a1a96b6..3ed5b8e 100644
--- a/Migrations/CentralSystemContextModelSnapshot.cs
+++ b/Migrations/CentralSystemContextModelSnapshot.cs
@@ -422,6 +422,12 @@ namespace PSTW_CentralSystem.Migrations
                     b.Property<DateTime?>("approvalDate")
                         .HasColumnType("datetime(6)");
 
+                    b.Property<string>("assignStoreItem")
+                        .HasColumnType("longtext");
+
+                    b.Property<string>("fromStoreItem")
+                        .HasColumnType("longtext");
+
                     b.Property<string>("remarkMasterInv")
                         .HasColumnType("longtext");
 
@@ -754,16 +760,16 @@ namespace PSTW_CentralSystem.Migrations
                         {
                             Id = 1,
                             AccessFailedCount = 0,
-                            ConcurrencyStamp = "d801514b-2c36-4df7-9bb5-1c7e351ed27e",
+                            ConcurrencyStamp = "407727d8-2266-45f2-9b48-ef3a450f09c6",
                             Email = "admin@pstw.com.my",
                             EmailConfirmed = true,
                             FullName = "MAAdmin",
                             LockoutEnabled = false,
                             NormalizedEmail = "ADMIN@PSTW.COM.MY",
                             NormalizedUserName = "ADMIN@PSTW.COM.MY",
-                            PasswordHash = "AQAAAAIAAYagAAAAEBSoDiGEYlobLgzVcffYwvTtm1WnXpqrBBT1yYP+kruV4OTtizW7Sel94qAfqUjGcw==",
+                            PasswordHash = "AQAAAAIAAYagAAAAEDc91vi8/AJwNGigDpnzFh7Iplvlph0VGj9GfG1zI6tY/jM/4f3P0CWVQZ/0oetzVg==",
                             PhoneNumberConfirmed = false,
-                            SecurityStamp = "6132b0af-6a7f-4f38-8959-d049ed486e8f",
+                            SecurityStamp = "2faceaca-f491-455a-9f10-3f641a5a7e0d",
                             TwoFactorEnabled = false,
                             UserInfoStatus = 1,
                             UserName = "admin@pstw.com.my"
@@ -772,16 +778,16 @@ namespace PSTW_CentralSystem.Migrations
                         {
                             Id = 2,
                             AccessFailedCount = 0,
-                            ConcurrencyStamp = "14f11e89-bb92-49dd-a8df-ec5b0d49df2d",
+                            ConcurrencyStamp = "8065f043-f8ed-4733-aa42-6ee6a1ebb636",
                             Email = "sysadmin@pstw.com.my",
                             EmailConfirmed = true,
                             FullName = "SysAdmin",
                             LockoutEnabled = false,
                             NormalizedEmail = "SYSADMIN@PSTW.COM.MY",
                             NormalizedUserName = "SYSADMIN@PSTW.COM.MY",
-                            PasswordHash = "AQAAAAIAAYagAAAAEEvcS1SY+9pxZKH/P1l4TaodgW3SFSRfcZ+PnjB3MiMmEUSyYoo64AQtX0bOxFSX2g==",
+                            PasswordHash = "AQAAAAIAAYagAAAAEOmfi3vsFMnCUitXZqLgUaq5+Jqmigy8HrXwNqd8IELW2yvFQAMrfHLvJM5h0c+lfQ==",
                             PhoneNumberConfirmed = false,
-                            SecurityStamp = "6dca2498-5150-4369-9923-6f19a48258d4",
+                            SecurityStamp = "46a8accc-305f-42e6-a4a2-376bfec07e84",
                             TwoFactorEnabled = false,
                             UserInfoStatus = 1,
                             UserName = "sysadmin@pstw.com.my"
diff --git a/appsettings.json b/appsettings.json
index 76db4eb..5b9735b 100644
--- a/appsettings.json
+++ b/appsettings.json
@@ -3,7 +3,7 @@
     //"DefaultConnection": "Server=localhost;uid=root;Password='';Database=web_interface;"
     //"DefaultConnection": "server=175.136.244.102;user id=root;password=tw_mysql_root;port=3306;database=web_interface"
     //"CentralConnnection": "Server=192.168.12.12;Port=3306;uid=installer;password='pstw_mysql_installer';database=pstw_cs;", //DB_dev Local connection
-    "CentralConnnection": "Server=219.92.7.60;Port=3307;uid=installer;password='pstw_mysql_installer';database=pstw_cs_prod;" //DB_dev Public connection
+    "CentralConnnection": "Server=219.92.7.60;Port=3307;uid=installer;password='pstw_mysql_installer';database=pstw_cs;" //DB_dev Public connection
     //"InventoryConnection": "Server=219.92.7.60;Port=3307;uid=installer;password='pstw_mysql_installer';database=pstw_cs_inventory;" //DB_dev connection
     //"DefaultConnection": "Server=219.92.7.60;Port=3307;uid=intern;password='intern_mysql_acct';database=web_interface;"//DB_dev connection
   },