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

Aligned the total of total, discount, and net total column properly #11079

Merged
merged 2 commits into from
Mar 13, 2025
Merged

Aligned the total of total, discount, and net total column properly #11079

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5e4cff
Aligned the total of total, discount, and net total column properly
TharinduAKTD Mar 12, 2025
2756f64
Merge branch 'development' into pharmacy_bill
TharinduAKTD Mar 12, 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
30 changes: 20 additions & 10 deletions src/main/webapp/pharmacy/pharmacy_report_sale_by_date_detail_by_payment_scheme.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,17 +155,23 @@
</p:column>

<p:column >

<h:outputLabel value="#{b.total}" >

<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>
</p:column>
<p:column >

<h:outputLabel value="#{b.discount}" >

<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>
</p:column>
<p:column >

<h:outputLabel value="#{b.netTotal}" >

<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>
</p:column>
Expand Down Expand Up @@ -215,7 +221,9 @@
</h:outputLabel>
</f:facet>
</p:column>
<p:column footerText="#{pharmacySaleReportController.billedDetail.netTotal}" style="text-align: center;">

<p:column footerText="#{pharmacySaleReportController.billedDetail.netTotal}" >

<f:facet name="footer">
<h:outputLabel value="#{pharmacySaleReportController.billedDetail.netTotal}">
<f:convertNumber pattern="#,##0.00" />
Expand Down Expand Up @@ -294,17 +302,17 @@
<p:column>
<h:outputLabel value="#{b.creater.webUserPerson.name}"/>
</p:column>
<p:column style="text-align: right;">
<p:column >
<h:outputLabel value="#{b.total}">
<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>
</p:column>
<p:column style="text-align: right;">
<p:column >
<h:outputLabel value="#{b.discount}">
<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>
</p:column>
<p:column style="text-align: right;">
<p:column >
<h:outputLabel value="#{b.netTotal}">
<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>
Expand All @@ -313,21 +321,21 @@
<p:row>
<p:column colspan="4" footerText="Summary">
</p:column>
<p:column footerText="#{i.sumNetTotal+i.sumDiscount}" style="text-align: right;">
<p:column footerText="#{i.sumNetTotal+i.sumDiscount}" >
<f:facet name="footer">
<h:outputLabel value="#{i.sumNetTotal+i.sumDiscount}">
<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>
</f:facet>
</p:column>
<p:column footerText="#{i.sumDiscount}" style="text-align: right;">
<p:column footerText="#{i.sumDiscount}" >
<f:facet name="footer">
<h:outputLabel value="#{i.sumDiscount}">
<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>
</f:facet>
</p:column>
<p:column footerText="#{i.sumNetTotal}" style="text-align: right;">
<p:column footerText="#{i.sumNetTotal}" >
<f:facet name="footer">
<h:outputLabel value="#{i.sumNetTotal}">
<f:convertNumber pattern="#,##0.00" />
Expand Down Expand Up @@ -355,7 +363,9 @@
</h:outputLabel>
</f:facet>
</p:column>

<p:column footerText="#{pharmacySaleReportController.cancelledDetail.netTotal}" >

<f:facet name="footer">
<h:outputLabel value="#{pharmacySaleReportController.cancelledDetail.netTotal}">
<f:convertNumber pattern="#,##0.00" />
Expand Down Expand Up @@ -434,17 +444,17 @@
<p:column>
<h:outputLabel value="#{b.creater.webUserPerson.name}"/>
</p:column>
<p:column style="text-align: right;">
<p:column >
<h:outputLabel value="#{b.total}">
<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>
</p:column>
<p:column style="text-align: right;">
<p:column >
<h:outputLabel value="#{b.discount}">
<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>
</p:column>
<p:column style="text-align: right;">
<p:column >
<h:outputLabel value="#{b.netTotal}">
<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>
Expand Down