diff --git a/Areas/Inventory/Views/InventoryMaster/ItemRegistration.cshtml b/Areas/Inventory/Views/InventoryMaster/ItemRegistration.cshtml
index de4b962..a4cb48b 100644
--- a/Areas/Inventory/Views/InventoryMaster/ItemRegistration.cshtml
+++ b/Areas/Inventory/Views/InventoryMaster/ItemRegistration.cshtml
@@ -1,17 +1,17 @@
-
-@{
+@{
     ViewData["Title"] = "Item Form";
     Layout = "~/Views/Shared/_Layout.cshtml";
 }
 <style>
     @@font-face {
-      font-family: 'OCR-A';
-      src: url('../assets/fonts/ocraext.ttf');
+        font-family: 'OCR-A';
+        src: url('../assets/fonts/ocraext.ttf');
     }
 
     .QrPrintFont {
-      font-family: 'OCR-A', monospace;
+        font-family: 'OCR-A', monospace;
     }
+
     .table td img {
         display: block !important;
     }
@@ -23,10 +23,10 @@
             <button id="addItemBtn" class="btn btn-success col-md-3 col-lg-3 m-1 col-12"><i class="fa fa-plus"></i>&nbsp;Add Item</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 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="itemDatatable" style=" width:100%;border-style: solid; border-width: 1px"></table>
         </div>
@@ -215,7 +215,7 @@
                                                                 </div>
                                                             </div>
                                                         </div>
-                                                        
+
                                                         @* Supplier coding *@
                                                         <div class="form-group row align-items-center">
                                                             <label class="col-sm-4 col-form-label">Supplier: </label>
@@ -223,7 +223,7 @@
                                                                 <div class="dropdown">
                                                                     <select class="btn btn-primary dropdown-toggle col-md-10" data-toggle="dropdown" aria-expanded="false" v-model="selectedSupplier" required>
                                                                         <option class="btn-light" value="" disabled selected>Select Supplier</option>
-                                                                        <option class="btn-light" v-for="(item, index) in suppliers" :value="item.supplierId">{{ item.supplierCompName }}</option>
+                                                                        <option class="btn-light" v-for="(item, index) in suppliers">{{ item.supplierCompName }}</option>
                                                                     </select>
                                                                 </div>
                                                             </div>
@@ -356,11 +356,11 @@
 </div>
 
 @section Scripts {
-@{
-    await Html.RenderPartialAsync("_ValidationScriptsPartial");
-}
-<script>
-    $(function () {
+    @{
+        await Html.RenderPartialAsync("_ValidationScriptsPartial");
+    }
+    <script>
+        $(function () {
             app.mount('#registerItem');
 
             // Attach a click event listener to elements with the class 'btn-success'.
@@ -372,655 +372,655 @@
                 // Show the modal with the ID 'addManufacturerModal'.
                 $('.modal').modal('hide');
             });
-    });
-    const app = Vue.createApp({
-        data() {
-            return {
-                companies: [ 
-                    { 
-                        companyId: 1,
-                        companyName: "PSTW",
-                        departments: [{ departmentId: 1, departmentName: "Air" }, { departmentId: 2, departmentName: "Marine" }, { departmentId: 3, departmentName: "River" }]
-                    },
-                    { 
-                        companyId: 2,
-                        companyName: "TES",
-                        departments: [{ departmentId: 1, departmentName: "Air" }],
-                    },
-                ],
-                company: "",
-                Dept: null,
-                teamTypes: ["Continuous", "Manual"],
-                teamType: "",
-                productName: null,
-                imageProduct: null,
-                productCategory: null,
-                serialNumber: "",
-                quantity: 1,
-                supplierName: null,
-                purchaseDate: null,
-                PO: null,
-                currency: "MYR",
-                DefaultPrice: 0.01,
-                currencyRate: 1,
-                convertPrice: 0.01,
-                DONo:null,
-                DODate: null,
-                warranty: 0,
-                EndWDate: null,
-                invoiceNo: null,
-                invoiceDate: null,
-                partNumber: null,
-                products: [],
-                depts: [],
-                suppliers: [
-                    {
-                        supplierId: 1,
-                        supplierName: "Pang",
-                    },
-                    {
-                        supplierId: 2,
-                        supplierName: "Ms Kim",
-                    },       
-                ],
-                isModalOpen: false,
-                selectedProduct: "",
-                selectedSupplier: "",
-                selectedCompany: "",
-                selectedDepartment: "",
-                selectedTeamType: "",
-                currencies: {},
-                showItemModal: false,
-                loading: false,
-                thisQRInfo: {
-                    uniqueID: null,
-                    departmentName: null,
-                    serialNumber: null,
-                    endWDate: null,
-                },
-                items: [],
-                currentUser: null,
-                currentUserCompanyDept: null,
-            }
-        },
-        mounted() {
-            this.fetchUser();
-            this.fetchItem();
-            this.fetchCurrencyData();
-            this.fetchCompanies();
-            this.fetchProducts();
-            this.fetchSuppliers();
-        },
-        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 : {};
-            },
-            showSerialNumber() {
-                return this.showProduct.category === 'Asset' || this.showProduct.category === 'Part';
-            },
-        },
-        methods: {
-            async addItem() {
-                if (this.showProduct.category == "Disposable") {
-                    this.serialNumber = "";
-                }
-                const formData = {
-                    CompanyId: this.selectedCompany,
-                    DepartmentId: this.selectedDepartment,
-                    ProductId: this.selectedProduct,
-                    SerialNumber: this.serialNumber,
-                    Quantity: this.quantity,
-                    Supplier: this.selectedSupplier,
-                    PurchaseDate: this.purchaseDate,
-                    PONo: this.PO,
-                    Currency: this.currency,
-                    DefaultPrice: this.DefaultPrice,
-                    CurrencyRate: this.currencyRate,
-                    ConvertPrice: this.convertPrice,
-                    DODate: this.DODate,
-                    Warranty: this.warranty,
-                    EndWDate: this.EndWDate,
-                    InvoiceDate: this.invoiceDate,
-                    CreatedByUserId: this.currentUser.id,
-                    TeamType: this.selectedTeamType,
-                    PartNumber: this.partNumber,
-                };
-
-                try {
-
-                    // Additional specific checks
-                    if (this.showSerialNumber) {
-                        this.quantity = 0;
-                        if (this.serialNumber === null || this.serialNumber === '') {
-                            alert('Serial Number Error', 'Serial Number must be filled when selecting Item or Part.', 'warning');
-                            return;
-                        }
-                    }
-                    else {
-                        this.serialNumber = null;
-                        if (this.quantity === 0 || this.quantity === null || this.quantity === '') {
-                            alert('quantity Error', 'Quantity is required when selecting Disposable.', 'warning');
-                            return;
-                        }
-                    }
-
-                    // Proceed to send the data to the API
-                    const response = await fetch('/InvMainAPI/AddItem', {
-                        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!', 'Item form has been successfully submitted.', 'success');
-                        const updatedItem = await response.json();
-                        this.items.push(updatedItem);
-
-                        this.fetchItem();
-
-                        // Reset the form
-                        this.resetForm();
-                    } 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');
-                }
-
-            },
-
-            initiateTable() {
-                self = this;
-                this.itemDatatable = $('#itemDatatable').DataTable({
-                    "data": this.items,
-                    "columns": [
+        });
+        const app = Vue.createApp({
+            data() {
+                return {
+                    companies: [
                         {
-                            "title": "Unique Id",
-                            "data": "uniqueID",
-                            "createdCell": function (td, cellData, rowData, row, col) {
-                                // Assign a unique ID to the <td> element
-                                $(td).attr('id', `qr${cellData}`);
-                            },
+                            companyId: 1,
+                            companyName: "PSTW",
+                            departments: [{ departmentId: 1, departmentName: "Air" }, { departmentId: 2, departmentName: "Marine" }, { departmentId: 3, departmentName: "River" }]
                         },
                         {
-                            "title": "Print",
-                            "data": "uniqueID",
-                            "render": function (data, type, full, meta) {
-                                var printButton = `<button type="button" class="btn btn-success print-btn" data-id="${data}">Print</button>`;
-                                return printButton;
-                            },
-                                "className": "align-middle",
+                            companyId: 2,
+                            companyName: "TES",
+                            departments: [{ departmentId: 1, departmentName: "Air" }],
                         },
-                        {
-                            "title": "Item Short Name",
-                            "data": "productShortName",
-                        },
-                        {
-                            "title": "Serial Number",
-                            "data": "serialNumber",
-                            },
-                        {
-                            "title": "Part Number",
-                            "data": "partNumber",
-                        },
-                        {
-                            "title": "Category",
-                            "data": "category",
-                        },
-                        {
-                            "title": "Quantity",
-                            "data": "quantity",
-                        },
-                        {
-                            "title": "Supplier",
-                            "data": "supplier",
-                        },
-                        {
-                            "title": "Purchase Date",
-                            "data": "purchaseDate",
-                        },
-                        {
-                            "title": "Price(RM)",
-                            "data": "convertPrice",
-                        },
-                        {
-                            "title": "Invoice Date",
-                            "data": "invoiceDate",
-                        },
-                        {
-                            "title": "Warranty Until",
-                                "data": "warranty",
-                            "render": function (data, type, full, meta) {
-                                if (data > 0) { return full.endWDate }
-                                else { return data }
-                            }
-                        },
-                        {
-                            "title": "Location",
-                            "data": "currentUser",
-                            "render": function (data, type, full, meta) {
-                                currentUser = data ?? null;
-                                currentStore = full.currentStore ?? 'N/A';
-                                currentStation = full.currentStation ?? 'N/A';
-                                return `User: ${currentUser}<br>
-                                Store: ${currentStore}<br>
-                                Station: ${currentStation}`
-                            }
-                        },
-                        {
-                            "title": "Delete",
-                            "data": "itemID",
-                            "render": function (data) {
-                                var deleteButton = `<button type="button" class="btn btn-danger delete-btn" data-id="${data}">Delete</button>`;
-                                return deleteButton;
-                            },
-                            "className": "align-middle",
-                        }
                     ],
-                    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], {
-                                    text: data.qrString,
-                                    width: 100,
-                                    height: 100,
-                                    colorDark: "#000000",
-                                    colorLight: "#ffffff",
-                                    correctLevel: QRCode.CorrectLevel.M
-                                });
-                            }
-                            // container.on('click', function() {
-                            //     window.open(data.qrString, '_blank');
-                            // });
-                        });
+                    company: "",
+                    Dept: null,
+                    teamTypes: ["Continuous", "Manual"],
+                    teamType: "",
+                    productName: null,
+                    imageProduct: null,
+                    productCategory: null,
+                    serialNumber: "",
+                    quantity: 1,
+                    supplierName: null,
+                    purchaseDate: null,
+                    PO: null,
+                    currency: "MYR",
+                    DefaultPrice: 0.01,
+                    currencyRate: 1,
+                    convertPrice: 0.01,
+                    DONo: null,
+                    DODate: null,
+                    warranty: 0,
+                    EndWDate: null,
+                    invoiceNo: null,
+                    invoiceDate: null,
+                    partNumber: null,
+                    products: [],
+                    depts: [],
+                    suppliers: [
+                        {
+                            supplierId: 1,
+                            supplierName: "Pang",
+                        },
+                        {
+                            supplierId: 2,
+                            supplierName: "Ms Kim",
+                        },
+                    ],
+                    isModalOpen: false,
+                    selectedProduct: "",
+                    selectedSupplier: "",
+                    selectedCompany: "",
+                    selectedDepartment: "",
+                    selectedTeamType: "",
+                    currencies: {},
+                    showItemModal: false,
+                    loading: false,
+                    thisQRInfo: {
+                        uniqueID: null,
+                        departmentName: null,
+                        serialNumber: null,
+                        endWDate: null,
                     },
-                })
+                    items: [],
+                    currentUser: null,
+                    currentUserCompanyDept: null,
+                }
+            },
+            mounted() {
+                this.fetchUser();
+                this.fetchItem();
+                this.fetchCurrencyData();
+                this.fetchCompanies();
+                this.fetchProducts();
+                this.fetchSuppliers();
+            },
+            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 : {};
+                },
+                showSerialNumber() {
+                    return this.showProduct.category === 'Asset' || this.showProduct.category === 'Part';
+                },
+            },
+            methods: {
+                async addItem() {
+                    if (this.showProduct.category == "Disposable") {
+                        this.serialNumber = "";
+                    }
+                    const formData = {
+                        CompanyId: this.selectedCompany,
+                        DepartmentId: this.selectedDepartment,
+                        ProductId: this.selectedProduct,
+                        SerialNumber: this.serialNumber,
+                        Quantity: this.quantity,
+                        Supplier: this.selectedSupplier,
+                        PurchaseDate: this.purchaseDate,
+                        PONo: this.PO,
+                        Currency: this.currency,
+                        DefaultPrice: this.DefaultPrice,
+                        CurrencyRate: this.currencyRate,
+                        ConvertPrice: this.convertPrice,
+                        DODate: this.DODate,
+                        Warranty: this.warranty,
+                        EndWDate: this.EndWDate,
+                        InvoiceDate: this.invoiceDate,
+                        CreatedByUserId: this.currentUser.id,
+                        TeamType: this.selectedTeamType,
+                        PartNumber: this.partNumber,
+                    };
 
-                // Attach click event listener to the delete buttons
-                $('#itemDatatable tbody').on('click', '.delete-btn', function () {
-                    const itemId = $(this).data('id'); 
-                        self.deleteItem(itemId); 
-                });
+                    try {
 
-                $('#itemDatatable tbody').on('click', '.print-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
+                        // Additional specific checks
+                        if (this.showSerialNumber) {
+                            this.quantity = 0;
+                            if (this.serialNumber === null || this.serialNumber === '') {
+                                alert('Serial Number Error', 'Serial Number must be filled when selecting Item or Part.', 'warning');
+                                return;
+                            }
+                        }
+                        else {
+                            this.serialNumber = null;
+                            if (this.quantity === 0 || this.quantity === null || this.quantity === '') {
+                                alert('quantity Error', 'Quantity is required when selecting Disposable.', 'warning');
+                                return;
+                            }
+                        }
 
-                    let imageSrc;
+                        // Proceed to send the data to the API
+                        const response = await fetch('/InvMainAPI/AddItem', {
+                            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!', 'Item form has been successfully submitted.', 'success');
+                            const updatedItem = await response.json();
+                            this.items.push(updatedItem);
 
-                    // Check if the table is collapsed
-                    if ($row.hasClass('child')) {
-                        // For collapsed view: Look for the closest `.dtr-data` that contains the img
+                            this.fetchItem();
+
+                            // Reset the form
+                            this.resetForm();
+                        } 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');
+                    }
+
+                },
+
+                initiateTable() {
+                    self = this;
+                    this.itemDatatable = $('#itemDatatable').DataTable({
+                        "data": this.items,
+                        "columns": [
+                            {
+                                "title": "Unique Id",
+                                "data": "uniqueID",
+                                "createdCell": function (td, cellData, rowData, row, col) {
+                                    // Assign a unique ID to the <td> element
+                                    $(td).attr('id', `qr${cellData}`);
+                                },
+                            },
+                            {
+                                "title": "Print",
+                                "data": "uniqueID",
+                                "render": function (data, type, full, meta) {
+                                    var printButton = `<button type="button" class="btn btn-success print-btn" data-id="${data}">Print</button>`;
+                                    return printButton;
+                                },
+                                "className": "align-middle",
+                            },
+                            {
+                                "title": "Item Short Name",
+                                "data": "productShortName",
+                            },
+                            {
+                                "title": "Serial Number",
+                                "data": "serialNumber",
+                            },
+                            {
+                                "title": "Part Number",
+                                "data": "partNumber",
+                            },
+                            {
+                                "title": "Category",
+                                "data": "category",
+                            },
+                            {
+                                "title": "Quantity",
+                                "data": "quantity",
+                            },
+                            {
+                                "title": "Supplier",
+                                "data": "supplier",
+                            },
+                            {
+                                "title": "Purchase Date",
+                                "data": "purchaseDate",
+                            },
+                            {
+                                "title": "Price(RM)",
+                                "data": "convertPrice",
+                            },
+                            {
+                                "title": "Invoice Date",
+                                "data": "invoiceDate",
+                            },
+                            {
+                                "title": "Warranty Until",
+                                "data": "warranty",
+                                "render": function (data, type, full, meta) {
+                                    if (data > 0) { return full.endWDate }
+                                    else { return data }
+                                }
+                            },
+                            {
+                                "title": "Location",
+                                "data": "currentUser",
+                                "render": function (data, type, full, meta) {
+                                    currentUser = data ?? null;
+                                    currentStore = full.currentStore ?? 'N/A';
+                                    currentStation = full.currentStation ?? 'N/A';
+                                    return `User: ${currentUser}<br>
+                                        Store: ${currentStore}<br>
+                                        Station: ${currentStation}`
+                                }
+                            },
+                            {
+                                "title": "Delete",
+                                "data": "itemID",
+                                "render": function (data) {
+                                    var deleteButton = `<button type="button" class="btn btn-danger delete-btn" data-id="${data}">Delete</button>`;
+                                    return deleteButton;
+                                },
+                                "className": "align-middle",
+                            }
+                        ],
+                        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], {
+                                        text: data.qrString,
+                                        width: 100,
+                                        height: 100,
+                                        colorDark: "#000000",
+                                        colorLight: "#ffffff",
+                                        correctLevel: QRCode.CorrectLevel.M
+                                    });
+                                }
+                                // container.on('click', function() {
+                                //     window.open(data.qrString, '_blank');
+                                // });
+                            });
+                        },
+                    })
+
+                    // Attach click event listener to the delete buttons
+                    $('#itemDatatable tbody').on('click', '.delete-btn', function () {
+                        const itemId = $(this).data('id');
+                        self.deleteItem(itemId);
+                    });
+
+                    $('#itemDatatable tbody').on('click', '.print-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
+
+                        let imageSrc;
+
+                        // 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');
-                    } 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');
-                    }
+                        } 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');
+                        }
 
