Skip to content

Commit

Permalink
Merge pull request #10981 from hmislk/10911-after-the-handover-the-ca…
Browse files Browse the repository at this point in the history 
…sh-in-the-drawer-for-the-current-shift-cash-balance-was-minus

10911 after the handover the cash in the drawer for the current shift cash balance was minus
  • Loading branch information
@GSMgeeth
GSMgeeth authored Mar 8, 2025
2 parents a9a7591 + f7f2703 commit 105168a
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 67 deletions.
12 changes: 11 additions & 1 deletion src/main/webapp/cashier/fund_transfer_bill_print.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,17 @@

</p:panel>

<prints:float_transfer_five_five bill="#{financialTransactionController.currentBill}"/>
<p:commandButton
value="Print"
ajax="false" >
<p:printer target="panelPrint" ></p:printer>
</p:commandButton>

<h:panelGroup id="panelPrint" >
<prints:float_transfer_five_five bill="#{financialTransactionController.currentBill}"/>
</h:panelGroup>



</h:form>
</ui:define>
Expand Down
63 changes: 31 additions & 32 deletions src/main/webapp/resources/ezcomp/prints/float_transfer_five_five.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,77 +14,76 @@

<cc:implementation>

<h:outputStylesheet library="css" name="fund_bill_five_five.css" ></h:outputStylesheet>
<div class="fiveinchbill">
<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Transfer Note CSS')}">

<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Transfer Note Header CSS')}" >
<h:outputText value="#{configOptionApplicationController.getLongTextValueByKey('Float Transfer Note Header Text')}" escape="false" ></h:outputText>
</div>

<div class="headingBillFiveFive" style="text-align: center;font-weight: bold;">
<h:outputLabel value="Float Transfer Note"/>
<h:outputLabel value="**Duplicate**" rendered="#{cc.attrs.duplicate eq true}"/>
<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Transfer Note Title CSS')}">
<h:outputLabel value="#{configOptionApplicationController.getLongTextValueByKey('Float Transfer Note Title CSS', 'Float Transfer Note')}"/>
<h:outputLabel value=" - **Duplicate**" rendered="#{cc.attrs.duplicate eq true}"/>
</div>

<div class="billline">
<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Transfer Note Horizontal Line CSS')}">
<hr/>
</div>

<div class="billDetailsFiveFive">
<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Transfer Note Bill Detail CSS')}">
<table style="width: 99%!important;">
<tr>
<td style="text-align: left;">
<h:outputLabel value="From" class="billDetailsFiveFive"></h:outputLabel>
<td >
<h:outputLabel value="From" ></h:outputLabel>
</td>
<td style="width: 10px;"></td>
<td ></td>
<td>:</td>
<td style="width: 5px;"></td>
<td ></td>
<td>
<h:outputLabel value="#{cc.attrs.bill.creater.name}" class="billDetailsFiveFive"></h:outputLabel>
<h:outputLabel value="#{cc.attrs.bill.creater.name}" ></h:outputLabel>
</td>
<td style="width: 50px;"></td>
<td ></td>
<td>
<h:outputLabel value="Date / Time " class="billDetailsFiveFive"></h:outputLabel>
<h:outputLabel value="Date / Time " ></h:outputLabel>
</td>
<td>:</td>
<td>
<h:outputLabel value="#{cc.attrs.bill.createdAt}" class="billDetailsFiveFive">
<h:outputLabel value="#{cc.attrs.bill.createdAt}" >
<f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"></f:convertDateTime>
</h:outputLabel>
</td>
</tr>
<tr>
<td style="text-align: left;">
<h:outputLabel value="To Staff" class="billDetailsFiveFive"></h:outputLabel>
<td >
<h:outputLabel value="To Staff" ></h:outputLabel>
</td>
<td style="width: 10px;"></td>
<td ></td>
<td>:</td>
<td style="width: 5px;"></td>
<td ></td>
<td>
<h:outputLabel value="#{cc.attrs.bill.toWebUser.webUserPerson.nameWithTitle}" class="billDetailsFiveFive"></h:outputLabel>
<h:outputLabel value="#{cc.attrs.bill.toWebUser.webUserPerson.nameWithTitle}" ></h:outputLabel>
</td>
<td style="width: 50px;"></td>
<td ></td>
<td>
<h:outputLabel value="Comments" class="billDetailsFiveFive"></h:outputLabel>
<h:outputLabel value="Comments" ></h:outputLabel>
</td>
<td>:</td>
<td>
<h:outputLabel value="#{cc.attrs.bill.comments}" class="billDetailsFiveFive"></h:outputLabel>
<h:outputLabel value="#{cc.attrs.bill.comments}" ></h:outputLabel>
</td>
</tr>
</table>
</div>

