Skip to content

Commit

Permalink
Print service charge in pharmacy direct issue #9981 (#9982)
Browse files Browse the repository at this point in the history 
* Signed-off-by: Buddhika <buddhika.ari@gmail.com>

* Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com>

* Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com>

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Create build.yml

* Create deploy.yml

* Update build.yml

* Update deploy.yml

* Delete .github/workflows/deploy.yml

* Update and rename build.yml to manual_deployment.yml

* Delete .github/workflows/manual_deployment.yml

* Create dev_dispatch.yml

* Delete .github/workflows/dev_dispatch.yml

* Create custom_deployment.yml

* Update custom_deployment.yml

* Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Issue #9942
Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika <buddhika.ari@gmail.com>

* added opd and cc bills

* added batch cancel and refund

* Signed-off-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>

* Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com>

* Signed-off-by: Chinthaka Prasad <chinthakaprasad30@gmail.com>

* Update PharmacyCalculation.java

testing commit

* changed column width

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* fixed null pointer exception bug

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* fixed filter bug

* Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>

* Closes #9960 Pharmacy_Retail_Sale_NOT_available_even_after_starting_a_new_Shift

Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: PasinduW99 <pwathsara@gmail.com>

* closes #9966
Signed-off-by: PasinduW99 <pwathsara@gmail.com>

* Add to Bill view for Sale1,2,3,4
Signed-off-by: PasinduW99 <pwathsara@gmail.com>

* Signed-off-by: PasinduW99 <pwathsara@gmail.com>

* Signed-off-by: PasinduW99 <pwathsara@gmail.com>

* Signed-off-by: PasinduW99 <pwathsara@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #9975
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Closes #9981
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

* Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>

---------

Signed-off-by: Buddhika <buddhika.ari@gmail.com>
Signed-off-by: IsuruUdaraRanaweera <isuru.udara.ranaweera@gmail.com>
Signed-off-by: Dr M H B Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>
Signed-off-by: Isuru Ranaweera <isuru.udara.ranaweera@gmail.com>
Signed-off-by: Buddhika Ariyaratne <buddhika.ari@gmail.com>
Signed-off-by: PasinduW99 <pwathsara@gmail.com>
Co-authored-by: IsuruUdaraRanaweera <isuru.udara.ranaweera@gmail.com>
Co-authored-by: Chinthaka Prasad <chinthakaprasad30@gmail.com>
Co-authored-by: Pubudu-Piyankara <pubudupiyankara.me@gmail.com>
Co-authored-by: Geeth Sandaru Madhushan <geeth.gsm@gmail.com>
Co-authored-by: Lawan Samarasekara <lawan.chaamindu1234@gmail.com>
Co-authored-by: imexh <chandikaranawella@gmail.com>
Co-authored-by: Chinthaka Prasad Wijerathna <118891516+ChinthakaPrasad@users.noreply.github.com>
Co-authored-by: PasinduW99 <pwathsara@gmail.com>
  • Loading branch information
@buddhika75 @IsuruUdaraRanaweera
@ChinthakaPrasad @Pubudu-Piyankara @GSMgeeth @DARKDRAGON-LK @imexh @PasinduW99
9 people authored Jan 6, 2025
1 parent 47b6ff1 commit 5eccbc9
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 51 deletions.
1 change: 0 additions & 1 deletion src/main/webapp/inward/pharmacy_bill_issue_bht.xhtml
View file
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
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
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
13 changes: 1 addition & 12 deletions src/main/webapp/resources/pharmacy/sale_bill_five_five_custom_3.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
<table class="info-table">
<h:panelGroup rendered="#{cc.attrs.bill.patient ne null}" >
<tr>

<td style="padding: 2px;">Name :</td>
<td style="padding: 2px;" >
<h:outputLabel value="#{cc.attrs.bill.patient.person.nameWithTitle}"/>
Expand All @@ -62,29 +61,24 @@
<tr>
<td style="padding: 2px;">Bill Date:</td>
<td style="padding: 2px;">

<h:outputLabel value="#{cc.attrs.bill.createdAt}" >
<f:convertDateTime pattern="yyyy-MM-dd" />
</h:outputLabel>
</td>

<td style="padding: 2px;" class="spacer"></td>
<td style="padding: 2px;">Bill Time:</td>
<td style="padding: 2px;">

<h:outputLabel value="#{cc.attrs.bill.createdAt}" >
<f:convertDateTime pattern="HH:mm a" />
</h:outputLabel>
</td>
</tr>
<tr>

<td style="padding: 2px;">Bill No:</td>
<td style="padding: 2px;">#{cc.attrs.bill.deptId}</td>
<td style="padding: 2px;" class="spacer"></td>
<td style="padding: 2px;" ><h:outputLabel value="BHT No : " rendered="#{cc.attrs.bill.patientEncounter ne null}"/></td>
<td style="padding: 2px;" ><h:outputLabel value="#{cc.attrs.bill.patientEncounter.bhtNo}" rendered="#{cc.attrs.bill.patientEncounter ne null}"/></td>

</tr>
</table>

Expand Down Expand Up @@ -146,14 +140,11 @@
<tr>
<td >Discount:</td>
<td style="text-align: right;">

<h:outputLabel value="#{-cc.attrs.bill.discount}">

<f:convertNumber pattern="#,##0.00" />
</h:outputLabel>
</td>
</tr>

<tr>
<td >Net Total:</td>
<td style="text-align: right;">
Expand Down Expand Up @@ -222,11 +213,9 @@
</table>
</h:panelGroup>


</h:panelGroup>
</div>

</cc:implementation>

</h:body>
</html>

0 comments on commit 5eccbc9

Please sign in to comment.