-                    if (imageSrc) {
-                        self.printItem(itemId, imageSrc); // Call the print function with the itemId and imageSrc
-                    } else {
-                        console.error("Image source not found.");
-                    }
-                });
-
-                this.loading = false;
-            },
-
-            async fetchItem() {
-                try {
-                    // const token = localStorage.getItem('token'); // Get the token from localStorage
-                    const response = await fetch('/InvMainAPI/ItemList', {
-                        method: 'POST', // Specify the HTTP method
-                        headers: {
-                            'Content-Type': 'application/json', // Set content type
-                            // 'Authorization': `Bearer ${token}` // Include the token in the headers
+                        if (imageSrc) {
+                            self.printItem(itemId, imageSrc); // Call the print function with the itemId and imageSrc
+                        } else {
+                            console.error("Image source not found.");
                         }
                     });
 
-                    if (!response.ok) {
-                        throw new Error('Failed to fetch item');
-                    }
-                    this.items = await response.json();
+                    this.loading = false;
+                },
 
-                    if (this.itemDatatable) {
-                        this.itemDatatable.clear().destroy();
-                    }
-                    this.initiateTable();
-                } 
-                catch (error) {
-                    console.error('Error fetching item:', error);
-                }
-            },
+                async fetchItem() {
+                    try {
+                        // const token = localStorage.getItem('token'); // Get the token from localStorage
+                        const response = await fetch('/InvMainAPI/ItemList', {
+                            method: 'POST', // Specify the HTTP method
+                            headers: {
+                                'Content-Type': 'application/json', // Set content type
+                                // 'Authorization': `Bearer ${token}` // Include the token in the headers
+                            }
+                        });
 
-            async fetchProducts() {
-                try {
-                    // const token = localStorage.getItem('token'); // Get the token from localStorage
-                    const response = await fetch('/InvMainAPI/ProductList', {
-                        method: 'POST', // Specify the HTTP method
-                        headers: {
-                            'Content-Type': 'application/json', // Set content type
-                            // 'Authorization': `Bearer ${token}` // Include the token in the headers
+                        if (!response.ok) {
+                            throw new Error('Failed to fetch item');
                         }
-                    });
+                        this.items = await response.json();
 
-                    if (!response.ok) {
-                        throw new Error('Failed to fetch products');
-                    }
-
-                    this.products = await response.json(); 
-                } 
-                catch (error) {
-                    console.error('Error fetching products:', error);
-                }
-            },
-
-            async fetchCompanies() {
-                try {
-                    const response = await fetch('/AdminAPI/GetDepartmentWithCompanyList', {
-                        method: 'POST', // Specify the HTTP method
-                        headers: {
-                            'Content-Type': 'application/json'
+                        if (this.itemDatatable) {
+                            this.itemDatatable.clear().destroy();
                         }
-                    });
-                    if (!response.ok) {
-                        throw new Error('Failed to fetch companies');
+                        this.initiateTable();
                     }
+                    catch (error) {
+                        console.error('Error fetching item:', error);
+                    }
+                },
 
-                    this.companies = await response.json();
+                async fetchProducts() {
+                    try {
+                        // const token = localStorage.getItem('token'); // Get the token from localStorage
+                        const response = await fetch('/InvMainAPI/ProductList', {
+                            method: 'POST', // Specify the HTTP method
+                            headers: {
+                                'Content-Type': 'application/json', // Set content type
+                                // 'Authorization': `Bearer ${token}` // Include the token in the headers
+                            }
+                        });
 
-                } catch (error) {
-                    console.error('Error fetching products:', error);
-                }
-            },
-
-            async fetchSuppliers() {
-                try {
-                    const response = await fetch('/InvMainAPI/SupplierList', {
-                        method: 'POST', // Specify the HTTP method
-                        headers: {
-                            'Content-Type': 'application/json'
+                        if (!response.ok) {
+                            throw new Error('Failed to fetch products');
                         }
-                    });
-                    if (!response.ok) {
-                        throw new Error('Failed to fetch suppliers');
+
+                        this.products = await response.json();
                     }
-                    this.suppliers = await response.json(); // Get the full response object
+                    catch (error) {
+                        console.error('Error fetching products:', error);
+                    }
+                },
 
-                } catch (error) {
-                    console.error('Error fetching suppliers:', error);
-                }
-            },
-            async fetchCurrencyData() {
-                try {
-                    // Fetch currency data from the API
-                    const response = await fetch('https://openexchangerates.org/api/currencies.json'); // Example API
-                    this.currencies = await response.json();
-                } catch (error) {
-                    console.error('Error fetching currency data:', error);
-                }
-            },
-            convertCurrency() {
-                // Your currency conversion logic here
-                console.log('Selected currency:', this.currency);
-            },
-            resetForm() {
-                this.company = '';
-                this.Dept = null;
-                this.productName = null;
-                this.imageProduct = null;
-                this.serialNumber = '';
-                this.quantity = 1;
-                this.supplierName = null;
-                this.purchaseDate = null;
-                this.PO = null;
-                this.currency = 'MYR';
-                this.DefaultPrice = 0.01;
-                this.currencyRate = 1;
-                this.convertPrice = 0.01;
-                this.DODate = null;
-                this.warranty = 0;
-                this.EndWDate = null;
-                this.invoiceDate = null;
-                this.selectedProduct = '';
-                this.selectedSupplier = '';
-                this.selectedCompany = this.currentUserCompanyDept.companyId;
-                this.selectedDepartment = '';
-                this.selectedTeamType = '';
-                this.partNumber = null;
-            },
+                async fetchCompanies() {
+                    try {
+                        const response = await fetch('/AdminAPI/GetDepartmentWithCompanyList', {
+                            method: 'POST', // Specify the HTTP method
+                            headers: {
+                                'Content-Type': 'application/json'
+                            }
+                        });
+                        if (!response.ok) {
+                            throw new Error('Failed to fetch companies');
+                        }
 
-            // FRONT END FUNCTIONS
-            //----------------------//
-            //Calculate Total Price
-            convertCurrency() {
-                const total = this.DefaultPrice * this.currencyRate;
-                this.convertPrice = total.toFixed(2);
-                this.DefaultPrice = this.DefaultPrice
+                        this.companies = await response.json();
+
+                    } catch (error) {
+                        console.error('Error fetching products:', error);
+                    }
+                },
+
+                async fetchSuppliers() {
+                    try {
+                        const response = await fetch('/InvMainAPI/SupplierList', {
+                            method: 'POST', // Specify the HTTP method
+                            headers: {
+                                'Content-Type': 'application/json'
+                            }
+                        });
+                        if (!response.ok) {
+                            throw new Error('Failed to fetch suppliers');
+                        }
+                        this.suppliers = await response.json(); // Get the full response object
+
+                    } catch (error) {
+                        console.error('Error fetching suppliers:', error);
+                    }
+                },
+                async fetchCurrencyData() {
+                    try {
+                        // Fetch currency data from the API
+                        const response = await fetch('https://openexchangerates.org/api/currencies.json'); // Example API
+                        this.currencies = await response.json();
+                    } catch (error) {
+                        console.error('Error fetching currency data:', error);
+                    }
+                },
+                convertCurrency() {
+                    // Your currency conversion logic here
+                    console.log('Selected currency:', this.currency);
+                },
+                resetForm() {
+                    this.company = '';
+                    this.Dept = null;
+                    this.productName = null;
+                    this.imageProduct = null;
+                    this.serialNumber = '';
+                    this.quantity = 1;
+                    this.supplierName = null;
+                    this.purchaseDate = null;
+                    this.PO = null;
+                    this.currency = 'MYR';
+                    this.DefaultPrice = 0.01;
+                    this.currencyRate = 1;
+                    this.convertPrice = 0.01;
+                    this.DODate = null;
+                    this.warranty = 0;
+                    this.EndWDate = null;
+                    this.invoiceDate = null;
+                    this.selectedProduct = '';
+                    this.selectedSupplier = '';
+                    this.selectedCompany = this.currentUserCompanyDept.companyId;
+                    this.selectedDepartment = '';
+                    this.selectedTeamType = '';
+                    this.partNumber = null;
+                },
+
+                // FRONT END FUNCTIONS
+                //----------------------//
+                //Calculate Total Price
+                convertCurrency() {
+                    const total = this.DefaultPrice * this.currencyRate;
+                    this.convertPrice = total.toFixed(2);
+                    this.DefaultPrice = this.DefaultPrice
                     // .replace(/[^0-9.]/g, '') // Remove non-numeric characters except decimal points
                     // .replace(/(\..*)\..*/g, '$1') // Allow only one decimal point
                     // .replace(/^(\d*\.\d{0,2})\d*$/, '$1'); // Limit to two decimal places
 
-            }, 
-            calculateWarrantyEndDate() {
-                // Check if DODate and warranty are valid
-                if (!this.DODate || isNaN(Date.parse(this.DODate))) {
-                    this.EndWDate = null;
-                    return;
-                }
-
-                const DODates = new Date(this.DODate);
-                const warrantyMonth = parseInt(this.warranty);
-
-                // Ensure warranty is a valid number
-                if (!isNaN(warrantyMonth)) {
-                    DODates.setMonth(DODates.getMonth() + warrantyMonth);
-                    this.EndWDate = DODates.toISOString().split('T')[0];
-                } else {
-                    this.EndWDate = null;
-                }
-            },
-            async deleteItem(itemId) {
-                if (!confirm("Are you sure you want to delete this item?")) {
-                    return;
-                }
-                try {
-                    const response = await fetch(`/InvMainAPI/DeleteItem/${itemId}`, {
-                        method: 'DELETE',
-                        headers: {
-                            'Content-Type': 'application/json',
-                        },
-                    });
-                    const result = await response.json();
-
-                    if (result.success) {
-                        alert(result.message);
-                        // Remove the row from DataTables
-                        this.itemDatatable
-                            .row($(`.delete-btn[data-id="${itemId}"]`).closest('tr'))
-                            .remove()
-                            .draw();
-                    } else {
-                        alert(result.message);
-                    }
-                } 
-                catch (error) {
-                    console.error("Error deleting item:", error);
-                        alert("An error occurred while deleting the item.");
-                }
-                finally {
-                    this.loading = false;
-                }
-            },
-            async printItem(itemId, imgSrc) {
-                try {
-                    this.thisQRInfo.uniqueID = itemId;
-                    const uniqueQR = itemId;
-                    const container = document.getElementById("QrContainer");
-
-                    if (!container) {
-                        console.error("Container not found.");
+                },
+                calculateWarrantyEndDate() {
+                    // Check if DODate and warranty are valid
+                    if (!this.DODate || isNaN(Date.parse(this.DODate))) {
+                        this.EndWDate = null;
                         return;
                     }
 
-                    // Safely set image content
-                    const sanitizedImgSrc = encodeURI(imgSrc); // Sanitize the URL
+                    const DODates = new Date(this.DODate);
+                    const warrantyMonth = parseInt(this.warranty);
+
+                    // Ensure warranty is a valid number
+                    if (!isNaN(warrantyMonth)) {
+                        DODates.setMonth(DODates.getMonth() + warrantyMonth);
+                        this.EndWDate = DODates.toISOString().split('T')[0];
+                    } else {
+                        this.EndWDate = null;
+                    }
+                },
+                async deleteItem(itemId) {
+                    if (!confirm("Are you sure you want to delete this item?")) {
+                        return;
+                    }
+                    try {
+                        const response = await fetch(`/InvMainAPI/DeleteItem/${itemId}`, {
+                            method: 'DELETE',
+                            headers: {
+                                'Content-Type': 'application/json',
+                            },
+                        });
+                        const result = await response.json();
+
+                        if (result.success) {
+                            alert(result.message);
+                            // Remove the row from DataTables
+                            this.itemDatatable
+                                .row($(`.delete-btn[data-id="${itemId}"]`).closest('tr'))
+                                .remove()
+                                .draw();
+                        } else {
+                            alert(result.message);
+                        }
+                    }
+                    catch (error) {
+                        console.error("Error deleting item:", error);
+                        alert("An error occurred while deleting the item.");
+                    }
+                    finally {
+                        this.loading = false;
+                    }
+                },
+                async printItem(itemId, imgSrc) {
+                    try {
+                        this.thisQRInfo.uniqueID = itemId;
+                        const uniqueQR = itemId;
+                        const container = document.getElementById("QrContainer");
+
+                        if (!container) {
+                            console.error("Container not found.");
+                            return;
+                        }
+
+                        // Safely set image content
+                        const sanitizedImgSrc = encodeURI(imgSrc); // Sanitize the URL
                         container.innerHTML = `<img src="${sanitizedImgSrc}" alt="QR Code" class="text-center " />`;
 
-                    // Fetch QR information
-                    const qrInfo = this.getPrintedQR(uniqueQR);
-                    if (!qrInfo) {
-                        console.error("QR Info not found.");
-                        return;
-                    }
+                        // Fetch QR information
+                        const qrInfo = this.getPrintedQR(uniqueQR);
+                        if (!qrInfo) {
+                            console.error("QR Info not found.");
+                            return;
+                        }
 
-                    this.thisQRInfo = qrInfo;
-                    this.thisQRInfo.imgSrc = sanitizedImgSrc
-                    this.thisQRInfo.imgContainer = container.innerHTML
-                    $(`#QrItemModal`).modal('show'); // Show modal
-                } 
-                catch (error) {
-                    console.error("Error generating QR code:", error);
-                    alert("An error occurred while generating the QR code.");
-                }
-            },
-            async fetchUser() {
-                try {
-                    const response = await fetch(`/IdentityAPI/GetUserInformation/`, {
-                        method: 'POST',
-                    });
-                    if (response.ok) {
-                        const data = await response.json();
-                        this.currentUser = data?.userInfo || null;
-                        const companyDeptData = await this.currentUser.department;
-                        this.currentUserCompanyDept = companyDeptData;
-                        this.selectedCompany = companyDeptData?.companyId || "";
-                        this.selectedDepartment = companyDeptData?.departmentId || "";
+                        this.thisQRInfo = qrInfo;
+                        this.thisQRInfo.imgSrc = sanitizedImgSrc
+                        this.thisQRInfo.imgContainer = container.innerHTML
+                        $(`#QrItemModal`).modal('show'); // Show modal
                     }
-                    else {
-                        console.error(`Failed to fetch user: ${response.statusText}`);
+                    catch (error) {
+                        console.error("Error generating QR code:", error);
+                        alert("An error occurred while generating the QR code.");
                     }
-                }
-                catch (error) {
-                    console.error('There was a problem with the fetch operation:', error);
-                }
-            },
-            getPrintedQR(uniqueID) {
-                if (!this.items || !Array.isArray(this.items)) {
-                    console.error("Items list is not available or is not an array.");
-                    return null;
-                }
-                return this.items.find(item => item.uniqueID === uniqueID);
-            },
-            printQRInfo() {
-                // Create a virtual DOM element
-                const virtualElement = document.createElement('div');
-                virtualElement.style.width = '330px '; // Match label size for 2 inches at 203 DPI
-                virtualElement.style.height = '160px';
-                virtualElement.style.position = 'absolute';
-                virtualElement.style.left = '-9999px'; // Position offscreen to avoid rendering on the main UI
-                // virtualElement.style.border = '1px solid #000'; // Optional: Add a border for debugging dimensions
+                },
+                async fetchUser() {
+                    try {
+                        const response = await fetch(`/IdentityAPI/GetUserInformation/`, {
+                            method: 'POST',
+                        });
+                        if (response.ok) {
+                            const data = await response.json();
+                            this.currentUser = data?.userInfo || null;
+                            const companyDeptData = await this.currentUser.department;
+                            this.currentUserCompanyDept = companyDeptData;
+                            this.selectedCompany = companyDeptData?.companyId || "";
+                            this.selectedDepartment = companyDeptData?.departmentId || "";
+                        }
+                        else {
+                            console.error(`Failed to fetch user: ${response.statusText}`);
+                        }
+                    }
+                    catch (error) {
+                        console.error('There was a problem with the fetch operation:', error);
+                    }
+                },
+                getPrintedQR(uniqueID) {
+                    if (!this.items || !Array.isArray(this.items)) {
+                        console.error("Items list is not available or is not an array.");
+                        return null;
+                    }
+                    return this.items.find(item => item.uniqueID === uniqueID);
+                },
+                printQRInfo() {
+                    // Create a virtual DOM element
+                    const virtualElement = document.createElement('div');
+                    virtualElement.style.width = '330px '; // Match label size for 2 inches at 203 DPI
+                    virtualElement.style.height = '160px';
+                    virtualElement.style.position = 'absolute';
+                    virtualElement.style.left = '-9999px'; // Position offscreen to avoid rendering on the main UI
+                    // virtualElement.style.border = '1px solid #000'; // Optional: Add a border for debugging dimensions
 
-                // Populate the virtual DOM with content
-                virtualElement.innerHTML = `
-                    <div class="container-fluid my-3 QrPrintFont" style="font-family: 'OCR A', monospace;">
-                        <div class="row" >
-                            <div class="col-5 text-center d-flex align-items-center justify-content-center">
-                                <div class="row">
-                                    <div class="col-12">
-                                        <div>${this.thisQRInfo.imgContainer}</div>
-                                            <div class="col-12 h4"style="font-family: 'Arial', monospace;"><b>${this.thisQRInfo.uniqueID}</b></div>
+                    // Populate the virtual DOM with content
+                    virtualElement.innerHTML = `
+                            <div class="container-fluid my-3 QrPrintFont" style="font-family: 'OCR A', monospace;">
+                                <div class="row" >
+                                    <div class="col-5 text-center d-flex align-items-center justify-content-center">
+                                        <div class="row">
+                                            <div class="col-12">
+                                                <div>${this.thisQRInfo.imgContainer}</div>
+                                                    <div class="col-12 h4"style="font-family: 'Arial', monospace;"><b>${this.thisQRInfo.uniqueID}</b></div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="col-7 d-flex align-items-center justify-content-left">
+                                        <div class="row-fluid">
+                                            <div class="col-12 h3"style="font-family: 'Verdana', monospace;"><b>${this.thisQRInfo.departmentName}</b></div>
+                                            <div class="col-12 h4"style="font-family: 'Arial', monospace;"><b>${this.thisQRInfo.productShortName}</b></div>
+                                            <div class="col-12 h4"style="font-family: 'Arial', monospace;"><b>${this.thisQRInfo.serialNumber ?? "-"}</b></div>
+                                            <div class="col-12 h4"style="font-family: 'Arial', monospace;"><b>${this.thisQRInfo.partNumber}</b></div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
-                            <div class="col-7 d-flex align-items-center justify-content-left">
-                                <div class="row-fluid">
-                                    <div class="col-12 h3"style="font-family: 'Verdana', monospace;"><b>${this.thisQRInfo.departmentName}</b></div>
-                                    <div class="col-12 h4"style="font-family: 'Arial', monospace;"><b>${this.thisQRInfo.productShortName}</b></div>
-                                    <div class="col-12 h4"style="font-family: 'Arial', monospace;"><b>${this.thisQRInfo.serialNumber??"-"}</b></div>
-                                    <div class="col-12 h4"style="font-family: 'Arial', monospace;"><b>${this.thisQRInfo.partNumber}</b></div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                `;
+                        `;
 
-                // Append the virtual DOM to the body (temporarily)
-                document.body.appendChild(virtualElement);
+                    // Append the virtual DOM to the body (temporarily)
+                    document.body.appendChild(virtualElement);
 
-                // Wait for the font to be loaded (important for custom fonts like OCR-A)
-                document.fonts.load('1em "OCR A"').then(() => {
-                    // Use html2canvas to convert the virtual DOM to an image
-                    html2canvas(virtualElement, {
-                        scale: 1, // Increase scale for sharper images
-                    }).then((canvas) => {
-                        // Convert the canvas to an image
-                        const imgData = canvas.toDataURL('image/png');
-                        // Open the image in a new tab for preview (optional)
-                        // const newWindow = window.open();
-                        // newWindow.location.href = imgData;
-                        //     console.log(imgData)
-                        // Use printJS to print the image
-                        printJS({
-                            printable: imgData,
-                            type: 'image',
-                            css: '/../lib/bootstrap/dist/css/bootstrap.css',
-                            style: `
-                                @@media print {
-                                    @@page {
-                                        margin: 5px 5px 0px 5px;
-                                    }
-                                    body { margin: 0; }
-                                }
-                            `
+                    // Wait for the font to be loaded (important for custom fonts like OCR-A)
+                    document.fonts.load('1em "OCR A"').then(() => {
+                        // Use html2canvas to convert the virtual DOM to an image
+                        html2canvas(virtualElement, {
+                            scale: 1, // Increase scale for sharper images
+                        }).then((canvas) => {
+                            // Convert the canvas to an image
+                            const imgData = canvas.toDataURL('image/png');
+                            // Open the image in a new tab for preview (optional)
+                            // const newWindow = window.open();
+                            // newWindow.location.href = imgData;
+                            //     console.log(imgData)
+                            // Use printJS to print the image
+                            printJS({
+                                printable: imgData,
+                                type: 'image',
+                                css: '/../lib/bootstrap/dist/css/bootstrap.css',
+                                style: `
+                                        @@media print {
+                                            @@page {
+                                                margin: 5px 5px 0px 5px;
+                                            }
+                                            body { margin: 0; }
+                                        }
+                                    `
+                            });
+
+                            // Remove the virtual DOM from the body after use
+                            document.body.removeChild(virtualElement);
+                        }).catch((error) => {
+                            console.error("Error generating image:", error);
+                            // Remove the virtual DOM if an error occurs
+                            document.body.removeChild(virtualElement);
                         });
-
-                        // Remove the virtual DOM from the body after use
-                        document.body.removeChild(virtualElement);
                     }).catch((error) => {
-                        console.error("Error generating image:", error);
-                        // Remove the virtual DOM if an error occurs
+                        console.error("Error loading font:", error);
+                        // Remove the virtual DOM if font loading fails
                         document.body.removeChild(virtualElement);
                     });
-                }).catch((error) => {
-                    console.error("Error loading font:", error);
-                    // Remove the virtual DOM if font loading fails
-                    document.body.removeChild(virtualElement);
-                });
+                },
+
+
             },
-
-
-        },
-    });
-</script>
+        });
+    </script>
 }
\ No newline at end of file
diff --git a/Areas/Inventory/Views/ItemMovement/ItemMovementUser.cshtml b/Areas/Inventory/Views/ItemMovement/ItemMovementUser.cshtml
index 19da61d..54b4709 100644
--- a/Areas/Inventory/Views/ItemMovement/ItemMovementUser.cshtml
+++ b/Areas/Inventory/Views/ItemMovement/ItemMovementUser.cshtml
@@ -4,19 +4,6 @@
     Layout = "~/Views/Shared/_Layout.cshtml";
 }
 <style>
-    @@font-face {
-      font-family: 'OCR-A';
-      src: url('../assets/fonts/ocraext.ttf');
-    }
-
-    .QrPrintFont {
-      font-family: 'OCR-A', monospace;
-    }
-    .table td img {
-        display: block !important;
-    }
-
-
     .text-true {
         color: green;
     }
@@ -88,13 +75,6 @@
             <div class="card-body">
                 <table class="table table-bordered table-hover table-striped no-wrap" id="itemMovementCompleteDatatable" style="width:100%;border-style: solid; border-width: 1px"></table>
             </div>
-
-            <div class="card-header">
-                <h3>Assign Station Movement</h3>
-            </div>
-            <div class="card-body">
-                <table class="table table-bordered table-hover table-striped no-wrap" id="stationDatatable" style="width:100%;border-style: solid; border-width: 1px"></table>
-            </div>
         </div>
     </div>
 
@@ -778,10 +758,8 @@
                     latestMovements.forEach(movement => {
                         if (movement.movementComplete == 0) {
                             notCompleteData.push(movement);
-                        } else if (movement.movementComplete == 1 && movement.action !== "Assign") {
+                        } else if (movement.movementComplete == 1) {
                             completeData.push(movement);
-                        } else if (movement.movementComplete == 1 && movement.action == "Assign") {
-                            assignedData.push(movement);
                         }
                     });
 
@@ -831,24 +809,6 @@
                         responsive: true,
                     });
 
-                    // Table 3: Assigned Movements
-                    this.stationDatatable = $("#stationDatatable").DataTable({
-                        data: assignedData,
-                        columns: [
-                            { title: "Unique Id", data: "id" },
-                            { title: "Product Name", data: "productName" },
-                            { title: "Product Code", data: "uniqueID" },
-                            { title: "Assign Date", data: "sendDate" },
-                            { title: "From User", data: "toUserName" },
-                            { title: "From Station", data: "toStationName" },
-                            { title: "Last Station", data: "lastStationName" },
-                            { title: "Qty", data: "quantity" },
-                            { title: "Note", data: "consignmentNote", render: renderFile },
-                            { title: "Remark", data: "remark" },
-                        ],
-                        responsive: true,
-                    });
-
                     // Function to render file (image/PDF)
                     function renderFile(data, type, full, meta) {
                         if (!data) {
@@ -881,6 +841,7 @@
                 },
 
                 toggleHistory(itemId) {
+                    this.historyVisible = {};
                     this.historyVisible[itemId] = !this.historyVisible[itemId];
                 },
 
diff --git a/Areas/Inventory/Views/ItemMovement/ItemRequest.cshtml b/Areas/Inventory/Views/ItemMovement/ItemRequest.cshtml
index 54e1c2b..9402849 100644
--- a/Areas/Inventory/Views/ItemMovement/ItemRequest.cshtml
+++ b/Areas/Inventory/Views/ItemMovement/ItemRequest.cshtml
@@ -452,19 +452,38 @@
                                 $(td).attr('id', `qr${cellData}`);
                             },
                         },
-                        {   "title": "Product Image", 
-                            "data": "productPicture",
-                            "render": function (data, type, full, meta) {
-                                var image = `<a href="${data}" target="_blank" data-lightbox="image-1">
-                                                <img src="${data}" alt="Image" class="img-thumbnail" style="width: 100px; height: 100px;" />
-                                            </a>`;
-                                return image;
+                            {
+                                "title": "Product Name",
+                                "data": "productName",
+                                "render": function (data, type, full, meta) {
+                                    if (!data) {
+                                        return "No Document";
+                                    }
+
+                                    var imageSrc = full.productPicture;
+                                    // 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>`;
+                                    } 
+                                },
                             },
-                        },
-                        {
-                            "title": "Product Name",
-                            "data": "productName",
-                        },
                         {
                             "title": "Product Category",
                             "data": "productCategory",
@@ -530,16 +549,6 @@
                                 return deleteButton;
                             },
                             "className": "align-middle",
-                            // "title": "Delete",
-                            // "data": "requestID",
-                            // "render": function (data, type, row) {
-                            //     if (row.status === "Approved" || row.status === "Rejected") {
-                            //         return `<button type="button" class="btn btn-danger delete-btn" data-id="${data}" disabled>Delete</button>`;
-                            //     } else {
-                            //         return `<button type="button" class="btn btn-danger delete-btn" data-id="${data}">Delete</button>`;
-                            //     }
-                            // },
-                            // "className": "align-middle",
                         }
 
                     ],
