Serik
/
aman-kassa-flutter
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

pin code check fixes

backend_nfc
suvaissov 2021-05-27 13:09:22 +06:00
parent 5a1f086d78
commit 9cea8b445b
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/views/check/image_show_container.dart
View File

@ -13,6 +13,7 @@ import 'package:aman_kassa_flutter/core/services/BankService.dart';
import 'package:aman_kassa_flutter/core/services/DataService.dart'; import 'package:aman_kassa_flutter/core/services/DataService.dart';
import 'package:aman_kassa_flutter/core/services/dialog_service.dart'; import 'package:aman_kassa_flutter/core/services/dialog_service.dart';
import 'package:aman_kassa_flutter/core/services/navigator_service.dart'; import 'package:aman_kassa_flutter/core/services/navigator_service.dart';
import 'package:aman_kassa_flutter/redux/actions/setting_actions.dart';
import 'package:aman_kassa_flutter/redux/actions/user_actions.dart'; import 'package:aman_kassa_flutter/redux/actions/user_actions.dart';
import 'package:aman_kassa_flutter/redux/constants/setting_const.dart'; import 'package:aman_kassa_flutter/redux/constants/setting_const.dart';
import 'package:aman_kassa_flutter/redux/state/setting_state.dart'; import 'package:aman_kassa_flutter/redux/state/setting_state.dart';
@ -211,14 +212,18 @@ class _MyFloatingActionButtonState extends State<MyFloatingActionButton> {
), ),
onPressed: () async { onPressed: () async {
_navigatorService.replace(HomeViewRoute); _navigatorService.replace(HomeViewRoute);
AmanDao<CardData> response = await refundHalykPos(widget.data.cardData, widget.data.voucher.total); try {
if(response.success) { await Redux.store.dispatch(changePinSkipFromSetting(true));
pressRefund(); AmanDao<CardData> response = await refundHalykPos(widget.data.cardData, widget.data.voucher.total);
} else { if (response.success) {
_dialog.showDialog(description: response.msg ); pressRefund();
} else {
_dialog.showDialog(description: response.msg);
}
} finally {
await Redux.store.dispatch(changePinSkipFromSetting(false));
} }
}, },
heroTag: null, heroTag: null,
) else SizedBox( ) else SizedBox(

3
lib/views/home/tabs/AdditionalTab.dart
View File

@ -235,8 +235,9 @@ class _AdditionalTabState extends State<AdditionalTab> {
return; return;
} }
await Redux.store.dispatch(changePinSkipFromSetting(true));
HalykCloseDayDao closeDayDao = await closeDayHalykPos(); HalykCloseDayDao closeDayDao = await closeDayHalykPos();
await Redux.store.dispatch(changePinSkipFromSetting(false));
log.i(closeDayDao.toJson()); log.i(closeDayDao.toJson());
if (closeDayDao.result.code != 0) { if (closeDayDao.result.code != 0) {
if (closeDayDao.result.description != null) { if (closeDayDao.result.description != null) {

16
lib/views/payment/payment_view.dart
View File

@ -14,6 +14,7 @@ import 'package:aman_kassa_flutter/core/services/dialog_service.dart';
import 'package:aman_kassa_flutter/core/services/navigator_service.dart'; import 'package:aman_kassa_flutter/core/services/navigator_service.dart';
import 'package:aman_kassa_flutter/redux/actions/calc_actions.dart'; import 'package:aman_kassa_flutter/redux/actions/calc_actions.dart';
import 'package:aman_kassa_flutter/redux/actions/kassa_actions.dart'; import 'package:aman_kassa_flutter/redux/actions/kassa_actions.dart';
import 'package:aman_kassa_flutter/redux/actions/setting_actions.dart';
import 'package:aman_kassa_flutter/redux/actions/user_actions.dart'; import 'package:aman_kassa_flutter/redux/actions/user_actions.dart';
import 'package:aman_kassa_flutter/redux/constants/operation_const.dart'; import 'package:aman_kassa_flutter/redux/constants/operation_const.dart';
import 'package:aman_kassa_flutter/redux/constants/setting_const.dart'; import 'package:aman_kassa_flutter/redux/constants/setting_const.dart';
@ -216,11 +217,16 @@ class _PaymentViewState extends State<PaymentView> {
} }
return InkWell( return InkWell(
onTap: () async { onTap: () async {
AmanDao<CardData> data = await paymentHalykPos(_total); try {
if (data.success) { await Redux.store.dispatch(changePinSkipFromSetting(true));
pressPayment(widget.model.operationType, data.data); AmanDao<CardData> data = await paymentHalykPos(_total);
} else { if (data.success) {
_dialogService.showDialog(description: data.msg); pressPayment(widget.model.operationType, data.data);
} else {
_dialogService.showDialog(description: data.msg);
}
} finally {
await Redux.store.dispatch(changePinSkipFromSetting(false));
} }
}, },
splashColor: halykColor.withOpacity(0.4), splashColor: halykColor.withOpacity(0.4),