-
Notifications
You must be signed in to change notification settings - Fork 91
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4579 from hmislk/Issue#4578
Signed-off-by: Senula88 <[email protected]>
- Loading branch information
Showing
5 changed files
with
302 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 3.0.0.20240410.17 | ||
| 3.0.0.20240410.19 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| <?xml version='1.0' encoding='UTF-8' ?> | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
| <html xmlns="http://www.w3.org/1999/xhtml" | ||
| xmlns:ui="http://xmlns.jcp.org/jsf/facelets" | ||
| xmlns:p="http://primefaces.org/ui" | ||
| xmlns:h="http://xmlns.jcp.org/jsf/html" | ||
| xmlns:f="http://xmlns.jcp.org/jsf/core" | ||
| xmlns:common="http://xmlns.jcp.org/jsf/composite/ezcomp/common" | ||
| xmlns:bi="http://xmlns.jcp.org/jsf/composite/bill" | ||
| xmlns:prints="http://xmlns.jcp.org/jsf/composite/ezcomp/prints"> | ||
|
|
||
| <h:body> | ||
| <ui:composition template="/resources/template/template.xhtml"> | ||
| <ui:define name="content"> | ||
| <h:form> | ||
| <h:panelGroup rendered="#{!billSearch.printPreview}" styleClass="alignTop"> | ||
| <p:panel> | ||
| <f:facet name="header"> | ||
| <h:outputText value="Cancellation" class="mt-5"/> | ||
| <h:panelGrid columns="3" style="float: right" class="w-50"> | ||
| <p:inputText placeholder="Enter Comments to Cancel Bill" value="#{billController.comment}" style="float: right" class="p-2 w-100"/> | ||
|
|
||
| <p:commandButton | ||
| ajax="false" | ||
| value="Cancel Bill" | ||
| icon="fa fa-cancel" | ||
| style="float: right" | ||
| class="ui-button-danger" action="#{billController.cancelBatchBill()}"> | ||
| </p:commandButton> | ||
| </h:panelGrid> | ||
| </f:facet> | ||
|
|
||
| <!-- Payment Mode Panel --> | ||
| <p:panel> | ||
| <f:facet name="header"> | ||
| <h:outputText styleClass="fas fa-money-bill"></h:outputText> | ||
| <h:outputLabel value="Payment Mode" class="mx-2"></h:outputLabel> | ||
| </f:facet> | ||
| <p:selectOneMenu id="cmbPs" value="#{billController.paymentMethod}" | ||
| disabled="#{billController.batchBill.paymentMethod eq 'Cash'}" | ||
| rendered="#{billController.batchBill.billType eq 'OpdBathcBill'}"> | ||
| <f:selectItem itemLabel="Select paymentMethod"/> | ||
| <f:selectItems value="#{inwardPaymentController.paymentMethods}"/> | ||
| </p:selectOneMenu> | ||
|
|
||
| <p:selectOneMenu id="cmbPs2" value="#{billController.paymentMethod}" | ||
| disabled="#{billController.batchBill.paymentMethod eq 'Agent'}" | ||
| rendered="#{billController.batchBill.billType eq 'CollectingCentreBill'}"> | ||
| <f:selectItem itemLabel="Select paymentMethod"/> | ||
| <f:selectItems value="#{enumController.collectingCentrePaymentMethods}"/> | ||
| </p:selectOneMenu> | ||
| </p:panel> | ||
|
|
||
| <!-- Patient Details and Bill Details Panels --> | ||
| <div class="row"> | ||
| <div class="col-6"> | ||
| <p:panel> | ||
| <f:facet name="header"> | ||
| <h:outputText styleClass="fas fa-id-card-alt"></h:outputText> | ||
| <h:outputLabel value="Patient Details" class="mx-2"></h:outputLabel> | ||
| </f:facet> | ||
| <common:patient patient="#{billController.batchBill.patient}" class="w-100"/> | ||
| </p:panel> | ||
| </div> | ||
| <div class="col-6"> | ||
| <p:panel> | ||
| <f:facet name="header"> | ||
| <h:outputText styleClass="fas fa-list-alt"></h:outputText> | ||
| <h:outputLabel value="Batch Bill Detail" class="mx-2"></h:outputLabel> | ||
| </f:facet> | ||
| <p:panelGrid columns="2"> | ||
| <h:outputLabel value="Bill No :" ></h:outputLabel> | ||
| <h:outputLabel value="#{billController.batchBill.insId}" ></h:outputLabel> | ||
| <h:outputLabel value="Total :" ></h:outputLabel> | ||
| <h:outputLabel value="#{billController.batchBill.total}" ></h:outputLabel> | ||
| <h:outputLabel value="Discount :" ></h:outputLabel> | ||
| <h:outputLabel value="#{billController.batchBill.discount}" ></h:outputLabel> | ||
| <h:outputLabel value="Net Total :" ></h:outputLabel> | ||
| <h:outputLabel value="#{billController.batchBill.netTotal}" ></h:outputLabel> | ||
| </p:panelGrid> | ||
| </p:panel> | ||
| </div> | ||
| </div> | ||
|
|
||
| <!-- Bill Item Detail Panel --> | ||
| <p:panel> | ||
| <f:facet name="header"> | ||
| <h:outputText styleClass="fas fa-list-alt"></h:outputText> | ||
| <h:outputLabel value="Cancelling Bills Details" class="mx-2"></h:outputLabel> | ||
| </f:facet> | ||
| <p:dataTable rowIndexVar="rowIndex" value="#{billController.bills}" var="bill"> | ||
| <p:column> | ||
| <f:facet name="header">Bill No</f:facet> | ||
| <h:outputLabel value="#{bill.deptId}"/> | ||
| </p:column> | ||
| <p:column> | ||
| <f:facet name="header">Billed At</f:facet> | ||
| <h:outputLabel value="#{bill.createdAt}"/> | ||
| </p:column> | ||
| <p:column> | ||
| <f:facet name="header">Billed For</f:facet> | ||
| <h:outputLabel value="#{bill.toDepartment.name}"/> | ||
| </p:column> | ||
| <p:column> | ||
| <f:facet name="header">Net Total</f:facet> | ||
| <h:outputLabel value="#{bill.netTotal}"/> | ||
| </p:column> | ||
| </p:dataTable> | ||
| </p:panel> | ||
| </p:panel> | ||
| </h:panelGroup> | ||
|
|
||
| <!-- Print Preview Panel --> | ||
| <h:panelGroup rendered="#{billSearch.printPreview}" > | ||
| <div class="d-flex justify-content-center"> | ||
| <p:outputLabel value="Paper Type" class="m-2"></p:outputLabel> | ||
| <p:selectOneMenu value="#{sessionController.departmentPreference.opdBillPaperType}" class="m-1" style="width: 13em;"> | ||
| <f:selectItem itemLabel="Please Select Paper Type" /> | ||
| <f:selectItems value="#{enumController.paperTypes}" /> | ||
| </p:selectOneMenu> | ||
| <p:commandButton ajax="false" icon="fa fa-sync-alt" class="ui-button m-1" title="Redraw Bill"></p:commandButton> | ||
| <p:commandButton value="Print" | ||
| class="ui-button-info m-1" | ||
| icon="fa fa-print" | ||
| ajax="false"> | ||
| </p:commandButton> | ||
| <h:panelGroup rendered="#{billSearch.bill.billType ne 'CollectingCentreBill'}"> | ||
| <p:commandButton | ||
| value="New OPD Bill" | ||
| ajax="false" | ||
| icon="fa fa-plus" | ||
| class="ui-button-success" | ||
| action="#{opdBillController.navigateToNewOpdBill()}" > | ||
| </p:commandButton> | ||
| </h:panelGroup> | ||
|
|
||
| <h:panelGroup rendered="#{billSearch.bill.billType eq 'CollectingCentreBill'}"> | ||
| <p:commandButton | ||
| value="New Collectiong Centre Bill" | ||
| ajax="false" | ||
| icon="fa fa-plus" | ||
| class="ui-button-success" | ||
| action="#{collectingCentreBillController.navigateToCollectingCenterBillingromMenu()}" > | ||
| </p:commandButton> | ||
| </h:panelGroup> | ||
| </div> | ||
| <h:panelGroup id="groupPrint" > | ||
| <!-- Bill Print Templates --> | ||
| <prints:five_five_paper_with_headings bill="#{billSearch.bill.cancelledBill}"/> | ||
| <prints:five_five_paper_without_headings | ||
| bill="#{billSearch.bill.cancelledBill}" | ||
| duplicate="#{opdBillController.duplicatePrint}" | ||
| payments="#{opdBillController.payments}"/> | ||
| <prints:posOpdBillWithoutLogo bill="#{billSearch.bill.cancelledBill}" duplicate="#{opdBillController.duplicatePrint}"/> | ||
| <prints:posOpdBill bill="#{billSearch.bill.cancelledBill}" duplicate="#{opdBillController.duplicatePrint}"/> | ||
| <prints:A4_paper_with_headings bill="#{billSearch.bill.cancelledBill}" duplicate="#{opdBillController.duplicatePrint}"/> | ||
| <prints:A4_paper_without_headings bill="#{billSearch.bill.cancelledBill}" duplicate="#{opdBillController.duplicatePrint}"/> | ||
| </h:panelGroup> | ||
| </h:panelGroup> | ||
| </h:form> | ||
| </ui:define> | ||
| </ui:composition> | ||
| </h:body> | ||
| </html> |
Oops, something went wrong.