@@ -560,19 +569,38 @@
                             "title": "Status",
                             "data": "status",
                         },
-                        {   "title": "Product Image", 
-                            "data": "productPicture",
-                            "render": function (data, type, full, meta) {
-                                var image = `<a href="${data}" target="_blank" data-lightbox="image-1">
-                                                <img src="${data}" alt="Image" class="img-thumbnail" style="width: 100px; height: 100px;" />
-                                            </a>`;
-                                return image;
+                            {
+                                "title": "Product Name",
+                                "data": "productName",
+                                "render": function (data, type, full, meta) {
+                                    if (!data) {
+                                        return "No Document";
+                                    }
+
+                                    var imageSrc = full.productPicture;
+                                    // 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>`;
+                                    }
+                                },
                             },
-                        },
-                        {
-                            "title": "Product Name",
-                            "data": "productName",
-                        },
                         {
                             "title": "Product Category",
                             "data": "productCategory",
diff --git a/Controllers/API/Inventory/InvMainAPI.cs b/Controllers/API/Inventory/InvMainAPI.cs
index eb6ae9a..a91cf37 100644
--- a/Controllers/API/Inventory/InvMainAPI.cs
+++ b/Controllers/API/Inventory/InvMainAPI.cs
@@ -815,6 +815,7 @@ namespace PSTW_CentralSystem.Controllers.API.Inventory
                         i.ToUser,
                         UniqueID = i.Item?.UniqueID,
                         ProductName = i.Item?.Product?.ProductName,
+                        ProductImage = i.Item?.Product?.ImageProduct,
                         LastUserName = i.FromUser?.FullName,
                         LastStoreName = i.FromStore?.StoreName,
                         LastStationName = i.FromStation?.StationName,