Merge pull request #11211 from hmislk/11210-ui-improving-in-pharmacy-direct-purchase-bill

#11210-ui-improving-in-pharmacy-direct-purchase-bill

Author: GSMgeeth

src/main/java/com/divudi/bean/pharmacy/PharmacyPurchaseController.java

@@ -562,6 +562,10 @@ public void settle() {
 
         billItemsTotalQty = 0;
         for (BillItem i : getBillItems()) {
+            
+            double lastPurchaseRate = 0.0;
+            lastPurchaseRate = getPharmacyBean().getLastPurchaseRate(i.getItem());
+            
             if (i.getPharmaceuticalBillItem().getQty() + i.getPharmaceuticalBillItem().getFreeQty() == 0.0) {
                 continue;
             }
@@ -591,7 +595,7 @@ public void settle() {
 
             tmpPh.setItemBatch(itemBatch);
             Stock stock = getPharmacyBean().addToStock(tmpPh, Math.abs(addingQty), getSessionController().getDepartment());
-
+            tmpPh.setLastPurchaseRate(lastPurchaseRate);
             tmpPh.setStock(stock);
             getPharmaceuticalBillItemFacade().edit(tmpPh);
 

src/main/webapp/pharmacy/pharmacy_purchase.xhtml

@@ -569,35 +569,39 @@
             </p:panel>
 
             <p:panel rendered="#{pharmacyPurchaseController.printPreview}">
-                <p:panel class="m-0 p-0" >
-                    <f:facet name="header" >
-                        <div class="d-flex align-items-center justify-content-between">
-                            <div>
-                                <h:outputText styleClass="fa-solid fa-circle-plus" />
-                                <h:outputLabel value="Direct Purchase Order" class="mx-4"></h:outputLabel>
-                            </div>
-                            <div>
-                                <p:commandButton 
-                                    ajax="false" 
-                                    class="ui-button-success"
-                                    icon="fa fa-plus"
-                                    action="#{pharmacyPurchaseController.makeNull()}" 
-                                    value="New Bill"/>                    
-                                <p:commandButton 
-                                    value="Print" 
-                                    ajax="false" 
-                                    action="#" 
-                                    class="ui-button-info mx-2"
-                                    icon="fas fa-print">
-                                    <p:printer target="gpBillPreview" ></p:printer>
-                                </p:commandButton>
-                            </div>
+                <f:facet name="header" >
+                    <div class="d-flex align-items-center justify-content-between">
+                        <div>
+                            <h:outputText styleClass="fa-solid fa-circle-plus" />
+                            <h:outputLabel value="Direct Purchase Order" class="mx-4"></h:outputLabel>
                         </div>
-                    </f:facet>
-                    <p:panel id="gpBillPreview">
-                        <pharmacy:purhcase bill="#{pharmacyPurchaseController.bill}"/>
-                    </p:panel>
-                </p:panel>
+                        <div>
+                            <p:commandButton 
+                                value="Print" 
+                                ajax="false" 
+                                action="#" 
+                                class="ui-button-info mx-2"
+                                icon="fas fa-print">
+                                <p:printer target="gpBillPreview" ></p:printer>
+                            </p:commandButton>
+                            <p:commandButton 
+                                ajax="false" 
+                                class="ui-button-success"
+                                icon="fa fa-plus"
+                                action="#{pharmacyPurchaseController.makeNull()}" 
+                                value="New Bill"/>                    
+
+                        </div>
+                    </div>
+                </f:facet>
+                <h:panelGroup id="gpBillPreview" >
+                    <pharmacy:purhcase 
+                        bill="#{pharmacyPurchaseController.bill}" 
+                        ShowProfit="#{configOptionApplicationController.getBooleanValueByKey('Show Profit % in Direct Purchase Bill', true)}"
+                        ShowRetailValue="#{configOptionApplicationController.getBooleanValueByKey('Show Retail Value in Direct Purchase Bill', true)}">
+                    </pharmacy:purhcase>
+                </h:panelGroup>
+
             </p:panel>
         </h:form>
     </ui:define>