adjust url core payment

android/.gradle/buildOutputCleanup/cache.properties

-#Fri Nov 25 14:54:48 ICT 2022
+#Mon Mar 20 13:05:51 WIB 2023
 gradle.version=7.4

ios/Runner/GeneratedPluginRegistrant.m

@@ -18,10 +18,10 @@
 @import package_info_plus;
 #endif
 
-#if __has_include(<path_provider_ios/FLTPathProviderPlugin.h>)
-#import <path_provider_ios/FLTPathProviderPlugin.h>
+#if __has_include(<path_provider_foundation/PathProviderPlugin.h>)
+#import <path_provider_foundation/PathProviderPlugin.h>
 #else
-@import path_provider_ios;
+@import path_provider_foundation;
 #endif
 
 #if __has_include(<permission_handler_apple/PermissionHandlerPlugin.h>)
@@ -36,10 +36,10 @@
 @import sentry_flutter;
 #endif
 
-#if __has_include(<shared_preferences_ios/FLTSharedPreferencesPlugin.h>)
-#import <shared_preferences_ios/FLTSharedPreferencesPlugin.h>
+#if __has_include(<shared_preferences_foundation/SharedPreferencesPlugin.h>)
+#import <shared_preferences_foundation/SharedPreferencesPlugin.h>
 #else
-@import shared_preferences_ios;
+@import shared_preferences_foundation;
 #endif
 
 #if __has_include(<sqflite/SqflitePlugin.h>)
