Skip to content

D
Dolan SelfService Topup
Commit b1f55a77 authored by Izol's avatar Izol
Browse files
Options

Update patch SS.13.WWW

parent 0df840c7
Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 38 deletions
android/local.properties
View file @ b1f55a77
sdk.dir=/Users/macbookpro/Library/Android/sdk sdk.dir=/Users/macbookpro/Library/Android/sdk
flutter.sdk=/Users/macbookpro/Developer/flutter flutter.sdk=/Users/macbookpro/Developer/flutter
flutter.buildMode=debug flutter.buildMode=debug
flutter.versionName=SS.12.WWW flutter.versionName=SS.13.WWW
flutter.versionCode=5 flutter.versionCode=6
\ No newline at end of file \ No newline at end of file
lib/ui/pages/home_page.dart
View file @ b1f55a77
...@@ -661,6 +661,36 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -661,6 +661,36 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
"multioutletservicechargeamount"); "multioutletservicechargeamount");
String sc = PreferencesHelper.getString( String sc = PreferencesHelper.getString(
"multioutletservicecharge"); "multioutletservicecharge");
_getInfoBalance(info);
AwesomeDialog(
context: context,
dismissOnTouchOutside: false,
autoHide: Duration(seconds: 10),
dialogType: DialogType.error,
animType: AnimType.rightSlide,
headerAnimationLoop: true,
title:
'Transaksi isi ulang anda tidak berhasil\nsimpan bukti pembayaran untuk di tunjukkan kepada petugas',
titleTextStyle: blackTextStyle.copyWith(
fontSize: 20,
fontWeight: bold,
),
desc:
"Your top up transaction was not successful\nSave proof of payment to show to the officer",
descTextStyle: greyTextStyle.copyWith(
fontSize: 18,
fontWeight: light,
),
).show().then((value){
countMax = 0;
timer?.cancel();
isShowingDialog = true;
_showTap();
tapDial();
});
StartService.print( StartService.print(
prevInfoCard, prevInfoCard,
companyName.split("-")[0], companyName.split("-")[0],
...@@ -677,26 +707,6 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -677,26 +707,6 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
PreferencesHelper.getString("provider"), PreferencesHelper.getString("provider"),
'Gagal', 'Gagal',
); );
AwesomeDialog(
context: context,
dismissOnTouchOutside: false,
autoHide: Duration(seconds: 5),
dialogType: DialogType.error,
animType: AnimType.rightSlide,
headerAnimationLoop: true,
title:
'Transaksi anda gagal ! saldo tidak bertambah',
desc:
"Your transaction failed! Your balance did not increase.",
btnOkIcon: Icons.cancel,
btnOkColor: Colors.red)
.show().then((value){
countMax = 0;
timer?.cancel();
isShowingDialog = true;
_showTap();
tapDial();
});
// Navigator.pop(context); // Navigator.pop(context);
}, },
btnOkIcon: Icons.cancel, btnOkIcon: Icons.cancel,
...@@ -763,17 +773,11 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -763,17 +773,11 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
name = infoMap["name"].toString().split("-")[0]; name = infoMap["name"].toString().split("-")[0];
Navigator.pop(context); Navigator.pop(context);
// Navigator.pop(context);
Future.delayed(Duration(seconds: int.parse(idle)), () { Future.delayed(Duration(seconds: int.parse(idle)), () {
if (timer != null) timer?.cancel(); if (timer != null) timer?.cancel();
isShowingDialog = false; isShowingDialog = false;
tapIdle(); tapIdle();
}); });
// timer = Timer.periodic(Duration(seconds: int.parse(idle)),(timer){
// print("ini pesan waktu idle : $idle");
// _showTap();
// tapDial();
// });
} }
}); });
} }
...@@ -911,9 +915,18 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -911,9 +915,18 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
context: context, context: context,
dialogType: DialogType.info, dialogType: DialogType.info,
animType: AnimType.rightSlide, animType: AnimType.rightSlide,
dismissOnTouchOutside: false,
headerAnimationLoop: true, headerAnimationLoop: true,
title: 'Pastikan Wristband Anda Tertempel Di Reader !', title: 'Pastikan Wristband Anda Tertempel Di Reader !',
titleTextStyle: blackTextStyle.copyWith(
fontSize: 20,
fontWeight: bold,
),
desc: "Make sure your wristband is attached to the reader !", desc: "Make sure your wristband is attached to the reader !",
descTextStyle: greyTextStyle.copyWith(
fontSize: 18,
fontWeight: light,
),
btnOkOnPress: () { btnOkOnPress: () {
tapBalance(); tapBalance();
}, },
...@@ -923,7 +936,6 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -923,7 +936,6 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
}); });
} }
Future<void> _showTap() { Future<void> _showTap() {
return showDialog<void>( return showDialog<void>(
context: context, context: context,
...@@ -1315,10 +1327,9 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -1315,10 +1327,9 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
fontWeight: bold, fontWeight: bold,
), ),
desc: "Please wait a moment ...", desc: "Please wait a moment ...",
descTextStyle: blackTextStyle.copyWith( descTextStyle: greyTextStyle.copyWith(
fontSize: 18, fontSize: 18,
color: Colors.green, fontWeight: light,
fontWeight: medium,
), ),
).show().then((value) { ).show().then((value) {
if(amountController!.text.isEmpty){ if(amountController!.text.isEmpty){
...@@ -1553,10 +1564,9 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -1553,10 +1564,9 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
fontWeight: bold, fontWeight: bold,
), ),
desc: "Please wait a moment ...", desc: "Please wait a moment ...",
descTextStyle: blackTextStyle.copyWith( descTextStyle: greyTextStyle.copyWith(
fontSize: 18, fontSize: 18,
color: Colors.green, fontWeight: light,
fontWeight: medium,
), ),
).show().then((value) { ).show().then((value) {
if(amountController!.text.isEmpty){ if(amountController!.text.isEmpty){
...@@ -2416,6 +2426,9 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -2416,6 +2426,9 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
deposit = CurrencyFormat.convertToIdr(infoMap["deposit"], 2); deposit = CurrencyFormat.convertToIdr(infoMap["deposit"], 2);
cardNumber = infoMap["cardNumber"]; cardNumber = infoMap["cardNumber"];
String outletName = PreferencesHelper.getString('outlet_name'); String outletName = PreferencesHelper.getString('outlet_name');
countMax += 1;
String nilaiTap = PreferencesHelper.getString('maxTap');
String newCardNumber = infoMap["cardNumber"];
AwesomeDialog( AwesomeDialog(
context: context, context: context,
dialogType: DialogType.info, dialogType: DialogType.info,
...@@ -2429,10 +2442,9 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback { ...@@ -2429,10 +2442,9 @@ class _HomePageState extends State<HomePage> implements AlertDialogCallback {
fontWeight: bold, fontWeight: bold,
), ),
desc: "Please wait a moment ...", desc: "Please wait a moment ...",
descTextStyle: blackTextStyle.copyWith( descTextStyle: greyTextStyle.copyWith(
fontSize: 18, fontSize: 18,
color: Colors.green, fontWeight: light,
fontWeight: medium,
), ),
).show().then((value) { ).show().then((value) {
denom(outletName, infoCard); denom(outletName, infoCard);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment