Merge pull request #376 from egovernments/develop

changes required as part of the ticket https://digit-discuss.atlassian.net/browse/PFM-2501 and making penalty configurable to use both state and tenant
egovernments · Mar 2, 2023 · ad9cb98 · ad9cb98
2 parents 357491e + 6a4a6c0
commit ad9cb98
Show file tree

Hide file tree

Showing 8 changed files with 160 additions and 109 deletions.
diff --git a/frontend/mgramseva/lib/providers/collect_payment.dart b/frontend/mgramseva/lib/providers/collect_payment.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:typed_data';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -112,9 +111,21 @@ class CollectPaymentProvider with ChangeNotifier {
       } else {}
 
       if (paymentDetails != null) {
+        var commonProvider = Provider.of<CommonProvider>(
+            navigatorKey.currentContext!,
+            listen: false);
         if (mdmsData == null) {
-          mdmsData = await CommonProvider.getMdmsBillingService();
-          paymentDetails.first.mdmsData = mdmsData;
+          mdmsData = await CommonProvider.getMdmsBillingService(
+              commonProvider.userDetails!.selectedtenant?.code.toString() ??
+                  commonProvider.userDetails!.userRequest!.tenantId.toString());
+          if (mdmsData.mdmsRes?.billingService?.taxHeadMasterList != null &&
+              mdmsData.mdmsRes!.billingService!.taxHeadMasterList!.isNotEmpty) {
+            paymentDetails.first.mdmsData = mdmsData;
+          } else {
+            mdmsData = await CommonProvider.getMdmsBillingService(
+                commonProvider.userDetails!.userRequest!.tenantId.toString());
+            paymentDetails.first.mdmsData = mdmsData;
+          }
         }
 
         paymentDetails.first.billDetails
@@ -394,7 +405,7 @@ class CollectPaymentProvider with ChangeNotifier {
         navigatorKey.currentContext!,
         listen: false);
     var res = await CoreRepository().getMdms(getMdmsPaymentModes(
-        commonProvider.userDetails!.userRequest!.tenantId.toString()));
+        commonProvider.userDetails!.selectedtenant!.code.toString()));
     if (res.mdmsRes?.billingService != null &&
         res.mdmsRes?.billingService?.businessServiceList != null) {
       Constants.PAYMENT_METHOD.forEach((e) {
@@ -406,8 +417,20 @@ class CollectPaymentProvider with ChangeNotifier {
         }
       });
       fetchBill.paymentMethod = paymentModeList.first.key;
-      notifyListeners();
+    } else {
+      var mdms = await CoreRepository().getMdms(getMdmsPaymentModes(
+          commonProvider.userDetails!.userRequest!.tenantId.toString()));
+      Constants.PAYMENT_METHOD.forEach((e) {
+        var index = mdms.mdmsRes?.billingService?.businessServiceList?.first
+            .collectionModesNotAllowed!
+            .indexOf(e.key);
+        if (index == -1) {
+          paymentModeList.add(KeyValue(e.key, e.label));
+        }
+      });
+      fetchBill.paymentMethod = paymentModeList.first.key;
     }
+    notifyListeners();
   }
 
   Future<void> updatePaymentInformation(

diff --git a/frontend/mgramseva/lib/providers/common_provider.dart b/frontend/mgramseva/lib/providers/common_provider.dart
@@ -907,15 +907,14 @@ class CommonProvider with ChangeNotifier {
             .abs();
   }
 
-  static Future<PaymentType> getMdmsBillingService() async {
+  static Future<PaymentType> getMdmsBillingService(String tenantId) async {
     try {
       var commonProvider = Provider.of<CommonProvider>(
           navigatorKey.currentContext!,
           listen: false);
 
-      return await CoreRepository().getPaymentTypeMDMS(getMdmsPaymentModes(
-          commonProvider.userDetails!.selectedtenant?.code.toString() ??
-              commonProvider.userDetails!.userRequest!.tenantId.toString()));
+      return await CoreRepository()
+          .getPaymentTypeMDMS(getMdmsPaymentModes(tenantId));
     } catch (e) {
       return PaymentType();
     }