Merge pull request #747 from egovernments/PFM-5680

PFM-5680: Thermal Printer Advance Fix
egovernments · Mar 11, 2024 · 9a146c6 · 9a146c6
2 parents ddc538c + 9f57eaf
commit 9a146c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/frontend/mgramseva/lib/components/house_connection_and_bill/consumer_bill_payment.dart b/frontend/mgramseva/lib/components/house_connection_and_bill/consumer_bill_payment.dart
@@ -230,9 +230,9 @@ class ConsumerBillPaymentsState extends State<ConsumerBillPayments> {
                                   .toString()) +
                               ' only')),
                       getPrinterLabel(
-                          i18.consumerReciepts.CONSUMER_PENDING_AMOUNT,
+                          (item.totalDue ?? 0) - (item.totalAmountPaid ?? 0)>0?i18.consumerReciepts.CONSUMER_PENDING_AMOUNT:i18.common.CORE_ADVANCE,
                           ('₹' +
-                              ((item.totalDue ?? 0) - (item.totalAmountPaid ?? 0))
+                              ((item.totalDue ?? 0) - (item.totalAmountPaid ?? 0)).abs()
                                   .toString())),
                       SizedBox(
                         height: 8,

diff --git a/frontend/mgramseva/lib/providers/collect_payment_provider.dart b/frontend/mgramseva/lib/providers/collect_payment_provider.dart
@@ -398,9 +398,9 @@ class CollectPaymentProvider with ChangeNotifier {
                                   .toString()) +
                               ' only')),
                       getPrinterLabel(
-                          i18.consumerReciepts.CONSUMER_PENDING_AMOUNT,
+                          (item.totalDue ?? 0) - (item.totalAmountPaid ?? 0)>0?i18.consumerReciepts.CONSUMER_PENDING_AMOUNT:i18.common.CORE_ADVANCE,
                           ('₹' +
-                              ((item.totalDue ?? 0) - (item.totalAmountPaid ?? 0))
+                              ((item.totalDue ?? 0) - (item.totalAmountPaid ?? 0)).abs()
                                   .toString())),
                       SizedBox(
                         height: 8,