@@ -53,10 +53,10 @@
 + (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry {
   [FLTDeviceInfoPlusPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTDeviceInfoPlusPlugin"]];
   [FLTPackageInfoPlusPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTPackageInfoPlusPlugin"]];
-  [FLTPathProviderPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTPathProviderPlugin"]];
+  [PathProviderPlugin registerWithRegistrar:[registry registrarForPlugin:@"PathProviderPlugin"]];
   [PermissionHandlerPlugin registerWithRegistrar:[registry registrarForPlugin:@"PermissionHandlerPlugin"]];
   [SentryFlutterPlugin registerWithRegistrar:[registry registrarForPlugin:@"SentryFlutterPlugin"]];
-  [FLTSharedPreferencesPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTSharedPreferencesPlugin"]];
+  [SharedPreferencesPlugin registerWithRegistrar:[registry registrarForPlugin:@"SharedPreferencesPlugin"]];
   [SqflitePlugin registerWithRegistrar:[registry registrarForPlugin:@"SqflitePlugin"]];
 }
 

lib/controller/text_controller.dart

@@ -5,8 +5,8 @@ import '../shared/preferences_helper.dart';
 
 
 TextEditingController urlDolanController = TextEditingController(text: PreferencesHelper.getString(kUrlDolan));
-TextEditingController urlGetQrController = TextEditingController(text: PreferencesHelper.getString(kUrlGetQr));
-TextEditingController urlStatusQrController = TextEditingController(text: PreferencesHelper.getString(kUrlStatusQr));
+TextEditingController urlCorePaymentController = TextEditingController(text: PreferencesHelper.getString(kUrlCorePayment));
+// TextEditingController urlStatusQrController = TextEditingController(text: PreferencesHelper.getString(kUrlStatusQr));
 TextEditingController urlCloseLoopController = TextEditingController(text: PreferencesHelper.getString(kUrlCloseLoop));
 TextEditingController merchantNameController = TextEditingController(text: PreferencesHelper.getString(kMerchantName));
 TextEditingController userNameController = TextEditingController(text: PreferencesHelper.getString(kUserName));

lib/services/api_helpert.dart

@@ -205,7 +205,8 @@ class ServiceApi {
       "https://api-portal.multidaya.id/payment-gateway/v1/general-payment/order";
 
   static Future<Map<String, dynamic>> requestQris(String body, String mid) async {
-    String url = PreferencesHelper.getString(kUrlGetQr) ?? DEFAULT_URL_ORDER;
+    String baseUrl = _getBaseUrl();
+    String url = "${PreferencesHelper.getString(kUrlCorePayment)}/payment-gateway/v1/general-payment/status/order" ?? DEFAULT_URL_ORDER;
     var headers = {
       'Content-Type': 'application/json',
       'Accept': 'application/json',
@@ -227,7 +228,7 @@ class ServiceApi {
       "https://api-portal.multidaya.id/payment-gateway/v1/general-payment/status";
 
   static Future<Map<String, dynamic>> statusQris(String body) async {
-    String url = PreferencesHelper.getString(kUrlStatusQr) ?? DEFAULT_URL_ORDER;
+    String url = "${PreferencesHelper.getString(kUrlCorePayment)}/payment-gateway/v1/general-payment/status" ?? DEFAULT_URL_ORDER;
     var headers = {
       'Content-Type': 'application/json',
       'Accept': 'application/json',

lib/shared/preference_constant.dart

 // ignore_for_file: unnecessary_nullable_for_final_variable_declarations
 
 const kUrlDolan = "url_dolan";
-const kUrlGetQr = "url_get_qr";
-const kUrlStatusQr = "url_status_qr";
+const kUrlCorePayment = "core_payment";
+// const kUrlStatusQr = "url_status_qr";
 const kUrlCloseLoop = "url_close_loop";
 const kMerchantName = "merchant_name";
 const kUserName = "user_name";

lib/ui/pages/set_merchant.dart

@@ -68,8 +68,7 @@ class _SetMerchantState extends State<SetMerchant> {
   void setConfig() {
 
     String urlDolan = urlDolanController.text;
-    String urlGetQr = urlGetQrController.text;
-    String urlStatusQr = urlStatusQrController.text;
+    String urlCorePayment = urlCorePaymentController.text;
     String urlCloseLoop = urlCloseLoopController.text;
     String merchantName = merchantNameController.text;
     String userName = userNameController.text;
@@ -97,8 +96,7 @@ class _SetMerchantState extends State<SetMerchant> {
 
       // NOTE untuk save data to sharedpreferencees
       PreferencesHelper.setString(kUrlDolan, urlDolan);
-      PreferencesHelper.setString(kUrlGetQr, urlGetQr);
-      PreferencesHelper.setString(kUrlStatusQr, urlStatusQr);
+      PreferencesHelper.setString(kUrlCorePayment, urlCorePayment);
       PreferencesHelper.setString(kUrlCloseLoop, urlCloseLoop);
 
       PreferencesHelper.setString(kMerchantName, merchantName);
@@ -138,8 +136,7 @@ class _SetMerchantState extends State<SetMerchant> {
 
   void getListOutlet() async {
     String urlDolan = urlDolanController.text;
-    String urlGetQr = urlGetQrController.text;
-    String urlStatusQr = urlStatusQrController.text;
+    String corePayment = urlCorePaymentController.text;
     String urlCloseLoop = urlCloseLoopController.text;
     String merchantName = merchantNameController.text;
     String userName = userNameController.text;
@@ -147,8 +144,7 @@ class _SetMerchantState extends State<SetMerchant> {
     String max = maxControlller.text;
     String min = minController.text;
     PreferencesHelper.getString(kUrlDolan, urlDolan);
-    PreferencesHelper.getString(kUrlGetQr, urlGetQr);
-    PreferencesHelper.getString(kUrlStatusQr, urlStatusQr);
+    PreferencesHelper.getString(kUrlCorePayment, corePayment);
     PreferencesHelper.getString(kUrlCloseLoop, urlCloseLoop);
     PreferencesHelper.getString(kMerchantName, merchantName);
     PreferencesHelper.getString(kUserName, userName);
@@ -345,7 +341,7 @@ class _SetMerchantState extends State<SetMerchant> {
                       CustomFormField(
                         controller: urlDolanController,
                         title: '( Url Host Trend )',
-                        isShowTitle: false,
+                        isShowTitle: false, validator: (value) {  },
                       ),
                       const SizedBox(
                         height: 20,
@@ -353,7 +349,7 @@ class _SetMerchantState extends State<SetMerchant> {
                       CustomFormField(
                         controller: urlCloseLoopController,
                         title: '( Url Host Dolan )',
-                        isShowTitle: false,
+                        isShowTitle: false, validator: (value) {  },
                       ),
                       const SizedBox(
                         height: 20,
@@ -361,31 +357,35 @@ class _SetMerchantState extends State<SetMerchant> {
                       CustomFormField(
                         controller: urlPrePaidController,
                         title: '( Url Host Prepaid )',
-                        isShowTitle: false,
-                      ),
-                      const SizedBox(
-                        height: 20,
-                      ),
-                      CustomFormField(
-                        controller: urlGetQrController,
-                        title: '( Url Get Qris Topup )',
-                        isShowTitle: false,
+                        isShowTitle: false, validator: (value) {  },
                       ),
                       const SizedBox(
                         height: 20,
                       ),
                       CustomFormField(
-                        controller: urlStatusQrController,
-                        title: '( Url Get Status Topup )',
+                        controller: urlCorePaymentController,
+                        title: '( Url Core Payment )',
                         isShowTitle: false,
-                      ),
+                          validator: (value) {
+                            if (value!.isEmpty) {
+                              return 'Please enter a URL';
+                            }
+                            if (!value!.startsWith('http://') && !value.startsWith('https://')) {
+                              return 'Please enter a valid URL with http:// or https://';
+                            }
+                            if (!value.endsWith('.com')) {
+                              return 'Please enter a valid URL with .com domain';
+                            }
+                            return null;
+                          },
+                        ),
                       const SizedBox(
                         height: 20,
                       ),
                       CustomFormField(
                         controller: merchantNameController,
                         title: 'Nama gerai',
-                        isShowTitle: false,
+                        isShowTitle: false, validator: (value) {  },
                       ),
                       const SizedBox(
                         height: 20,
@@ -393,7 +393,7 @@ class _SetMerchantState extends State<SetMerchant> {
                       CustomFormField(
                         controller: userNameController,
                         title: 'Nama Pengguna',
-                        isShowTitle: false,
+                        isShowTitle: false, validator: (value) {  },
                       ),
                       const SizedBox(
                         height:20,
@@ -417,7 +417,7 @@ class _SetMerchantState extends State<SetMerchant> {
                       CustomFormField(
                         controller: idleController,
                         title: "Waktu siaga beranda (detik)",
-                        isShowTitle: false,
+                        isShowTitle: false, validator: (value) {  },
                       ),
                     ],
                   ),
@@ -435,8 +435,7 @@ class _SetMerchantState extends State<SetMerchant> {
                             print('URL/HOST/TREND : ${urlDolanController}');
                             print('URL/HOST/DOLAN : ${urlCloseLoopController}');
                             print('URL/HOST/PREPAID : ${urlPrePaidController}');
-                            print('URL/HOST/QRIS/ORDER : ${urlGetQrController}');
-                            print('URL/HOST/QRIS/STATUS : ${urlStatusQrController}');
+                            print('URL/HOST/QRIS/CORE/PAYMENT : ${urlCorePaymentController}');
                             print('NAMA/GERAI : ${merchantNameController}');
                             print('NAMA/PENGGUNA : ${userNameController}');
                             print('MAX/ISIULANG/TOPUP : ${maxControlller}');
@@ -548,7 +547,7 @@ class _SetMerchantState extends State<SetMerchant> {
                   Flexible(
                     child: CustomFormField(
                       title: 'Cari Outlet',
-                      isShowTitle: false,
+                      isShowTitle: false, validator: (value) {  },
                     ),
                   ),
                   SizedBox(
@@ -586,7 +585,6 @@ class _SetMerchantState extends State<SetMerchant> {
                           PreferencesHelper.setString('outletname', isiOutlet[index].outletname.toString());
                           PreferencesHelper.setString('outletpayment', isiOutlet[index].outletpayment.toString());
                           PreferencesHelper.setString('tid', outletpayment.tid);
-                          PreferencesHelper.setString('provider', outletpayment.provider);
                           PreferencesHelper.setString('mid', outletpayment.mid);
                           PreferencesHelper.setString('token', outletpayment.token);
                           PreferencesHelper.setString(kVersionApp, getVersionApp());
@@ -610,7 +608,7 @@ class _SetMerchantState extends State<SetMerchant> {
                             print(MultiOutlet.fromJson(listMultiOutlet).multioutletservicecharge);
                             print(MultiOutlet.fromJson(listMultiOutlet).multioutletservicechargeamount);
                             // PreferencesHelper.setBool('outletname', false);
-                            print('menyimpan disaat dipilih terminal');
+                            print('TERMINAL ENVI SAVED');
                             Navigator.pushNamedAndRemoveUntil(
                                 context, newRouteName, (route) => false);
                           });

lib/ui/widgets/dialog.dart

@@ -104,7 +104,7 @@ class _DialLogState extends State<DialLog> {
                   CustomFormField(
                     controller: urlDolanController,
                     title: 'Url Host Dolan',
-                    isShowTitle: false,
+                    isShowTitle: false, validator: (value) {  },
                   ),
                   const SizedBox(
                     height: 20,
@@ -112,7 +112,7 @@ class _DialLogState extends State<DialLog> {
                   CustomFormField(
                     controller: urlCloseLoopController,
                     title: 'Url Host Close Loop',
-                    isShowTitle: false,
+                    isShowTitle: false, validator: (value) {  },
                   ),
                   const SizedBox(
                     height: 20,
@@ -120,7 +120,7 @@ class _DialLogState extends State<DialLog> {
                   CustomFormField(
                     controller: merchantNameController,
                     title: 'Merchant Name',
-                    isShowTitle: false,
+                    isShowTitle: false, validator: (value) {  },
                   ),
                   const SizedBox(
                     height: 20,
@@ -128,7 +128,7 @@ class _DialLogState extends State<DialLog> {
                   CustomFormField(
                     controller: userNameController,
                     title: 'Username',
-                    isShowTitle: false,
+                    isShowTitle: false, validator: (value) {  },
                   ),
                   // Text('url dolan: $urlDolan'),
                   // Text('url CloseLoop: $urlCloseLoop'),

lib/ui/widgets/forms.dart

@@ -16,7 +16,7 @@ class CustomFormField extends StatelessWidget {
     this.obscureText = false,
     this.controller,
     this.isShowTitle = true,
-    this.onFieldSubmitted,
+    this.onFieldSubmitted, required String? Function(dynamic value) validator,
   }) : super(key: key);
 
   @override