transactions-negative-topup-balance

.idea/workspace.xml

@@ -15,48 +15,19 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="8704a1d9-96ef-4cdc-ac57-c88bc9c0306e" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.flutter-plugins" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.flutter-plugins-dependencies" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/android/app/src/main/res/drawable/wahoo_print.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/assets/wahoo.bmp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ios/Flutter/Generated.xcconfig" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/ios/Flutter/flutter_export_environment.sh" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_Packages.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Dart_SDK.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/libraries/Flutter_Plugins.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Flutter_Plugins.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.flutter-plugins-dependencies" beforeDir="false" afterPath="$PROJECT_DIR$/.flutter-plugins-dependencies" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/.gradle/7.4/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.4/checksums/checksums.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/.gradle/7.4/checksums/md5-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.4/checksums/md5-checksums.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/.gradle/7.4/checksums/sha1-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.4/checksums/sha1-checksums.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/android/.gradle/7.4/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.4/executionHistory/executionHistory.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/android/.gradle/7.4/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.4/executionHistory/executionHistory.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/android/.gradle/7.4/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.4/fileHashes/fileHashes.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/android/.gradle/7.4/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.4/fileHashes/fileHashes.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/.gradle/7.4/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/7.4/fileHashes/resourceHashesCache.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/android/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/android/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/android/.gradle/file-system.probe" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/android/.idea/gradle.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/.idea/modules/-435484205/android.workmanager.androidTest.iml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/.idea/modules/-435484205/android.workmanager.unitTest.iml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/android/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/android/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/android/app/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/app/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/android/app/debug/app-debug.apk" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/app/release/app-release.apk" beforeDir="false" afterPath="$PROJECT_DIR$/android/app/release/app-release.apk" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/app/src/main/kotlin/com/example/self_service_3/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/android/app/src/main/kotlin/com/example/self_service_3/MainActivity.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/app/src/main/res/drawable/wahoo.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/android/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/android/local.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/assets/wahoo.png" beforeDir="false" afterPath="$PROJECT_DIR$/assets/wahoo.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/assets/wristband.gif" beforeDir="false" afterPath="$PROJECT_DIR$/assets/wristband.gif" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/daemon/7.4/registry.bin" beforeDir="false" afterPath="$PROJECT_DIR$/daemon/7.4/registry.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/daemon/7.4/registry.bin.lock" beforeDir="false" afterPath="$PROJECT_DIR$/daemon/7.4/registry.bin.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/kotlin-profile/2022-11-28-11-34-03-909.profile" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/services/api_helpert.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/services/api_helpert.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/lib/ui/pages/home_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/ui/pages/home_page.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/ui/pages/set_merchant.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/ui/pages/set_merchant.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/ui/pages/splash_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/lib/ui/pages/splash_page.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/pubspec.yaml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

android/.idea/workspace.xml

@@ -6,56 +6,26 @@
     </shared>
   </component>
   <component name="AndroidLogFilters">
-    <option name="TOOL_WINDOW_LOG_LEVEL" value="verbose" />
     <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
   </component>
   <component name="AutoImportSettings">
     <option name="autoReloadType" value="NONE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4f624a11-7645-4429-bfd9-02d923f12bca" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/../.flutter-plugins" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../.flutter-plugins-dependencies" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/wahoo_print.png" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../assets/wahoo.bmp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../ios/Flutter/Generated.xcconfig" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/../ios/Flutter/flutter_export_environment.sh" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../.idea/libraries/Dart_Packages.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../.idea/libraries/Dart_Packages.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../.idea/libraries/Dart_SDK.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../.idea/libraries/Dart_SDK.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../.idea/libraries/Flutter_Plugins.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../.idea/libraries/Flutter_Plugins.xml" afterDir="false" />
+    <list default="true" id="c7d09fe3-2ec0-49c5-928b-765737aa51fa" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/../.flutter-plugins-dependencies" beforeDir="false" afterPath="$PROJECT_DIR$/../.flutter-plugins-dependencies" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.4/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.4/checksums/checksums.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.4/checksums/md5-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.4/checksums/md5-checksums.bin" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.4/checksums/sha1-checksums.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.4/checksums/sha1-checksums.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/7.4/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.4/executionHistory/executionHistory.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/7.4/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.4/executionHistory/executionHistory.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/7.4/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.4/fileHashes/fileHashes.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/7.4/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.4/fileHashes/fileHashes.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/7.4/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.4/fileHashes/resourceHashesCache.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules/-435484205/android.workmanager.androidTest.iml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/modules/-435484205/android.workmanager.unitTest.iml" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/debug/app-debug.apk" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/release/app-release.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/app-release.apk" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/kotlin/com/example/self_service_3/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/kotlin/com/example/self_service_3/MainActivity.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/drawable/wahoo.png" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/local.properties" beforeDir="false" afterPath="$PROJECT_DIR$/local.properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../assets/wahoo.png" beforeDir="false" afterPath="$PROJECT_DIR$/../assets/wahoo.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../assets/wristband.gif" beforeDir="false" afterPath="$PROJECT_DIR$/../assets/wristband.gif" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../daemon/7.4/registry.bin" beforeDir="false" afterPath="$PROJECT_DIR$/../daemon/7.4/registry.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../daemon/7.4/registry.bin.lock" beforeDir="false" afterPath="$PROJECT_DIR$/../daemon/7.4/registry.bin.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../kotlin-profile/2022-11-28-11-34-03-909.profile" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/../lib/services/api_helpert.dart" beforeDir="false" afterPath="$PROJECT_DIR$/../lib/services/api_helpert.dart" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../lib/ui/pages/home_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/../lib/ui/pages/home_page.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../lib/ui/pages/set_merchant.dart" beforeDir="false" afterPath="$PROJECT_DIR$/../lib/ui/pages/set_merchant.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../lib/ui/pages/splash_page.dart" beforeDir="false" afterPath="$PROJECT_DIR$/../lib/ui/pages/splash_page.dart" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pubspec.lock" beforeDir="false" afterPath="$PROJECT_DIR$/../pubspec.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pubspec.yaml" beforeDir="false" afterPath="$PROJECT_DIR$/../pubspec.yaml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -74,7 +44,7 @@
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
-  <component name="ProjectId" id="2IIttpLppDCI02QnsHdD2qGY0Zj" />
+  <component name="ProjectId" id="2IJcpOD6XlZ2vri7Je0qOurH00D" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
@@ -152,11 +122,11 @@
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="4f624a11-7645-4429-bfd9-02d923f12bca" name="Changes" comment="" />
-      <created>1669881143956</created>
+      <changelist id="c7d09fe3-2ec0-49c5-928b-765737aa51fa" name="Changes" comment="" />
+      <created>1669903309312</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1669881143956</updated>
+      <updated>1669903309312</updated>
     </task>
     <servers />
   </component>

