Commit Graph

4 Commits (b343d433e9eb27e3df9ba6d72433639d25955f67)

Author SHA1 Message Date
error500 0345a310e5 Merge branch 'backend_nfc' into ns_bank_merge
# Conflicts:
#	lib/core/logger.dart
#	lib/core/models/check_data.dart
#	lib/core/router.dart
#	lib/core/services/DataService.dart
#	lib/main.dart
#	lib/redux/store.dart
#	lib/views/check/image_show_container.dart
#	lib/views/history/history_view.dart
#	lib/views/home/home_view_m.dart
#	lib/views/home/tabs/AdditionalTab.dart
#	lib/views/login/login_view.dart
#	lib/views/payment/payment_view.dart
#	lib/views/start_up/start_up_view.dart
#	pubspec.lock
#	pubspec.yaml
2022-01-25 17:04:36 +06:00
suvaissov 9d54a20f65 payment +
closeDay +-
refund -
2021-04-27 11:18:17 +06:00
suvaissov 0de65ff2e9 refund release 2021-01-05 16:09:12 +06:00
suvaissov 4a1f65c681 close day success
refund start developing
2021-01-02 16:51:08 +06:00