Merge pull request #6418 from hmislk/Issue#6351

Issue#6351 Closes #6351
hmislk · Jul 19, 2024 · 9c7b953 · 9c7b953
2 parents a7bf69d + 04881c9
commit 9c7b953
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 17 deletions.
diff --git a/.github/counter.txt b/.github/counter.txt
@@ -1 +1 @@
-4
+4
diff --git a/nb-configuration.xml b/nb-configuration.xml
@@ -16,5 +16,6 @@ Any value defined here will override the pom.xml file value but is only applicab
 -->
         <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
         <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>pfv5ee8</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
+
     </properties>
 </project-shared-configuration>
diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml
@@ -1,14 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
     <persistence-unit name="hmisPU" transaction-type="JTA">
-        <jta-data-source>jdbc/ruhunuDemo</jta-data-source>
+
+        <jta-data-source>jdbc/arogya</jta-data-source>
+
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="javax.persistence.schema-generation.database.action" value="create-or-extend-tables"/>
         </properties>
     </persistence-unit>
     <persistence-unit name="hmisAuditPU" transaction-type="JTA">
-        <jta-data-source>jdbc/ruhunuDemoAudit</jta-data-source>
+
+        <jta-data-source>jdbc/arogyaAudit</jta-data-source>
+
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
         </properties>

diff --git a/src/main/resources/VERSION.txt b/src/main/resources/VERSION.txt
@@ -1 +1 @@
-3.0.0.20240719.4
+3.0.0.20240719.4
diff --git a/src/main/webapp/WEB-INF/glassfish-web.xml b/src/main/webapp/WEB-INF/glassfish-web.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
 <glassfish-web-app error-url="">
-  <context-root>/ruhunuDemo</context-root>
+
+  <context-root>/demo</context-root>
+
   <class-loader delegate="true"/>
   <jsp-config>
     <property name="keepgenerated" value="true">

diff --git a/src/main/webapp/resources/ezcomp/prints/five_five_paper_with_headings.xhtml b/src/main/webapp/resources/ezcomp/prints/five_five_paper_with_headings.xhtml
@@ -131,8 +131,8 @@
                         </td>
 
                         <td>
-                            <h:outputLabel value="#{cc.attrs.bill.deptId}" class="billDetailsFiveFive">
-                            </h:outputLabel>
+                            <h:outputLabel value="#{cc.attrs.bill.cancelledBill.deptId}" class="billDetailsFiveFive" rendered="#{cc.attrs.bill.cancelled}"></h:outputLabel>
+                            <h:outputLabel value="#{cc.attrs.bill.deptId}" class="billDetailsFiveFive" rendered="#{!cc.attrs.bill.cancelled}"></h:outputLabel>
                         </td>
 
                     </tr>
@@ -380,10 +380,11 @@
 
             </div>
 
-            <div style="text-decoration: overline; margin-top: 10px;">
+            <div style=" margin-top: 10px;" class="d-flex justify-content-between">
                 <h:outputLabel value="Cashier : #{cc.attrs.bill.creater.webUserPerson.name}"/>
+                <h:outputLabel value="Original Bill : #{cc.attrs.bill.deptId}" rendered="#{cc.attrs.bill.cancelled and configOptionApplicationController.getBooleanValueByKey('Package Billing - Display the Original Bill Number in Canceled Bill',false)}"/>
             </div>
-
+            
             <h:panelGroup rendered="#{cc.attrs.bill.paymentMethod eq 'Card'}" style="margin-top: 10px;font-size: 8pt">
                 <h:outputLabel value="Payments : #{cc.attrs.bill.paymentMethod.label}"/>
                 <ui:repeat value="#{cc.attrs.payments}" var="p">

diff --git a/src/main/webapp/resources/ezcomp/prints/five_five_paper_without_headings.xhtml b/src/main/webapp/resources/ezcomp/prints/five_five_paper_without_headings.xhtml
@@ -120,8 +120,8 @@
                         </td>
 
                         <td>
-                            <h:outputLabel value="#{cc.attrs.bill.deptId}" class="billDetailsFiveFive">
-                            </h:outputLabel>
+                            <h:outputLabel value="#{cc.attrs.bill.cancelledBill.deptId}" class="billDetailsFiveFive" rendered="#{cc.attrs.bill.cancelled}"></h:outputLabel>
+                            <h:outputLabel value="#{cc.attrs.bill.deptId}" class="billDetailsFiveFive" rendered="#{!cc.attrs.bill.cancelled}"></h:outputLabel>
                         </td>
 
                     </tr>
@@ -426,9 +426,10 @@
 
             </div>
 
-            <div style="font-size: 8pt">
-                <h:outputLabel value="Payment : #{cc.attrs.bill.paymentMethod}" >
-                </h:outputLabel>
+            <div style="font-size: 9pt" class="d-flex justify-content-between">
+                <h:outputLabel value="Payment : #{cc.attrs.bill.paymentMethod}" ></h:outputLabel>
+                <h:outputLabel value="Original Bill : #{cc.attrs.bill.deptId}" rendered="#{cc.attrs.bill.cancelled and configOptionApplicationController.getBooleanValueByKey('Package Billing - Display the Original Bill Number in Canceled Bill',false)}"/>
+
             </div>
 
             <ui:repeat value="#{cc.attrs.payments}" var="ps">

diff --git a/src/main/webapp/resources/ezcomp/prints/posOpdBill.xhtml b/src/main/webapp/resources/ezcomp/prints/posOpdBill.xhtml
@@ -90,12 +90,21 @@
                             <h:outputLabel value="Inv.No" style="text-align: center!important;
                                            font-size: 12px!important;
                                            font-family:Arial, Helvetica, sans-serif!important;"></h:outputLabel>
+
                         </td>
                         <td>:</td>
                         <td style="width: 30%;" >
-                            <h:outputLabel value="#{cc.attrs.bill.deptId}"  style="text-align: center!important;
-                                           font-size: 12px!important;
-                                           font-family:Arial, Helvetica, sans-serif!important;">
+                            <h:outputLabel 
+                                value="#{cc.attrs.bill.cancelledBill.deptId}"
+                                style="text-align: center!important;font-size: 12px!important;font-family:Arial, Helvetica, sans-serif!important;" 
+                                class="billDetailsFiveFive" 
+                                rendered="#{cc.attrs.bill.cancelled}">
+                            </h:outputLabel>
+                            <h:outputLabel 
+                                value="#{cc.attrs.bill.deptId}" 
+                                style="text-align: center!important;font-size: 12px!important;font-family:Arial, Helvetica, sans-serif!important;" 
+                                class="billDetailsFiveFive" 
+                                rendered="#{!cc.attrs.bill.cancelled}">
                             </h:outputLabel>
                         </td>
                     </tr>
@@ -425,6 +434,10 @@
                 </table>
 
             </div>
+
+            <div class="billDetails d-flex justify-content-end">
+                <h:outputLabel value="Original Bill : #{cc.attrs.bill.deptId}" class="mx-3" rendered="#{cc.attrs.bill.cancelled and configOptionApplicationController.getBooleanValueByKey('Package Billing - Display the Original Bill Number in Canceled Bill',false)}"/>
+            </div>
 
             <div class="billDetails">
                 <h:outputLabel value="Signature :"> </h:outputLabel>