<div class="billline">
<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Transfer Note Horizontal Line CSS')}">
<hr/>
</div>

<div class="itemHeadingsFiveFive">
<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Transfer Note Bill Detail CSS')}">
<table width="100%">
<ui:repeat value="#{cc.attrs.bill.payments}" var="bip">
<tr>
<td style="overflow: visible;">
<h:outputLabel class="itemsBlockRightFiveFive" value="#{bip.paymentMethod}" style="text-transform: capitalize!important;"></h:outputLabel>
<h:outputLabel value="#{bip.paymentMethod}" ></h:outputLabel>
</td>
<td>
<h:panelGroup rendered="#{bip.paymentMethod eq 'Cash'}">
Expand Down Expand Up @@ -122,7 +121,7 @@
</h:panelGroup>
</td>
<td style="text-align: right;">
<h:outputLabel class="itemsBlockRightFiveFive" value="#{bip.absolutePaidValueTransient}">
<h:outputLabel value="#{bip.absolutePaidValueTransient}">
<f:convertNumber pattern="#,##0.00"/>
</h:outputLabel>
</td>
Expand All @@ -131,18 +130,18 @@
</table>
</div>

<div class="billline">
<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Transfer Note Horizontal Line CSS')}">
<hr/>
</div>

<div>
<table style="width: 100%;">
<table style="#{configOptionApplicationController.getLongTextValueByKey('Float Transfer Note Bill Table CSS')}">
<h:panelGroup rendered="#{cc.attrs.bill.margin > 0? 'false':'true'}">
<tr>
<td class="totalsBlock" style="text-align: left; width: 60%;">
<td >
<h:outputLabel value="Total"/>
</td>
<td class="totalsBlock" style="text-align: right!important; width: 40%; padding-right: 30px;">
<td >
<h:outputLabel value="#{cc.attrs.bill.absoluteNetTotalTransient}">
<f:convertNumber pattern="#,##0.00"/>
</h:outputLabel>
Expand All @@ -152,7 +151,7 @@
</table>
</div>

<div class="billline">
<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Transfer Note Horizontal Line CSS')}">
<hr/>
</div>

Expand Down
64 changes: 30 additions & 34 deletions src/main/webapp/resources/ezcomp/prints/float_transfer_receive_five_five.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,79 +14,76 @@

<cc:implementation>

<h:outputStylesheet library="css" name="fund_bill_five_five.css" ></h:outputStylesheet>
<div class="fiveinchbill">
<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Receive Note CSS')}">

<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Receive Note Header CSS')}" >
<h:outputText value="#{configOptionApplicationController.getLongTextValueByKey('Float Receive Note Header Text')}" escape="false" ></h:outputText>
</div>

<div class="headingBillFiveFive" style="text-align: center;font-weight: bold;">
<h:outputLabel value="Float Receive Note"/>
<h:outputLabel value="**Duplicate**" rendered="#{cc.attrs.duplicate eq true}"/>
<div class="billline">
<hr/>
</div>

<div class="billline">
<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Receive Note Title CSS')}">
<h:outputLabel value="#{configOptionApplicationController.getLongTextValueByKey('Float Receive Note Title', 'Float Receive Note')}"/>
<h:outputLabel value=" - **Duplicate**" rendered="#{cc.attrs.duplicate eq true}"/>
</div>

<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Receive Note Horizontal Line CSS')}">
<hr/>
</div>

