Commit Graph

63 Commits (backend_nfc)

Author SHA1 Message Date
error500 fe9e9c5fe4 Merge branch 'master' into backend_nfc
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/views/settings/setting_printer_view.dart
#	pubspec.lock
#	pubspec.yaml
2021-12-02 11:18:15 +06:00
suvaissov cb6e68bb1e Merge branch 'master' into backend_nfc
# Conflicts:
#	lib/views/home/tabs/AdditionalTab.dart
2021-06-21 09:25:52 +06:00
suvaissov 32100a3ecb XReport fix 2021-05-31 14:17:57 +06:00
suvaissov 77ed845505 Bottom Draggable Sheet fix to PageBuilder 2021-05-31 13:59:41 +06:00
suvaissov 9cea8b445b pin code check fixes 2021-05-27 13:09:22 +06:00
suvaissov 5a1f086d78 bug fixes on halyk payment 2021-05-26 15:47:24 +06:00
suvaissov c497fa7ed6 for halykpos service minsdk 27 2021-05-26 14:14:42 +06:00
suvaissov 07fa2d683a payment, refund, closeday - finished/ Tested with moscow server 2021-04-27 14:14:21 +06:00
suvaissov 9d54a20f65 payment +
closeDay +-
refund -
2021-04-27 11:18:17 +06:00
suvaissov 6d385d16e8 clean bank 2021-03-30 13:45:21 +06:00
suvaissov 2a3519500e last fixes after merge @printer and @pin_locker 2021-03-30 09:54:27 +06:00
suvaissov 0cfbd11ade Merge branch 'master' into pin_locker
# Conflicts:
#	lib/core/router.dart
#	lib/redux/actions/setting_actions.dart
#	lib/redux/reducers/setting_reducer.dart
#	lib/redux/state/setting_state.dart
#	lib/views/home/components/popup_menu.dart
#	lib/views/home/home_view.dart
#	pubspec.lock
#	pubspec.yaml
2021-03-30 09:42:37 +06:00
suvaissov a45bbc03c3 print images 2021-03-11 15:48:58 +06:00
suvaissov 54df0728f3 Merge branch 'master' into backend_nfc
# Conflicts:
#	android/app/build.gradle
#	lib/views/home/home_view.dart
#	pubspec.yaml
2021-03-03 17:39:13 +06:00
suvaissov 8a53233afd pin lock? bug fixes 2021-01-20 01:11:21 +06:00
suvaissov e1301e7340 fix crash app 2021-01-19 11:00:19 +06:00
suvaissov 8c0ae9939a pin code in settings 2021-01-19 01:19:13 +06:00
suvaissov 839432d011 pin release 2021-01-19 01:01:58 +06:00
suvaissov 923e32274a fix deprecate methods 2021-01-18 12:47:59 +06:00
suvaissov f8d7e4717f Merge branch 'master' into backend_nfc
# Conflicts:
#	lib/core/services/DataService.dart
#	lib/views/start_up/start_up_view.dart
#	pubspec.lock
#	pubspec.yaml
2021-01-18 12:16:36 +06:00
suvaissov 07c661c994 #1790 - Камера EAN-Datamatrix для JS1 2021-01-15 11:11:44 +06:00
suvaissov b31e685af0 - halykpos logo
- save pos close day report
2021-01-14 22:10:53 +06:00
suvaissov a1b8223980 refund and close day release 2021-01-08 14:52:11 +06:00
suvaissov 48398435e8 fix bugs after up dependencies version 2021-01-05 17:12:24 +06:00
suvaissov 4a1f65c681 close day success
refund start developing
2021-01-02 16:51:08 +06:00
Serik.Uvaissov e30f1b3466 barcode-scanner 2020-09-09 16:18:18 +06:00
Serik.Uvaissov e06d192dcb Toast.makeText CardPaymentCallbackHandler
currency method BankNfcPlugins
2020-08-23 16:48:56 +06:00
Serik.Uvaissov 1b9a8af2c5 ui and back worked 2020-08-23 14:05:56 +06:00
Serik.Uvaissov b09646b475 Merge branch 'master' into nfc-android 2020-07-16 21:37:39 +06:00
Serik Uvaissov 47a4567a3d ui fixes button and wrap ui 2020-07-16 21:01:26 +06:00
Serik.Uvaissov ce8f20b7b0 Merge branch 'master' into nfc-android
# Conflicts:
#	lib/views/login/login_view.dart
#	pubspec.yaml
2020-07-15 13:57:14 +06:00
Serik Uvaissov 5772a5efab ui busy button fix 2020-07-14 16:35:13 +06:00
Serik.Uvaissov 14d035ecc9 smena new login UI
Phone mask
mob_agent
2020-07-14 15:28:57 +06:00
Serik.Uvaissov f8f646279f Merge branch 'master' into nfc-android
# Conflicts:
#	lib/views/home/components/popup_menu.dart
2020-07-10 20:27:34 +06:00
Serik.Uvaissov 5024fe2f21 up version all libs.
fix dialog_manager.dart when touch overflow
2020-07-10 20:25:33 +06:00
Serik.Uvaissov 8d6ec6bfe1 android BankActivity.kt 2020-07-10 09:36:27 +06:00
Serik Uvaissov 12621e42ac ios 10 build 2020-07-10 01:42:31 +06:00
Serik.Uvaissov 9b2b0a805d login reAuth 2020-07-08 16:16:07 +06:00
Serik.Uvaissov 0527ef932c linter small fixes 2020-07-08 12:42:12 +06:00
Serik.Uvaissov 0b4424a0e4 qr-code
kkm-info
login fix
2020-07-08 12:31:12 +06:00
Serik.Uvaissov 4be3bafe92 histry release 2020-07-04 17:13:28 +06:00
Serik Uvaissov 2826d56a73 price dot fix 2020-07-02 15:50:34 +06:00
Serik.Uvaissov 8d16949f40 - url redirect
- auth message
- update catalog
2020-07-02 15:21:36 +06:00
Serik.Uvaissov 3a526d8592 Merge branch 'master' of http://gitea.a7.kz/dev/aman-kassa-flutter 2020-06-30 20:24:59 +06:00
Serik.Uvaissov f1c69bcf70 icons android 2020-06-30 20:24:46 +06:00
Serik Uvaissov c83d055c64 Merge branch 'master' of http://gitea.a7.kz/dev/aman-kassa-flutter 2020-06-30 20:14:35 +06:00
Serik Uvaissov 2bc6b79d97 hide dialog, autoSizeFont, 2020-06-30 20:12:04 +06:00
Serik.Uvaissov 3d51769955 Merge branch 'master' of http://gitea.a7.kz/dev/aman-kassa-flutter 2020-06-27 14:45:25 +06:00
Serik.Uvaissov 1a3a1bd0ca fixes 2020-06-27 14:45:12 +06:00
Serik Uvaissov 25aadb3692 ios release 2020-06-27 14:34:53 +06:00