Merge pull request #584 from egovernments/develop

PFM-4640
egovernments · Sep 25, 2023 · a9b5de8 · a9b5de8
2 parents 4a3d847 + 25f62bd
commit a9b5de8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/frontend/mgramseva/lib/providers/collect_payment_provider.dart b/frontend/mgramseva/lib/providers/collect_payment_provider.dart
@@ -33,6 +33,7 @@ import 'package:provider/provider.dart';
 import 'package:screenshot/screenshot.dart';
 
 import '../components/house_connection_and_bill/js_connnector.dart' as js;
+import '../env/app_config.dart';
 import '../model/localization/language.dart';
 import '../repository/core_repo.dart';
 import 'common_provider.dart';
@@ -620,7 +621,7 @@ class CollectPaymentProvider with ChangeNotifier {
           "tenantId": tenantId
         },
         "callbackUrl":
-            "https://mgramseva-uat.psegs.in/mgramseva/paymentSuccess",
+            "${apiBaseUrl}mgramseva/paymentSuccess",
         "additionalDetails": {"isWhatsapp": false,"connectionType":query["connectionType"]}
       }
     };

diff --git a/frontend/mgramseva/lib/screeens/common/payment_success.dart b/frontend/mgramseva/lib/screeens/common/payment_success.dart
@@ -142,7 +142,7 @@ class _PaymentSuccessState extends State<PaymentSuccess> {
             backButton: false,
             isWithoutLogin: true,
             isConsumer: true,
-            amount: '${transactionObject.transaction!.first.currencyCode!}${transactionObject.transaction!.first.transactionAmount!}',
+            amount: '${transactionObject.transaction!.first.currencyCode! ?? ''} ${transactionObject.transaction!.first.txnAmount! ?? '0'}',
           )
         : NoLoginFailurePage(i18.payment.PAYMENT_FAILED);
   }