Skip to content

Commit

Permalink
Merge pull request #6457 from hmislk/Issue#6456
Browse files Browse the repository at this point in the history 
Issue#6456 Closes #6456
  • Loading branch information
@Irani96
Irani96 authored Jul 19, 2024
2 parents 4b696f8 + 50d9d57 commit e46b15b
Show file tree
Hide file tree
Showing 8 changed files with 137 additions and 41 deletions.
1 change: 1 addition & 0 deletions src/main/java/com/divudi/bean/cashTransaction/FinancialTransactionController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,7 @@ public String navigateToViewStartToEndOfSelectedShiftStartSummaryBill(Bill start
nonClosedShiftStartFundBill = startBill;
fillPaymentsFromShiftStartToEnd(startBill, endBill, startBill.getCreater());
return "/cashier/shift_end_summery_bill_of_selected_user_not_closed?faces-redirect=true";

}

public String navigateToCreateShiftEndSummaryBillByBills() {
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/divudi/bean/channel/analytics/ReportTemplateController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -830,8 +830,6 @@ public Institution getCreditCompany() {
public void setCreditCompany(Institution creditCompany) {
this.creditCompany = creditCompany;
}


/**
*
*/
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/META-INF/persistence.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/arogya</jta-data-source>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/VERSION.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.0.20240720.3
3.0.0.20240720.3
2 changes: 0 additions & 2 deletions src/main/webapp/WEB-INF/glassfish-web.xml
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<?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>/demo</context-root>

<class-loader delegate="true"/>
<jsp-config>
<property name="keepgenerated" value="true">
Expand Down
7 changes: 2 additions & 5 deletions src/main/webapp/channel/channel_booking_by_date.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,11 @@
<!-- View Cancelled Session Data Button -->
<p:commandButton
ajax="false"
title="Cancelled"
icon="fa fa-times-circle"
title="Cancelled"
icon="fa fa-times"
styleClass="ui-button-danger mx-1"
action="#{bookingControllerViewScope.listCancelled()}" />




</div>
</div>

Expand Down
44 changes: 43 additions & 1 deletion src/main/webapp/dataAdmin/report.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@

</p:panelGrid>

<h:panelGroup >
<h1>
<p:outputLabel value="Report : " />
<p:outputLabel value="#{reportTemplateController.current.name}" />
</h1>
</h:panelGroup>

<h:panelGroup >
<h1>
Expand Down Expand Up @@ -77,7 +83,13 @@
<p:calendar id="calToDate" value="#{reportTemplateController.toDate}" required="true" class="w-100"/>
</h:panelGroup>


<h:panelGroup rendered="#{reportTemplateController.current.matchesReportTemplateFilter('CREDIT_COMPANY')}">
<p:outputLabel value="Credit Company" />
<p:autoComplete class="w-75 mx-2" id="agent2" forceSelection="true"
value="#{reportTemplateController.creditCompany}" completeMethod="#{agencyController.completeAgency}" var="ix"
itemLabel="#{ix.name}" itemValue="#{ix}" size="38">
</p:autoComplete>
</h:panelGroup>

<h:panelGroup rendered="#{reportTemplateController.current.matchesReportTemplateFilter('CREDIT_COMPANY')}">
<p:outputLabel value="Credit Company" />
Expand All @@ -89,6 +101,36 @@



<h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_FEE_GROUPED_BY_TO_DEPARTMENT_AND_CATEGORY'}">
<ez:report_bill_fee_grouped_by_category_bill_type_atomic_and_to_department
bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
</h:panelGroup>
<h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_TYPE_ATOMIC_SUMMARY_USING_FEES'}">
<ez:report_bill_fee_grouped_by_atomic_bill_type
bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
</h:panelGroup>
<h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_TYPE_ATOMIC_SUMMARY_USING_BILLS'}">
<ez:report_bill_fee_grouped_by_atomic_bill_type
bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
</h:panelGroup>


<h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_TYPE_ATOMIC_SUMMARY_USING_BILLS'}">
<ez:report_bill_fee_grouped_by_atomic_bill_type
bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
</h:panelGroup>


<h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'ITEM_CATEGORY_SUMMARY_BY_BILL_ITEM'}">
<ez:report_item_cateroy_value
bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
</h:panelGroup>

</p:panelGrid>

</h:form>


<h:panelGroup rendered="#{reportTemplateController.current.reportTemplateType eq 'BILL_FEE_GROUPED_BY_TO_DEPARTMENT_AND_CATEGORY'}">
<ez:report_bill_fee_grouped_by_category_bill_type_atomic_and_to_department
bundle="#{reportTemplateController.reportTemplateRowBundle}"/>
Expand Down
119 changes: 90 additions & 29 deletions src/main/webapp/lab/collecting_centre_bill.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,70 @@
<h:panelGroup >
<p:panel rendered="#{!agentPaymentRecieveBillController.printPreview}" >
<f:facet name="header" >
<h:panelGrid columns="15" >
<h:outputLabel value="Collecting Centre Payment Bills" />
<h:outputLabel value="&nbsp;&nbsp;&nbsp;&nbsp;" style="min-width: 50px;" />
<p:selectOneMenu id="cmbPs" value="#{agentPaymentRecieveBillController.current.paymentMethod}">
<div class="d-flex justify-content-between">
<h:outputLabel value="Collecting Centre Payment" class="mt-2"/>
<div class="d-flex gap-2">
<p:commandButton
id="btnSettle"
value="Settle"
class="ui-button-success"
icon="fa fa-check"
action="#{agentPaymentRecieveBillController.collectingCentrePaymentRecieveSettleBill}"
ajax="false"
style="width: 150px; padding: 1px;border: 1px solid ; margin: auto;" >
</p:commandButton>
<p:defaultCommand target="btnSettle"/>
<p:commandButton
value="New Bill"
ajax="false"
icon="fa fa-plus"
class="ui-button-warning"
action="#{agentPaymentRecieveBillController.prepareNewBill()}" >
</p:commandButton>
</div>

</div>
</f:facet>

<div class="row">
<div class="col-md-2">
<p:outputLabel value="Collecting Centre" />
</div>
<div class="col-md-7">
<p:autoComplete
id="creditCom"
forceSelection="true"
value="#{agentPaymentRecieveBillController.current.fromInstitution}"
completeMethod="#{institutionController.completeCollectingCenter}"
var="ix"
class="w-100"
inputStyleClass="form-control"
itemLabel="#{ix.name}"
itemValue="#{ix}"
size="30"
maxResults="20"
>
<f:ajax event="itemSelect" execute="creditCom" />
<p:column headerText="Code" style="padding: 5px;">#{ix.institutionCode}</p:column>
<p:column headerText="Collecting Centre Name" style="padding: 5px;">#{ix.name}</p:column>
</p:autoComplete>
</div>
</div>

<div class="row my-2">
<div class="col-md-2">
<p:outputLabel value="Payment" />
</div>
<div class="col-md-2">
<p:selectOneMenu
id="cmbPs"
class="w-100"
value="#{agentPaymentRecieveBillController.current.paymentMethod}">
<f:selectItems value="#{enumController.paymentMethodsWithoutCredit}"/>
<p:ajax process="cmbPs" update="creditCard cheque slip" event="change" />
<p:ajax process="cmbPs" update="creditCard cheque slip cash" event="change" />
</p:selectOneMenu>

<p:inputText value="#{agentPaymentRecieveBillController.comment}" id="comment"/>
<p:watermark value="Comment" for="comment"/>

</div>
<div class="col-md-5">
<h:panelGroup id="creditCard" style="display: #{agentPaymentRecieveBillController.current.paymentMethod ne 'Card' ? 'none' : 'block'} ; ">
<pa:creditCard paymentMethodData="#{agentPaymentRecieveBillController.paymentMethodData}"/>
</h:panelGroup>
Expand All @@ -36,28 +89,36 @@
<h:panelGroup id="slip" style="display: #{agentPaymentRecieveBillController.current.paymentMethod ne 'Slip' ? 'none' : 'block'} ;">
<pa:slip paymentMethodData="#{agentPaymentRecieveBillController.paymentMethodData}"/>
</h:panelGroup>

<h:panelGroup id="cash" style="display: #{agentPaymentRecieveBillController.current.paymentMethod ne 'Cash' ? 'none' : 'block'} ;">
<p:inputText autocomplete="off" value="#{agentPaymentRecieveBillController.current.netTotal}"/>
</h:panelGroup>

</div>
</div>

<p:commandButton id="btnSettle" value="Settle" action="#{agentPaymentRecieveBillController.collectingCentrePaymentRecieveSettleBill}" ajax="false" style="width: 150px; padding: 1px;border: 1px solid ; margin: auto;" >
</p:commandButton>
<p:defaultCommand target="btnSettle"/>

<p:commandButton value="New Bill" ajax="false" action="#{agentPaymentRecieveBillController.prepareNewBill()}" >
</p:commandButton>
</h:panelGrid>
</f:facet>
<div class="row">
<div class="col-md-2">
<p:outputLabel value="Description"/>
</div>
<div class="col-md-7">
<p:inputTextarea
class="w-100"
value="#{agentPaymentRecieveBillController.current.comments}"/>
</div>
</div>

<p:panelGrid columns="2" style="min-width: 100%;">
<p:outputLabel value="Collecting Centre" />
<p:autoComplete id="creditCom" forceSelection="true" value="#{agentPaymentRecieveBillController.current.fromInstitution}" completeMethod="#{institutionController.completeCollectingCenter}" var="ix" itemLabel="#{ix.name}" itemValue="#{ix}" size="30" style="width: 400px;">
<f:ajax event="itemSelect" execute="creditCom" />
<p:column>#{ix.institutionCode}</p:column>
<p:column>#{ix.name}</p:column>
</p:autoComplete>
<p:outputLabel value="Payment" />
<p:inputText autocomplete="off" value="#{agentPaymentRecieveBillController.current.netTotal}"/>
<p:outputLabel value="Description"/>
<p:inputTextarea value="#{agentPaymentRecieveBillController.current.comments}"/>
</p:panelGrid>
<div class="row mt-2">
<div class="col-md-2">
<p:outputLabel value="Comment"/>
</div>
<div class="col-md-7">
<p:inputText
class="w-100"
value="#{agentPaymentRecieveBillController.comment}"
id="comment"/>
</div>
</div>
</p:panel>
</h:panelGroup>

Expand Down

0 comments on commit e46b15b

Please sign in to comment.