Commit Graph

142 Commits (master)

Author SHA1 Message Date
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 8c3451ffd2 printer release 2021-03-17 11:46:30 +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 4210c98f18 Нельзя добавить повторно одинаковые товары 2021-01-16 12:01:55 +06:00
suvaissov 07c661c994 #1790 - Камера EAN-Datamatrix для JS1 2021-01-15 11:11:44 +06:00
suvaissov 746b7488dd Merge branch 'master' into barcode-scanner
# Conflicts:
#	pubspec.lock
2021-01-15 09:21:19 +06:00
suvaissov b31e685af0 - halykpos logo
- save pos close day report
2021-01-14 22:10:53 +06:00
suvaissov 62f107d7ac http://redmine.helios-soft.kz/issues/1791 HalyPos разместить логотип банка при оплате POS 2021-01-12 11:56: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 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
suvaissov f9ed7711e9 halyk test success 2020-12-21 11:21:50 +06:00
suvaissov bc853d5bdd first try halyk connect 2020-12-20 12:22:22 +06:00
suvaissov b22abd1389 Merge branch 'master' into backend_nfc
# Conflicts:
#	lib/redux/store.dart
#	pubspec.lock
#	pubspec.yaml
2020-12-20 10:51:11 +06:00
suvaissov a394668884 message when operation false on payment/payment_view.dart 2020-12-02 12:28:29 +06:00
Serik.Uvaissov 5f4d20fce4 currency release 2020-09-09 22:08:07 +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 1f18d5d928 permissions add method MethodCallHandler 2020-08-23 14:37:12 +06:00
Serik.Uvaissov 273aba6ce8 edit card handler
nfc button
2020-08-23 14:19:25 +06:00
Serik.Uvaissov 1b9a8af2c5 ui and back worked 2020-08-23 14:05:56 +06:00
Serik.Uvaissov e049349a04 add local google_fonts 2020-08-05 12:47:13 +06:00
Serik.Uvaissov 8edcc2cdb3 backend nfc release 2020-08-05 09:09:08 +06:00
Serik.Uvaissov e0c4ade930 ui commit and debug fix 2020-08-02 17:07:49 +06:00
Serik.Uvaissov 23774d69dc animation with content 2020-07-30 16:47:42 +06:00
Serik.Uvaissov 4196636df1 gradle crash 2020-07-21 22:56:34 +06:00
Serik.Uvaissov 18aafa6410 crash fix? maybe help 2020-07-20 19:15:54 +06:00
Serik.Uvaissov ee598f59d8 payment and cancel release 2020-07-20 18:54:27 +06:00
Serik.Uvaissov e6e2b3516b Merge branch 'master' into nfc-android 2020-07-18 23:46:16 +06:00
Serik Uvaissov 23e1b347a8 1.0.3 release 2020-07-18 22:11:03 +06:00
Serik.Uvaissov cf2f0ee6cf DataService.dart fix on load empty data
logger.dart new logger release
2020-07-18 17:40:39 +06:00
Serik.Uvaissov 39153af143 auth m4bank release 2020-07-18 15:54:11 +06:00
Serik.Uvaissov c3cf63fdbe start flutter plugin 2020-07-17 01:44:42 +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 0544edf17b busy btn fix 2020-07-15 01:13: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 4f9bea7980 Merge branch 'master' into nfc-android
# Conflicts:
#	android/app/build.gradle
#	android/app/src/main/AndroidManifest.xml
2020-07-13 13:11:30 +06:00
Serik.Uvaissov 34123689de change package name to @kz.com.aman.kassa 2020-07-13 13:07:58 +06:00
Serik.Uvaissov e5f6cad039 m4bank test-app inited 2020-07-10 22:21:48 +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 44e85646fd android MusicPlugin.java 2020-07-10 09:36:49 +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 216af42639 Merge branch 'master' of http://gitea.a7.kz/dev/aman-kassa-flutter 2020-07-08 12:32:25 +06:00
Serik.Uvaissov 0b4424a0e4 qr-code
kkm-info
login fix
2020-07-08 12:31:12 +06:00
Serik Uvaissov 350b870cde whatsapp utf char conflict fix 2020-07-04 22:16:16 +06:00
Serik.Uvaissov a80eb5874f wa.me 2020-07-04 22:06:39 +06:00
Serik Uvaissov 226fd7e413 ios build whatsapp 2020-07-04 21:38:43 +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 72df9c777c logger edit 2020-07-02 15:28:30 +06:00
Serik.Uvaissov b733132327 Merge branch 'master' of http://gitea.a7.kz/dev/aman-kassa-flutter 2020-07-02 15:21:46 +06:00
Serik.Uvaissov 8d16949f40 - url redirect
- auth message
- update catalog
2020-07-02 15:21:36 +06:00
Serik Uvaissov 403143a4d0 ios icons 2020-07-02 14:57:56 +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
Serik.Uvaissov 903cc3cb70 release 1.0.2 fixes 2020-06-25 14:36:42 +06:00
Serik.Uvaissov 4d4ea42c6a release 1.0.2 2020-06-25 13:48:18 +06:00
Serik.Uvaissov 5dcb99ec67 global share release 2020-06-25 12:31:26 +06:00
Serik.Uvaissov d3d983ba3f pre release 2020-06-25 11:39:17 +06:00
Serik.Uvaissov 2e2033fec1 Calculator 2020-06-22 20:10:48 +06:00
Serik.Uvaissov d916f638fb UI done 2020-06-09 11:13:50 +06:00
Serik.Uvaissov 0f1f45223a KassaTab.dart add ProductDao.dart 2020-06-08 17:16:50 +06:00
Serik.Uvaissov 1d18e70208 redux main state/main_state.dart 2020-06-08 15:50:28 +06:00
Serik.Uvaissov 71fb01ee93 Calculator initialize 2020-05-29 22:56:50 +06:00
Serik.Uvaissov f955ff8d71 Calculator 2020-05-29 22:47:58 +06:00
Serik.Uvaissov 9c9dc94f1b Product View Component 2020-05-29 22:43:54 +06:00
Serik.Uvaissov 9fe2c71075 Kassa tab 2020-05-29 15:29:55 +06:00
Serik.Uvaissov 28bffdf0f7 floating action and bottom bar release 2020-05-26 20:33:03 +06:00
Serik.Uvaissov 3e7007ab63 floating action and bottom bar release 2020-05-26 20:32:41 +06:00
Serik.Uvaissov 46302aed18 login navigate 2020-05-21 16:12:32 +06:00
Serik.Uvaissov 30db638877 MVVM with Provider 2020-05-20 19:11:17 +06:00
Serik.Uvaissov 6425f34f4f redux-navigation example 2020-05-20 11:30:18 +06:00