lib/ui/pages/home_page.dart

@@ -85,13 +85,14 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
       getRegDb,
       lastBalance,
       approvalCode,
-      amount,
+      amount ,
       report,
       infoM,
       infoMulti,
       companyAddress,
       num;
   Map<String, dynamic>? dataQris;
+  var countMax = 0;
   String? prevBalance;
   String subPhone = "";
   String? maskedText;
@@ -331,7 +332,6 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
         rawData,
         persoReff,
       );
-
       DatabaseHelper.insertTransaction(wristbandInfo);
       print("ini pesan $wristbandInfo");
       String ticketJson, companyName, companyPhone, denom;
@@ -428,8 +428,11 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
                 .toLowerCase()
                 .contains('settlement')) {
           Navigator.pop(context);
-          Future.delayed(Duration(seconds: 10), () {
-            topUpBalance(approvalCode);
+          Future.delayed(Duration(seconds: 10), () async {
+            //TODO: getcard
+            var isTap = await StartService.getCard();
+            _getInfoBeforeTopup(isTap);
+            // topUpBalance(approvalCode);
           });
           showPop(approvalCode);
           dataQris = null;
@@ -459,6 +462,69 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
     return result;
   }
 
+  _getInfoBeforeTopup(var info) {
+    setState(() {
+      countMax += 1;
+      if (info.toString().toLowerCase().contains('failed')) {
+        print('ini pesan salah');
+        message = "Silakan Tempel Wristband Anda Di Reader";
+        tapDial();
+      } else {
+        infoCard = info;
+        var infoMap = jsonDecode(info);
+        String newCardNumber = infoMap["cardNumber"];
+        if (newCardNumber == cardNumber) {
+          topUpBalance(approvalCode);
+        } else {
+          AwesomeDialog(
+                  context: context,
+                  dialogType: DialogType.error,
+                  animType: AnimType.rightSlide,
+                  headerAnimationLoop: true,
+                  title: 'Kartu tidak sama ! tempelkan kartu sebelumnya',
+                  desc: "Cards are not the same! please put the previous card ${countMax}",
+                  btnOkOnPress: () async {
+                    if (countMax < 3) {
+                      var isTap = await StartService.getCard();
+                      _getInfoBeforeTopup(isTap);
+                    }else{
+                      AwesomeDialog(
+                          context: context,
+                          dialogType: DialogType.error,
+                          animType: AnimType.rightSlide,
+                          headerAnimationLoop: true,
+                          title: 'Transaksi anda gagal ! dikarenakan tidak menempelkan kartu sebelumnya',
+                          desc: "Make sure your number matches !",
+                          btnOkOnPress: () async{
+                            String companyName = PreferencesHelper.getString('outletname');
+                            String companyPhone = PreferencesHelper.getString('companyphone');
+                            String companyAddress = PreferencesHelper.getString('companyaddress');
+                            String denoms = amountController!.text.replaceAll(",", "");
+                            infoM = await StartService.print(
+                                info,
+                                companyName.split("-")[0],
+                                companyAddress,
+                                companyPhone,
+                                approvalCode,
+                                prevBalance!,
+                                "1",
+                                (int.parse("10") + int.parse("1") + int.parse("0")).toString(),
+                                denoms
+                            );
+                          },
+                          btnOkIcon: Icons.cancel,
+                          btnOkColor: Colors.red)
+                          .show();
+                    }
+                  },
+                  btnOkIcon: Icons.cancel,
+                  btnOkColor: Colors.red)
+              .show();
+        }
+      }
+    });
+  }
+
   _getInfoBalance(var info) {
     setState(() {
       if (info.toString().toLowerCase().contains('failed')) {
@@ -1834,7 +1900,7 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
               width: 1,
             ),
             TimerBuilder.periodic(Duration(seconds: 1), builder: (context) {
-              print("${getSystemTime()}");
+              // print("${getSystemTime()}");
               return Column(
                 children: [
                   Text(