<div class="billDetailsFiveFive">
<table style="width: 99%!important;">
<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Receive Note Bill Detail CSS')}">
<table style="width: 100%!important;">
<tr>
<td style="text-align: left;">
<h:outputLabel value="From" class="billDetailsFiveFive"></h:outputLabel>
<td>
<h:outputLabel value="From" ></h:outputLabel>
</td>
<td style="width: 10px;"></td>
<td>:</td>
<td style="width: 5px;"></td>
<td>
<h:outputLabel value="#{cc.attrs.bill.referenceBill.creater.name}" class="billDetailsFiveFive"></h:outputLabel>
<h:outputLabel value="#{cc.attrs.bill.referenceBill.creater.webUserPerson.nameWithTitle}" ></h:outputLabel>
</td>
<td style="width: 50px;"></td>
<td>
<h:outputLabel value="Transferred At" class="billDetailsFiveFive"></h:outputLabel>
<h:outputLabel value="Transferred At" ></h:outputLabel>
</td>
<td>:</td>
<td>
<h:outputLabel value="#{cc.attrs.bill.referenceBill.createdAt}" class="billDetailsFiveFive">
<h:outputLabel value="#{cc.attrs.bill.referenceBill.createdAt}" >
<f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"></f:convertDateTime>
</h:outputLabel>
</td>
</tr>
<tr>
<td style="text-align: left;">
<h:outputLabel value="To Staff" class="billDetailsFiveFive"></h:outputLabel>
<td>
<h:outputLabel value="To Staff" ></h:outputLabel>
</td>
<td style="width: 10px;"></td>
<td>:</td>
<td style="width: 5px;"></td>
<td>
<h:outputLabel value="#{cc.attrs.bill.creater.webUserPerson.nameWithTitle}" class="billDetailsFiveFive"></h:outputLabel>
<h:outputLabel value="#{cc.attrs.bill.creater.webUserPerson.nameWithTitle}" ></h:outputLabel>
</td>
<td style="width: 50px;"></td>
<td>
<h:outputLabel value="Received At" class="billDetailsFiveFive"></h:outputLabel>
<h:outputLabel value="Received At" ></h:outputLabel>
</td>
<td>:</td>
<td>
<h:outputLabel value="#{cc.attrs.bill.createdAt}" class="billDetailsFiveFive">
<h:outputLabel value="#{cc.attrs.bill.createdAt}" >
<f:convertDateTime pattern="#{sessionController.applicationPreference.longDateTimeFormat}"></f:convertDateTime>
</h:outputLabel>
</td>
</tr>
</table>
</div>

<div class="billline">
<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Receive Note Horizontal Line CSS')}">
<hr/>
</div>

<div class="itemHeadingsFiveFive">
<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Receive Note Bill Detail CSS')}">
<table width="100%">
<ui:repeat value="#{cc.attrs.bill.payments}" var="bip">
<tr>
<td style="overflow: visible;">
<h:outputLabel class="itemsBlockRightFiveFive" value="#{bip.paymentMethod}" style="text-transform: capitalize!important;"></h:outputLabel>
<td >
<h:outputLabel value="#{bip.paymentMethod}" ></h:outputLabel>
</td>
<td>
<h:panelGroup rendered="#{bip.paymentMethod eq 'Cash'}">
Expand Down Expand Up @@ -124,7 +121,7 @@
</h:panelGroup>
</td>
<td style="text-align: right;">
<h:outputLabel class="itemsBlockRightFiveFive" value="#{bip.paidValue}">
<h:outputLabel value="#{bip.paidValue}">
<f:convertNumber pattern="#,##0.00"/>
</h:outputLabel>
</td>
Expand All @@ -133,18 +130,18 @@
</table>
</div>

<div class="billline">
<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Receive Note Horizontal Line CSS')}">
<hr/>
</div>

<div>
<table style="width: 100%;">
<h:panelGroup rendered="#{cc.attrs.bill.margin > 0? 'false':'true'}">
<tr>
<td class="totalsBlock" style="text-align: left; width: 60%;">
<td >
<h:outputLabel value="Total"/>
</td>
<td class="totalsBlock" style="text-align: right!important; width: 40%; padding-right: 30px;">
<td >
<h:outputLabel value="#{cc.attrs.bill.total}">
<f:convertNumber pattern="#,##0.00"/>
</h:outputLabel>
Expand All @@ -154,15 +151,14 @@
</table>
</div>

<div class="billline">
<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Receive Note Horizontal Line CSS')}">
<hr/>
</div>

<div style="#{configOptionApplicationController.getLongTextValueByKey('Float Receive Note Footer CSS')}" >
<h:outputText value="#{configOptionApplicationController.getLongTextValueByKey('Float Receive Note Footer Text')}" escape="false" ></h:outputText>
</div>


</div>
</cc:implementation>
</html>

0 comments on commit 105168a

Please sign in to comment.