Merge pull request #4715 from hmislk/Issue#4707

Issue#4707 Closes #4707
hmislk · Apr 22, 2024 · 2ca1489 · 2ca1489
2 parents e3122d5 + 84b8104
commit 2ca1489
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/main/java/com/divudi/bean/pharmacy/StockController.java b/src/main/java/com/divudi/bean/pharmacy/StockController.java
@@ -101,6 +101,9 @@ public StoreBean getStoreBean() {
 
     public void listStocksOfSelectedItem(Item item) {
         selectedItemStocks = null;
+        if(selectedItemStocks == null){
+            selectedItemStocks = new ArrayList<>();
+        }
         selectedItem = item;
         if (item == null) {
             return;

diff --git a/src/main/webapp/pharmacy/pharmacy_purhcase_order_request.xhtml b/src/main/webapp/pharmacy/pharmacy_purhcase_order_request.xhtml
@@ -105,15 +105,17 @@
                                 <p:column headerText="Stock" style="width:4em; text-align: right; padding: 0;">
                                     <p:commandLink value="#{stockController.findStock(bi.item)}"
                                                    oncomplete="PF('stockDetailsDialog').show();"
-                                                   update=":stockDetailsForm:stockList"
+                                                   process="itemList"
+                                                   update="stockDetailsForm"
                                                    actionListener="#{stockController.listStocksOfSelectedItem(bi.item)}">
                                     </p:commandLink>
                                 </p:column>
 
                                 <p:column headerText="Expiry" style="width:4em; text-align: right; padding: 0;">
                                     <p:commandLink value="#{stockController.findExpiaringStock(bi.item)}"
                                                    oncomplete="PF('expStockDetailsDialog').show();"
-                                                   update=":expStockDetailsForm:expStockList"
+                                                  process="itemList"
+                                                   update="expStockDetailsForm"
                                                    actionListener="#{stockController.listExpiaringStocks(bi.item)}"
                                                    style="#{stockController.findExpiaringStock(bi.item) > 0 ? 'color: red;' : 'color: #02e05f;'}">
                                     </p:commandLink>
@@ -130,7 +132,8 @@
                                     <p:commandButton 
                                         class="ui-button-danger" 
                                         icon="fas fa-trash"
-                                        ajax="false" 
+                                        process="itemList"
+                                        update="itemList :#{p:resolveFirstComponentWithId('tot',view).clientId}"
                                         tabindex="-1"
                                         style="padding: 0;"
                                         action="#{purchaseOrderRequestController.removeItem(bi)}"/>