#1 topup confirm

android/.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

android/app/src/main/java/io/flutter/plugins/GeneratedPluginRegistrant.java

@@ -15,6 +15,11 @@ import io.flutter.embedding.engine.FlutterEngine;
 public final class GeneratedPluginRegistrant {
   private static final String TAG = "GeneratedPluginRegistrant";
   public static void registerWith(@NonNull FlutterEngine flutterEngine) {
+    try {
+      flutterEngine.getPlugins().add(new dev.fluttercommunity.plus.connectivity.ConnectivityPlugin());
+    } catch(Exception e) {
+      Log.e(TAG, "Error registering plugin connectivity_plus, dev.fluttercommunity.plus.connectivity.ConnectivityPlugin", e);
+    }
     try {
       flutterEngine.getPlugins().add(new dev.fluttercommunity.plus.device_info.DeviceInfoPlusPlugin());
     } catch(Exception e) {

android/app/src/main/kotlin/com/example/self_service_3/MainActivity.kt

@@ -407,7 +407,7 @@ class MainActivity : MethodChannel.MethodCallHandler, FlutterActivity(), MifareT
 
     // _mifareTicketing?.setBaseUrl(
     ////                              "https://postrend.dev.dolanapp.com",
-    //////                            "http://202.159.28.42:33101",
+    //////                            "http://202.159.28.42:33000",
     //////                            "http://202.159.28.42:8150",
     ////                              "http://192.168.7.8:33101",
     ////                              "http://192.168.7.8:8150",

ios/Runner/GeneratedPluginRegistrant.m

@@ -6,6 +6,12 @@
 
 #import "GeneratedPluginRegistrant.h"
 
+#if __has_include(<connectivity_plus/ConnectivityPlusPlugin.h>)
+#import <connectivity_plus/ConnectivityPlusPlugin.h>
+#else
+@import connectivity_plus;
+#endif
+
 #if __has_include(<device_info_plus/FLTDeviceInfoPlusPlugin.h>)
 #import <device_info_plus/FLTDeviceInfoPlusPlugin.h>
 #else
@@ -51,6 +57,7 @@
 @implementation GeneratedPluginRegistrant
 
 + (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry {
+  [ConnectivityPlusPlugin registerWithRegistrar:[registry registrarForPlugin:@"ConnectivityPlusPlugin"]];
   [FLTDeviceInfoPlusPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTDeviceInfoPlusPlugin"]];
   [FLTPackageInfoPlusPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTPackageInfoPlusPlugin"]];
   [PathProviderPlugin registerWithRegistrar:[registry registrarForPlugin:@"PathProviderPlugin"]];

lib/blocs/api_bloc.dart

@@ -81,7 +81,7 @@ class GeneralStatusApiBloc extends Bloc<ApiEvent, ApiState> {
     if (event is DoCheckStatusQris) {
       try {
         yield OnWaitingProcess();
-        Map<String, dynamic> response = await ServiceApi.statusQris(event.body);
+        Map<String, dynamic> response = await ServiceApi.statusQris(event.body, "");
         if (response['response']['code'].toString() == "200") {
           if (response['data']['status']
                   .toString()

lib/services/api_helpert.dart

@@ -206,7 +206,13 @@ class ServiceApi {
 
   static Future<Map<String, dynamic>> requestQris(String body, String mid) async {
     String baseUrl = _getBaseUrl();
-    String url = "${PreferencesHelper.getString(kUrlCorePayment)}/payment-gateway/v1/general-payment/status/order" ?? DEFAULT_URL_ORDER;
+
+    String url = PreferencesHelper.getString(kUrlCorePayment)?.isNotEmpty == true
+        ? PreferencesHelper.getString(kUrlCorePayment)
+        : DEFAULT_URL_ORDER;
+    if (PreferencesHelper.getString(kUrlCorePayment)?.isNotEmpty == true) {
+      url = "$url/v1/general-payment/order";
+    }
     var headers = {
       'Content-Type': 'application/json',
       'Accept': 'application/json',
@@ -227,12 +233,18 @@ class ServiceApi {
   static const String DEFAULT_URL_STATUS =
       "https://api-portal.multidaya.id/payment-gateway/v1/general-payment/status";
 
-  static Future<Map<String, dynamic>> statusQris(String body) async {
-    String url = "${PreferencesHelper.getString(kUrlCorePayment)}/payment-gateway/v1/general-payment/status" ?? DEFAULT_URL_ORDER;
+  static Future<Map<String, dynamic>> statusQris(String body, String mid) async {
+
+    String url = PreferencesHelper.getString(kUrlCorePayment)?.isNotEmpty == true
+        ? PreferencesHelper.getString(kUrlCorePayment)
+        : DEFAULT_URL_STATUS;
+    if (PreferencesHelper.getString(kUrlCorePayment)?.isNotEmpty == true) {
+      url = "$url/v1/general-payment/status";
+    }
     var headers = {
       'Content-Type': 'application/json',
       'Accept': 'application/json',
-      'X-Merchant-ID': '7e5aba0fdd4af4f6370eb456b6df497e'
+      'X-Merchant-ID': mid
     };
     var response;
     var uri = Uri.parse(url);

lib/ui/pages/set_merchant.dart

@@ -587,6 +587,7 @@ class _SetMerchantState extends State<SetMerchant> {
                           PreferencesHelper.setString('tid', outletpayment.tid);
                           PreferencesHelper.setString('mid', outletpayment.mid);
                           PreferencesHelper.setString('token', outletpayment.token);
+                          PreferencesHelper.setString('provider', outletpayment.provider);
                           PreferencesHelper.setString(kVersionApp, getVersionApp());
 
                           OutletPayment.fromJson(outletProvider[0]);

pubspec.yaml

@@ -46,6 +46,8 @@ dependencies:
   build_runner: ^2.3.2
   intl: ^0.17.0
   qr_flutter: ^4.0.0
+  connectivity_plus: ^3.0.3
+  ping_discover_network_forked: ^0.0.1
   circular_countdown_timer: ^0.2.3
   animated_text_kit: ^4.2.2
   validators: ^2.0.0+1