Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Print service charge in pharmacy direct issue #9981 #9983

Merged
merged 3 commits into from
Jan 4, 2025
Merged

Print service charge in pharmacy direct issue #9981 #9983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50871a0
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
buddhika75 Jan 4, 2025
1408c94
Closes #9981
buddhika75 Jan 4, 2025
9eab306
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
buddhika75 Jan 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@
</f:facet>
</p:cellEditor>
</p:column>

<p:column >
<p:rowEditor />
</p:column>
Expand Down
9 changes: 7 additions & 2 deletions src/main/webapp/inward/pharmacy_reprint_bill_sale_bht.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
</p:selectOneMenu>
<p:commandButton ajax="false" icon="fa fa-sync-alt" class="ui-button m-1" title="Redraw Bill"></p:commandButton>
</div>

<h:panelGroup id="gpBillPreview" class="mt-2">

<h:panelGroup id="gpBillPreviewSingle" rendered="#{sessionController.departmentPreference.pharmacyBillPaperType eq 'PosPaper'}">
Expand All @@ -208,7 +208,12 @@

<h:panelGroup id="gpBillPreviewFiveFive" rendered="#{sessionController.departmentPreference.pharmacyBillPaperType eq 'FiveFivePaper'}">
<phi:saleBill_five_five bill="#{pharmacyBillSearch.bill}"></phi:saleBill_five_five>
</h:panelGroup>
</h:panelGroup>

<h:panelGroup id="gpBillPreviewFiveFiveCustom3" rendered="#{configOptionApplicationController.getBooleanValueByKey('Pharmacy Inward Direct Issue Bill is FiveFiveCustom3',true)}">
<phi:inward_direct_issue_bill_five_five_custom_3 bill="#{pharmacyBillSearch.bill}"/>
</h:panelGroup>

</h:panelGroup>
</p:panel>
</div>
Expand Down
50 changes: 14 additions & 36 deletions src/main/webapp/resources/pharmacy/inward_direct_issue_bill_five_five_custom_3.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,30 +97,29 @@
<thead>
<tr>
<th>No</th>
<th>Item Name</th>
<th>Rate</th>
<th>Qty</th>
<th colspan="3">Item</th>
<th style="text-align: right">Qty</th>
<th style="text-align: right">Rate</th>
<th style="text-align: right">Value</th>
</tr>
</thead>
<tbody>
<ui:repeat value="#{cc.attrs.bill.billItems}" var="item" varStatus="s">
<tr>
<!-- Display the item number across all items -->
<td>#{s.index +1}</td> <!-- status.index starts from 0, so add 1 for a human-readable count -->
<td>#{item.item.name}</td>
<td>
<h:outputLabel value="#{item.rate}">
<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>
</td>
<td>
<td>#{s.index +1}</td>
<td colspan="3">#{item.item.name}</td>
<td style="text-align: right">
<h:outputLabel value="#{item.qty}">
<f:convertNumber integerOnly="true" />
</h:outputLabel>
</td>
<td style="text-align: right">
<h:outputLabel value="#{item.netValue / item.qty }">
<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>
</td>
<td style="text-align: right">
<h:outputLabel value="#{item.grossValue}">
<h:outputLabel value="#{item.netValue}">
<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>
</td>
Expand All @@ -136,33 +135,12 @@
<table class="total-table">
<tr>
<td >Total:</td>
<td style="text-align: right;">
<h:outputLabel value="#{cc.attrs.bill.total}" >
<td style="text-align: right;">
<h:outputLabel value="#{cc.attrs.bill.netTotal}">
<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>
</td>
</tr>

<h:panelGroup rendered="#{cc.attrs.bill.discount ne 0.0}" >
<tr>
<td >Discount:</td>
<td style="text-align: right;">
<h:outputLabel value="#{cc.attrs.bill.discount ne 0.0 ?'#{-cc.attrs.bill.discount}' : '0.0'}">
<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>
</td>
</tr>
<tr>
<td >Net Total:</td>
<td style="text-align: right;">
<h:outputLabel value="#{cc.attrs.bill.netTotal}">
<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>
</td>
</tr>

</h:panelGroup>

<tr>
<td >No of Items:</td>
<td >
Expand Down