Merge branch 'Dev2' of https://git.pstw.com.my/catalyx/PSTW_CentralizeSystem into Dev2

Areas/Inventory/Views/InventoryMaster/ItemRequestMaster.cshtml

@@ -170,6 +170,9 @@
                 // },
             },
             methods: {
+                resetForm() {
+                    this.rejectremark = "";
+                },
                 async addRequest() {
                     try {
                             const requiredFields = ['stationId', 'productId', 'quantity', 'productCategory'];

Areas/Inventory/Views/InventoryMaster/QrMaster.cshtml

@@ -193,12 +193,12 @@
                                         @*                         Receive *@
                                         @*                     </button> *@
                                         @*                 </div> *@
-                                        @*            zx </div> *@
+                                        @*             </div> *@
-                                        @*         </fzxorm> *@
+                                        @*         </form> *@
-                                        @*     </div> zx*@
+                                        @*     </div> *@
                                         @* </div> *@
 
-zx                                        <div v-if="itemlateststatus == 'Faulty'">
+                                        <div v-if="itemlateststatus == 'Faulty'">
                                             <h2 class="register-heading">Add Item Movement</h2>
                                             <div class="col-sm-3"></div>
                                             <div class="col-sm-6 offset-sm-3">

Controllers/API/Inventory/InvMainAPI.cs

@@ -561,6 +561,7 @@ namespace PSTW_CentralSystem.Controllers.API.Inventory
                                         .Include(i => i.NextStore)
                                         .Include(i => i.NextStation)
                                         .Include(i => i.NextUser)
+                                        .Include(i => i.NextUser)
                                         .ToListAsync();
             //var itemList = await _centralDbContext.Items.ToListAsync();
 
@@ -973,6 +974,7 @@ namespace PSTW_CentralSystem.Controllers.API.Inventory
                 i.approvalDate,
                 i.remarkMasterInv,
                 i.remarkUser,
+               
             }));
 
         }