Merge pull request #4731 from hmislk/Issue#4726

Issue#4726 Closes #4726
hmislk · Apr 24, 2024 · 852d9e4 · 852d9e4
2 parents 3574579 + 33e1878
commit 852d9e4
Show file tree

Hide file tree

Showing 4 changed files with 398 additions and 11 deletions.
diff --git a/src/main/java/com/divudi/bean/pharmacy/GrnController.java b/src/main/java/com/divudi/bean/pharmacy/GrnController.java
@@ -142,6 +142,8 @@ public String navigateToReceiveWholesale() {
         pos = null;
         printPreview = false;
         billItems = null;
+        difference = 0;
+        insTotal = 0;
         createGrnWholesale();
         return "/pharmacy/pharmacy_grn_wh?faces-redirect=true";
     }

diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
@@ -2,7 +2,7 @@
 <persistence version="2.2" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
     <persistence-unit name="hmisPU" transaction-type="JTA">
         <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
-        <jta-data-source>jdbc/arogyaNew</jta-data-source>
+        <jta-data-source>jdbc/arogya</jta-data-source>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="eclipselink.logging.level.sql" value="SEVERE"/>

diff --git a/src/main/webapp/pharmacy/pharmacy_grn_wh.xhtml b/src/main/webapp/pharmacy/pharmacy_grn_wh.xhtml
@@ -214,13 +214,13 @@
                             icon="fas fa-trash"
                             class="ui-button-danger"
                             action="#{grnController.removeItem(bi)}"/>
-                         <p:commandButton 
-                                process=":#{p:resolveFirstComponentWithId('itemList',view).clientId}"
-                                update=":#{p:resolveFirstComponentWithId('tot',view).clientId} :#{p:resolveFirstComponentWithId('itemList',view).clientId} "
-                                style="float: right;"
-                                icon="fas fa-plus"
-                                class="ui-button-danger mx-1"
-                                action="#{grnController.duplicateItem(bi)}"/>
+                        <p:commandButton 
+                            process=":#{p:resolveFirstComponentWithId('itemList',view).clientId}"
+                            update=":#{p:resolveFirstComponentWithId('tot',view).clientId} :#{p:resolveFirstComponentWithId('itemList',view).clientId} "
+                            style="float: right;"
+                            icon="fas fa-plus"
+                            class="ui-button-danger mx-1"
+                            action="#{grnController.duplicateItem(bi)}"/>
                         <p:rowEditor /> 
                     </p:column>
 
@@ -271,7 +271,8 @@
                     </p:panelGrid>
                 </p:panel>
             </p:panel>
-
+
+
             <p:panel rendered="#{grnController.printPreview}" style="border: none;">
                 <f:facet name="header">
                     <div class="d-flex justify-content-between">
@@ -300,11 +301,49 @@
                 <h:panelGroup  id="gpBillPreview"   style="border: none; width: 214mm;" >
 
                     <h:panelGroup rendered="#{sessionController.loggedPreference.grnBillDetailed eq false}" class="d-flex justify-content-center">
-                        <ph:grn bill="#{grnController.grnBill}"/>
+                        <ph:grn_wholesale bill="#{grnController.grnBill}"/>
                     </h:panelGroup>
-
+                    
                 </h:panelGroup>
             </p:panel>
+
+
+
+
+
+<!--            <p:panel rendered="#{grnController.printPreview}" style="border: none;">
+                <f:facet name="header">
+                    <div class="d-flex justify-content-between">
+                        <h:outputLabel value="GRN Preview " class="mt-2"/>
+                        <div class="d-flex gap-2">
+                            <p:commandButton 
+                                ajax="false" 
+                                action="pharmacy_purchase_order_list_for_recieve"
+                                class="ui-button-warning"
+                                icon="fa fa-arrow-left"
+                                actionListener="#{grnController.viewPoList()}" 
+                                value="Back to PO List"> 
+                            </p:commandButton>                   
+                            <p:commandButton 
+                                value="Print" 
+                                ajax="false" 
+                                icon="fa fa-print"
+                                class="ui-button-info"
+                                action="#" >
+                                <p:printer target="gpBillPreview" ></p:printer>
+                            </p:commandButton>
+                        </div>
+                    </div>
+                </f:facet>
+
+                <p:panel   id="gpBillPreview"   style="border: none;">
+
+                    <ph:grn_wh bill="#{grnController.grnBill}"/>
+                    
+                    <ph:grn_detail_wh bill="#{grnController.grnBill}"/>
+                    
+                </p:panel>
+            </p:panel>-->
 
         </h:form>
     </ui:define>