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

Compare commits

base: Serik:fortenew
Branches Tags
Serik:fortenew
Serik:forte
Serik:master
Serik:migrate_to_ns
Serik:ns-printer
Serik:ns_bank_merge
Serik:backend_nfc
Serik:fix_ssl_master
Serik:4.4
..
compare: Serik:backend_nfc
Branches Tags
Serik:fortenew
Serik:forte
Serik:master
Serik:migrate_to_ns
Serik:ns-printer
Serik:ns_bank_merge
Serik:backend_nfc
Serik:fix_ssl_master
Serik:4.4

No commits in common. "fortenew" and "backend_nfc" have entirely different histories.
fortenew ... backend_nf

124 changed files with 1754 additions and 3328 deletions
Show Stats Expand all files Collapse all files

19
android/app/build.gradle
View File

@ -34,7 +34,7 @@ if (keystorePropertiesFile.exists()) {
android {
compileSdkVersion 31
compileSdkVersion 30
sourceSets {
main.java.srcDirs += 'src/main/kotlin'
@ -47,7 +47,7 @@ android {
defaultConfig {
applicationId "kz.com.aman.kassa"
minSdkVersion 21
targetSdkVersion 35
targetSdkVersion 30
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
multiDexEnabled true
@ -63,6 +63,9 @@ android {
}
}
buildTypes {
// all {
// buildConfigField ("String[]", "SUPPORTED_DEVICES", collectSupportedDevicesToArray())
// }
debug {
shrinkResources false
minifyEnabled false
@ -87,11 +90,6 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
packagingOptions {
exclude "META-INF/library_release.kotlin_module"
exclude "META-INF/com.android.tools/proguard/coroutines.pro"
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}
@ -116,10 +114,15 @@ dependencies {
implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
//implementation 'com.android.support:multidex:2.0.1'
implementation 'com.android.support:multidex:1.0.3'
//m4bank dependencies
}
//def collectSupportedDevicesToArray() {
// return '{' + rootProject.ext."supportedDevices${getProject().name}".collect {
// "\"${it}\""
// }.join(",") + '}'
//}

39
android/app/google-services.json
View File

@ -1,39 +0,0 @@
{
"project_info": {
"project_number": "1086013480150",
"project_id": "aman-f670e",
"storage_bucket": "aman-f670e.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:1086013480150:android:d00d738289818373f17d77",
"android_client_info": {
"package_name": "kz.com.aman.kassa"
}
},
"oauth_client": [
{
"client_id": "1086013480150-tbavt0qel11hs9eqsfni0j8hhr1nbis1.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyAlAhTjrXj0s1Qep2_mP_u4QtMnltMi4RA"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "1086013480150-tbavt0qel11hs9eqsfni0j8hhr1nbis1.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}

10
android/app/src/main/AndroidManifest.xml
View File

@ -14,17 +14,17 @@
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<!-- android:name="io.flutter.app.FlutterApplication"-->
<application
android:name="${applicationName}"
android:label="Аман Касса"
tools:replace="android:label"
android:name="io.flutter.app.FlutterApplication"
android:icon="@mipmap/ic_launcher"
android:label="Аман Касса"
android:allowBackup="false"
android:roundIcon="@mipmap/ic_launcher_rounded"
>
<activity
android:name=".MainActivity"
android:exported="true"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
android:hardwareAccelerated="true"
android:launchMode="singleTop"
@ -44,14 +44,12 @@
android:resource="@drawable/splash"
/>
-->
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<!--
Don't delete the meta-data below.
This is used by the Flutter tool to generate GeneratedPluginRegistrant.java

63
android/app/src/main/kotlin/kz/com/aman/kassa/MainActivity.kt
View File

@ -1,7 +1,6 @@
package kz.com.aman.kassa
import android.app.Activity
import android.content.ActivityNotFoundException
import android.content.ComponentName
import android.content.Intent
import android.os.Build
@ -70,9 +69,7 @@ class MainActivity : FlutterActivity() {
amount = call.argument<Long>("amount")!!.toLong()
}
val operationParameters = createOperationParameters(token)
val packageName = call.argument<String>("packageName").toString()
startOperation(OperationType.PAYMENT, JsonForExternalCall.getPaymentCardJson(operationParameters.authToken, amount.toString()), packageName)
startOperation(OperationType.PAYMENT, JsonForExternalCall.getPaymentCardJson(operationParameters.authToken, amount.toString()))
}
private fun operationRefund(call: MethodCall) {
@ -81,14 +78,8 @@ class MainActivity : FlutterActivity() {
val operDay = call.argument<String>("operDay").toString()
val transNum = call.argument<String>("transNum").toString()
val amount = call.argument<String>("amount").toString()
val packageName = call.argument<String>("packageName").toString()
val operationParameters = createOperationParameters(token)
val body = JsonForExternalCall.getRefundCardJson(operationParameters.authToken, terminalId, operDay, transNum, amount)
startOperation(
OperationType.REFUND,
body,
packageName
)
startOperation(OperationType.REFUND, JsonForExternalCall.getRefundCardJson(operationParameters.authToken, terminalId, operDay, transNum, amount))
}
private fun operationReversal(call: MethodCall) {
@ -97,24 +88,15 @@ class MainActivity : FlutterActivity() {
val operDay = call.argument<String>("operDay").toString()
val transNum = call.argument<String>("transNum").toString()
val operationParameters = createOperationParameters(token)
val packageName = call.argument<String>("packageName").toString()
val body = JsonForExternalCall.getReversalJson(operationParameters.authToken, terminalId, operDay, transNum)
startOperation(
OperationType.REVERSAL,
body,
packageName
)
val body = JsonForExternalCall.getReversalJson(operationParameters.authToken, terminalId, operDay, transNum);
println(body)
startOperation(OperationType.REVERSAL, body)
}
private fun operationCloseDay(call: MethodCall) {
val token = call.argument<String>("token").toString()
val packageName = call.argument<String>("packageName").toString()
val operationParameters = createOperationParameters(token)
startOperation(
OperationType.CLOSE_DAY,
JsonForExternalCall.getCloseDayJson(operationParameters.authToken),
packageName
)
startOperation(OperationType.CLOSE_DAY, JsonForExternalCall.getCloseDayJson(operationParameters.authToken))
}
@ -122,32 +104,18 @@ class MainActivity : FlutterActivity() {
return OperationParameters(authToken = token, operDay = operDay, terminalId = terminalId, transNum = transNum)
}
private fun startOperation(
operationType: OperationType,
inputJsonData: String?,
packageName: String
) {
try {
val intent = Intent()
intent.component = ComponentName(packageName, "ru.m4bank.feature.externalapplication.ExternalApplicationActivity")
intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
// intent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
intent.putExtra(externalOperationTypeKey, operationType.code)
intent.putExtra(externalInputDataKey, inputJsonData)
if (intent.resolveActivity(packageManager) != null) {
startActivityForResult(intent, externalApplicationRequestCode)
} else {
_result.error("008", "Не удалось найти подходящее приложение", "aaa")
}
} catch (e: ActivityNotFoundException) {
_result.error("008", "Не удалось найти подходящее приложение", "aaa")
}
private fun startOperation(operationType: OperationType, inputJsonData: String?) {
val intent = Intent()
intent.component = ComponentName("ru.m4bank.softpos.halyk", "ru.m4bank.feature.externalapplication.ExternalApplicationActivity")
intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
// intent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
intent.putExtra(externalOperationTypeKey, operationType.code)
intent.putExtra(externalInputDataKey, inputJsonData)
startActivityForResult(intent, externalApplicationRequestCode)
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
super.onActivityResult(requestCode, resultCode, data)
try {
if (requestCode == externalApplicationRequestCode) {
println("---------------")
println(requestCode)
@ -172,9 +140,6 @@ class MainActivity : FlutterActivity() {
// } else
// _result.success(null)
}
} catch (e: IllegalStateException) {
print("IllegalStateException")
}
}

2
android/app/src/main/kotlin/kz/com/aman/kassa/bank/JsonForExternalCall.kt
View File

@ -37,7 +37,7 @@ object JsonForExternalCall {
"instrument": "CARD",
"amountData" : {
"currencyCode": "348",
"amount": "$amount",
"amount": "6000",
"amountExponent": "2"
},
"parentTransaction" : {

4
android/build.gradle
View File

@ -1,9 +1,8 @@
buildscript {
ext.kotlin_version = '1.6.10'
ext.kotlin_version = '1.3.61'
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
@ -19,7 +18,6 @@ allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
configurations.all {

2
android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip

BIN
assets/images/fortepos.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 192 KiB

2
ios/Flutter/AppFrameworkInfo.plist
View File

@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>9.0</string>
<string>8.0</string>
</dict>
</plist>

83
ios/Podfile.lock
View File

@ -1,111 +1,98 @@
PODS:
- barcode_scan2 (0.0.1):
- barcode_scan (0.0.1):
- Flutter
- MTBBarcodeScanner
- SwiftProtobuf
- bluetooth_print (0.0.1):
- Flutter
- charset_converter (0.0.1):
- Flutter
- device_info (0.0.1):
- Flutter
- esys_flutter_share (0.0.1):
- Flutter
- Flutter (1.0.0)
- flutter_blue (0.0.1):
- flutter_bluetooth_basic (0.0.1):
- Flutter
- flutter_blue/Protos (= 0.0.1)
- flutter_blue/Protos (0.0.1):
- Flutter
- Protobuf (~> 3.11.4)
- FMDB (2.7.5):
- FMDB/standard (= 2.7.5)
- FMDB/standard (2.7.5)
- local_auth (0.0.1):
- Flutter
- MTBBarcodeScanner (5.0.11)
- path_provider_ios (0.0.1):
- path_provider (0.0.1):
- Flutter
- "permission_handler (5.1.0+2)":
- Flutter
- Protobuf (3.11.4)
- shared_preferences_ios (0.0.1):
- shared_preferences (0.0.1):
- Flutter
- sqflite (0.0.2):
- Flutter
- FMDB (>= 2.7.5)
- SwiftProtobuf (1.18.0)
- url_launcher_ios (0.0.1):
- Flutter
- vocsy_esys_flutter_share (0.0.1):
- SwiftProtobuf (1.9.0)
- url_launcher (0.0.1):
- Flutter
DEPENDENCIES:
- barcode_scan2 (from `.symlinks/plugins/barcode_scan2/ios`)
- bluetooth_print (from `.symlinks/plugins/bluetooth_print/ios`)
- barcode_scan (from `.symlinks/plugins/barcode_scan/ios`)
- charset_converter (from `.symlinks/plugins/charset_converter/ios`)
- device_info (from `.symlinks/plugins/device_info/ios`)
- esys_flutter_share (from `.symlinks/plugins/esys_flutter_share/ios`)
- Flutter (from `Flutter`)
- flutter_blue (from `.symlinks/plugins/flutter_blue/ios`)
- flutter_bluetooth_basic (from `.symlinks/plugins/flutter_bluetooth_basic/ios`)
- local_auth (from `.symlinks/plugins/local_auth/ios`)
- path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
- path_provider (from `.symlinks/plugins/path_provider/ios`)
- permission_handler (from `.symlinks/plugins/permission_handler/ios`)
- shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
- sqflite (from `.symlinks/plugins/sqflite/ios`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
- vocsy_esys_flutter_share (from `.symlinks/plugins/vocsy_esys_flutter_share/ios`)
- url_launcher (from `.symlinks/plugins/url_launcher/ios`)
SPEC REPOS:
trunk:
- FMDB
- MTBBarcodeScanner
- Protobuf
- SwiftProtobuf
EXTERNAL SOURCES:
barcode_scan2:
:path: ".symlinks/plugins/barcode_scan2/ios"
bluetooth_print:
:path: ".symlinks/plugins/bluetooth_print/ios"
barcode_scan:
:path: ".symlinks/plugins/barcode_scan/ios"
charset_converter:
:path: ".symlinks/plugins/charset_converter/ios"
device_info:
:path: ".symlinks/plugins/device_info/ios"
esys_flutter_share:
:path: ".symlinks/plugins/esys_flutter_share/ios"
Flutter:
:path: Flutter
flutter_blue:
:path: ".symlinks/plugins/flutter_blue/ios"
flutter_bluetooth_basic:
:path: ".symlinks/plugins/flutter_bluetooth_basic/ios"
local_auth:
:path: ".symlinks/plugins/local_auth/ios"
path_provider_ios:
:path: ".symlinks/plugins/path_provider_ios/ios"
path_provider:
:path: ".symlinks/plugins/path_provider/ios"
permission_handler:
:path: ".symlinks/plugins/permission_handler/ios"
shared_preferences_ios:
:path: ".symlinks/plugins/shared_preferences_ios/ios"
shared_preferences:
:path: ".symlinks/plugins/shared_preferences/ios"
sqflite:
:path: ".symlinks/plugins/sqflite/ios"
url_launcher_ios:
:path: ".symlinks/plugins/url_launcher_ios/ios"
vocsy_esys_flutter_share:
:path: ".symlinks/plugins/vocsy_esys_flutter_share/ios"
url_launcher:
:path: ".symlinks/plugins/url_launcher/ios"
SPEC CHECKSUMS:
barcode_scan2: 0af2bb63c81b4565aab6cd78278e4c0fa136dbb0
bluetooth_print: da8f47e8881a0b1f0fd8d73cd6fa84c9bd41ac28
barcode_scan: a5c27959edfafaa0c771905bad0b29d6d39e4479
charset_converter: 215c7b04932ec2b9ba43be96a9bc34afed3e5322
device_info: d7d233b645a32c40dfdc212de5cf646ca482f175
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
flutter_blue: eeb381dc4727a0954dede73515f683865494b370
esys_flutter_share: 403498dab005b36ce1f8d7aff377e81f0621b0b4
Flutter: 434fef37c0980e73bb6479ef766c45957d4b510c
flutter_bluetooth_basic: 0e4e27e22b50b3a25cc1d1e131953feb4af414f4
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
local_auth: ef62030a2731330b95df7ef1331bd15f6a64b8a6
local_auth: 25938960984c3a7f6e3253e3f8d962fdd16852bd
MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
path_provider_ios: 7d7ce634493af4477d156294792024ec3485acd5
path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
Protobuf: 176220c526ad8bd09ab1fb40a978eac3fef665f7
shared_preferences_ios: aef470a42dc4675a1cdd50e3158b42e3d1232b32
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
SwiftProtobuf: c3c12645230d9b09c72267e0de89468c5543bd86
url_launcher_ios: 02f1989d4e14e998335b02b67a7590fa34f971af
vocsy_esys_flutter_share: 98b79fad467203ababde56a7289ac90da6a4ddf5
SwiftProtobuf: ecbec1be9036d15655f6b3443a1c4ea693c97932
url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
PODFILE CHECKSUM: 5aafc9b59da66d8d46f05cbbbd21261eb9757176

49
ios/Runner.xcodeproj/project.pbxproj
View File

@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 50;
objectVersion = 46;
objects = {
/* Begin PBXBuildFile section */
@ -166,7 +166,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = "The Chromium Authors";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
@ -256,35 +256,31 @@
"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/FMDB/FMDB.framework",
"${BUILT_PRODUCTS_DIR}/MTBBarcodeScanner/MTBBarcodeScanner.framework",
"${BUILT_PRODUCTS_DIR}/Protobuf/protobuf.framework",
"${BUILT_PRODUCTS_DIR}/SwiftProtobuf/SwiftProtobuf.framework",
"${BUILT_PRODUCTS_DIR}/barcode_scan2/barcode_scan2.framework",
"${BUILT_PRODUCTS_DIR}/barcode_scan/barcode_scan.framework",
"${BUILT_PRODUCTS_DIR}/charset_converter/charset_converter.framework",
"${BUILT_PRODUCTS_DIR}/device_info/device_info.framework",
"${BUILT_PRODUCTS_DIR}/flutter_blue/flutter_blue.framework",
"${BUILT_PRODUCTS_DIR}/esys_flutter_share/esys_flutter_share.framework",
"${BUILT_PRODUCTS_DIR}/local_auth/local_auth.framework",
"${BUILT_PRODUCTS_DIR}/path_provider_ios/path_provider_ios.framework",
"${BUILT_PRODUCTS_DIR}/shared_preferences_ios/shared_preferences_ios.framework",
"${BUILT_PRODUCTS_DIR}/path_provider/path_provider.framework",
"${BUILT_PRODUCTS_DIR}/shared_preferences/shared_preferences.framework",
"${BUILT_PRODUCTS_DIR}/sqflite/sqflite.framework",
"${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework",
"${BUILT_PRODUCTS_DIR}/vocsy_esys_flutter_share/vocsy_esys_flutter_share.framework",
"${BUILT_PRODUCTS_DIR}/url_launcher/url_launcher.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FMDB.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MTBBarcodeScanner.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/protobuf.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftProtobuf.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/barcode_scan2.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/barcode_scan.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/charset_converter.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_blue.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/esys_flutter_share.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/local_auth.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/path_provider.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/shared_preferences.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/vocsy_esys_flutter_share.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
@ -380,7 +376,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
@ -405,10 +401,7 @@
"$(PROJECT_DIR)/Flutter",
);
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
@ -470,7 +463,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@ -519,7 +512,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = iphoneos;
@ -545,10 +538,7 @@
"$(PROJECT_DIR)/Flutter",
);
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",
@ -580,10 +570,7 @@
"$(PROJECT_DIR)/Flutter",
);
INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Flutter",

2
ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1020"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"

34
ios/Runner/GoogleService-Info.plist
View File

@ -1,34 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CLIENT_ID</key>
<string>1086013480150-93mcqf1l60dvmd2k1lkg2ikmvm3u29ca.apps.googleusercontent.com</string>
<key>REVERSED_CLIENT_ID</key>
<string>com.googleusercontent.apps.1086013480150-93mcqf1l60dvmd2k1lkg2ikmvm3u29ca</string>
<key>API_KEY</key>
<string>AIzaSyApELiWrEflqtXPo8cndFnPW0sRVVHmkYQ</string>
<key>GCM_SENDER_ID</key>
<string>1086013480150</string>
<key>PLIST_VERSION</key>
<string>1</string>
<key>BUNDLE_ID</key>
<string>com.kz.amankassaflutter</string>
<key>PROJECT_ID</key>
<string>aman-f670e</string>
<key>STORAGE_BUCKET</key>
<string>aman-f670e.appspot.com</string>
<key>IS_ADS_ENABLED</key>
<false></false>
<key>IS_ANALYTICS_ENABLED</key>
<false></false>
<key>IS_APPINVITE_ENABLED</key>
<true></true>
<key>IS_GCM_ENABLED</key>
<true></true>
<key>IS_SIGNIN_ENABLED</key>
<true></true>
<key>GOOGLE_APP_ID</key>
<string>1:1086013480150:ios:958c91234e46010cf17d77</string>
</dict>
</plist>

7
ios/firebase_app_id_file.json
View File

@ -1,7 +0,0 @@
{
"file_generated_by": "FlutterFire CLI",
"purpose": "FirebaseAppID & ProjectID for this Firebase app in this directory",
"GOOGLE_APP_ID": "1:1086013480150:ios:958c91234e46010cf17d77",
"FIREBASE_PROJECT_ID": "aman-f670e",
"GCM_SENDER_ID": "1086013480150"
}

4
lib/core/base/base_service.dart
View File

@ -3,9 +3,9 @@ import 'package:logger/logger.dart';
import '../logger.dart';
class BaseService {
late Logger log;
Logger log;
BaseService({String? title}) {
BaseService({String title}) {
this.log = getLogger(
title ?? this.runtimeType.toString(),
);

8
lib/core/entity/Category.dart
View File

@ -5,10 +5,10 @@ const String Category_columnName = 'name';
const String Category_columnAppCompanyId = 'app_company_id';
class Category {
int? id;
int? parentIn;
String name = '';
int? appCompanyId;
int id;
int parentIn;
String name;
int appCompanyId;
Map<String, dynamic> toMap() {
var map = <String, dynamic>{

22
lib/core/entity/Goods.dart
View File

@ -13,17 +13,17 @@ const String Goog_columnOkei = 'okei';
const String Goog_columnDiscount = 'discount';
class Good {
int? id;
int articul = -1;
String name = '';
double price = -1;
int categoryId = -1;
String? ean;
int? appCompanyId;
String? description;
double? showPrice;
int? okei;
double? discount;
int id;
int articul;
String name;
double price;
int categoryId;
String ean;
int appCompanyId;
String description;
double showPrice;
int okei;
double discount;
Map<String, dynamic> toMap() {
var map = <String, dynamic>{

19
lib/core/entity/Service.dart
View File

@ -14,15 +14,16 @@ const String Service_columnDiscount = 'discount';
class Service {
int? id;
int articul = -1;
String name = '';
double price = -1;
int? appCompanyId;
String? description;
double? showPrice;
String? okei;
double? discount;
int id;
int articul;
String name;
double price;
String ean;
int appCompanyId;
String description;
double showPrice;
String okei;
double discount;
Map<String, dynamic> toMap() {
var map = <String, dynamic>{

24
lib/core/entity/Voucher.dart
View File

@ -17,16 +17,16 @@ const String VoucherTypeReport = 'report';
const String VoucherTypeCloseDayPosReport = 'closeDayPosReport';
class Voucher {
int? id;
String? name;
double? total;
String? data;
String? base64Data;
DateTime? dateTime;
int? appCompanyId;
int? kassaId;
String? type;
String? url;
int id;
String name;
double total;
String data;
String base64Data;
DateTime dateTime;
int appCompanyId;
int kassaId;
String type;
String url;
Voucher();
@ -36,7 +36,7 @@ class Voucher {
Voucher_columnTotal: total,
Voucher_columnData: data,
Voucher_columnBase64Data: base64Data,
Voucher_columnDateTime: dateTime?.toIso8601String(),
Voucher_columnDateTime: dateTime.toIso8601String(),
Voucher_columnKassaId: kassaId,
Voucher_columnAppCompanyId: appCompanyId,
Voucher_columnType: type,
@ -48,7 +48,7 @@ class Voucher {
return map;
}
Voucher.fromMap(Map<dynamic, dynamic> map) {
Voucher.fromMap(Map<String, dynamic> map) {
id = map[Voucher_columnId];
name = map[Voucher_columnName];
total = map[Voucher_columnTotal]?.toDouble();

10
lib/core/locator.dart
View File

@ -1,9 +1,7 @@
import 'package:aman_kassa_flutter/core/services/BankService.dart' as bank;
import 'package:aman_kassa_flutter/core/services/ForteService.dart' as forte;
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/blue_print_service.dart';
import '../core/services/DbService.dart';
@ -28,8 +26,6 @@ class LocatorInjector {
locator.registerLazySingleton<DialogService>(() => DialogService());
_log.d('Initializing DbService Service');
locator.registerLazySingleton<DbService>(() => DbService.instance);
_log.d('Initializing BluePrintService Service');
locator.registerLazySingleton<BluePrintService>(() => BluePrintService());
// depencies
@ -38,8 +34,6 @@ class LocatorInjector {
_log.d('Initializing DataService Service');
locator.registerLazySingleton<DataService>(() => DataService());
_log.d('Initializing BankService Service');
locator.registerLazySingleton<bank.BankService>(() => bank.BankService());
_log.d('Initializing Forte Service');
locator.registerLazySingleton<forte.ForteService>(() => forte.ForteService());
locator.registerLazySingleton<BankService>(() => BankService());
}
}

16
lib/core/logger.dart
View File

@ -14,13 +14,13 @@ class SimpleLogPrinter extends LogPrinter {
var error = event.error?.toString() ?? '';
var color = PrettyPrinter.levelColors[level];
var emoji = PrettyPrinter.levelEmojis[level];
String? stack;
String stack;
if (event.stackTrace == null) {
stack = formatStackTrace(StackTrace.current, 2);
} else {
stack = formatStackTrace(event.stackTrace!, 1);
stack = formatStackTrace(event.stackTrace, 2);
}
print(color!(' $emoji $message $error -> $stack '));
print(color(' $emoji $message $error -> $stack '));
return [];
}
@ -33,9 +33,9 @@ class SimpleLogPrinter extends LogPrinter {
}
}
String? formatStackTrace(StackTrace stackTrace, int methodPosition) {
String formatStackTrace(StackTrace stackTrace, int methodPosition) {
var lines = stackTrace.toString().split('\n');
var lines = stackTrace.toString()?.split('\n');
var formatted = <String>[];
var count = 0;
for (var line in lines) {
@ -62,7 +62,7 @@ class SimpleLogPrinter extends LogPrinter {
if (match == null) {
return false;
}
return match.group(2)!.startsWith('package:logger');
return match.group(2).startsWith('package:logger');
}
bool _discardWebStacktraceLine(String line) {
@ -70,8 +70,8 @@ class SimpleLogPrinter extends LogPrinter {
if (match == null) {
return false;
}
return match.group(1)!.startsWith('packages/logger') ||
match.group(1)!.startsWith('dart-sdk/lib');
return match.group(1).startsWith('packages/logger') ||
match.group(1).startsWith('dart-sdk/lib');
}
}

8
lib/core/models/aman_dao.dart
View File

@ -1,8 +1,8 @@
class AmanDao<T> {
final T? data;
final dynamic? rows;
final String? msg;
final bool? success;
final T data;
final dynamic rows;
final String msg;
final bool success;
AmanDao({this.data, this.success, this.msg, this.rows});

14
lib/core/models/auth_response.dart
View File

@ -2,9 +2,9 @@ import '../utilsParse.dart';
import 'user.dart';
class AuthResponse {
final AuthBody? body;
final int? status;
final bool? operation;
final AuthBody body;
final int status;
final bool operation;
AuthResponse( {this.body, this.status, this.operation});
@ -19,10 +19,10 @@ class AuthResponse {
}
class AuthBody {
final List<String>? email;
final List<String>? password;
final String? message;
final User? user;
final List<String> email;
final List<String> password;
final String message;
final User user;
AuthBody({this.message, this.user, this.email, this.password});
factory AuthBody.fromJson(Map<String, dynamic> json) {
return AuthBody(

4
lib/core/models/calc_model.dart
View File

@ -1,9 +1,9 @@
class CalcModel {
String num1;
String? num2;
String num2;
bool closed;
String operation;
CalcModel({required this.num1, this.num2, required this.operation, this.closed = false});
CalcModel({this.num1, this.num2, this.operation, this.closed = false});
@override
String toString() {

16
lib/core/models/card_data.dart
View File

@ -1,15 +1,15 @@
class CardData {
final int? transactionNumber;
final int? operationDay;
final int? terminalId;
final String? cardNumber;
final String? cardholderName;
final String? authorizationCode;
final String? transactionType;
final int transactionNumber;
final int operationDay;
final int terminalId;
final String cardNumber;
final String cardholderName;
final String authorizationCode;
final String transactionType;
CardData({this.transactionNumber, this.operationDay, this.cardNumber, this.cardholderName, this.authorizationCode, this.terminalId, this.transactionType });
static CardData? fromJson(Map<String, dynamic>? json) {
static CardData fromJson(Map<String, dynamic> json) {
return json != null ?
CardData(
transactionNumber: json['transactionNumber'],

26
lib/core/models/check_data.dart
View File

@ -2,31 +2,25 @@ import 'package:aman_kassa_flutter/core/models/card_data.dart';
import 'package:aman_kassa_flutter/core/models/check_item.dart';
class CheckData {
final String? type;
num? card;
num? mobile;
String? contragent;
final List<CheckItem>? items;
CardData? cardData;
CheckData({this.type, this.card, this.mobile, this.items, this.cardData, this.contragent});
final String type;
num card;
final List<CheckItem> items;
CardData cardData;
CheckData({this.type, this.card, this.items, this.cardData});
static CheckData fromJson(Map<String, dynamic> json) {
return CheckData(
type: json['type'] as String?,
card: json['card'] as num?,
mobile: json['mobile'] as num?,
type: json['type'],
card: json['card'],
items: (json['items'] as List).map((e) => CheckItem.fromJson(e)).toList(),
cardData: CardData.fromJson(json['cardData']),
contragent: json['type'] as String?,
cardData: CardData.fromJson(json['cardData'])
);
}
Map<String, dynamic> toJson() =>
{
'type': type,
'card': card,
'mobile': mobile,
'items': items?.map((e) => e.toJson()).toList(),
'cardData': cardData?.toJson(),
'contragent': contragent,
'items': items.map((e) => e.toJson()).toList(),
'cardData': cardData!=null ? cardData.toJson() : null
};
}

4
lib/core/models/check_image_modal.dart
View File

@ -1,6 +1,6 @@
class CheckImageModal {
final String? base64Data;
final String? textData;
final String base64Data;
final String textData;
CheckImageModal({this.base64Data, this.textData});
static CheckImageModal fromJson(Map<String, dynamic> json) {

4
lib/core/models/check_item.dart
View File

@ -3,8 +3,8 @@ class CheckItem {
final num cnt;
final num price;
final int articul;
final String? excise;
CheckItem({required this.name, required this.cnt, required this.price, required this.articul, this.excise});
final String excise;
CheckItem({this.name, this.cnt, this.price, this.articul, this.excise});
static CheckItem fromJson(Map<String, dynamic> json) {
return CheckItem(

2
lib/core/models/choice.dart
View File

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
class Choice {
const Choice({required this.title, required this.icon, required this.command});
const Choice({this.title, this.icon, this.command});
final String command;
final String title;
final IconData icon;

24
lib/core/models/forte/close_day_data.dart → lib/core/models/close_day_data.dart
View File

@ -1,20 +1,20 @@
import 'package:aman_kassa_flutter/core/models/transaction_item.dart';
import 'forte_close_day_dao.dart';
import 'halyk/halyk_close_day_dao.dart';
class CloseDayData {
final String? title;
final num? totalAmount;
final int? totalCount;
final num? paymentAmount;
final int? paymentCount;
final num? refundAmount;
final int? refundCount;
final num? cancelAmount;
final int? cancelCount;
final String title;
final num totalAmount;
final int totalCount;
final num paymentAmount;
final int paymentCount;
final num refundAmount;
final int refundCount;
final num cancelAmount;
final int cancelCount;
final List<TransactionBean>? items;
final List<TransactionBean> items;
CloseDayData({
this.title,
this.items,
@ -49,6 +49,6 @@ class CloseDayData {
'refundCount': refundCount,
'cancelAmount': cancelAmount,
'cancelCount': cancelCount,
'items': items?.map((e) => e.toJson()).toList(),
'items': items.map((e) => e.toJson()).toList(),
};
}

14
lib/core/models/dialog_models.dart
View File

@ -4,13 +4,13 @@ class DialogRequest {
final String title;
final String description;
final String buttonTitle;
final String? cancelTitle;
final String? formatType;
final String cancelTitle;
final String formatType;
DialogRequest(
{required this.title,
required this.description,
required this.buttonTitle,
{@required this.title,
@required this.description,
@required this.buttonTitle,
this.cancelTitle,
this.formatType});
}
@ -18,13 +18,13 @@ class DialogRequest {
class DialogResponse {
//final String fieldOne;
//final String fieldTwo;
final String? responseText;
final String responseText;
final bool confirmed;
DialogResponse({
//this.fieldOne,
//this.fieldTwo,
this.responseText,
required this.confirmed,
this.confirmed,
});
}

2
lib/core/models/dict_dao.dart
View File

@ -1,5 +1,5 @@
class DictDao {
final int id;
final String name;
DictDao({ required this.id, required this.name});
DictDao({ this.id, this.name});
}

180
lib/core/models/forte/forte_close_day_dao.dart
View File

@ -1,180 +0,0 @@
/// result : {"code":"0","description":"Successfully completed"}
/// transactions : {"transaction":[{"type":"PAYMENT","instrument":"CARD","amount":"6000","terminalId":"123321","operationDay":"4","transactionNumber":"69","instrumentSpecificData":{"authorizationCode":"000000","rrn":"1234567890","cardholderName":"IVAN IVANOV","maskedPan":"123456******7890"}},{"type":"REFUND","instrument":"CARD","amount":"4500","terminalId":"123321","operationDay":"4","transactionNumber":"70","instrumentSpecificData":{"authorizationCode":"000000","rrn":"1234567890","cardholderName":"IVAN IVANOV","maskedPan":"123456******7890"},"parentTransaction":{"terminalId":"123321","operationDay":"4","transactionNumber":"69"}}]}
/// closeDayResults : {"reconciliationResult":[{"hostResultCode":"000","hostResultDescription":"Success","terminalExternalId":"example_terminal_id"}]}
class ForteCloseDayDao {
ResultBean? result;
TransactionsBean? transactions;
CloseDayResultsBean? closeDayResults;
ForteCloseDayDao({ this.result, this.closeDayResults, this.transactions});
static ForteCloseDayDao? fromMap(Map<String, dynamic>? map) {
if (map == null) return null;
ForteCloseDayDao forteCloseDayDaoBean = ForteCloseDayDao();
forteCloseDayDaoBean.result = ResultBean.fromMap(map['result']);
forteCloseDayDaoBean.transactions = TransactionsBean.fromMap(map['transactions']);
forteCloseDayDaoBean.closeDayResults = CloseDayResultsBean.fromMap(map['closeDayResults']);
return forteCloseDayDaoBean;
}
Map toJson() => {
"result": result,
"transactions": transactions,
"closeDayResults": closeDayResults,
};
}
/// reconciliationResult : [{"hostResultCode":"000","hostResultDescription":"Success","terminalExternalId":"example_terminal_id"}]
class CloseDayResultsBean {
List<ReconciliationResultBean>? reconciliationResult;
static CloseDayResultsBean? fromMap(Map<String, dynamic>? map) {
if (map == null) return null;
CloseDayResultsBean closeDayResultsBean = CloseDayResultsBean();
closeDayResultsBean.reconciliationResult = (map['reconciliationResult'] as List)
.map((o) => ReconciliationResultBean.fromMap(o))
.toList();
return closeDayResultsBean;
}
Map toJson() => {
"reconciliationResult": reconciliationResult,
};
}
/// hostResultCode : "000"
/// hostResultDescription : "Success"
/// terminalExternalId : "example_terminal_id"
class ReconciliationResultBean {
String? hostResultCode;
String? hostResultDescription;
String? terminalExternalId;
static ReconciliationResultBean fromMap(Map<String, dynamic> map) {
ReconciliationResultBean reconciliationResultBean = ReconciliationResultBean();
reconciliationResultBean.hostResultCode = map['hostResultCode'];
reconciliationResultBean.hostResultDescription = map['hostResultDescription'];
reconciliationResultBean.terminalExternalId = map['terminalExternalId'];
return reconciliationResultBean;
}
Map toJson() => {
"hostResultCode": hostResultCode,
"hostResultDescription": hostResultDescription,
"terminalExternalId": terminalExternalId,
};
}
/// transaction : [{"type":"PAYMENT","instrument":"CARD","amount":"6000","terminalId":"123321","operationDay":"4","transactionNumber":"69","instrumentSpecificData":{"authorizationCode":"000000","rrn":"1234567890","cardholderName":"IVAN IVANOV","maskedPan":"123456******7890"}},{"type":"REFUND","instrument":"CARD","amount":"4500","terminalId":"123321","operationDay":"4","transactionNumber":"70","instrumentSpecificData":{"authorizationCode":"000000","rrn":"1234567890","cardholderName":"IVAN IVANOV","maskedPan":"123456******7890"},"parentTransaction":{"terminalId":"123321","operationDay":"4","transactionNumber":"69"}}]
class TransactionsBean {
List<TransactionBean>? transaction;
static TransactionsBean? fromMap(Map<String, dynamic>? map) {
if (map == null) return null;
TransactionsBean transactionsBean = TransactionsBean();
transactionsBean.transaction = (map['transaction'] as List)
.map((o) => TransactionBean.fromMap(o))
.toList();
return transactionsBean;
}
Map toJson() => {
"transaction": transaction,
};
}
/// type : "PAYMENT"
/// instrument : "CARD"
/// amount : "6000"
/// terminalId : "123321"
/// operationDay : "4"
/// transactionNumber : "69"
/// instrumentSpecificData : {"authorizationCode":"000000","rrn":"1234567890","cardholderName":"IVAN IVANOV","maskedPan":"123456******7890"}
class TransactionBean {
String? type;
String? instrument;
num amount = 0;
int? terminalId;
int? operationDay;
int? transactionNumber;
InstrumentSpecificDataBean? instrumentSpecificData;
static TransactionBean fromMap(Map<String, dynamic> map) {
TransactionBean transactionBean = TransactionBean();
transactionBean.type = map['type'];
transactionBean.instrument = map['instrument'];
transactionBean.amount = map['amount'] ?? 0;
transactionBean.terminalId = map['terminalId'];
transactionBean.operationDay = map['operationDay'];
transactionBean.transactionNumber = map['transactionNumber'];
transactionBean.instrumentSpecificData = InstrumentSpecificDataBean.fromMap(map['instrumentSpecificData']);
return transactionBean;
}
Map toJson() => {
"type": type,
"instrument": instrument,
"amount": amount,
"terminalId": terminalId,
"operationDay": operationDay,
"transactionNumber": transactionNumber,
"instrumentSpecificData": instrumentSpecificData,
};
}
/// authorizationCode : "000000"
/// rrn : "1234567890"
/// cardholderName : "IVAN IVANOV"
/// maskedPan : "123456******7890"
class InstrumentSpecificDataBean {
String? authorizationCode;
String? rrn;
String? cardholderName;
String? maskedPan;
static InstrumentSpecificDataBean? fromMap(Map<String, dynamic>? map) {
if (map == null) return null;
InstrumentSpecificDataBean instrumentSpecificDataBean = InstrumentSpecificDataBean();
instrumentSpecificDataBean.authorizationCode = map['authorizationCode'];
instrumentSpecificDataBean.rrn = map['rrn'];
instrumentSpecificDataBean.cardholderName = map['cardholderName'];
instrumentSpecificDataBean.maskedPan = map['maskedPan'];
return instrumentSpecificDataBean;
}
Map toJson() => {
"authorizationCode": authorizationCode,
"rrn": rrn,
"cardholderName": cardholderName,
"maskedPan": maskedPan,
};
}
/// code : "0"
/// description : "Successfully completed"
class ResultBean {
int? code;
String? description;
ResultBean({this.code, this.description});
static ResultBean? fromMap(Map<String, dynamic>? map) {
if (map == null) return null;
ResultBean resultBean = ResultBean();
resultBean.code = map['code'];
resultBean.description = map['description'];
return resultBean;
}
Map toJson() => {
"code": code,
"description": description,
};
}

79
lib/core/models/forte/forte_post_session.dart
View File

@ -1,79 +0,0 @@
import 'package:intl/intl.dart';
class FortePosSession {
const FortePosSession({
this.login,
this.token,
this.serverTime,
this.tokenTimeout,
this.result,
});
final String? login;
final String? token;
final DateTime? serverTime;
final int? tokenTimeout;
final ResultBean? result;
static FortePosSession fromJson(Map<String, dynamic> data) => FortePosSession(
login: data['login'] as String?,
token: data['token'] as String?,
result: data['result'] != null ? ResultBean.fromMap(data['result'] as Map<String, dynamic>) : null,
serverTime: data['ServerTime'] != null
? DateFormat("dd.MM.yyyy HH:mm:ss ZZZ").parse(data['ServerTime'])
: null,
tokenTimeout: data['TokenTimeout'] as int?,
);
Map<String, dynamic> toJson() => {
"login": login,
"token": token,
"ServerTime": serverTime != null
? DateFormat("dd.MM.yyyy HH:mm:ss ZZZ").format(serverTime!)
: null,
"TokenTimeout": tokenTimeout,
"result": result?.toJson(),
};
}
class ResultBean {
late String ServerTime;
late String ResultCode;
late String ResultStr;
late ResponseBean? Response;
static ResultBean? fromMap(Map<String, dynamic>? map) {
if (map == null) return null;
ResultBean resultBean = ResultBean();
resultBean.ServerTime = map['ServerTime'] as String? ?? '';
resultBean.ResultCode = map['ResultCode'] as String? ?? '';
resultBean.ResultStr = map['ResultStr'] as String? ?? '';
resultBean.Response = map['Response'] != null ? ResponseBean.fromMap(map['Response'] as Map<String, dynamic>) : null;
return resultBean;
}
Map<String, dynamic> toJson() => {
"ServerTime": ServerTime,
"ResultCode": ResultCode,
"ResultStr": ResultStr,
"Response": Response?.toJson(),
};
}
class ResponseBean {
late String Code;
late String Description;
static ResponseBean? fromMap(Map<String, dynamic>? map) {
if (map == null) return null;
ResponseBean responseBean = ResponseBean();
responseBean.Code = map['Code'] as String? ?? '';
responseBean.Description = map['Description'] as String? ?? '';
return responseBean;
}
Map<String, dynamic> toJson() => {
"Code": Code,
"Description": Description,
};
}

155
lib/core/models/forte/forte_response_dao.dart
View File

@ -1,155 +0,0 @@
/// result : {"code":"0","description":"Successfully completed","hostResponse":{"code":"0","description":"Successfully completed"}}
/// transaction : {"terminalId":"123321","operationDay":"4","transactionNumber":"69","instrumentSpecificData":{"authorizationCode":"000000","rrn":"1234567890","cardholderName":"IVAN IVANOV","maskedPan":"123456******7890"}}
class ForteResponse {
ResultBean? result;
TransactionBean? transaction;
ForteResponse({this.result, this.transaction});
static ForteResponse? fromMap(Map<String, dynamic>? map) {
if (map == null) return null;
ForteResponse forteResponseBean = ForteResponse();
forteResponseBean.result = ResultBean.fromMap(map['result']);
forteResponseBean.transaction = TransactionBean.fromMap(map['transaction']);
return forteResponseBean;
}
Map toJson() =>
{
"result": result,
"transaction": transaction,
};
}
/// terminalId : "123321"
/// operationDay : "4"
/// transactionNumber : "69"
/// instrumentSpecificData : {"authorizationCode":"000000","rrn":"1234567890","cardholderName":"IVAN IVANOV","maskedPan":"123456******7890"}
class TransactionBean {
int? terminalId;
int? operationDay;
int? transactionNumber;
InstrumentSpecificDataBean? instrumentSpecificData;
static TransactionBean? fromMap(Map<String, dynamic>? map) {
if (map == null) return null;
TransactionBean transactionBean = TransactionBean();
transactionBean.terminalId = map['terminalId'];
transactionBean.operationDay = map['operationDay'];
transactionBean.transactionNumber = map['transactionNumber'];
transactionBean.instrumentSpecificData = InstrumentSpecificDataBean.fromMap(map['instrumentSpecificData']);
return transactionBean;
}
Map toJson() =>
{
"terminalId": terminalId,
"operationDay": operationDay,
"transactionNumber": transactionNumber,
"instrumentSpecificData": instrumentSpecificData,
};
}
/// authorizationCode : "000000"
/// rrn : "1234567890"
/// cardholderName : "IVAN IVANOV"
/// maskedPan : "123456******7890"
class InstrumentSpecificDataBean {
String? authorizationCode;
String? rrn;
String? cardholderName;
String? maskedPan;
static InstrumentSpecificDataBean? fromMap(Map<String, dynamic>? map) {
if (map == null) return null;
InstrumentSpecificDataBean instrumentSpecificDataBean = InstrumentSpecificDataBean();
instrumentSpecificDataBean.authorizationCode = map['authorizationCode'];
instrumentSpecificDataBean.rrn = map['rrn'];
instrumentSpecificDataBean.cardholderName = map['cardholderName'];
instrumentSpecificDataBean.maskedPan = map['maskedPan'];
return instrumentSpecificDataBean;
}
Map toJson() =>
{
"authorizationCode": authorizationCode,
"rrn": rrn,
"cardholderName": cardholderName,
"maskedPan": maskedPan,
};
}
/// code : "0"
/// description : "Successfully completed"
/// hostResponse : {"code":"0","description":"Successfully completed"}
class ResultBean {
int? code;
String? description;
HostResponseBean? hostResponse;
ErrorResponseBean? errorData;
ResultBean({this.code, this.description});
static ResultBean? fromMap(Map<String, dynamic>? map) {
if (map == null) return null;
ResultBean resultBean = ResultBean();
resultBean.code = map['code'];
resultBean.description = map['description'];
resultBean.hostResponse = HostResponseBean.fromMap(map['hostResponse']);
resultBean.errorData = ErrorResponseBean.fromMap(map['errorData']);
return resultBean;
}
Map toJson() =>
{
"code": code,
"description": description,
"hostResponse": hostResponse,
"errorData": errorData,
};
}
/// code : "0"
/// description : "Successfully completed"
class HostResponseBean {
int? code;
String? description;
static HostResponseBean? fromMap(Map<String, dynamic>? map) {
if (map == null) return null;
HostResponseBean hostResponseBean = HostResponseBean();
hostResponseBean.code = map['code'];
hostResponseBean.description = map['description'];
return hostResponseBean;
}
Map toJson() =>
{
"code": code,
"description": description,
};
}
class ErrorResponseBean {
int? code;
String? description;
static ErrorResponseBean? fromMap(Map<String, dynamic>? map) {
if (map == null) return null;
ErrorResponseBean errorResponseBean = ErrorResponseBean();
errorResponseBean.code = map['code'];
errorResponseBean.description = map['description'];
return errorResponseBean;
}
Map toJson() =>
{
"code": code,
"description": description,
};
}

54
lib/core/models/halyk/close_day_data.dart
View File

@ -1,54 +0,0 @@
import 'package:aman_kassa_flutter/core/models/transaction_item.dart';
import 'halyk_close_day_dao.dart';
class CloseDayData {
final String? title;
final num? totalAmount;
final int? totalCount;
final num? paymentAmount;
final int? paymentCount;
final num? refundAmount;
final int? refundCount;
final num? cancelAmount;
final int? cancelCount;
final List<TransactionBean>? items;
CloseDayData({
this.title,
this.items,
this.totalAmount, this.totalCount,
this.paymentAmount, this.paymentCount,
this.refundAmount, this.refundCount,
this.cancelAmount, this.cancelCount
});
static CloseDayData fromJson(Map<String, dynamic> json) {
return CloseDayData(
title: json['title'],
totalAmount: json['totalAmount'],
totalCount: json['totalCount'],
paymentAmount: json['paymentAmount'],
paymentCount: json['paymentCount'],
refundAmount: json['refundAmount'],
refundCount: json['refundCount'],
cancelAmount: json['cancelAmount'],
cancelCount: json['cancelCount'],
items: (json['items'] as List).map((e) => TransactionBean.fromMap(e)).toList(),
);
}
Map<String, dynamic> toJson() =>
{
'title': title,
'totalAmount': totalAmount,
'totalCount': totalCount,
'paymentAmount': paymentAmount,
'paymentCount': paymentCount,
'refundAmount': refundAmount,
'refundCount': refundCount,
'cancelAmount': cancelAmount,
'cancelCount': cancelCount,
'items': items?.map((e) => e.toJson()).toList(),
};
}

64
lib/core/models/halyk/halyk_close_day_dao.dart
View File

@ -3,13 +3,13 @@
/// closeDayResults : {"reconciliationResult":[{"hostResultCode":"000","hostResultDescription":"Success","terminalExternalId":"example_terminal_id"}]}
class HalykCloseDayDao {
ResultBean? result;
TransactionsBean? transactions;
CloseDayResultsBean? closeDayResults;
ResultBean result;
TransactionsBean transactions;
CloseDayResultsBean closeDayResults;
HalykCloseDayDao({ this.result, this.closeDayResults, this.transactions});
static HalykCloseDayDao? fromMap(Map<String, dynamic>? map) {
static HalykCloseDayDao fromMap(Map<String, dynamic> map) {
if (map == null) return null;
HalykCloseDayDao halykCloseDayDaoBean = HalykCloseDayDao();
halykCloseDayDaoBean.result = ResultBean.fromMap(map['result']);
@ -28,13 +28,13 @@ class HalykCloseDayDao {
/// reconciliationResult : [{"hostResultCode":"000","hostResultDescription":"Success","terminalExternalId":"example_terminal_id"}]
class CloseDayResultsBean {
List<ReconciliationResultBean>? reconciliationResult;
List<ReconciliationResultBean> reconciliationResult;
static CloseDayResultsBean? fromMap(Map<String, dynamic>? map) {
static CloseDayResultsBean fromMap(Map<String, dynamic> map) {
if (map == null) return null;
CloseDayResultsBean closeDayResultsBean = CloseDayResultsBean();
closeDayResultsBean.reconciliationResult = List.empty()..addAll(
(map['reconciliationResult'] as List).map((o) => ReconciliationResultBean.fromMap(o))
closeDayResultsBean.reconciliationResult = List()..addAll(
(map['reconciliationResult'] as List ?? []).map((o) => ReconciliationResultBean.fromMap(o))
);
return closeDayResultsBean;
}
@ -49,11 +49,12 @@ class CloseDayResultsBean {
/// terminalExternalId : "example_terminal_id"
class ReconciliationResultBean {
String? hostResultCode;
String? hostResultDescription;
String? terminalExternalId;
String hostResultCode;
String hostResultDescription;
String terminalExternalId;
static ReconciliationResultBean fromMap(Map<String, dynamic> map) {
if (map == null) return null;
ReconciliationResultBean reconciliationResultBean = ReconciliationResultBean();
reconciliationResultBean.hostResultCode = map['hostResultCode'];
reconciliationResultBean.hostResultDescription = map['hostResultDescription'];
@ -71,13 +72,13 @@ class ReconciliationResultBean {
/// transaction : [{"type":"PAYMENT","instrument":"CARD","amount":"6000","terminalId":"123321","operationDay":"4","transactionNumber":"69","instrumentSpecificData":{"authorizationCode":"000000","rrn":"1234567890","cardholderName":"IVAN IVANOV","maskedPan":"123456******7890"}},{"type":"REFUND","instrument":"CARD","amount":"4500","terminalId":"123321","operationDay":"4","transactionNumber":"70","instrumentSpecificData":{"authorizationCode":"000000","rrn":"1234567890","cardholderName":"IVAN IVANOV","maskedPan":"123456******7890"},"parentTransaction":{"terminalId":"123321","operationDay":"4","transactionNumber":"69"}}]
class TransactionsBean {
List<TransactionBean>? transaction;
List<TransactionBean> transaction;
static TransactionsBean? fromMap(Map<String, dynamic>? map) {
static TransactionsBean fromMap(Map<String, dynamic> map) {
if (map == null) return null;
TransactionsBean transactionsBean = TransactionsBean();
transactionsBean.transaction = List.empty()..addAll(
(map['transaction'] as List).map((o) => TransactionBean.fromMap(o))
transactionsBean.transaction = List()..addAll(
(map['transaction'] as List ?? []).map((o) => TransactionBean.fromMap(o))
);
return transactionsBean;
}
@ -96,19 +97,20 @@ class TransactionsBean {
/// instrumentSpecificData : {"authorizationCode":"000000","rrn":"1234567890","cardholderName":"IVAN IVANOV","maskedPan":"123456******7890"}
class TransactionBean {
String? type;
String? instrument;
num amount = 0;
int? terminalId;
int? operationDay;
int? transactionNumber;
InstrumentSpecificDataBean? instrumentSpecificData;
String type;
String instrument;
num amount;
int terminalId;
int operationDay;
int transactionNumber;
InstrumentSpecificDataBean instrumentSpecificData;
static TransactionBean fromMap(Map<String, dynamic> map) {
if (map == null) return null;
TransactionBean transactionBean = TransactionBean();
transactionBean.type = map['type'];
transactionBean.instrument = map['instrument'];
transactionBean.amount = map['amount'] ?? 0;
transactionBean.amount = map['amount'];
transactionBean.terminalId = map['terminalId'];
transactionBean.operationDay = map['operationDay'];
transactionBean.transactionNumber = map['transactionNumber'];
@ -133,12 +135,12 @@ class TransactionBean {
/// maskedPan : "123456******7890"
class InstrumentSpecificDataBean {
String? authorizationCode;
String? rrn;
String? cardholderName;
String? maskedPan;
String authorizationCode;
String rrn;
String cardholderName;
String maskedPan;
static InstrumentSpecificDataBean? fromMap(Map<String, dynamic>? map) {
static InstrumentSpecificDataBean fromMap(Map<String, dynamic> map) {
if (map == null) return null;
InstrumentSpecificDataBean instrumentSpecificDataBean = InstrumentSpecificDataBean();
instrumentSpecificDataBean.authorizationCode = map['authorizationCode'];
@ -160,12 +162,12 @@ class InstrumentSpecificDataBean {
/// description : "Successfully completed"
class ResultBean {
int? code;
String? description;
int code;
String description;
ResultBean({this.code, this.description});
static ResultBean? fromMap(Map<String, dynamic>? map) {
static ResultBean fromMap(Map<String, dynamic> map) {
if (map == null) return null;
ResultBean resultBean = ResultBean();
resultBean.code = map['code'];

26
lib/core/models/halyk/halyk_post_session.dart
View File

@ -8,11 +8,11 @@ class HalykPosSession {
this.tokenTimeout,
this.result});
final String? login;
final String? token;
final DateTime? serverTime;
final int? tokenTimeout;
final ResultBean? result;
final String login;
final String token;
final DateTime serverTime;
final int tokenTimeout;
final ResultBean result;
static HalykPosSession fromJson(Map<String, dynamic> data) => HalykPosSession(
login: data['login'],
@ -30,12 +30,12 @@ class HalykPosSession {
/// Response : {"Code":"040","Description":"Unknown operator login. Check the correctness of the data or contact support."}
class ResultBean {
String? ServerTime;
String? ResultCode;
String? ResultStr;
ResponseBean? Response;
String ServerTime;
String ResultCode;
String ResultStr;
ResponseBean Response;
static ResultBean? fromMap(Map<String, dynamic>? map) {
static ResultBean fromMap(Map<String, dynamic> map) {
if (map == null) return null;
ResultBean resultBean = ResultBean();
resultBean.ServerTime = map['ServerTime'];
@ -57,10 +57,10 @@ class ResultBean {
/// Description : "Unknown operator login. Check the correctness of the data or contact support."
class ResponseBean {
String? Code;
String? Description;
String Code;
String Description;
static ResponseBean? fromMap(Map<String, dynamic>? map) {
static ResponseBean fromMap(Map<String, dynamic> map) {
if (map == null) return null;
ResponseBean responseBean = ResponseBean();
responseBean.Code = map['Code'];

48
lib/core/models/halyk/halyk_response_dao.dart
View File

@ -2,12 +2,12 @@
/// transaction : {"terminalId":"123321","operationDay":"4","transactionNumber":"69","instrumentSpecificData":{"authorizationCode":"000000","rrn":"1234567890","cardholderName":"IVAN IVANOV","maskedPan":"123456******7890"}}
class HalykResponse {
ResultBean? result;
TransactionBean? transaction;
ResultBean result;
TransactionBean transaction;
HalykResponse({this.result, this.transaction});
static HalykResponse? fromMap(Map<String, dynamic>? map) {
static HalykResponse fromMap(Map<String, dynamic> map) {
if (map == null) return null;
HalykResponse halykResponseBean = HalykResponse();
halykResponseBean.result = ResultBean.fromMap(map['result']);
@ -28,12 +28,12 @@ class HalykResponse {
/// instrumentSpecificData : {"authorizationCode":"000000","rrn":"1234567890","cardholderName":"IVAN IVANOV","maskedPan":"123456******7890"}
class TransactionBean {
int? terminalId;
int? operationDay;
int? transactionNumber;
InstrumentSpecificDataBean? instrumentSpecificData;
int terminalId;
int operationDay;
int transactionNumber;
InstrumentSpecificDataBean instrumentSpecificData;
static TransactionBean? fromMap(Map<String, dynamic>? map) {
static TransactionBean fromMap(Map<String, dynamic> map) {
if (map == null) return null;
TransactionBean transactionBean = TransactionBean();
transactionBean.terminalId = map['terminalId'];
@ -58,12 +58,12 @@ class TransactionBean {
/// maskedPan : "123456******7890"
class InstrumentSpecificDataBean {
String? authorizationCode;
String? rrn;
String? cardholderName;
String? maskedPan;
String authorizationCode;
String rrn;
String cardholderName;
String maskedPan;
static InstrumentSpecificDataBean? fromMap(Map<String, dynamic>? map) {
static InstrumentSpecificDataBean fromMap(Map<String, dynamic> map) {
if (map == null) return null;
InstrumentSpecificDataBean instrumentSpecificDataBean = InstrumentSpecificDataBean();
instrumentSpecificDataBean.authorizationCode = map['authorizationCode'];
@ -87,14 +87,14 @@ class InstrumentSpecificDataBean {
/// hostResponse : {"code":"0","description":"Successfully completed"}
class ResultBean {
int? code;
String? description;
HostResponseBean? hostResponse;
ErrorResponseBean? errorData;
int code;
String description;
HostResponseBean hostResponse;
ErrorResponseBean errorData;
ResultBean({this.code, this.description});
static ResultBean? fromMap(Map<String, dynamic>? map) {
static ResultBean fromMap(Map<String, dynamic> map) {
if (map == null) return null;
ResultBean resultBean = ResultBean();
resultBean.code = map['code'];
@ -117,10 +117,10 @@ class ResultBean {
/// description : "Successfully completed"
class HostResponseBean {
String? code;
String? description;
String code;
String description;
static HostResponseBean? fromMap(Map<String, dynamic>? map) {
static HostResponseBean fromMap(Map<String, dynamic> map) {
if (map == null) return null;
HostResponseBean hostResponseBean = HostResponseBean();
hostResponseBean.code = map['code'];
@ -136,10 +136,10 @@ class HostResponseBean {
}
class ErrorResponseBean {
int? code;
String? description;
int code;
String description;
static ErrorResponseBean? fromMap(Map<String, dynamic>? map) {
static ErrorResponseBean fromMap(Map<String, dynamic> map) {
if (map == null) return null;
ErrorResponseBean errorResponseBean = ErrorResponseBean();
errorResponseBean.code = map['code'];

2
lib/core/models/message.dart
View File

@ -1,7 +1,7 @@
class Message {
final String message;
Message({required this.message});
Message({this.message});
static Message fromJson(Map<String, dynamic> data) => Message(message : data['message']);

4
lib/core/models/money.dart
View File

@ -1,5 +1,5 @@
class Money {
final num? total;
final num total;
final bool loading;
Money({this.total, required this.loading});
Money({this.total, this.loading});
}

8
lib/core/models/product_dao.dart
View File

@ -6,11 +6,11 @@ class ProductDao {
final num price;
num count;
num total;
final Good? good;
final Service? service;
final String? excise;
final Good good;
final Service service;
final String excise;
ProductDao( {required this.name, required this.price, required this.count, required this.total, this.good, this.service, this.excise });
ProductDao( {this.name, this.price, this.count, this.total, this.good, this.service, this.excise });
}

4
lib/core/models/response.dart
View File

@ -1,9 +1,9 @@
class Response<T> {
final T? body;
final T body;
final int status;
final bool operation;
Response({this.body, required this.operation, required this.status});
Response({this.body, this.operation, this.status});
factory Response.fromJson(Map<String, dynamic> data, Function parser) {
return Response(

6
lib/core/models/setting_model.dart
View File

@ -1,6 +1,6 @@
class SettingModel {
const SettingModel({this.name, this.type, this.address});
final String? type;
final String? name;
final String? address;
final String type;
final String name;
final String address;
}

8
lib/core/models/smena.dart
View File

@ -1,8 +1,8 @@
class Smena {
final int? id;
final DateTime? startedAt;
final DateTime? endedAt;
final String? message;
final int id;
final DateTime startedAt;
final DateTime endedAt;
final String message;
Smena({this.id, this.startedAt, this.endedAt, this.message});

12
lib/core/models/transaction_item.dart
View File

@ -1,10 +1,10 @@
class TransactionItem {
final String? cardType;
final String? cardExpireDate;
final String? cardNumber;
final String? transactionType;
final num? amount;
final DateTime? date;
final String cardType;
final String cardExpireDate;
final String cardNumber;
final String transactionType;
final num amount;
final DateTime date;
TransactionItem({this.cardType, this.cardExpireDate, this.cardNumber, this.transactionType, this.amount, this.date});
static TransactionItem fromJson(Map<String, dynamic> json) {

18
lib/core/models/user.dart
View File

@ -1,23 +1,23 @@
class User {
final String? name;
final String? email;
final String? fullName;
final String? token;
int? appCompanyId;
int? kassaId;
final String name;
final String email;
final String fullName;
final String token;
int appCompanyId;
int kassaId;
User({this.email, this.fullName, this.name, this.token, this.appCompanyId, this.kassaId});
static User? fromJson(Map<String, dynamic> json) {
static User fromJson(Map<String, dynamic> json) {
return json != null
? User (
name: json['name'],
email: json['mail'],
token: json['api_token'],
fullName: json['fullname'],
appCompanyId: json['app_company_id'] ,
kassaId: json['kassa_id'] ,
appCompanyId: json['app_company_id'] as int,
kassaId: json['kassa_id'] as int,
)
: null;
}

1
lib/core/route_names.dart
View File

@ -10,7 +10,6 @@ const String SettingsViewRoute = "SettingsViewRoute";
const String QrViewRoute = "QrViewRoute";
const String BankViewRoute = "BankViewRoute";
const String BankSettingViewRoute = "BankSettingViewRoute";
const String ForteSettingViewRoute = "ForteSettingViewRoute";
const String SettingsPrinterRoute = "SettingsPrinterRoute";

80
lib/core/router.dart
View File

@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import 'package:aman_kassa_flutter/core/models/halyk/close_day_data.dart' as halyk;
import 'package:aman_kassa_flutter/core/models/forte/close_day_data.dart' as forte;
import 'package:aman_kassa_flutter/core/models/close_day_data.dart';
import 'package:aman_kassa_flutter/views/bank_setting/bank_setting_view.dart';
import 'package:aman_kassa_flutter/views/bank_view/bank_view.dart';
import 'package:aman_kassa_flutter/views/check/image_show_container.dart';
@ -17,10 +16,7 @@ import 'package:aman_kassa_flutter/views/settings/printer/views/PrinterEncoding.
import 'package:aman_kassa_flutter/views/settings/printer/views/PrinterPaperSize.dart';
import 'package:aman_kassa_flutter/views/settings/setting_printer_view.dart';
import 'package:aman_kassa_flutter/views/login/login_view.dart';
import '../redux/state/bank_state.dart';
import '../redux/store.dart';
import './route_names.dart';
import 'package:aman_kassa_flutter/views/bank_setting/forte_setting_view.dart';
Route<dynamic> generateRoute(RouteSettings settings) {
@ -28,116 +24,92 @@ Route<dynamic> generateRoute(RouteSettings settings) {
case LoginViewRoute:
LoginModel model = settings.arguments as LoginModel;
return _getPageRoute(
routeName: settings.name!,
viewToShow: LoginView(loginModel: model,),
routeName: settings.name,
viewToShow: LoginView(
loginModel: model,
),
);
case HomeViewRoute:
return _getPageRoute(
routeName: settings.name!,
routeName: settings.name,
viewToShow: HomeView(),
);
case PaymentViewRoute:
PaymentModel model = settings.arguments as PaymentModel;
return _getPageRoute(
routeName: settings.name!,
routeName: settings.name,
viewToShow: PaymentView(model: model),
);
case PaymentNfcViewRoute:
PaymentModel model = settings.arguments as PaymentModel;
return _getPageRoute(
routeName: settings.name!,
routeName: settings.name,
viewToShow: PaymentNfcView(model: model),
);
case HistoryViewRoute:
return _getPageRoute(
routeName: settings.name!,
routeName: settings.name,
viewToShow: HistoryView(),
);
case InfoKkmViewRoute:
return _getPageRoute(
routeName: settings.name!,
routeName: settings.name,
viewToShow: InfoKkmView(),
);
case SettingsViewRoute:
return _getPageRoute(
routeName: settings.name!,
routeName: settings.name,
viewToShow: SettingView(),
);
case BankViewRoute:
return _getPageRoute(
routeName: settings.name!,
routeName: settings.name,
viewToShow: BankView(),
);
case BankSettingViewRoute:
return _getPageRoute(
routeName: settings.name!,
routeName: settings.name,
viewToShow: BankSettingView(),
);
case ForteSettingViewRoute:
return _getPageRoute(
routeName: settings.name!,
viewToShow: ForteSettingView(),
);
case QrViewRoute:
ImageShowModel data = settings.arguments as ImageShowModel;
return _getPageRoute(
routeName: settings.name!,
routeName: settings.name,
viewToShow: QrView(data),
);
case ImageShowRoute:
ImageShowModel data = settings.arguments as ImageShowModel;
//return SlideRightRoute(widget: ImageShowContainer(data));
return _getPageRoute(
routeName: settings.name!,
routeName: settings.name,
viewToShow: ImageShowContainer(data),
);
case SettingsPrinterRoute:
return _getPageRoute(
routeName: settings.name!,
routeName: settings.name,
viewToShow: SettingPrinterView(),
);
case SettingsPrinterBTRoute:
return _getPageRoute(
routeName: settings.name!,
routeName: settings.name,
viewToShow: PrinterSelectView(),
);
case SettingsPrinterEncodingRoute:
return _getPageRoute(
routeName: settings.name!,
routeName: settings.name,
viewToShow: PrinterEncodingView(),
);
case SettingsPrinterPaperRoute:
return _getPageRoute(
routeName: settings.name!,
routeName: settings.name,
viewToShow: PrinterPaperView(),
);
case CloseDayShowRoute:
var data = settings.arguments;
if (data is halyk.CloseDayData) {
return _getPageRoute(
routeName: settings.name!,
viewToShow: CloseDayShowContainer(data),
);
} else if (data is forte.CloseDayData) {
return _getPageRoute(
routeName: settings.name!,
viewToShow: CloseDayShowContainer(data),
);
} else {
return _getPageRoute(
routeName: settings.name!,
viewToShow: Scaffold(
appBar: AppBar(
title: Text('Информация недоступна'),
),
body: Center(
child: Text('Данные не могут быть отображены. Пожалуйста, попробуйте позже.'),
),
),
);
}
CloseDayData data = settings.arguments as CloseDayData;
return _getPageRoute(
routeName: settings.name,
viewToShow: CloseDayShowContainer(data),
);
default:
return MaterialPageRoute(
builder: (_) => Scaffold(
@ -147,7 +119,7 @@ Route<dynamic> generateRoute(RouteSettings settings) {
}
}
PageRoute _getPageRoute({required String routeName, required Widget viewToShow}) {
PageRoute _getPageRoute({String routeName, Widget viewToShow}) {
return MaterialPageRoute(
settings: RouteSettings(
name: routeName,
@ -157,7 +129,7 @@ PageRoute _getPageRoute({required String routeName, required Widget viewToShow})
class SlideRightRoute extends PageRouteBuilder {
final Widget widget;
SlideRightRoute({required this.widget})
SlideRightRoute({this.widget})
: super(
pageBuilder: (BuildContext context, Animation<double> animation,
Animation<double> secondaryAnimation) {

30
lib/core/services/ApiService.dart
View File

@ -3,7 +3,6 @@ import 'dart:io';
import 'package:aman_kassa_flutter/core/base/base_service.dart';
import 'package:aman_kassa_flutter/core/models/halyk/halyk_post_session.dart';
import 'package:aman_kassa_flutter/core/models/forte/forte_post_session.dart';
import 'package:aman_kassa_flutter/redux/state/user_state.dart';
import 'package:aman_kassa_flutter/redux/store.dart';
import 'package:aman_kassa_flutter/views/login/login_view.dart';
@ -44,7 +43,7 @@ class ApiService extends BaseService {
};
String response = await requestFormData('/authenticate', requestBody, statusCheck: statusCheck );
AuthResponse aman = AuthResponse.fromJson(json.decode(response));
return aman.body!;
return aman.body;
}
Future<AuthBody> authenticateToken(String token, { bool statusCheck = true}) async {
@ -53,7 +52,7 @@ class ApiService extends BaseService {
};
String response = await requestFormData('/activate_token', requestBody, statusCheck: statusCheck );
AuthResponse aman = AuthResponse.fromJson(json.decode(response));
return aman.body!;
return aman.body;
}
Future<Response<Message>> isActive(String token) async {
@ -74,25 +73,12 @@ class ApiService extends BaseService {
print(hash);
Map<String, String> requestBody = <String, String>{'login': login, 'hash': hash};
String pointUrl = test ? '/hb/pos/gettoken' : '/halykpos/gettoken';
var response = await requestFormData(pointUrl, requestBody, bodyEntry: true, posEndPoint: true, statusCheck: false);
//var response = await requestFormData('/halykpos/gettoken', requestBody, bodyEntry: true, posEndPoint: true, statusCheck: false);
var response = await requestFormData('/hb/pos/gettoken', requestBody, bodyEntry: true, posEndPoint: true, statusCheck: false);
print(response);
return HalykPosSession.fromJson(jsonDecode(response));
}
Future<FortePosSession> fortePosToken(String token, login, password) async {
String salt = '!=uF:w1N_Salh?1gVSJ#eGfJYHA(wS4D';
String hash = md5.convert(utf8.encode('$login$salt')).toString();
print(hash);
Map<String, String> requestBody = <String, String>{'login': login, 'hash': hash};
// String pointUrl = '/fortepos/test/gettoken';
String pointUrl = '/fortepos/prod/gettoken';
var response = await requestFormData(pointUrl, requestBody, bodyEntry: true, posEndPoint: true, statusCheck: false);
print(response);
return FortePosSession.fromJson(jsonDecode(response));
}
Future<Response<dynamic>> money(String token) async {
Map<String, String> requestBody = <String, String>{'api_token': token};
var response = await requestFormData('/money', requestBody);
@ -154,7 +140,7 @@ class ApiService extends BaseService {
}
Future<String> requestFormData(String point, Map<String, String> requestBody, { bool statusCheck = true, bool bodyEntry = false, bool posEndPoint= false } ) async {
Future<String> requestFormData(String point, Map<String, dynamic> requestBody, { bool statusCheck = true, bool bodyEntry = false, bool posEndPoint= false } ) async {
DeviceInfoPlugin deviceInfo = DeviceInfoPlugin();
@ -192,10 +178,6 @@ class ApiService extends BaseService {
String body;
// log.i(uri);
// log.i(jsonEncode(headers));
// log.i(jsonEncode(requestBody));
if(bodyEntry) {
http.Response res = await http.post(uri, body: jsonEncode(requestBody), headers: headers );
body = res.body;
@ -215,7 +197,7 @@ class ApiService extends BaseService {
new Future.delayed(const Duration(milliseconds: 1000), (){
_dialogService.showDialog(description: 'Необходимо пройти повторную авторизацию');
UserState state = Redux.store!.state.userState!;
UserState state = Redux.store.state.userState;
_navigatorService.replace(LoginViewRoute, arguments: LoginModel(authType: state.authenticateType, login: state.login, password: state.password ));
});

51
lib/core/services/BankService.dart
View File

@ -1,7 +1,7 @@
import 'dart:convert';
import 'package:aman_kassa_flutter/core/base/base_service.dart';
import 'package:aman_kassa_flutter/core/locator.dart';
import 'package:aman_kassa_flutter/core/models/halyk/close_day_data.dart';
import 'package:aman_kassa_flutter/core/models/close_day_data.dart';
import 'package:aman_kassa_flutter/core/models/halyk/halyk_close_day_dao.dart' as Cd;
import 'package:aman_kassa_flutter/core/models/halyk/halyk_post_session.dart' as Ps;
import 'package:aman_kassa_flutter/core/models/halyk/halyk_response_dao.dart';
@ -15,7 +15,6 @@ import '../models/aman_dao.dart';
class BankService extends BaseService {
int sdkVersion = 27;
String packageName = 'ru.m4bank.softpos.halyk';
final ApiService _api = locator<ApiService>();
final MethodChannel _channel = MethodChannel('channel:com.amanKassa/bank');
@ -29,11 +28,11 @@ class BankService extends BaseService {
result = '0';
}
log.i(result);
return int.parse(result);
return int.parse(result) ?? 0;
}
Future<Ps.HalykPosSession?> renewToken({required String token, required String login, required String password}) async {
Ps.HalykPosSession? result;
Future<Ps.HalykPosSession> renewToken({String token, String login, String password}) async {
Ps.HalykPosSession result;
try {
result = await _api.halykPosToken(token, login, password);
} catch (e, stack) {
@ -44,14 +43,11 @@ class BankService extends BaseService {
Future<Cd.HalykCloseDayDao?> closeDay({ required String token}) async {
Future<Cd.HalykCloseDayDao> closeDay({ String token}) async {
try {
String response = await _channel.invokeMethod("closeDay", <String, dynamic>{
'token': token,
'packageName': packageName
});
String response = await _channel.invokeMethod("closeDay", <String, dynamic>{'token': token });
log.i(response);
Cd.HalykCloseDayDao dao = Cd.HalykCloseDayDao.fromMap(json.decode(response))!;
Cd.HalykCloseDayDao dao = Cd.HalykCloseDayDao.fromMap(json.decode(response));
return dao;
} catch (e, stack) {
log.e("BankService", e, stack);
@ -59,18 +55,14 @@ class BankService extends BaseService {
}
}
Future<HalykResponse> pay({required double amount, required String token}) async {
Future<HalykResponse> pay({double amount, String token}) async {
try {
double total = amount * 100;
log.i('total: $total, ${total.toInt()}');
String response = await _channel.invokeMethod("pay", <String, dynamic>{
'amount': total.toInt(),
'token': token,
'packageName': packageName
});
String response = await _channel.invokeMethod("pay", <String, dynamic>{'amount': total.toInt(), 'token': token });
log.i(response);
HalykResponse dao = HalykResponse.fromMap(json.decode(response))!;
HalykResponse dao = HalykResponse.fromMap(json.decode(response));
return dao;
} catch (e, stack) {
log.e("BankService", e, stack);
@ -78,17 +70,12 @@ class BankService extends BaseService {
}
}
Future<HalykResponse> refund({required double amount, required String token, required int terminalId, required int operDay, required int transNum }) async {
Future<HalykResponse> refund({double amount, String token, int terminalId, int operDay, int transNum }) async {
try {
String response = await _channel.invokeMethod("refund", <String, dynamic>{
'amount': amount.toInt(),
'token': token,
'terminalId': terminalId,
'operDay': operDay,
'transNum': transNum,
'packageName': packageName
'amount': amount.toInt(), 'token': token , 'terminalId': terminalId, 'operDay': operDay, 'transNum': transNum
});
HalykResponse dao = HalykResponse.fromMap(json.decode(response))!;
HalykResponse dao = HalykResponse.fromMap(json.decode(response));
return dao;
} catch (e, stack) {
log.e("BankService", e, stack);
@ -96,17 +83,13 @@ class BankService extends BaseService {
}
}
Future<HalykResponse> reversal({ required String token, required int terminalId, required int operDay, required int transNum }) async {
Future<HalykResponse> reversal({ String token, int terminalId, int operDay, int transNum }) async {
try {
String response = await _channel.invokeMethod("reversal", <String, dynamic>{
'token': token,
'terminalId': terminalId,
'operDay': operDay,
'transNum': transNum,
'packageName': packageName
'token': token , 'terminalId': terminalId, 'operDay': operDay, 'transNum': transNum
});
log.i(response);
HalykResponse dao = HalykResponse.fromMap(json.decode(response))!;
HalykResponse dao = HalykResponse.fromMap(json.decode(response));
return dao;
} catch (e, stack) {
log.e("BankService", e, stack);
@ -119,7 +102,7 @@ class BankService extends BaseService {
final DateFormat formatter = DateFormat('dd.MM.yyyy');
final DateTime now = DateTime.now();
final String formatted = formatter.format(now);
List<Cd.TransactionBean> items = transactions.transaction!;
List<Cd.TransactionBean> items = transactions.transaction;
num totalAmount = 0;
int totalCount = 0;
num paymentAmount = 0;

113
lib/core/services/DataService.dart
View File

@ -1,5 +1,4 @@
import 'dart:convert';
import 'dart:ffi';
import 'package:aman_kassa_flutter/core/base/base_service.dart';
import 'package:aman_kassa_flutter/core/entity/Category.dart';
@ -27,8 +26,7 @@ class DataService extends BaseService {
final ApiService _api = locator<ApiService>();
final DbService _db = locator<DbService>();
Future<List<Category>> getCategoriesByParentId(
{int? parentId}) async {
Future<List<Category>> getCategoriesByParentId({int parentId}) async {
List<Map<String, dynamic>> list = await _db.queryRowsWithWhere(
Category_tableName, '$Category_columnParentIn = ?', [parentId ?? 0]);
return list.map((e) => Category.fromMap(e)).toList();
@ -39,38 +37,35 @@ class DataService extends BaseService {
return list.map((e) => Service.fromMap(e)).toList();
}
Future<List<Good>> getGoodsByCategoryId({int? categoryId}) async {
Future<List<Good>> getGoodsByCategoryId({int categoryId}) async {
List<Map<String, dynamic>> list = await _db.queryRowsWithWhere(
Goog_tableName, '$Goog_columnCategoryId = ?', [categoryId ?? 0]);
return list.map((e) => Good.fromMap(e)).toList();
}
Future<List<Good>> getGoodsByBarcode({required String barcode}) async {
List<Map<String, dynamic>> list = await _db
.queryRowsWithWhere(Goog_tableName, ' $Goog_columnEan = ?', [barcode]);
Future<List<Good>> getGoodsByBarcode ({ String barcode}) async {
List<Map<String, dynamic>> list = await _db.queryRowsWithWhere(Goog_tableName, ' $Goog_columnEan = ?', [barcode]);
return list.map((e) => Good.fromMap(e)).toList();
}
CheckData _transformProductsToCheckData(
{String? paymentType,
String? tradeType,
required List<ProductDao> items}) {
{String paymentType, String tradeType, List<ProductDao> items}) {
List<CheckItem> itemsList = [];
int iterator = 1;
num summ = 0.0;
items.forEach((el) {
int articul = iterator;
if (el.service != null) {
articul = el.service!.articul;
articul = el.service.articul;
} else if (el.good != null) {
articul = el.good!.articul;
articul = el.good.articul;
}
itemsList.add(CheckItem(
name: el.name,
cnt: el.count,
price: el.price,
articul: articul,
excise: el.excise,
name: el.name ?? 'Позиция №$iterator',
cnt: el.count,
price: el.price,
articul: articul,
excise: el.excise,
));
summ += el.total;
iterator++;
@ -78,16 +73,12 @@ class DataService extends BaseService {
CheckData checkData = CheckData(type: tradeType, items: itemsList);
if ((paymentType ?? 'cash') == 'card') {
checkData.card = summ;
} else if ((paymentType ?? 'cash') == 'mobile') {
checkData.mobile = summ;
}
return checkData;
}
CheckData _transformCalcModelToCheckData(
{String? paymentType,
String? tradeType,
required List<CalcModel> items}) {
{String paymentType, String tradeType, List<CalcModel> items}) {
List<CheckItem> itemsList = [];
int iterator = 1;
num summ = 0.0;
@ -95,7 +86,7 @@ class DataService extends BaseService {
int articul = iterator;
CheckItem item = CheckItem(
name: 'Позиция $iterator',
cnt: el.num2 != null ? double.parse(el.num2!) : 1.0,
cnt: el.num2 != null ? double.parse(el.num2) : 1.0,
price: double.parse(el.num1),
articul: articul);
@ -106,8 +97,6 @@ class DataService extends BaseService {
CheckData checkData = CheckData(type: tradeType, items: itemsList);
if ((paymentType ?? 'cash') == 'card') {
checkData.card = summ;
} else if ((paymentType ?? 'cash') == 'mobile') {
checkData.mobile = summ;
}
return checkData;
}
@ -123,13 +112,13 @@ class DataService extends BaseService {
* type
*/
Future<void> insertVoucher(
{required User user,
String? data,
String? base64Data,
required String name,
{@required User user,
String data,
String base64Data,
@required String name,
double total = 0.0,
String type = VoucherTypePayment,
String? url}) async {
String url}) {
assert(user != null);
assert(name != null);
Voucher voucher = Voucher()
@ -145,13 +134,14 @@ class DataService extends BaseService {
log.i(
'save to db appCompanyId: ${user.appCompanyId}, kassaId: ${user.kassaId}');
_db.insert(Voucher_tableName, voucher.toMap());
return null;
}
Future<Response<dynamic>?> refundM4Bank(
Future<Response<dynamic>> refundM4Bank(
{
required String token,
required CheckData checkData,
required CardData cardData}) async {
String token,
CheckData checkData,
CardData cardData}) async {
try {
var json = cardData.toJson();
json['transactionType'] = VoucherTypeReturnPay;
@ -164,10 +154,10 @@ class DataService extends BaseService {
log.i('response status: ${response.status}');
log.i('response operation: ${response.operation}');
if (response.status == 200 && response.operation == true) {
User user = Redux.store!.state.userState!.user!;
String check = response.body['check'];
dynamic journal = response.body['journal'];
String url = response.body['link'];
User user = Redux.store.state.userState.user;
String check = response?.body['check'];
dynamic journal = response?.body['journal'];
String url = response?.body['link'];
int checkNum = journal['check_num'];
var summ = journal['summ'];
double total = summ != null ? double.parse(summ.toString()) : 0.0;
@ -187,29 +177,26 @@ class DataService extends BaseService {
return null;
}
Future<Response<dynamic>?> sellOrReturn(
{String? paymentType,
String? tradeType,
String? contragent,
required String token,
required List<ProductDao> kassaItems,
required List<CalcModel> calcItems,
required String operationType,
required String mode,
required CardData? cardData}) async {
Future<Response<dynamic>> sellOrReturn(
{String paymentType,
String tradeType,
String token,
List<ProductDao> kassaItems,
List<CalcModel> calcItems,
String operationType,
String mode,
CardData cardData}) async {
try {
String data = "";
String data;
if (mode == SettingModeKassa) {
CheckData checkData = _transformProductsToCheckData(
paymentType: paymentType, tradeType: tradeType, items: kassaItems);
checkData.cardData = cardData;
checkData.contragent = contragent;
data = jsonEncode(checkData.toJson());
} else if (mode == SettingModeCalc) {
CheckData checkData = _transformCalcModelToCheckData(
paymentType: paymentType, tradeType: tradeType, items: calcItems);
checkData.cardData = cardData;
checkData.contragent = contragent;
data = jsonEncode(checkData.toJson());
}
@ -221,20 +208,18 @@ class DataService extends BaseService {
// log.i('response status: ${response.status}');
// log.i('response operation: ${response.operation}');
if (response.status == 200 && response.operation == true) {
User user = Redux.store!.state.userState!.user!;
User user = Redux.store.state.userState.user;
//check compare
String check = response.body['check'];
var checkText = response.body['check_text'];
CheckImageModal imageModal = new CheckImageModal(
base64Data: check,
textData: checkText != null ? jsonEncode(checkText) : null);
String check = response?.body['check'];
var checkText = response?.body['check_text'];
CheckImageModal imageModal = new CheckImageModal( base64Data: check, textData: checkText !=null ? jsonEncode(checkText) : null );
// journal analyze
dynamic journal = response.body['journal'];
dynamic journal = response?.body['journal'];
int checkNum = journal['check_num'];
var summ = journal['summ'];
// short url
String url = response.body['link'];
String url = response?.body['link'];
// total
double total = summ != null ? double.parse(summ.toString()) : 0.0;
@ -258,9 +243,9 @@ class DataService extends BaseService {
}
Future<void> checkDbFill(User user) async {
int serviceCount = await _db.queryRowCount(Service_tableName) ?? 0;
int serviceCount = await _db.queryRowCount(Service_tableName);
if (serviceCount == 0) {
int goodCount = await _db.queryRowCount(Goog_tableName) ?? 0;
int goodCount = await _db.queryRowCount(Goog_tableName);
if (goodCount == 0) {
await getDataFromServer(user);
} else {
@ -274,10 +259,9 @@ class DataService extends BaseService {
Future<bool> getDataFromServer(User user) async {
log.i('Get Data from server');
try {
String token = user.token!;
String token = user.token;
Response<dynamic> goods = await _api.getGoodsFromServer(token);
if (goods.operation == false &&
[401, 402, 403, 412].contains(goods.status)) {
if(goods.operation==false && [401,402,403,412].contains(goods.status)){
log.i('session is closed');
return false;
}
@ -288,6 +272,7 @@ class DataService extends BaseService {
await _db.deleteAll(Service_tableName);
log.i('All tables cleaned');
if (goods.body.isNotEmpty) {
for (var key in goods.body.keys) {
Good row = Good.fromJson(goods.body[key]);

8
lib/core/services/DbService.dart
View File

@ -19,13 +19,13 @@ class DbService extends BaseService {
static final DbService instance = DbService._privateConstructor();
// only have a single app-wide reference to the database
static Database? _database;
static Database _database;
Future<Database> get database async {
if (_database != null) return _database!;
if (_database != null) return _database;
// lazily instantiate the db the first time it is accessed
_database = await _initDatabase();
return _database!;
return _database;
}
// this opens the database (and creates it if it doesn't exist)
@ -136,7 +136,7 @@ class DbService extends BaseService {
// All of the methods (insert, query, update, delete) can also be done using
// raw SQL commands. This method uses a raw query to give the row count.
Future<int?> queryRowCount(String table) async {
Future<int> queryRowCount(String table) async {
Database db = await instance.database;
return Sqflite.firstIntValue(
await db.rawQuery('SELECT COUNT(*) FROM $table'));

161
lib/core/services/ForteService.dart
View File

@ -1,161 +0,0 @@
import 'dart:convert';
import 'package:aman_kassa_flutter/core/base/base_service.dart';
import 'package:aman_kassa_flutter/core/locator.dart';
import 'package:aman_kassa_flutter/core/models/forte/close_day_data.dart';
import 'package:aman_kassa_flutter/core/models/forte/forte_close_day_dao.dart' as Cd;
import 'package:aman_kassa_flutter/core/models/forte/forte_post_session.dart' as Ps;
import 'package:aman_kassa_flutter/core/models/forte/forte_response_dao.dart';
import 'package:aman_kassa_flutter/core/models/transaction_item.dart';
import 'package:aman_kassa_flutter/core/services/ApiService.dart';
import 'package:flutter/services.dart';
import 'package:intl/intl.dart';
import '../models/aman_dao.dart';
class ForteService extends BaseService {
int sdkVersion = 27;
String packageName = 'kz.forte.pos';
final ApiService _api = locator<ApiService>();
final MethodChannel _channel = MethodChannel('channel:com.amanKassa/bank');
Future<int> version() async {
String result;
try {
result = await _channel.invokeMethod('version');
} catch (e, stack) {
log.e("ForteService", e, stack);
result = '0';
}
log.i(result);
return int.parse(result);
}
Future<Ps.FortePosSession?> renewToken({required String token, required String login, required String password}) async {
Ps.FortePosSession? result;
try {
result = await _api.fortePosToken(token, login, password);
} catch (e, stack) {
log.e("ForteService", e, stack);
}
return result;
}
Future<Cd.ForteCloseDayDao?> closeDay({ required String token}) async {
try {
String response = await _channel.invokeMethod("closeDay", <String, dynamic>{
'token': token,
'packageName': packageName
});
log.i(response);
Cd.ForteCloseDayDao dao = Cd.ForteCloseDayDao.fromMap(json.decode(response))!;
return dao;
} catch (e, stack) {
log.e("ForteService", e, stack);
return new Cd.ForteCloseDayDao(result: Cd.ResultBean(description: 'Ошибка при закрытии дня', code: -1));
}
}
Future<ForteResponse> pay({required double amount, required String token}) async {
try {
double total = amount * 100;
log.i('total: $total, ${total.toInt()}');
String response = await _channel.invokeMethod("pay", <String, dynamic>{
'amount': total.toInt(),
'token': token,
'packageName': packageName
});
log.i(response);
ForteResponse dao = ForteResponse.fromMap(json.decode(response))!;
return dao;
} catch (e, stack) {
log.e("ForteService", e, stack);
return new ForteResponse(result: ResultBean(description: 'Ошибка оплаты', code: -1));
}
}
Future<ForteResponse> refund({required double amount, required String token, required int terminalId, required int operDay, required int transNum }) async {
try {
double total = amount * 100;
String response = await _channel.invokeMethod("refund", <String, dynamic>{
'amount': total,
'token': token,
'terminalId': terminalId,
'operDay': operDay,
'transNum': transNum,
'packageName': packageName
});
ForteResponse dao = ForteResponse.fromMap(json.decode(response))!;
return dao;
} catch (e, stack) {
log.e("ForteService", e, stack);
return new ForteResponse(result: ResultBean(description: 'Ошибка при возврате', code: -1));
}
}
Future<ForteResponse> reversal({ required String token, required int terminalId, required int operDay, required int transNum }) async {
try {
String response = await _channel.invokeMethod("reversal", <String, dynamic>{
'token': token,
'terminalId': terminalId,
'operDay': operDay,
'transNum': transNum,
'packageName': packageName
});
log.i(response);
ForteResponse dao = ForteResponse.fromMap(json.decode(response))!;
return dao;
} catch (e, stack) {
log.e("ForteService", e, stack);
return new ForteResponse(result: ResultBean(description: 'Ошибка при возврате', code: -1));
}
}
CloseDayData closeDayDataConvert(Cd.TransactionsBean transactions) {
final DateFormat formatter = DateFormat('dd.MM.yyyy');
final DateTime now = DateTime.now();
final String formatted = formatter.format(now);
List<Cd.TransactionBean> items = transactions.transaction!;
num totalAmount = 0;
int totalCount = 0;
num paymentAmount = 0;
int paymentCount = 0;
num refundAmount = 0;
int refundCount = 0;
num cancelAmount = 0;
int cancelCount = 0;
for(Cd.TransactionBean item in items) {
if(item.type == 'PAYMENT') {
paymentCount++;
paymentAmount += ( item.amount / 100 );
totalAmount += ( item.amount / 100 );
} else if(item.type == 'REFUND') {
refundCount++;
refundAmount += ( item.amount / 100 );
totalAmount -= ( item.amount / 100 );
} else if(item.type == 'REVERSAL') {
cancelCount++;
cancelAmount += ( item.amount / 100 );
totalAmount -= ( item.amount / 100 );
}
totalCount++;
}
CloseDayData closeDayData = new CloseDayData(
items: items,
title: 'Отчет POS от $formatted',
totalAmount: totalAmount, totalCount: totalCount,
paymentAmount: paymentAmount, paymentCount: paymentCount,
refundAmount: refundAmount, refundCount: refundCount,
cancelAmount: cancelAmount, cancelCount: cancelCount,
);
return closeDayData;
}
}

20
lib/core/services/authentication_service.dart
View File

@ -10,18 +10,18 @@ import 'ApiService.dart';
class AuthenticationService extends BaseService {
final ApiService _api;
AuthenticationService({required ApiService api}) : _api = api;
AuthenticationService({ApiService api}) : _api = api;
User? _currentUser;
User? get currentUser => _currentUser;
User _currentUser;
User get currentUser => _currentUser;
Future<AuthBody?> loginWithEmail({
required String email,
required String password,
Future<AuthBody> loginWithEmail({
@required String email,
@required String password,
}) async {
try {
AuthBody? result = await _api.authenticate(email, password);
if (result!=null && result.user != null) {
AuthBody result = await _api.authenticate(email, password);
if (result.user != null) {
_currentUser = result.user;
}
return result;
@ -32,7 +32,7 @@ class AuthenticationService extends BaseService {
Future<bool> isUserLoggedIn(String token) async {
Response<Message> session = await _api.isActive(token);
if ("OK" == session.body?.message) {
if ("OK" == session.body.message) {
//_session = session;
return true;
}
@ -40,7 +40,7 @@ class AuthenticationService extends BaseService {
}
Future<bool> logout(String token) async {
Response<dynamic> session = await _api.logout(token);
Response<Message> session = await _api.logout(token);
if ("logout" == session.body.message) {
return true;
}

173
lib/core/services/blue_print_service.dart
View File

@ -1,173 +0,0 @@
import 'dart:io';
import 'dart:typed_data';
import 'package:aman_kassa_flutter/core/base/base_service.dart';
import 'package:bluetooth_print/bluetooth_print.dart';
import 'package:bluetooth_print/bluetooth_print_model.dart';
import 'package:flutter_blue/flutter_blue.dart' as flutter_blue;
import 'package:flutter_blue/gen/flutterblue.pb.dart' as proto;
class BluePrintService extends BaseService {
final BluetoothPrint _bluetoothAndr = BluetoothPrint.instance;
flutter_blue.BluetoothDevice? _bluetoothDeviceIOS;
final flutter_blue.FlutterBlue _bluetoothIOS =
flutter_blue.FlutterBlue.instance;
final bool isAndroid = Platform.isAndroid;
final bool isIos = Platform.isIOS;
// final bool isAndroid = false;
// final bool isIos = true;
BluetoothDevice? _device;
Future<void> scan() async {
if (isAndroid) {
await _bluetoothAndr.startScan(timeout: Duration(seconds: 4));
} else if (isIos) {
await _bluetoothIOS.startScan(timeout: const Duration(seconds: 5));
}
}
Future<void> stopScan() async {
if (isAndroid) {
await _bluetoothAndr.stopScan();
} else if (isIos) {
await _bluetoothIOS.stopScan();
}
}
Stream<List<BluetoothDevice>> get scanResult {
if (isAndroid)
return _bluetoothAndr.scanResults;
else
return _bluetoothIOS.scanResults.asyncMap<List<BluetoothDevice>>(
(event) =>
Future.wait(event.toList().map((e) async => BluetoothDevice()
..name = e.device.name
..type = e.device.type.index
..address = e.device.id.id)));
}
Stream<bool> get isScanning =>
isAndroid ? _bluetoothAndr.isScanning : _bluetoothIOS.isScanning;
Stream<int> get state => isAndroid
? _bluetoothAndr.state
: _bluetoothIOS.state.asyncMap<int>((event) => event.index);
set device(BluetoothDevice device) => _device = device;
Future<bool> connect() async {
bool response = false;
if (_device == null) {
response = false;
} else {
// try {
// await _bluetoothAndr.connect(_device!);
// await Future.delayed(Duration(seconds: 5));
// response = true;
// } catch (e) {
// print('Error connect $e');
// response = false;
// }
try {
if (isAndroid) {
await _bluetoothAndr.connect(_device!);
} else if (isIos) {
_bluetoothDeviceIOS = flutter_blue.BluetoothDevice.fromProto(
proto.BluetoothDevice(
name: _device?.name ?? '',
remoteId: _device?.address ?? '',
type: proto.BluetoothDevice_Type.valueOf(_device?.type ?? 0),
),
);
final List<flutter_blue.BluetoothDevice> connectedDevices =
await _bluetoothIOS.connectedDevices;
final int deviceConnectedIndex = connectedDevices
.indexWhere((flutter_blue.BluetoothDevice bluetoothDevice) {
return bluetoothDevice.id == _bluetoothDeviceIOS?.id;
});
if (deviceConnectedIndex < 0) {
await _bluetoothDeviceIOS?.connect();
}
}
response = true;
_device?.connected = true;
return Future<bool>.value(response);
} on Exception catch (error) {
print('$runtimeType - Error $error');
response = false;
_device?.connected = false;
return Future<bool>.value(response);
}
}
return response;
}
Future<bool> disconnect() async {
bool response = false;
try {
if (isAndroid) {
await _bluetoothAndr.disconnect();
} else if (isIos) {
await _bluetoothDeviceIOS?.disconnect();
}
print('disconnected');
response = true;
} catch (e) {
print('Error $e');
response = false;
}
return response;
}
Future<bool> printBytes(Uint8List bytes,
{int chunkSizeBytes = 20, int queueSleepTimeMs = 20}) async {
Map<String, dynamic> config = Map();
final len = bytes.length;
List<List<int>> chunks = [];
for (var i = 0; i < len; i += chunkSizeBytes) {
var end = (i + chunkSizeBytes < len) ? i + chunkSizeBytes : len;
chunks.add(bytes.sublist(i, end));
}
for (var i = 0; i < chunks.length; i += 1) {
if (isAndroid) {
await _printAndroid(chunks[i], config);
} else if (isIos) {
await _printIos(Uint8List.fromList(chunks[i]), config);
}
await Future.delayed(Duration(milliseconds: queueSleepTimeMs));
}
return true;
}
Future<void> _printIos(Uint8List bytes,Map<String, dynamic> config) async {
final List<flutter_blue.BluetoothService> bluetoothServices =
await _bluetoothDeviceIOS?.discoverServices() ??
<flutter_blue.BluetoothService>[];
final flutter_blue.BluetoothService bluetoothService =
bluetoothServices.firstWhere(
(flutter_blue.BluetoothService service) => service.isPrimary,
);
final flutter_blue.BluetoothCharacteristic characteristic =
bluetoothService.characteristics.firstWhere(
(flutter_blue.BluetoothCharacteristic bluetoothCharacteristic) =>
bluetoothCharacteristic.properties.write,
);
await characteristic.write(bytes, withoutResponse: true);
}
Future<void> _printAndroid(List<int> chunk ,Map<String, dynamic> config) async {
await _bluetoothAndr.rawBytes(config, chunk);
}
}

34
lib/core/services/dialog_service.dart
View File

@ -5,11 +5,11 @@ import 'package:flutter/cupertino.dart';
class DialogService {
GlobalKey<NavigatorState> _dialogNavigationKey = GlobalKey<NavigatorState>();
Function(DialogRequest)? _showDialogListener;
Function(DialogRequest)? _showDialogInputListener;
Completer<DialogResponse>? _dialogCompleter;
Function(DialogRequest) _showDialogListener;
Function(DialogRequest) _showDialogInputListener;
Completer<DialogResponse> _dialogCompleter;
Completer<DialogResponse>? get completer => this._dialogCompleter;
Completer<DialogResponse> get completer => this._dialogCompleter;
GlobalKey<NavigatorState> get dialogNavigationKey => _dialogNavigationKey;
@ -23,53 +23,53 @@ class DialogService {
/// Calls the dialog listener and returns a Future that will wait for dialogComplete.
Future<DialogResponse> showDialog({
String title = 'Aman Касса',
required String description,
String description,
String buttonTitle = 'Ok',
}) {
_dialogCompleter = Completer<DialogResponse>();
_showDialogListener!(DialogRequest(
_showDialogListener(DialogRequest(
title: title,
description: description,
buttonTitle: buttonTitle,
));
return _dialogCompleter!.future;
return _dialogCompleter.future;
}
/// Shows a confirmation dialog
Future<DialogResponse> showConfirmationDialog(
{required String title,
required String description,
{String title,
String description,
String confirmationTitle = 'Ok',
String cancelTitle = 'Cancel'}) {
_dialogCompleter = Completer<DialogResponse>();
_showDialogListener!(DialogRequest(
_showDialogListener(DialogRequest(
title: title,
description: description,
buttonTitle: confirmationTitle,
cancelTitle: cancelTitle));
return _dialogCompleter!.future;
return _dialogCompleter.future;
}
Future<DialogResponse> showConfirmationDialogInput(
{String title = ' Aman Касса',
required String description,
String description,
String confirmationTitle = 'Ok',
String cancelTitle = 'Cancel',
String? formatType}) {
String formatType}) {
_dialogCompleter = Completer<DialogResponse>();
_showDialogInputListener!(DialogRequest(
_showDialogInputListener(DialogRequest(
title: title,
description: description,
buttonTitle: confirmationTitle,
cancelTitle: cancelTitle,
formatType: formatType));
return _dialogCompleter!.future;
return _dialogCompleter.future;
}
/// Completes the _dialogCompleter to resume the Future's execution call
void dialogComplete(DialogResponse response) {
_dialogNavigationKey.currentState!.pop();
_dialogCompleter!.complete(response);
_dialogNavigationKey.currentState.pop();
_dialogCompleter.complete(response);
_dialogCompleter = null;
}
}

16
lib/core/services/navigator_service.dart
View File

@ -6,27 +6,27 @@ class NavigatorService extends BaseService {
Future<dynamic> push(String routeName, {dynamic arguments}) {
log.i('routeName: $routeName');
return navigatorKey.currentState!
return navigatorKey.currentState
.pushNamed(routeName, arguments: arguments);
}
Future<dynamic> replace(String routeName, {dynamic arguments}) {
log.i('routeName: $routeName');
return navigatorKey.currentState!
return navigatorKey.currentState
.pushNamedAndRemoveUntil(routeName, (Route<dynamic> route) => false, arguments: arguments);
}
Future<T?> navigateToPage<T>(MaterialPageRoute<T> pageRoute) async {
Future<T> navigateToPage<T>(MaterialPageRoute<T> pageRoute) async {
log.i('navigateToPage: pageRoute: ${pageRoute.settings.name}');
if (navigatorKey.currentState == null) {
log.e('navigateToPage: Navigator State is null');
return null;
}
return navigatorKey.currentState!.push(pageRoute);
return navigatorKey.currentState.push(pageRoute);
}
Future<T?> navigateToPageWithReplacement<T>(
Future<T> navigateToPageWithReplacement<T>(
MaterialPageRoute<T> pageRoute) async {
log.i('navigateToPageWithReplacement: '
'pageRoute: ${pageRoute.settings.name}');
@ -34,15 +34,15 @@ class NavigatorService extends BaseService {
log.e('navigateToPageWithReplacement: Navigator State is null');
return null;
}
return navigatorKey.currentState!.pushReplacement(pageRoute);
return navigatorKey.currentState.pushReplacement(pageRoute);
}
void pop<T>([T? result]) {
void pop<T>([T result]) {
log.i('goBack:');
if (navigatorKey.currentState == null) {
log.e('goBack: Navigator State is null');
return;
}
navigatorKey.currentState!.pop(result);
navigatorKey.currentState.pop(result);
}
}

2
lib/core/utilsParse.dart
View File

@ -1,4 +1,4 @@
List<String>? parseListString(json){
List<String> parseListString(json){
if(json==null) return null;
return new List<String>.from(json);
}

69
lib/firebase_options.dart
View File

@ -1,69 +0,0 @@
// File generated by FlutterFire CLI.
// ignore_for_file: lines_longer_than_80_chars, avoid_classes_with_only_static_members
import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
import 'package:flutter/foundation.dart'
show defaultTargetPlatform, kIsWeb, TargetPlatform;
/// Default [FirebaseOptions] for use with your Firebase apps.
///
/// Example:
/// ```dart
/// import 'firebase_options.dart';
/// // ...
/// await Firebase.initializeApp(
/// options: DefaultFirebaseOptions.currentPlatform,
/// );
/// ```
class DefaultFirebaseOptions {
static FirebaseOptions get currentPlatform {
if (kIsWeb) {
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for web - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
}
switch (defaultTargetPlatform) {
case TargetPlatform.android:
return android;
case TargetPlatform.iOS:
return ios;
case TargetPlatform.macOS:
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for macos - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
case TargetPlatform.windows:
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for windows - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
case TargetPlatform.linux:
throw UnsupportedError(
'DefaultFirebaseOptions have not been configured for linux - '
'you can reconfigure this by running the FlutterFire CLI again.',
);
default:
throw UnsupportedError(
'DefaultFirebaseOptions are not supported for this platform.',
);
}
}
static const FirebaseOptions android = FirebaseOptions(
apiKey: 'AIzaSyAlAhTjrXj0s1Qep2_mP_u4QtMnltMi4RA',
appId: '1:1086013480150:android:d00d738289818373f17d77',
messagingSenderId: '1086013480150',
projectId: 'aman-f670e',
storageBucket: 'aman-f670e.appspot.com',
);
static const FirebaseOptions ios = FirebaseOptions(
apiKey: 'AIzaSyApELiWrEflqtXPo8cndFnPW0sRVVHmkYQ',
appId: '1:1086013480150:ios:958c91234e46010cf17d77',
messagingSenderId: '1086013480150',
projectId: 'aman-f670e',
storageBucket: 'aman-f670e.appspot.com',
iosClientId: '1086013480150-93mcqf1l60dvmd2k1lkg2ikmvm3u29ca.apps.googleusercontent.com',
iosBundleId: 'com.kz.amankassaflutter',
);
}

94
lib/main.dart
View File

@ -1,16 +1,14 @@
//general
import 'dart:io';
import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';
import 'package:flutter_redux/flutter_redux.dart';
import 'package:aman_kassa_flutter/shared/app_colors.dart';
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:firebase_core/firebase_core.dart';
import 'firebase_options.dart';
import 'package:flutter_screenutil/screenutil_init.dart';
import 'package:google_fonts/google_fonts.dart';
//service & tools
import 'package:aman_kassa_flutter/redux/store.dart';
import 'core/locator.dart';
@ -18,16 +16,13 @@ import 'core/router.dart';
import 'core/services/navigator_service.dart';
import 'core/services/dialog_service.dart';
import './widgets/dialog_manager.dart';
//pages
import 'views/start_up/start_up_view.dart';
//main start
void main() async {
// HttpOverrides.global = MyHttpOverrides();
HttpOverrides.global = MyHttpOverrides();
WidgetsFlutterBinding.ensureInitialized();
HttpOverrides.global = MyHttpOverrides();
@ -39,80 +34,29 @@ void main() async {
yield LicenseEntryWithLineBreaks(['google_fonts'], license);
});
await Firebase.initializeApp(
options: DefaultFirebaseOptions.currentPlatform,
);
FirebaseMessaging messaging = FirebaseMessaging.instance;
NotificationSettings settings = await messaging.requestPermission(
alert: true,
announcement: false,
badge: true,
carPlay: false,
criticalAlert: false,
provisional: false,
sound: true,
);
print('User granted permission: ${settings.authorizationStatus}');
await FirebaseMessaging.instance.subscribeToTopic('all');
FirebaseMessaging.onMessage.listen((RemoteMessage message) {
if (message.notification != null) {
locator<DialogService>().showDialog(description: message.notification?.body ?? '');
}
});
FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) async {
if (message.notification != null) {
locator<DialogService>().showDialog(description: message.notification?.body ?? '');
}
});
FirebaseMessaging.onBackgroundMessage(_firebaseMessagingBackgroundHandler);
await Redux.init();
runApp(MainApplication());
}
Future<void> _firebaseMessagingBackgroundHandler(RemoteMessage message) async {
// If you're going to use other Firebase services in the background, such as Firestore,
// make sure you call `initializeApp` before using other Firebase services.
await Firebase.initializeApp();
}
class MyHttpOverrides extends HttpOverrides {
@override
HttpClient createHttpClient(SecurityContext? context) {
return super.createHttpClient(context)
..badCertificateCallback =
(X509Certificate cert, String host, int port) => true;
}
}
class MainApplication extends StatelessWidget {
@override
Widget build(BuildContext context) {
return StoreProvider<AppState>(
store: Redux.store!,
store: Redux.store,
child: ScreenUtilInit(
designSize: const Size(
411.43,
683.43,
),
builder: (context, child) => MaterialApp(
designSize: Size(411.43, 683.43),
allowFontScaling: false,
builder: () => MaterialApp(
theme: ThemeData(
backgroundColor: backgroundColor,
primaryColor: primaryColor,
accentColor: yellowColor,
scaffoldBackgroundColor: Colors.white,
// textTheme: GoogleFonts.latoTextTheme(
// Theme.of(context).textTheme,
// )
textTheme: GoogleFonts.latoTextTheme(
Theme.of(context).textTheme,
)
),
debugShowCheckedModeBanner: false,
builder: (context, child) => Navigator(
@ -121,10 +65,18 @@ class MainApplication extends StatelessWidget {
builder: (context) => DialogManager(child: child)),
),
navigatorKey: locator<NavigatorService>().navigatorKey,
home: StartUpView(),
// first page
home: StartUpView(), // first page
onGenerateRoute: generateRoute,
),
));
),
);
}
}
class MyHttpOverrides extends HttpOverrides{
@override
HttpClient createHttpClient(SecurityContext context){
return super.createHttpClient(context)
..badCertificateCallback = (X509Certificate cert, String host, int port)=> true;
}
}

54
lib/redux/actions/bank_actions.dart
View File

@ -1,6 +1,5 @@
import 'package:aman_kassa_flutter/core/models/halyk/halyk_post_session.dart';
import 'package:aman_kassa_flutter/core/models/forte/forte_post_session.dart';
import 'package:aman_kassa_flutter/redux/state/bank_state.dart';
import 'package:meta/meta.dart';
import 'package:redux/redux.dart';
@ -14,58 +13,9 @@ class SetBankStateAction {
SetBankStateAction(this.bankState);
}
ThunkAction<AppState> saveData(String login, String password, {String? sessionType}) {
ThunkAction<AppState> saveData(String login, String password) {
return (Store<AppState> store) async {
final currentState = store.state.bankState;
dynamic session;
if (sessionType == 'Halyk') {
session = HalykPosSession(
login: login,
token: currentState?.session != null &&
currentState?.session is HalykPosSession
? (currentState?.session as HalykPosSession).token
: null,
serverTime: currentState?.session != null &&
currentState?.session is HalykPosSession
? (currentState?.session as HalykPosSession).serverTime
: null,
tokenTimeout: currentState?.session != null &&
currentState?.session is HalykPosSession
? (currentState?.session as HalykPosSession).tokenTimeout
: null,
result: currentState?.session != null &&
currentState?.session is HalykPosSession
? (currentState?.session as HalykPosSession).result
: null,
);
} else if (sessionType == 'Forte') {
session = FortePosSession(
login: login,
token: currentState?.session != null &&
currentState?.session is FortePosSession
? (currentState?.session as FortePosSession).token
: null,
serverTime: currentState?.session != null &&
currentState?.session is FortePosSession
? (currentState?.session as FortePosSession).serverTime
: null,
tokenTimeout: currentState?.session != null &&
currentState?.session is FortePosSession
? (currentState?.session as FortePosSession).tokenTimeout
: null,
result: currentState?.session != null &&
currentState?.session is FortePosSession
? (currentState?.session as FortePosSession).result
: null,
);
}
store.dispatch(SetBankStateAction(BankState(
login: login,
password: password,
session: session,
sessionType: sessionType,
)));
store.dispatch(SetBankStateAction(BankState(login: login, password: password)));
};
}

3
lib/redux/actions/calc_actions.dart
View File

@ -1,4 +1,3 @@
import 'package:aman_kassa_flutter/core/models/calc_model.dart';
import 'package:aman_kassa_flutter/redux/state/calc_state.dart';
import 'package:aman_kassa_flutter/widgets/components/calculator/calculator.dart';
import 'package:meta/meta.dart';
@ -27,7 +26,7 @@ ThunkAction<AppState> onTapAction(String value) {
if(value == Calculations.EQUAL){
return setEqual(store);
}
List<CalcModel> calcItems = Calculator.action(value: value, items: store.state.calcState!.calcItems!);
List calcItems = Calculator.action(value: value, items: store.state.calcState.calcItems);
store.dispatch(SetCalcStateAction(CalcState(calcItems: calcItems, isEqual: false)));
};
}

28
lib/redux/actions/kassa_actions.dart
View File

@ -24,8 +24,8 @@ final DataService _dataService = locator<DataService>();
final DialogService _dialogService = locator<DialogService>();
Future<void> backBottomElement(Store<AppState> store) async {
List<DictDao>? prevCategories = store.state.kassaState!.prevCategories;
DictDao? last = prevCategories?.removeLast() ;
List<DictDao> prevCategories = store.state.kassaState.prevCategories;
DictDao last = prevCategories.removeLast();
if (last != null) {
store.dispatch(SetKassaStateAction(KassaState(prevCategories: prevCategories)));
store.dispatch(selectBottomElement(last.id));
@ -36,18 +36,18 @@ Future<void> cleanKassaItems(Store<AppState> store) async {
store.dispatch(SetKassaStateAction(KassaState(kassaItems: [])));
}
ThunkAction<AppState> addCustomProductToKassaItems(String name, double count, double price, double total) {
ThunkAction<AppState> addCustomProductToKassaItems(String name, int count, double price, double total) {
return (Store<AppState> store) async {
List<ProductDao> items = store.state.kassaState!.kassaItems!;
List<ProductDao> items = store.state.kassaState.kassaItems;
items.add(new ProductDao(name: name, count: count, price: price, total: total));
store.dispatch(SetKassaStateAction(KassaState(kassaItems: items)));
};
}
ThunkAction<AppState> addProductToKassaItems(Good good, String? excise) {
ThunkAction<AppState> addProductToKassaItems(Good good, String excise) {
return (Store<AppState> store) async {
List<ProductDao> items = store.state.kassaState!.kassaItems!;
List<ProductDao> items = store.state.kassaState.kassaItems;
int index = items.indexWhere((element) => element.excise == null && element.good?.id == good.id);
if(excise !=null) {
int existIndex = items.indexWhere((element) => element.excise != null && element.excise == excise);
@ -68,7 +68,7 @@ ThunkAction<AppState> addProductToKassaItems(Good good, String? excise) {
ThunkAction<AppState> addServiceToKassaItems(Service service) {
return (Store<AppState> store) async {
List<ProductDao> items = store.state.kassaState!.kassaItems!;
List<ProductDao> items = store.state.kassaState.kassaItems;
int index = items.indexWhere((element) => element.good?.id == service.id);
if (index > -1) {
store.dispatch(counterProductFromKassaItems(index, 1));
@ -82,7 +82,7 @@ ThunkAction<AppState> addServiceToKassaItems(Service service) {
ThunkAction<AppState> removeProductFromKassaItems(int index) {
return (Store<AppState> store) async {
List<ProductDao> items = List.from(store.state.kassaState!.kassaItems!);
List<ProductDao> items = List.from(store.state.kassaState.kassaItems);
items.removeAt(index);
store.dispatch(SetKassaStateAction(KassaState(kassaItems: items)));
};
@ -90,7 +90,7 @@ ThunkAction<AppState> removeProductFromKassaItems(int index) {
ThunkAction<AppState> counterProductFromKassaItems(int index, int counter) {
return (Store<AppState> store) async {
List<ProductDao> items = store.state.kassaState!.kassaItems!;
List<ProductDao> items = store.state.kassaState.kassaItems;
ProductDao product = items.elementAt(index);
if (product.count == 1 && counter < 0) {
//if count to zero need delete element
@ -107,24 +107,24 @@ ThunkAction<AppState> selectBottomElement(int parentId) {
return (Store<AppState> store) async {
store.dispatch(SetKassaStateAction(KassaState(bottomSheetLoading: true, bottomSheetElements: [])));
try {
List<DictDao> prevCategories = store.state.kassaState!.prevCategories!;
List<DictDao> prevCategories = store.state.kassaState.prevCategories;
if (parentId == 0) {
prevCategories = [];
}
store.state.kassaState!.bottomSheetElements!.forEach((element) {
store.state.kassaState.bottomSheetElements.forEach((element) {
if (element is Category && element.id == parentId) {
prevCategories.add(DictDao(id: element.parentIn!, name: element.name));
prevCategories.add(DictDao(id: element.parentIn, name: element.name));
}
});
List _bottomSheetElements = [];
if(store.state.settingState!.tradeType == SettingTradeTypeGood) {
if(store.state.settingState.tradeType == SettingTradeTypeGood) {
List<Category> categories = await _dataService.getCategoriesByParentId(parentId: parentId);
_bottomSheetElements.addAll(categories);
List<Good> goods = await _dataService.getGoodsByCategoryId(categoryId: parentId);
_bottomSheetElements.addAll(goods);
} else if(store.state.settingState!.tradeType == SettingTradeTypeService) {
} else if(store.state.settingState.tradeType == SettingTradeTypeService) {
List<Service> services = await _dataService.getServices();
_bottomSheetElements.addAll(services);
}

2
lib/redux/actions/setting_actions.dart
View File

@ -1,9 +1,9 @@
import 'package:aman_kassa_flutter/redux/constants/setting_const.dart';
import 'package:aman_kassa_flutter/redux/state/setting_state.dart';
import 'package:bluetooth_print/bluetooth_print_model.dart';
import 'package:meta/meta.dart';
import 'package:redux/redux.dart';
import 'package:redux_thunk/redux_thunk.dart';
import 'package:flutter_bluetooth_basic/src/bluetooth_device.dart';
import '../store.dart';
@immutable

20
lib/redux/actions/user_actions.dart
View File

@ -30,17 +30,17 @@ final DialogService _dialogService = locator<DialogService>();
Future<void> checkUserAction(Store<AppState> store) async {
store.dispatch(SetUserStateAction(UserState(isLoading: true)));
try {
User? user = store.state.userState?.user;
String? token = user?.token;
User user = store.state.userState.user;
String token = user?.token;
bool isAuthenticated = false;
if (token != null && user !=null) {
if(user.email!=null && user.email!.toLowerCase().trim().startsWith('test')){
if (token != null) {
if(user.email!=null && user.email.toLowerCase().trim().startsWith('test')){
_api.test = true;
} else {
_api.test = false;
}
Response<Message> session = await _api.isActive(token);
isAuthenticated = "OK" == session.body?.message;
isAuthenticated = "OK" == session.body.message;
} else {
await Future.delayed(Duration(milliseconds: 2000));
@ -82,11 +82,11 @@ Future<void> logoutAction(Store<AppState> store) async {
}
}
Future<Response<dynamic>?> checkMoney(Store<AppState> store) async {
Future<Response<dynamic>> checkMoney(Store<AppState> store) async {
store.dispatch(SetUserStateAction(UserState(money: Money(loading: true))));
try {
Response<dynamic> result =
await _api.money(store.state.userState!.user!.token!);
await _api.money(store.state.userState.user.token);
if (result.operation) {
store.dispatch(SetUserStateAction(UserState(
money: Money(
@ -165,20 +165,20 @@ ThunkAction<AppState> authenticate(String email, String password) {
}
Future<void> checkSmena(Store<AppState> store) async {
String token = store.state.userState!.user!.token!;
String token = store.state.userState.user.token;
Response<Smena> result = await _api.smena(token);
store.dispatch(SetUserStateAction(UserState(smena: result.body)));
}
Future<void> closeSmena(Store<AppState> store) async {
String token = store.state.userState!.user!.token!;
String token = store.state.userState.user.token;
Response<Smena> result = await _api.closeSmena(token);
store.dispatch(SetUserStateAction(UserState(smena: result.body)));
store.dispatch(checkMoney);
}
Future<void> openSmena(Store<AppState> store) async {
String token = store.state.userState!.user!.token!;
String token = store.state.userState.user.token;
Response<Smena> result = await _api.openSmena(token);
store.dispatch(SetUserStateAction(UserState(smena: result.body)));
if (result.operation) {

8
lib/redux/reducers/bank_reducer.dart
View File

@ -3,11 +3,5 @@ import 'package:aman_kassa_flutter/redux/state/bank_state.dart';
bankReducer(BankState prevState, SetBankStateAction action) {
final payload = action.bankState;
return prevState.copyWith(
login: payload.login ?? prevState.login,
password: payload.password ?? prevState.password,
session: payload.session ?? prevState.session,
sessionType: payload.sessionType ?? prevState.sessionType,
loading: null,
);
return prevState.copyWith(login: payload.login, password: payload.password, session: payload.session);
}

60
lib/redux/state/bank_state.dart
View File

@ -1,27 +1,22 @@
import 'package:aman_kassa_flutter/core/models/halyk/halyk_post_session.dart';
import 'package:aman_kassa_flutter/core/models/forte/forte_post_session.dart';
import 'package:aman_kassa_flutter/redux/constants/setting_const.dart';
import 'package:meta/meta.dart';
@immutable
class BankState {
final String? login;
final String? password;
final dynamic session;
final String? sessionType;
final bool? loading;
final String login;
final String password;
final HalykPosSession session;
BankState({this.login, this.password, this.session,this.loading,this.sessionType});
BankState({this.login, this.password, this.session,});
//read hive
factory BankState.initial(BankState? payload) {
factory BankState.initial(BankState payload) {
return BankState(
login: payload?.login,
password: payload?.password,
session: payload?.session,
loading: payload?.loading,
sessionType: payload?.sessionType,
session: payload?.session
);
}
@ -30,49 +25,24 @@ class BankState {
@required login,
@required password,
@required session,
@required loading,
@required sessionType,
}) {
return BankState(
login: login ?? this.login,
password: password ?? this.password,
session: session ?? this.session,
loading: loading ?? this.loading,
sessionType: sessionType ?? this.sessionType
session: session ?? this.session
);
}
static BankState? fromJson(Map<String, dynamic> json) {
if (json == null) return null;
// Определяем тип сессии
dynamic session;
String sessionType = json['sessionType'];
if (sessionType == "Halyk") {
session = HalykPosSession.fromJson(json['session']);
} else if (sessionType == "Forte") {
session = FortePosSession.fromJson(json['session']);
}
return BankState(
login: json['login'],
static BankState fromJson(dynamic json) {
return json != null
? BankState(
password: json['password'],
session: session,
sessionType: sessionType,
);
login: json['login'],
)
: null;
}
Map<String, dynamic> toJson() {
return {
"login": login,
"password": password,
"sessionType": sessionType,
"session": session?.toJson(),
};
}
@override
String toString() {
return 'BankState(login: $login, password: $password, sessionType: $sessionType, session: $session)';
dynamic toJson() {
return {"password": password, "login": login};
}
}

4
lib/redux/state/calc_state.dart
View File

@ -3,8 +3,8 @@ import 'package:meta/meta.dart';
@immutable
class CalcState {
final List<CalcModel>? calcItems;
final bool? isEqual;
final List<CalcModel> calcItems;
final bool isEqual;
CalcState({this.calcItems, this.isEqual});

8
lib/redux/state/kassa_state.dart
View File

@ -4,10 +4,10 @@ import 'package:meta/meta.dart';
@immutable
class KassaState {
final List? bottomSheetElements;
final bool? bottomSheetLoading;
final List<DictDao>? prevCategories;
final List<ProductDao>? kassaItems;
final List bottomSheetElements;
final bool bottomSheetLoading;
final List<DictDao> prevCategories;
final List<ProductDao> kassaItems;
KassaState(

24
lib/redux/state/setting_state.dart
View File

@ -1,17 +1,17 @@
import 'package:aman_kassa_flutter/redux/constants/setting_const.dart';
import 'package:bluetooth_print/bluetooth_print_model.dart';
import 'package:meta/meta.dart';
import 'package:flutter_bluetooth_basic/src/bluetooth_device.dart';
@immutable
class SettingState {
final String? mode;
final String? tradeType;
final String? pinCode;
final bool? pinLocked;
final bool? pinSkip;
final BluetoothDevice? printerBT;
final String? printerEncoding;
final String? printerPaperSize;
final String mode;
final String tradeType;
final String pinCode;
final bool pinLocked;
final bool pinSkip;
final BluetoothDevice printerBT;
final String printerEncoding;
final String printerPaperSize;
SettingState({this.mode, this.tradeType, this.pinCode, this.pinLocked, this.pinSkip, this.printerBT,
@ -19,7 +19,7 @@ class SettingState {
this.printerPaperSize});
//read hive
factory SettingState.initial(SettingState? payload) {
factory SettingState.initial(SettingState payload) {
return SettingState(
mode: payload?.mode ?? SettingModeKassa,
tradeType: payload?.tradeType ?? SettingTradeTypeGood,
@ -56,7 +56,7 @@ class SettingState {
);
}
static SettingState? fromJson(dynamic json) {
static SettingState fromJson(dynamic json) {
return json != null
? SettingState(
tradeType: json['tradeType'],
@ -80,7 +80,7 @@ class SettingState {
"pinCode": pinCode,
"pinLocked" : pinLocked,
"pinSkip" : pinSkip,
"printerBT": printerBT != null ? printerBT!.toJson() : null,
"printerBT": printerBT != null ? printerBT.toJson() : null,
"printerEncoding": printerEncoding,
"printerPaperSize": printerPaperSize,
};

52
lib/redux/state/user_state.dart
View File

@ -5,16 +5,16 @@ import 'package:meta/meta.dart';
@immutable
class UserState {
final bool? isError;
final bool? isLoading;
final bool? isAuthenticated;
final String? authenticateType;
final String? login;
final String? password;
final LoginFormMessage? loginFormMessage;
final User? user;
final Smena? smena;
final Money? money;
final bool isError;
final bool isLoading;
final bool isAuthenticated;
final String authenticateType;
final String login;
final String password;
final LoginFormMessage loginFormMessage;
final User user;
final Smena smena;
final Money money;
UserState(
@ -30,7 +30,7 @@ class UserState {
this.money,
});
factory UserState.initial(UserState? payload) => UserState(
factory UserState.initial(UserState payload) => UserState(
isLoading: false,
isError: false,
isAuthenticated: false,
@ -44,16 +44,16 @@ class UserState {
);
UserState copyWith({
@required bool? isError,
@required bool? isLoading,
@required User? user,
@required bool? isAuthenticated,
@required LoginFormMessage? loginFormMessage,
@required Smena? smena,
@required String? authenticateType,
@required String? login,
@required String? password,
@required Money? money,
@required bool isError,
@required bool isLoading,
@required User user,
@required bool isAuthenticated,
@required LoginFormMessage loginFormMessage,
@required Smena smena,
@required String authenticateType,
@required String login,
@required String password,
@required Money money,
}) {
return UserState(
isError: isError ?? this.isError,
@ -69,7 +69,7 @@ class UserState {
);
}
static UserState? fromJson(dynamic json) {
static UserState fromJson(dynamic json) {
return json != null
? UserState(
user: User.fromJson(json['user']),
@ -82,7 +82,7 @@ class UserState {
dynamic toJson() {
return {
"user": user != null ? user!.toJson() : null,
"user": user != null ? user.toJson() : null,
"authenticateType": authenticateType,
"login": login,
"password": password,
@ -91,9 +91,9 @@ class UserState {
}
class LoginFormMessage {
final String? email;
final String? password;
final String? message;
final String email;
final String password;
final String message;
LoginFormMessage({this.email, this.password, this.message});
}

52
lib/redux/store.dart
View File

@ -11,7 +11,6 @@ import 'package:aman_kassa_flutter/redux/state/calc_state.dart';
import 'package:aman_kassa_flutter/redux/state/kassa_state.dart';
import 'package:aman_kassa_flutter/redux/state/setting_state.dart';
import 'package:aman_kassa_flutter/redux/state/user_state.dart';
import 'package:aman_kassa_flutter/views/payment/halyk_pos_service.dart';
import 'package:meta/meta.dart';
import 'package:redux/redux.dart';
import 'package:redux_persist_flutter/redux_persist_flutter.dart';
@ -25,23 +24,23 @@ import 'actions/calc_actions.dart';
AppState appReducer(AppState state, dynamic action) {
if (action is SetUserStateAction) {
/** UserAction **/
final nextUserState = userReducer(state.userState!, action);
final nextUserState = userReducer(state.userState, action);
return state.copyWith(userState: nextUserState);
} else if (action is SetKassaStateAction) {
/** KassaAction **/
final nextMainState = mainReducer(state.kassaState!, action);
final nextMainState = mainReducer(state.kassaState, action);
return state.copyWith(kassaState: nextMainState);
} else if (action is SetSettingStateAction) {
/** SettingAction **/
final nextSettingState = settingReducer(state.settingState!, action);
final nextSettingState = settingReducer(state.settingState, action);
return state.copyWith(settingState: nextSettingState);
} else if (action is SetCalcStateAction) {
/** CalcAction **/
final nextCalcState = calcReducer(state.calcState!, action);
final nextCalcState = calcReducer(state.calcState, action);
return state.copyWith(calcState: nextCalcState);
} else if (action is SetBankStateAction) {
/** BankAction **/
final nextBankState = bankReducer(state.bankState!, action);
final nextBankState = bankReducer(state.bankState, action);
return state.copyWith(bankState: nextBankState);
}
return state;
@ -50,11 +49,11 @@ AppState appReducer(AppState state, dynamic action) {
//Main State
@immutable
class AppState {
final UserState? userState;
final KassaState? kassaState;
final SettingState? settingState;
final CalcState? calcState;
final BankState? bankState;
final UserState userState;
final KassaState kassaState;
final SettingState settingState;
final CalcState calcState;
final BankState bankState;
AppState({
this.userState,
@ -66,11 +65,11 @@ class AppState {
//stable work
AppState copyWith({
UserState? userState,
KassaState? kassaState,
SettingState? settingState,
CalcState? calcState,
BankState? bankState,
UserState userState,
KassaState kassaState,
SettingState settingState,
CalcState calcState,
BankState bankState,
}) {
return AppState(
userState: userState ?? this.userState,
@ -81,8 +80,8 @@ class AppState {
);
}
static AppState? fromJson(dynamic json){
return json !=null
static AppState fromJson(dynamic json) {
return json != null
? AppState(
settingState: SettingState.fromJson(json['settingState']),
userState: UserState.fromJson(json['userState']),
@ -93,17 +92,17 @@ class AppState {
dynamic toJson() {
return {
"settingState": settingState?.toJson(),
"userState": userState?.toJson(),
"bankState": bankState?.toJson(),
"settingState": settingState.toJson(),
"userState": userState.toJson(),
"bankState": bankState.toJson(),
};
}
}
class Redux {
static Store<AppState>? _store;
static Store<AppState> _store;
static Store<AppState>? get store {
static Store<AppState> get store {
if (_store == null) {
throw Exception("store is not initialized");
} else {
@ -120,12 +119,7 @@ class Redux {
AppState.fromJson), // Or use other serializers
);
AppState? initialState;
try {
initialState = await persist.load();
} catch (e, stack) {
log.e('message', e, stack);
}
final initialState = await persist.load();
final userStateInitial = UserState.initial(initialState?.userState);
final kassaStateInitial = KassaState.initial();

1
lib/shared/app_colors.dart
View File

@ -5,7 +5,6 @@ const Color fillColor = Color.fromRGBO(248, 248, 248, 1);
const Color primaryColor = Color.fromRGBO(51, 122, 183, 1);
const Color halykColor = Color.fromRGBO(0, 118, 59, 1);
const Color forteColor = Color.fromRGBO(175, 32, 92, 1.0);
const Color menuColor = Color.fromRGBO(0, 75, 120, 1);

44
lib/views/bank_setting/bank_setting_view.dart
View File

@ -12,8 +12,6 @@ import 'package:aman_kassa_flutter/shared/ui_helpers.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import '../../core/services/navigator_service.dart';
class BankSettingView extends StatefulWidget {
BankSettingView();
@ -22,20 +20,18 @@ class BankSettingView extends StatefulWidget {
}
class _BankSettingViewState extends State<BankSettingView> {
late TextEditingController _emailController;
late TextEditingController _passwordController;
final NavigatorService _navigatorService = locator<NavigatorService>();
TextEditingController _emailController;
TextEditingController _passwordController;
final BankService _bankService = locator<BankService>();
final DialogService _dialogService = locator<DialogService>();
late String _sessionType;
@override
void initState() {
super.initState();
BankState state = Redux.store!.state.bankState!;
BankState state = Redux.store.state.bankState;
_emailController = new TextEditingController(text: state.login);
_passwordController = new TextEditingController(text: state.password);
//permissions();
_sessionType = 'Halyk';
}
// Future<void> permissions() async {
@ -56,40 +52,14 @@ class _BankSettingViewState extends State<BankSettingView> {
void _saveData(BuildContext _context) async {
FocusScope.of(_context).unfocus();
await Redux.store!.dispatch(saveData(
_emailController.text,
_passwordController.text,
sessionType: _sessionType,
));
await Redux.store.dispatch(saveData(_emailController.text, _passwordController.text));
_dialogService.showDialog(description: 'Данные сохранены');
_navigatorService.pop();
}
@override
Widget build(BuildContext context) {
final BankState? state = Redux.store?.state.bankState;
// Проверяем, активна ли Forte-сессия
if ((state?.login != null && state!.login!.isNotEmpty) ||
(state?.password != null && state!.password!.isNotEmpty)) {
if (state.sessionType != 'Halyk') {
return Scaffold(
appBar: AppBar(
centerTitle: true,
title: Text('Настройка HalykPos'),
),
body: Center(
child: Text(
'У вас подключен терминал Forte',
style: TextStyle(fontSize: 16.0, color: Colors.grey),
),
),
);
}
}
return Scaffold(
appBar: AppBar(
centerTitle: true,
@ -102,7 +72,7 @@ class _BankSettingViewState extends State<BankSettingView> {
children: <Widget>[
verticalSpaceTiny,
Text(
'Необходимо указать почту/номер и пароль для подключения к системе проведения платежей',
'Необходимо указать почту и пароль для подключения к системе проведения платежей',
style: TextStyle(fontSize: 15.0),
textAlign: TextAlign.center,
),
@ -110,7 +80,7 @@ class _BankSettingViewState extends State<BankSettingView> {
TextField(
controller: _emailController,
decoration: InputDecoration(
labelText: 'E-Mail / Номер телефона ', hintText: "Введите адрес почты"),
labelText: 'E-Mail', hintText: "Введите адрес почты"),
keyboardType: TextInputType.emailAddress,
),
TextField(

142
lib/views/bank_setting/forte_setting_view.dart
View File

@ -1,142 +0,0 @@
import 'dart:convert';
import 'package:aman_kassa_flutter/core/locator.dart';
import 'package:aman_kassa_flutter/core/models/aman_dao.dart';
import 'package:aman_kassa_flutter/core/services/ForteService.dart';
import 'package:aman_kassa_flutter/core/services/dialog_service.dart';
import 'package:aman_kassa_flutter/redux/actions/bank_actions.dart';
import 'package:aman_kassa_flutter/redux/state/bank_state.dart';
import 'package:aman_kassa_flutter/redux/store.dart';
import 'package:aman_kassa_flutter/shared/app_colors.dart';
import 'package:aman_kassa_flutter/shared/ui_helpers.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import '../../core/services/navigator_service.dart';
class ForteSettingView extends StatefulWidget {
ForteSettingView();
@override
_ForteSettingViewState createState() => _ForteSettingViewState();
}
class _ForteSettingViewState extends State<ForteSettingView> {
late TextEditingController _emailController;
late TextEditingController _passwordController;
final NavigatorService _navigatorService = locator<NavigatorService>();
final DialogService _dialogService = locator<DialogService>();
late String _sessionType;
@override
void initState() {
super.initState();
BankState state = Redux.store!.state.bankState!;
_emailController = new TextEditingController(text: state.login);
_passwordController = new TextEditingController(text: state.password);
//permissions();
_sessionType = 'Forte';
}
// Future<void> permissions() async {
// try {
// await _bankService.permissions();
// } on PlatformException {
//
// }
// }
@override
void dispose() {
_emailController.dispose();
_passwordController.dispose();
super.dispose();
}
void _saveData(BuildContext _context) async {
FocusScope.of(_context).unfocus();
await Redux.store!.dispatch(saveData(
_emailController.text,
_passwordController.text,
sessionType: _sessionType
));
_dialogService.showDialog(description: 'Данные сохранены');
_navigatorService.pop();
}
@override
Widget build(BuildContext context) {
final BankState? state = Redux.store?.state.bankState;
// Проверяем, активна ли Halyk-сессия
if ((state?.login != null && state!.login!.isNotEmpty) ||
(state?.password != null && state!.password!.isNotEmpty)) {
if (state.sessionType != 'Forte') {
return Scaffold(
appBar: AppBar(
centerTitle: true,
title: Text('Настройка FortePos'),
),
body: Center(
child: Text(
'У вас подключен терминал Halyk',
style: TextStyle(fontSize: 16.0, color: Colors.grey),
),
),
);
}
}
return Scaffold(
appBar: AppBar(
centerTitle: true,
title: Text('Настройка FortePos'),
),
body: SingleChildScrollView(
child: Container(
margin: const EdgeInsets.symmetric(horizontal: 14.0),
child: Column(
children: <Widget>[
verticalSpaceTiny,
Text(
'Необходимо указать почту/номер и пароль для подключения к системе проведения платежей',
style: TextStyle(fontSize: 15.0),
textAlign: TextAlign.center,
),
verticalSpaceTiny,
TextField(
controller: _emailController,
decoration: InputDecoration(
labelText: 'E-Mail / Номер телефона в формете 77xx ', hintText: "Введите адрес почты/телефон"),
keyboardType: TextInputType.emailAddress,
),
TextField(
controller: _passwordController,
obscureText: true,
decoration: InputDecoration(
labelText: 'Пароль', hintText: "Введите пароль"),
),
verticalSpaceMedium,
RaisedButton(
onPressed: () => this._saveData(context),
child: Text(
'Cохранить',
style: TextStyle(color: whiteColor, fontSize: 25.0),
),
color: primaryColor,
padding:
const EdgeInsets.symmetric(vertical: 5.0, horizontal: 20.0),
),
],
),
),
),
);
}
}

28
lib/views/bank_view/bank_view.dart
View File

@ -16,17 +16,17 @@ class _BankViewState extends State<BankView> {
MethodChannel('channel:com.amanKassa/bank');
static const MethodChannel _activity =
MethodChannel('channel:com.amanKassa/activity');
String? initValue;
String? connectionValue;
String? authValue;
String? payValue;
String? cancelValue;
String? shutdownValue;
String? versionValue;
String? transactionValue;
String? closeDayValue;
String? getValue;
String? errorValue;
String initValue;
String connectionValue;
String authValue;
String payValue;
String cancelValue;
String shutdownValue;
String versionValue;
String transactionValue;
String closeDayValue;
String getValue;
String errorValue;
bool loading = false;
@override
@ -40,21 +40,21 @@ class _BankViewState extends State<BankView> {
'serverUrl': 'http://195.200.74.83:5000',
});
setState(() {
initValue = result;
initValue = result ?? 'none';
});
}
version() async {
String result = await _channel.invokeMethod('version');
setState(() {
versionValue = result;
versionValue = result ?? 'none';
});
}
transaction() async {
String result = await _channel.invokeMethod('transaction');
setState(() {
transactionValue = result ;
transactionValue = result ?? 'none';
});
}

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

@ -1,7 +1,6 @@
import 'dart:convert';
import 'dart:io';
import 'package:aman_kassa_flutter/core/entity/Voucher.dart';
import 'dart:typed_data';
import 'package:aman_kassa_flutter/core/locator.dart';
import 'package:aman_kassa_flutter/core/models/check_data.dart';
import 'package:aman_kassa_flutter/core/models/check_image_modal.dart';
@ -12,7 +11,6 @@ import 'package:aman_kassa_flutter/core/models/response.dart';
import 'package:aman_kassa_flutter/core/route_names.dart';
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/blue_print_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/redux/actions/setting_actions.dart';
@ -26,17 +24,16 @@ import 'package:aman_kassa_flutter/views/settings/printer/PrinterTest.dart';
import 'package:aman_kassa_flutter/views/payment/halyk_pos_service.dart';
import 'package:aman_kassa_flutter/widgets/fields/busy_button_icon.dart';
import 'package:aman_kassa_flutter/widgets/loader/Dialogs.dart';
import 'package:bluetooth_print/bluetooth_print_model.dart';
import 'package:esc_pos_bluetooth/esc_pos_bluetooth.dart';
import 'package:esc_pos_utils/esc_pos_utils.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:flutter_bluetooth_basic/flutter_bluetooth_basic.dart';
import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
import 'package:vocsy_esys_flutter_share/vocsy_esys_flutter_share.dart';
import 'package:esys_flutter_share/esys_flutter_share.dart';
import 'package:url_launcher/url_launcher.dart';
import '../../core/models/aman_dao.dart';
import '../../redux/state/bank_state.dart';
import '../payment/forte_pos_service.dart';
class ImageShowContainer extends StatefulWidget {
final ImageShowModel showModel;
@ -48,18 +45,19 @@ class ImageShowContainer extends StatefulWidget {
}
class _ImageShowContainerState extends State<ImageShowContainer> {
final BluePrintService printerManager = locator<BluePrintService>();
final PrinterBluetoothManager printerManager = PrinterBluetoothManager();
final DialogService _dialogService = locator<DialogService>();
final BluetoothDevice? printerBtDevice =
Redux.store!.state.settingState!.printerBT;
final BluetoothDevice printerBtDevice = Redux.store.state.settingState.printerBT;
final BluetoothManager bluetoothManager = BluetoothManager.instance;
bool _printing = false;
void _preparePrint() async {
if (Platform.isIOS) {
_print();
await _print();
} else {
printerManager.state.listen((val) {
bluetoothManager.state.listen((val) {
print("state = $val");
if (!mounted) return;
if (val == 12) {
@ -67,31 +65,17 @@ class _ImageShowContainerState extends State<ImageShowContainer> {
_print();
} else if (val == 10) {
print('off');
_dialogService.showDialog(
description: 'Отсутвует соеденение Bluetooth или он отключен',
title: 'Bluetooth');
_dialogService.showDialog(description: 'Отсутвует соеденение Bluetooth или он отключен', title: 'Bluetooth');
}
print('state is $val');
});
}
}
@override
void dispose() {
disconnect();
super.dispose();
}
void disconnect() async {
await printerManager.disconnect();
}
void _print() async {
final SettingState state = Redux.store!.state.settingState!;
final SettingState state = Redux.store.state.settingState;
if (state.printerBT == null) {
_dialogService.showDialog(
description: 'Укажите в настройках принтер для печати чеков');
_dialogService.showDialog(description: 'Укажите в настройках принтер для печати чеков');
return;
}
@ -108,32 +92,29 @@ class _ImageShowContainerState extends State<ImageShowContainer> {
_printing = true;
});
try {
printerManager.device = state.printerBT!;
await printerManager.connect();
PaperSize paper = state.printerPaperSize == SettingPrinterPaperM80
? PaperSize.mm80
: PaperSize.mm58;
printerManager.selectPrinter(PrinterBluetooth(state.printerBT));
PaperSize paper = state.printerPaperSize == SettingPrinterPaperM80 ? PaperSize.mm80 : PaperSize.mm58;
if (SettingPrinterEncodingImage == state.printerEncoding) {
final bool res = await printerManager.printBytes(
Uint8List.fromList(await printImageCheck(paper, widget.showModel.data!.base64Data!)));
if (!res) {
_dialogService.showDialog(description: 'Ошибка при печати');
final PosPrintResult res = await printerManager.printTicket(
await printImageCheck(paper, widget.showModel.data.base64Data),
chunkSizeBytes: chunkSizeBytes,
queueSleepTimeMs: queueSleepTimeMs);
if (res.value != 1) {
_dialogService.showDialog(description: res.msg);
}
} else {
final bool res = await printerManager.printBytes(
Uint8List.fromList(await printTextCheck(paper, state.printerEncoding!,
jsonDecode(widget.showModel.data!.textData!)))
);
if (!res) {
_dialogService.showDialog(description: 'Ошибка при печати');
final PosPrintResult res = await printerManager.printTicket(
await printTextCheck(paper, state.printerEncoding, jsonDecode(widget.showModel.data.textData)),
chunkSizeBytes: chunkSizeBytes,
queueSleepTimeMs: queueSleepTimeMs);
if (res.value != 1) {
_dialogService.showDialog(description: res.msg);
}
}
} catch (e) {
print(e);
}
await Future.delayed(Duration(seconds: 15));
await Future.delayed(Duration(seconds: 7));
setState(() {
_printing = false;
});
@ -164,9 +145,7 @@ class _ImageShowContainerState extends State<ImageShowContainer> {
],
),
body: ListView(
children: <Widget>[
imageFromBase64String(widget.showModel.data!.base64Data!)
],
children: <Widget>[imageFromBase64String(widget.showModel.data.base64Data)],
),
floatingActionButton: MyFloatingActionButton(widget.showModel),
);
@ -181,13 +160,13 @@ Padding imageFromBase64String(String base64String) {
}
class ImageShowModel {
final CheckImageModal? data;
final CheckImageModal data;
final String title;
final String? url;
final CardData? cardData;
final Voucher? voucher;
final String url;
final CardData cardData;
final Voucher voucher;
ImageShowModel({this.data, required this.title, this.url, this.cardData, this.voucher});
ImageShowModel({this.data, this.title, this.url, this.cardData, this.voucher});
}
class MyFloatingActionButton extends StatefulWidget {
@ -217,7 +196,7 @@ class _MyFloatingActionButtonState extends State<MyFloatingActionButton> {
return Column(
mainAxisAlignment: MainAxisAlignment.end,
children: [
if (widget.data.cardData?.transactionType == "payment")
if (widget.data.cardData != null && widget.data.cardData.transactionType == "payment")
FloatingActionButton(
backgroundColor: redColor,
tooltip: 'Отмена',
@ -228,27 +207,23 @@ class _MyFloatingActionButtonState extends State<MyFloatingActionButton> {
onPressed: () async {
var today = new DateTime.now();
var yesterday = today.subtract(new Duration(days: 1));
if(Redux.store?.state.userState?.smena?.startedAt == null
|| yesterday.isAfter(Redux.store!.state.userState!.smena!.startedAt!)) {
if( Redux.store.state.userState == null
|| Redux.store.state.userState.smena == null
|| Redux.store.state.userState.smena.startedAt == null
|| yesterday.isAfter(Redux.store.state.userState.smena.startedAt)) {
_dialog.showDialog(description: 'Текущая смена открыта более 24 ч. Необходимо закрыть смену и открыть ее заново.');
return;
}
try {
await Redux.store!.dispatch(changePinSkipFromSetting(true));
// Определяем метод отмены в зависимости от типа сессии
final BankState? state = Redux.store?.state.bankState;
final isForteSessionActive = state?.sessionType == 'Forte';
final AmanDao<CardData> response = isForteSessionActive
? await reversalFortePos(widget.data.cardData!, widget.data.voucher!.total!)
: await reversalHalykPos(widget.data.cardData!, widget.data.voucher!.total!);
if (response.success == true) {
await Redux.store.dispatch(changePinSkipFromSetting(true));
AmanDao<CardData> response = await reversalHalykPos(widget.data.cardData, widget.data.voucher.total);
if (response.success) {
pressRefund();
} else {
_dialog.showDialog(description: response.msg!);
_dialog.showDialog(description: response.msg);
}
} finally {
await Redux.store!.dispatch(changePinSkipFromSetting(false));
await Redux.store.dispatch(changePinSkipFromSetting(false));
}
_navigatorService.replace(HomeViewRoute);
},
@ -261,7 +236,7 @@ class _MyFloatingActionButtonState extends State<MyFloatingActionButton> {
SizedBox(
height: 10,
),
if (widget.data.cardData != null && widget.data.cardData?.transactionType == "payment")
if (widget.data.cardData != null && widget.data.cardData.transactionType == "payment")
FloatingActionButton(
backgroundColor: redColor,
tooltip: 'Возврат',
@ -272,29 +247,24 @@ class _MyFloatingActionButtonState extends State<MyFloatingActionButton> {
onPressed: () async {
var today = new DateTime.now();
var yesterday = today.subtract(new Duration(days: 1));
if( Redux.store!.state.userState == null
|| Redux.store!.state.userState?.smena == null
|| Redux.store!.state.userState?.smena?.startedAt == null
|| yesterday.isAfter(Redux.store!.state.userState!.smena!.startedAt!)) {
if( Redux.store.state.userState == null
|| Redux.store.state.userState.smena == null
|| Redux.store.state.userState.smena.startedAt == null
|| yesterday.isAfter(Redux.store.state.userState.smena.startedAt)) {
_dialog.showDialog(description: 'Текущая смена открыта более 24 ч. Необходимо закрыть смену и открыть ее заново.');
return;
}
try {
await Redux.store!.dispatch(changePinSkipFromSetting(true));
final BankState? state = Redux.store?.state.bankState;
final isForteSessionActive = state?.sessionType == 'Forte';
final AmanDao<CardData> response = isForteSessionActive
? await refundFortePos(widget.data.cardData!, widget.data.voucher!.total!)
: await refundHalykPos(widget.data.cardData!, widget.data.voucher!.total!);
if (response.success == true) {
await Redux.store.dispatch(changePinSkipFromSetting(true));
AmanDao<CardData> response = await refundHalykPos(widget.data.cardData, widget.data.voucher.total);
if (response.success) {
pressRefund();
} else {
_dialog.showDialog(description: response.msg!);
_dialog.showDialog(description: response.msg);
}
} finally {
await Redux.store!.dispatch(changePinSkipFromSetting(false));
await Redux.store.dispatch(changePinSkipFromSetting(false));
}
},
heroTag: null,
@ -316,7 +286,7 @@ class _MyFloatingActionButtonState extends State<MyFloatingActionButton> {
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.all(Radius.circular(15)),
boxShadow: [BoxShadow(blurRadius: 10, color: Colors.grey[300]!, spreadRadius: 5)]),
boxShadow: [BoxShadow(blurRadius: 10, color: Colors.grey[300], spreadRadius: 5)]),
height: 260,
child: Column(
children: <Widget>[
@ -361,22 +331,22 @@ class _MyFloatingActionButtonState extends State<MyFloatingActionButton> {
pressRefund() async {
Dialogs.showLoadingDialog(context, _keyLoader);
try {
AppState _state = Redux.store!.state;
String _token = _state.userState!.user!.token!;
CardData _cardData = widget.data.cardData!;
CheckData _checkData = CheckData.fromJson(json.decode(widget.data.voucher!.data!));
Response<dynamic>? response =
AppState _state = Redux.store.state;
String _token = _state.userState.user.token;
CardData _cardData = widget.data.cardData;
CheckData _checkData = CheckData.fromJson(json.decode(widget.data.voucher.data));
Response<dynamic> response =
await _dataService.refundM4Bank(token: _token, cardData: _cardData, checkData: _checkData);
if (response != null) {
if (response.operation) {
String message = response.body['message'];
String check = response.body['check'];
var checkText = response.body['check_text'];
String url = response.body['link'];
String url = response?.body['link'];
print('url : $url');
Redux.store!.dispatch(checkMoney);
Redux.store!.dispatch(openSmenaPseudo);
Navigator.of(_keyLoader.currentContext!, rootNavigator: true).pop();
Redux.store.dispatch(checkMoney);
Redux.store.dispatch(openSmenaPseudo);
Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
_navigatorService.replace(HomeViewRoute);
_navigatorService.push(ImageShowRoute,
arguments: ImageShowModel(
@ -385,23 +355,23 @@ class _MyFloatingActionButtonState extends State<MyFloatingActionButton> {
title: message,
url: url));
} else if (!response.operation && ![401, 402, 403, 412, 500].contains(response.status)) {
Navigator.of(_keyLoader.currentContext!, rootNavigator: true).pop();
Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
_dialog.showDialog(description: response.body['message']);
} else {
Navigator.of(_keyLoader.currentContext!, rootNavigator: true).pop();
Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
}
} else {
Navigator.of(_keyLoader.currentContext!, rootNavigator: true).pop();
Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
}
} catch (e) {
print(e);
Navigator.of(_keyLoader.currentContext!, rootNavigator: true).pop();
Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
}
}
void shareFile() async {
try {
await Share.file('Aman Kassa', 'aman_kassa_check.png', base64Decode(widget.data.data!.base64Data!), 'image/png');
await Share.file('Aman Kassa', 'aman_kassa_check.png', base64Decode(widget.data.data.base64Data), 'image/png');
} catch (e) {
print('error: $e');
}
@ -415,15 +385,15 @@ class _MyFloatingActionButtonState extends State<MyFloatingActionButton> {
DialogResponse response = await _dialog.showConfirmationDialogInput(
description: 'Номер телефона', cancelTitle: 'Отмена', confirmationTitle: 'Отправить', formatType: 'phone');
if (response.confirmed) {
String phoneNumber = response.responseText!;
String phoneNumber = response.responseText;
String msg = "Спасибо за покупку! \r\n ${widget.data.url} ";
launchWhatsApp(phone: phoneNumber, message: msg);
}
}
void launchWhatsApp({
required String phone,
required String message,
@required String phone,
@required String message,
}) async {
String url() {
if (Platform.isIOS) {

29
lib/views/close_day_view/close_day_show_container.dart
View File

@ -1,18 +1,13 @@
import 'package:aman_kassa_flutter/core/models/halyk/close_day_data.dart' as halyk;
import 'package:aman_kassa_flutter/core/models/halyk/halyk_close_day_dao.dart' as halykDao;
import 'package:aman_kassa_flutter/core/models/forte/close_day_data.dart' as forte;
import 'package:aman_kassa_flutter/core/models/forte/forte_close_day_dao.dart' as forteDao;
import 'package:aman_kassa_flutter/core/models/close_day_data.dart';
import 'package:aman_kassa_flutter/core/models/halyk/halyk_close_day_dao.dart';
import 'package:aman_kassa_flutter/core/models/transaction_item.dart';
import 'package:aman_kassa_flutter/shared/shared_styles.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import '../../redux/state/bank_state.dart';
import '../../redux/store.dart';
class CloseDayShowContainer extends StatelessWidget {
final dynamic data;
final CloseDayData data;
DateFormat dateFormat = DateFormat("dd.MM.yyyy HH:mm:ss");
CloseDayShowContainer(this.data);
@override
@ -60,27 +55,19 @@ class CloseDayShowContainer extends StatelessWidget {
Divider(),
Expanded(
child: ListView.separated(
itemCount: data.items?.length ?? 0,
itemCount: data.items.length,
separatorBuilder: (BuildContext context, int index) {
return Divider();
},
itemBuilder: (BuildContext context, int index) {
final BankState? state = Redux.store?.state.bankState;
final isForteSessionActive = state?.sessionType == 'Forte';
var item;
if (isForteSessionActive == true) {
item = data.items!.elementAt(index) as forteDao.TransactionBean;
} else {
item = data.items!.elementAt(index) as halykDao.TransactionBean;
}
TransactionBean item = data.items.elementAt(index);
return ListTile(
title: Text(item.instrumentSpecificData?.maskedPan ?? ''),
title: Text(item.instrumentSpecificData.maskedPan),
subtitle: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if(item.instrumentSpecificData!.cardholderName!=null)
Text(item.instrumentSpecificData!.cardholderName!),
if(item.instrumentSpecificData.cardholderName!=null)
Text(item.instrumentSpecificData.cardholderName),
Text('Операционный день № ${item.operationDay?.toString()}'),
],
),

18
lib/views/history/history_view.dart
View File

@ -5,7 +5,7 @@ import 'package:aman_kassa_flutter/core/locator.dart';
import 'package:aman_kassa_flutter/core/models/check_image_modal.dart';
import 'package:aman_kassa_flutter/core/models/card_data.dart';
import 'package:aman_kassa_flutter/core/models/check_data.dart';
import 'package:aman_kassa_flutter/core/models/halyk/close_day_data.dart';
import 'package:aman_kassa_flutter/core/models/close_day_data.dart';
import 'package:aman_kassa_flutter/core/route_names.dart';
import 'package:aman_kassa_flutter/core/services/DbService.dart';
import 'package:aman_kassa_flutter/core/services/navigator_service.dart';
@ -68,16 +68,16 @@ class _HistoryViewState extends State<HistoryView> {
},
itemBuilder: (BuildContext context, int index) {
Voucher voucher = data[index];
CardData? cardData;
CloseDayData? closeDayData;
CardData cardData;
CloseDayData closeDayData;
if( voucher.type == VoucherTypeCloseDayPosReport ) {
closeDayData = CloseDayData.fromJson(json.decode(voucher.data!));
closeDayData = CloseDayData.fromJson(json.decode(voucher.data));
} else if( voucher.data !=null ) {
CheckData checkData = CheckData.fromJson(json.decode(voucher.data!));
CheckData checkData = CheckData.fromJson(json.decode(voucher.data));
cardData = checkData.cardData;
}
String? base64Data = voucher.base64Data;
String base64Data = voucher.base64Data;
CheckImageModal checkImageData;
if(base64Data !=null && base64Data.startsWith('{')){
checkImageData = CheckImageModal.fromJson(jsonDecode(base64Data));
@ -94,7 +94,7 @@ class _HistoryViewState extends State<HistoryView> {
_navigatorService.push(ImageShowRoute,
arguments: ImageShowModel(
data: checkImageData,
title: voucher.name ?? '',
title: voucher.name,
url: voucher.url,
cardData: cardData,
voucher: voucher,
@ -105,7 +105,7 @@ class _HistoryViewState extends State<HistoryView> {
subtitle: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(dateFormat.format(voucher.dateTime!)),
Text(dateFormat.format(voucher.dateTime)),
cardData != null ? Text('№ ${cardData.cardNumber} holder: ${cardData.cardholderName}') : Text(''),
],
),
@ -138,7 +138,7 @@ class _HistoryViewState extends State<HistoryView> {
Text buildText(Voucher voucher) {
if (voucher.type == VoucherTypePayment || voucher.type == VoucherTypeReturnPay) {
return Text(
'${voucher.name} на сумму: ${voucher.total?.toStringAsFixed(2)}');
'${voucher.name} на сумму: ${voucher.total.toStringAsFixed(2)}');
}
return Text('${voucher.name}');
}

8
lib/views/home/components/bottom_bar.dart
View File

@ -11,20 +11,20 @@ class BottomBar extends StatelessWidget {
final int selectedTabIndex;
BottomBar({
required this.pageController,
required this.selectedTabIndex,
this.pageController,
this.selectedTabIndex,
});
@override
Widget build(BuildContext context) {
return StoreConnector<AppState, SettingState>(
converter: (store) => store.state.settingState!,
converter: (store) => store.state.settingState,
builder: (context, vm) {
return BottomNavigationBar(
currentIndex: selectedTabIndex,
showUnselectedLabels: true,
backgroundColor: menuColor,
type: BottomNavigationBarType.shifting,
showUnselectedLabels: true,
items: [
vm.mode == SettingModeKassa
? BottomNavigationBarItem(

10
lib/views/home/components/header_title.dart
View File

@ -11,7 +11,7 @@ class HeaderTitle extends StatelessWidget {
@override
Widget build(BuildContext context) {
return StoreConnector<AppState, UserState>(
converter: (store) => store.state.userState!,
converter: (store) => store.state.userState,
builder: (context, vm) {
return Row(
mainAxisAlignment: MainAxisAlignment.start,
@ -30,7 +30,7 @@ class HeaderTitle extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
'Пользователь: ${vm.user?.email}',
'Пользователь: ${vm.user.email}',
overflow: TextOverflow.fade,
maxLines: 1,
softWrap: false,
@ -39,10 +39,10 @@ class HeaderTitle extends StatelessWidget {
color: Colors.black,
),
),
vm.smena?.message != null
? Text(vm.smena!.message!,
vm.smena.message != null
? Text(vm.smena.message,
style: TextStyle(fontSize: 13, color: redColor))
: vm.smena!.startedAt != null
: vm.smena.startedAt != null
? Text(
'Смена открыта',
overflow: TextOverflow.fade,

7
lib/views/home/components/popup_menu.dart
View File

@ -9,7 +9,7 @@ class PopupMenu extends StatefulWidget {
final void Function(Choice value) onSelectChoice;
PopupMenu({required this.onSelectChoice});
PopupMenu({this.onSelectChoice});
@override
_PopupMenuState createState() => _PopupMenuState();
@ -17,7 +17,7 @@ class PopupMenu extends StatefulWidget {
class _PopupMenuState extends State<PopupMenu> {
BankService _bankService = locator<BankService>();
List<Choice> choices = <Choice>[];
List<Choice> choices;
@override
void initState() {
// TODO: implement initState
@ -33,8 +33,7 @@ class _PopupMenuState extends State<PopupMenu> {
//if (version >= 24 )
// const Choice(title: 'Bank', icon: Icons.text_fields, command: 'bank'),
if (version >= _bankService.sdkVersion )
const Choice(title: 'Настройка HalykPos', icon: Icons.phonelink_lock_outlined, command: 'tap2phone'),
const Choice(title: 'Настройка FortePos', icon: Icons.phonelink_lock_outlined, command: 'fortepos'),
const Choice(title: 'Настройка HalykPos', icon: Icons.phonelink_lock_outlined, command: 'tap2phone'),
const Choice(title: 'Настройки', icon: Icons.settings, command: 'settings'),
const Choice(title: 'Принтер', icon: Icons.print, command: 'print'),
const Choice(title: 'Выйти', icon: Icons.exit_to_app, command: 'exit')

63
lib/views/home/home_view_m.dart
View File

@ -34,8 +34,8 @@ class HomeView extends StatefulWidget {
class _HomeViewState extends State<HomeView> with WidgetsBindingObserver {
Logger log = getLogger('HomeView');
late PageController pageController;
late int selectedTabIndex;
PageController pageController;
int selectedTabIndex;
DataService _dataService = locator<DataService>();
ApiService _api = locator<ApiService>();
NavigatorService _navigatorService = locator<NavigatorService>();
@ -55,8 +55,8 @@ class _HomeViewState extends State<HomeView> with WidgetsBindingObserver {
final prevState = sp.getInt(lastKnownStateKey);
final prevStateIsNotPaused = prevState != null &&
AppLifecycleState.values[prevState] != AppLifecycleState.paused;
final bool pinIsExist = Redux.store!.state.settingState?.pinCode != null && Redux.store!.state.settingState!.pinCode!.length > 3;
final bool pinSkipped = Redux.store!.state.settingState?.pinSkip == true;
final bool pinIsExist = Redux.store.state.settingState?.pinCode?.isNotEmpty;
final bool pinSkipped = Redux.store.state.settingState.pinSkip;
print('prevStateIsNotPaused=$prevStateIsNotPaused, pinIsExist=$pinIsExist, pinSkipped=$pinSkipped');
if(prevStateIsNotPaused && pinSkipped == false && pinIsExist == true) {
// save App backgrounded time to Shared preferences
@ -72,7 +72,7 @@ class _HomeViewState extends State<HomeView> with WidgetsBindingObserver {
final allowedBackgroundTime = bgTime + pinLockMillis;
final shouldShowPIN = DateTime.now().millisecondsSinceEpoch > allowedBackgroundTime;
if(shouldShowPIN && bgTime > 0) {
await Redux.store!.dispatch(changePinLockedFromSetting(true));
await Redux.store.dispatch(changePinLockedFromSetting(true));
pushToLockScreen();
}
sp.remove(backgroundedTimeKey); // clean
@ -92,8 +92,8 @@ class _HomeViewState extends State<HomeView> with WidgetsBindingObserver {
}
_checkLockPin () async {
final bool pinIsExist = Redux.store!.state.settingState?.pinCode != null && Redux.store!.state.settingState!.pinCode!.length > 3;
final bool pinLocked = Redux.store!.state.settingState?.pinLocked == true;
final bool pinIsExist = Redux.store.state.settingState?.pinCode?.isNotEmpty;
final bool pinLocked = Redux.store.state.settingState?.pinLocked;
final sp = await SharedPreferences.getInstance();
sp.remove(backgroundedTimeKey);
sp.setInt(lastKnownStateKey, AppLifecycleState.resumed.index);// previous state
@ -109,8 +109,8 @@ class _HomeViewState extends State<HomeView> with WidgetsBindingObserver {
WidgetsBinding.instance.addObserver(this);
selectedTabIndex = 0;
pageController = new PageController(initialPage: selectedTabIndex);
Redux.store!.dispatch(checkSmena);
_dataService.checkDbFill(Redux.store!.state.userState!.user!);
Redux.store.dispatch(checkSmena);
_dataService.checkDbFill(Redux.store.state.userState.user);
_checkLockPin();
}
@ -143,11 +143,12 @@ class _HomeViewState extends State<HomeView> with WidgetsBindingObserver {
void _onSelectChoice(Choice choice) async {
if (choice.command == 'exit') {
Dialogs.showLoadingDialog(context, _keyLoader);
Response<dynamic> result = await _api.logout(Redux.store!.state.userState!.user!.token!);
if(result.operation && result.status == 200) {
Redux.store!.dispatch(logoutAction);
Response<dynamic> result =
await _api.logout(Redux.store.state.userState.user.token);
if (result.operation && result.status == 200) {
Redux.store.dispatch(logoutAction);
}
Navigator.of(_keyLoader.currentContext!, rootNavigator: true).pop();
Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
} else if (choice.command == 'infokkm') {
_navigatorService.push(InfoKkmViewRoute);
} else if (choice.command == 'settings') {
@ -158,8 +159,6 @@ class _HomeViewState extends State<HomeView> with WidgetsBindingObserver {
_navigatorService.push(BankViewRoute);
} else if (choice.command == 'tap2phone') {
_navigatorService.push(BankSettingViewRoute);
} else if (choice.command == 'fortepos') {
_navigatorService.push(ForteSettingViewRoute);
}
}
@ -177,24 +176,22 @@ class _HomeViewState extends State<HomeView> with WidgetsBindingObserver {
],
backgroundColor: fillColor,
),
body:StoreConnector<AppState, SettingState>(
converter: (store) => store.state.settingState!,
builder: (context, vm) {
return PageView(
pageSnapping: true,
onPageChanged: (index) {
setState(() {
selectedTabIndex = index;
});
},
controller: pageController,
children: <Widget>[
vm.mode == SettingModeKassa ? KassaTab(0) : CalculatorTab(0),
AdditionalTab(1),
],
);
}
),
body: StoreConnector<AppState, SettingState>(
converter: (store) => store.state.settingState,
builder: (context, vm) {
return PageView(
onPageChanged: (index) {
setState(() {
selectedTabIndex = index;
});
},
controller: pageController,
children: <Widget>[
vm.mode == SettingModeKassa ? KassaTab(0) : CalculatorTab(0),
AdditionalTab(1),
],
);
}),
bottomNavigationBar: BottomBar(
pageController: pageController,
selectedTabIndex: selectedTabIndex,

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

@ -3,10 +3,8 @@ import 'dart:convert';
import 'package:aman_kassa_flutter/core/entity/Voucher.dart';
import 'package:aman_kassa_flutter/core/locator.dart';
import 'package:aman_kassa_flutter/core/models/check_image_modal.dart';
import 'package:aman_kassa_flutter/core/models/halyk/close_day_data.dart' as halyk_models;
import 'package:aman_kassa_flutter/core/models/forte/close_day_data.dart' as forte_models;
import 'package:aman_kassa_flutter/core/models/close_day_data.dart';
import 'package:aman_kassa_flutter/core/models/halyk/halyk_close_day_dao.dart';
import 'package:aman_kassa_flutter/core/models/forte/forte_close_day_dao.dart';
import 'package:aman_kassa_flutter/core/models/money.dart';
import 'package:aman_kassa_flutter/core/models/response.dart';
import 'package:aman_kassa_flutter/core/models/dialog_models.dart';
@ -14,7 +12,6 @@ import 'package:aman_kassa_flutter/core/models/user.dart';
import 'package:aman_kassa_flutter/core/route_names.dart';
import 'package:aman_kassa_flutter/core/services/ApiService.dart';
import 'package:aman_kassa_flutter/core/services/BankService.dart';
import 'package:aman_kassa_flutter/core/services/ForteService.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/navigator_service.dart';
@ -30,14 +27,11 @@ import 'package:aman_kassa_flutter/widgets/fields/aman_icon_button.dart';
import 'package:aman_kassa_flutter/widgets/fields/aman_icon_button_horizontal.dart';
import 'package:aman_kassa_flutter/widgets/fields/busy_button.dart';
import 'package:aman_kassa_flutter/widgets/loader/Dialogs.dart';
import 'package:aman_kassa_flutter/views/payment/halyk_pos_service.dart' as halyk;
import 'package:aman_kassa_flutter/views/payment/forte_pos_service.dart' as forte;
import 'package:aman_kassa_flutter/views/payment/halyk_pos_service.dart';
import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart';
import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
import '../../../redux/state/bank_state.dart';
class AdditionalTab extends StatefulWidget {
final int index;
@ -51,18 +45,18 @@ class _AdditionalTabState extends State<AdditionalTab> {
ApiService _api = locator<ApiService>();
NavigatorService _navigator = locator<NavigatorService>();
DialogService _dialog = locator<DialogService>();
dynamic _bankService;
final BankService _bankService = locator<BankService>();
DataService _dataService = locator<DataService>();
final GlobalKey<State> _keyLoader = new GlobalKey<State>();
late bool isMoneyCheckBusy;
late bool closeSmenaBusy;
late bool openSmenaBusy;
late bool depositBusy;
late bool withdrawalBusy;
late bool xReportBusy;
late bool updateCatalog;
late bool isClosePosBusy;
bool isMoneyCheckBusy;
bool isClosePosBusy;
bool closeSmenaBusy;
bool openSmenaBusy;
bool depositBusy;
bool withdrawalBusy;
bool xReportBusy;
bool updateCatalog;
@override
void initState() {
@ -82,7 +76,7 @@ class _AdditionalTabState extends State<AdditionalTab> {
closeSmenaBusy = true;
});
try {
await Redux.store!.dispatch(closeSmena);
await Redux.store.dispatch(closeSmena);
} catch (e) {
print(e);
} finally {
@ -97,7 +91,7 @@ class _AdditionalTabState extends State<AdditionalTab> {
openSmenaBusy = true;
});
try {
await Redux.store!.dispatch(openSmena);
await Redux.store.dispatch(openSmena);
} catch (e) {
print(e);
} finally {
@ -112,16 +106,15 @@ class _AdditionalTabState extends State<AdditionalTab> {
xReportBusy = true;
});
try {
User user = Redux.store!.state.userState!.user!;
Response response = await _api.xReport(user.token!);
User user = Redux.store.state.userState.user;
Response response = await _api.xReport(user.token);
if (response.operation) {
String check = response.body['check'];
var checkText = response.body['check_text'];
_navigator.push(ImageShowRoute,
arguments:
ImageShowModel(data: CheckImageModal(base64Data: check, textData: checkText !=null ? jsonEncode(checkText) : null ), title: 'X Отчет'));
String? url = response.body['link'];
String url = response?.body['link'];
_dataService.insertVoucher(
user: user,
name: 'X Отчет',
@ -146,8 +139,8 @@ class _AdditionalTabState extends State<AdditionalTab> {
});
try {
Dialogs.showLoadingDialog(context, _keyLoader);
await _dataService.getDataFromServer(Redux.store!.state.userState!.user!);
Navigator.of(_keyLoader.currentContext!, rootNavigator: true).pop();
await _dataService.getDataFromServer(Redux.store.state.userState.user);
Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
} catch (e) {
print(e);
} finally {
@ -169,10 +162,10 @@ class _AdditionalTabState extends State<AdditionalTab> {
);
if (response.confirmed) {
Response<dynamic> result = await _api.deposit(
Redux.store!.state.userState!.user!.token!, response.responseText!);
Redux.store.state.userState.user.token, response.responseText);
_dialog.showDialog(description: result.body['message']);
if (result.operation) {
await Redux.store!.dispatch(checkMoney);
await Redux.store.dispatch(checkMoney);
}
}
} catch (e) {
@ -196,10 +189,10 @@ class _AdditionalTabState extends State<AdditionalTab> {
);
if (response.confirmed) {
Response<dynamic> result = await _api.withdrawal(
Redux.store!.state.userState!.user!.token!, response.responseText!);
Redux.store.state.userState.user.token, response.responseText);
_dialog.showDialog(description: result.body['message']);
if (result.operation) {
await Redux.store!.dispatch(checkMoney);
await Redux.store.dispatch(checkMoney);
}
}
} catch (e) {
@ -216,7 +209,7 @@ class _AdditionalTabState extends State<AdditionalTab> {
isMoneyCheckBusy = true;
});
try {
await Redux.store!.dispatch(checkMoney);
await Redux.store.dispatch(checkMoney);
setState(() {
isMoneyCheckBusy = false;
});
@ -234,14 +227,6 @@ class _AdditionalTabState extends State<AdditionalTab> {
isClosePosBusy = true;
});
BankState? state = Redux.store?.state.bankState;
if (state?.sessionType == 'Halyk' && state?.session != null) {
_bankService = locator<BankService>();
} else if (state?.sessionType == 'Forte' && state?.session != null) {
_bankService = locator<ForteService>();
}
int version = await _bankService.version();
if (version < _bankService.sdkVersion ) {
setState(() {
@ -250,24 +235,14 @@ class _AdditionalTabState extends State<AdditionalTab> {
_dialog.showDialog(description: 'Функция Tap2Phone доступна c Android версии 8.1');
return;
}
final isForteSessionActive = state?.sessionType == 'Forte';
await Redux.store!.dispatch(changePinSkipFromSetting(true));
dynamic closeDayDao;
if (isForteSessionActive) {
closeDayDao = await forte.closeDayFortePos();
} else {
closeDayDao = await halyk.closeDayHalykPos();
}
await Redux.store!.dispatch(changePinSkipFromSetting(false));
forte.log.i(closeDayDao.toJson());
halyk.log.i(closeDayDao.toJson());
if (closeDayDao?.result?.code != 0) {
if (closeDayDao!.result?.description != null) {
_dialog.showDialog(description: closeDayDao.result!.description!);
await Redux.store.dispatch(changePinSkipFromSetting(true));
HalykCloseDayDao closeDayDao = await closeDayHalykPos();
await Redux.store.dispatch(changePinSkipFromSetting(false));
log.i(closeDayDao.toJson());
if (closeDayDao.result.code != 0) {
if (closeDayDao.result.description != null) {
_dialog.showDialog(description: closeDayDao.result.description);
}
setState(() {
isClosePosBusy = false;
@ -275,27 +250,24 @@ class _AdditionalTabState extends State<AdditionalTab> {
return;
}
User user = Redux.store!.state.userState!.user!;
if (isForteSessionActive) {
final closeDayData = _bankService.closeDayDataConvert(closeDayDao!.transactions!);
CloseDayData closeDayData = _bankService.closeDayDataConvert(closeDayDao.transactions);
_dataService.insertVoucher(
user: user,
name: closeDayData.title!,
data: jsonEncode(closeDayData.toJson()),
total: closeDayData.totalAmount!.toDouble(),
type: VoucherTypeCloseDayPosReport);
} else {
final closeDayData = _bankService.closeDayDataConvert(closeDayDao!.transactions!);
User user = Redux.store.state.userState.user;
_dataService.insertVoucher(
user: user,
name: closeDayData.title,
data: jsonEncode(closeDayData.toJson()),
total: closeDayData.totalAmount.toDouble(),
type: VoucherTypeCloseDayPosReport);
_dataService.insertVoucher(
user: user,
name: closeDayData.title!,
data: jsonEncode(closeDayData.toJson()),
total: closeDayData.totalAmount!.toDouble(),
type: VoucherTypeCloseDayPosReport);
}
// _dialog.showDialog(description: 'Закрытие дня: операция прошла успешно!');
setState(() {
isClosePosBusy = false;
});
_navigator.push(CloseDayShowRoute,
arguments: closeDayData);
}
@override
@ -310,7 +282,7 @@ class _AdditionalTabState extends State<AdditionalTab> {
right: 20.0,
),
child: StoreConnector<AppState, SettingState>(
converter: (store) => store.state.settingState!,
converter: (store) => store.state.settingState,
builder: (context, vm) {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
@ -364,7 +336,7 @@ class _AdditionalTabState extends State<AdditionalTab> {
height: 50,
// width: double.infinity,
child: StoreConnector<AppState, Money>(
converter: (store) => store.state.userState!.money!,
converter: (store) => store.state.userState.money,
builder: (_, vm) {
if (vm.loading == true) {
return Center(
@ -506,6 +478,6 @@ class _AdditionalTabState extends State<AdditionalTab> {
}
void changeMode(el) {
Redux.store!.dispatch(changeModeFromSetting(el));
Redux.store.dispatch(changeModeFromSetting(el));
}
}

8
lib/views/home/tabs/CalculatorTab.dart
View File

@ -28,10 +28,10 @@ class CalculatorTab extends StatelessWidget {
body: Column(
children: <Widget>[
StoreConnector<AppState, CalcState>(
converter: (store) => store.state.calcState!,
converter: (store) => store.state.calcState,
builder: (context, vm) {
return NumberDisplay(
value: Calculator.parseItems(vm.calcItems!, vm.isEqual!));
value: Calculator.parseItems(vm.calcItems, vm.isEqual));
}),
CalculatorButtons(onTap: _onPress),
Row(
@ -74,7 +74,7 @@ class CalculatorTab extends StatelessWidget {
));
}
void _onPress({required String buttonText}) {
Redux.store!.dispatch(onTapAction(buttonText));
void _onPress({String buttonText}) {
Redux.store.dispatch(onTapAction(buttonText));
}
}

28
lib/views/home/tabs/KassaTab.dart
View File

@ -17,10 +17,10 @@ import 'package:aman_kassa_flutter/views/home/tabs/kassaView/CatalogBottomSheet.
import 'package:aman_kassa_flutter/views/home/tabs/kassaView/ProductAddBottomSheet.dart';
import 'package:aman_kassa_flutter/views/payment/payment_view.dart';
import 'package:aman_kassa_flutter/widgets/components/ProductListItem.dart';
import 'package:barcode_scan2/gen/protos/protos.pb.dart';
import 'package:barcode_scan2/gen/protos/protos.pbenum.dart';
import 'package:barcode_scan2/model/scan_options.dart';
import 'package:barcode_scan2/platform_wrapper.dart';
import 'package:barcode_scan/gen/protos/protos.pb.dart';
import 'package:barcode_scan/gen/protos/protos.pbenum.dart';
import 'package:barcode_scan/model/scan_options.dart';
import 'package:barcode_scan/platform_wrapper.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_redux/flutter_redux.dart';
@ -103,12 +103,12 @@ class KassaTab extends StatelessWidget {
Expanded(
child: Container(
child: StoreConnector<AppState, KassaState>(
converter: (store) => store.state.kassaState!,
converter: (store) => store.state.kassaState,
builder: (context, vm) {
return ListView.builder(
itemCount: vm.kassaItems!.length,
itemCount: vm.kassaItems.length,
itemBuilder: (BuildContext ctxt, int index) =>
buildItem(ctxt, index, vm.kassaItems![index]));
buildItem(ctxt, index, vm.kassaItems[index]));
}),
),
),
@ -119,9 +119,9 @@ class KassaTab extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
StoreConnector<AppState, KassaState>(
converter: (store) => store.state.kassaState!,
converter: (store) => store.state.kassaState,
builder: (context, vm) {
return Text(totalCalc(vm.kassaItems!),
return Text(totalCalc(vm.kassaItems),
style: TextStyle(fontSize: 25));
}),
],
@ -184,7 +184,7 @@ class KassaTab extends StatelessWidget {
Future<void> scan() async {
try {
await Redux.store!.dispatch(changePinSkipFromSetting(true));
await Redux.store.dispatch(changePinSkipFromSetting(true));
var options = ScanOptions(strings: {
"cancel": 'Отмена',
"flash_on": 'Вкл фонарик',
@ -197,8 +197,8 @@ class KassaTab extends StatelessWidget {
// print(result.formatNote); // If a unknown format was scanned this field contains a note
// print(result.rawContent); // content
if (result.type == ResultType.Barcode ) {
String? barcode;
String? dataMatrix;
String barcode;
String dataMatrix;
if(result.format == BarcodeFormat.ean13 || result.format == BarcodeFormat.ean8) {
barcode = result.rawContent;
} else if( result.format == BarcodeFormat.dataMatrix ) {
@ -219,7 +219,7 @@ class KassaTab extends StatelessWidget {
List<Good> goods =
await _dataService.getGoodsByBarcode(barcode: barcode);
if (goods != null && goods.isNotEmpty) {
await Redux.store!.dispatch(addProductToKassaItems(goods.first, dataMatrix));
await Redux.store.dispatch(addProductToKassaItems(goods.first, dataMatrix));
} else {
_dialogService.showDialog(
description: 'Товар не найден: $barcode');
@ -241,7 +241,7 @@ class KassaTab extends StatelessWidget {
_dialogService.showDialog(description: 'Неизвестная ошибка: $e');
}
} finally {
await Redux.store!.dispatch(changePinSkipFromSetting(false));
await Redux.store.dispatch(changePinSkipFromSetting(false));
}
}

54
lib/views/home/tabs/kassaView/CatalogBottomSheet.dart
View File

@ -15,20 +15,20 @@ import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart';
class CatalogBottomSheet extends StatelessWidget {
final ScrollController? scrollController;
final ScrollController scrollController;
CatalogBottomSheet({this.scrollController});
@override
Widget build(BuildContext context) {
return StoreConnector<AppState, KassaState>(
converter: (store) => store.state.kassaState!,
onInit: (store) => Redux.store!.dispatch(selectBottomElement(0)),
converter: (store) => store.state.kassaState,
onInit: (store) => Redux.store.dispatch(selectBottomElement(0)),
builder: (context, vm) {
return WillPopScope(
onWillPop: () {
if (vm.prevCategories!.length > 0) {
Redux.store!.dispatch(backBottomElement);
if (vm.prevCategories.length > 0) {
Redux.store.dispatch(backBottomElement);
} else
Navigator.pop(context);
return new Future(() => false);
@ -36,8 +36,8 @@ class CatalogBottomSheet extends StatelessWidget {
child: Scaffold(
appBar: AppBar(
title: Text(
vm.prevCategories!.isNotEmpty
? vm.prevCategories!.last.name
vm.prevCategories.isNotEmpty
? vm.prevCategories?.last?.name
: '',
style: TextStyle(color: Colors.black45),
),
@ -45,12 +45,12 @@ class CatalogBottomSheet extends StatelessWidget {
backgroundColor: whiteColor,
elevation: 1,
leading: IconButton(
icon: Icon(vm.prevCategories!.length > 0
icon: Icon(vm.prevCategories.length > 0
? Icons.arrow_back
: Icons.close),
onPressed: () {
if (vm.prevCategories!.length > 0) {
Redux.store!.dispatch(backBottomElement);
if (vm.prevCategories.length > 0) {
Redux.store.dispatch(backBottomElement);
} else
Navigator.pop(context);
},
@ -63,11 +63,11 @@ class CatalogBottomSheet extends StatelessWidget {
Expanded(
child: ListView.builder(
controller: scrollController,
itemCount: vm.bottomSheetElements!.length,
itemCount: vm.bottomSheetElements.length,
itemBuilder: (context, index) {
var el = vm.bottomSheetElements![index];
String? name;
String? price;
var el = vm.bottomSheetElements[index];
String name;
String price;
if (el is Category) {
Category category = el;
name = category.name;
@ -86,19 +86,19 @@ class CatalogBottomSheet extends StatelessWidget {
? Icon(Icons.layers, size: 25)
: null,
title: Text(
name ?? '',
name,
style: TextStyle(fontSize: 15),
),
onTap: () async {
if (el is Category) {
Redux.store!
.dispatch(selectBottomElement(el.id!));
Redux.store
.dispatch(selectBottomElement(el.id));
} else if (el is Good) {
await Redux.store!
await Redux.store
.dispatch(addProductToKassaItems(el, null));
Navigator.pop(context);
} else if (el is Service) {
await Redux.store!
await Redux.store
.dispatch(addServiceToKassaItems(el));
Navigator.pop(context);
}
@ -106,7 +106,7 @@ class CatalogBottomSheet extends StatelessWidget {
trailing: el is Category
? Icon(Icons.chevron_right)
: Text(
price ?? '',
price,
style: TextStyle(
fontSize: 15, color: Colors.black54),
),
@ -135,12 +135,12 @@ class CatalogBottomSheet extends StatelessWidget {
return Container(
margin: const EdgeInsets.symmetric(horizontal: 15.0, vertical: 5.0),
child: StoreConnector<AppState, KassaState>(
converter: (store) => store.state.kassaState!,
converter: (store) => store.state.kassaState,
builder: (_, mainState) {
return StoreConnector<AppState, SettingState>(
converter: (store) => store.state.settingState!,
converter: (store) => store.state.settingState,
builder: (_, settingState) {
if (mainState.kassaItems!.isNotEmpty) {
if (mainState.kassaItems.isNotEmpty) {
return GestureDetector(
onTap: () {
locator<DialogService>().showDialog(
@ -169,8 +169,8 @@ class CatalogBottomSheet extends StatelessWidget {
underline: Container(
height: 1,
),
onChanged: (String? newValue) {
onChangeTradeType(newValue!, settingState.tradeType!);
onChanged: (String newValue) {
onChangeTradeType(newValue, settingState.tradeType);
},
items: [
DropdownMenuItem<String>(
@ -190,8 +190,8 @@ class CatalogBottomSheet extends StatelessWidget {
void onChangeTradeType(String newValue, String oldValue) async {
if (oldValue != newValue) {
await Redux.store!.dispatch(changeTradeTypeFromSetting(newValue));
await Redux.store!.dispatch(selectBottomElement(0));
await Redux.store.dispatch(changeTradeTypeFromSetting(newValue));
await Redux.store.dispatch(selectBottomElement(0));
}
}
}

17
lib/views/home/tabs/kassaView/ProductAddBottomSheet.dart
View File

@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
class ProductAddBottomSheet extends StatefulWidget {
final ScrollController? scrollController;
final ScrollController scrollController;
ProductAddBottomSheet({this.scrollController});
@ -15,9 +15,9 @@ class ProductAddBottomSheet extends StatefulWidget {
}
class _ProductAddBottomSheetState extends State<ProductAddBottomSheet> {
late TextEditingController nameController;
late TextEditingController countController;
late TextEditingController priceController;
TextEditingController nameController;
TextEditingController countController;
TextEditingController priceController;
double sum = 0.0;
@override
@ -75,12 +75,11 @@ class _ProductAddBottomSheetState extends State<ProductAddBottomSheet> {
prefixText: ' ',
),
keyboardType: const TextInputType.numberWithOptions(
decimal: true,
decimal: false,
),
inputFormatters: <TextInputFormatter>[
// WhitelistingTextInputFormatter.digitsOnly
// FilteringTextInputFormatter.digitsOnly
FilteringTextInputFormatter.allow(RegExp("^[0-9.]*")),
FilteringTextInputFormatter.digitsOnly
],
controller: countController,
onChanged: calcOnChange,
@ -158,9 +157,9 @@ class _ProductAddBottomSheetState extends State<ProductAddBottomSheet> {
priceController.text.isEmpty) {
_showDialog();
} else {
Redux.store!.dispatch(addCustomProductToKassaItems(
Redux.store.dispatch(addCustomProductToKassaItems(
nameController.text,
double.parse(countController.text),
int.parse(countController.text),
double.parse(priceController.text),
sum));
Navigator.pop(context);

4
lib/views/info_kkm/info_kkm_view.dart
View File

@ -28,8 +28,8 @@ class _InfoKkmViewState extends State<InfoKkmView> {
setState(() {
loading = true;
});
User user = Redux.store!.state.userState!.user!;
Response<dynamic> response = await _apiService.infoKkm(user.token!);
User user = Redux.store.state.userState.user;
Response<dynamic> response = await _apiService.infoKkm(user.token);
if (response.operation) {
List<dynamic> list = [];
for (var key in response.body.keys) {

6
lib/views/lockscreen/passcodescreen.dart
View File

@ -8,7 +8,7 @@ import 'package:aman_kassa_flutter/core/locator.dart';
import 'package:aman_kassa_flutter/core/services/navigator_service.dart';
class PassCodeScreen extends StatefulWidget {
PassCodeScreen({Key? key, required this.title}) : super(key: key);
PassCodeScreen({Key key, this.title}) : super(key: key);
final String title;
@ -45,7 +45,7 @@ class _PassCodeScreenState extends State<PassCodeScreen> {
@override
Widget build(BuildContext context) {
var myPass = [];
String _pinCode = Redux.store!.state.settingState!.pinCode!;
String _pinCode = Redux.store.state.settingState.pinCode;
for (var i = 0; i < _pinCode.length; i++) {
myPass.add(int.parse(_pinCode[i]));
}
@ -72,7 +72,7 @@ class _PassCodeScreenState extends State<PassCodeScreen> {
return true;
},
onSuccess: () {
Redux.store!.dispatch(changePinLockedFromSetting(false));
Redux.store.dispatch(changePinLockedFromSetting(false));
_navigatorService.replace(HomeViewRoute);
});
}

180
lib/views/login/login_view.dart
View File

@ -11,17 +11,17 @@ import 'package:aman_kassa_flutter/shared/app_colors.dart';
import 'package:aman_kassa_flutter/shared/ui_helpers.dart';
import 'package:aman_kassa_flutter/widgets/fields/busy_button.dart';
import 'package:aman_kassa_flutter/widgets/fields/input_field.dart';
import 'package:barcode_scan2/gen/protos/protos.pb.dart';
import 'package:barcode_scan2/model/scan_options.dart';
import 'package:barcode_scan2/platform_wrapper.dart';
import 'package:barcode_scan/gen/protos/protos.pb.dart';
import 'package:barcode_scan/gen/protos/protos.pbenum.dart';
import 'package:barcode_scan/model/scan_options.dart';
import 'package:barcode_scan/platform_wrapper.dart';
import 'package:flutter/services.dart';
import 'package:flutter_redux/flutter_redux.dart';
import 'package:flutter/material.dart';
import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
class LoginView extends StatefulWidget {
final LoginModel? loginModel;
final LoginModel loginModel;
LoginView({this.loginModel});
@override
@ -29,9 +29,9 @@ class LoginView extends StatefulWidget {
}
class _LoginViewState extends State<LoginView> {
late TextEditingController emailController;
TextEditingController emailController;
late TextEditingController passwordController;
TextEditingController passwordController;
final FocusNode passwordNode = new FocusNode();
@ -45,10 +45,10 @@ class _LoginViewState extends State<LoginView> {
void initState() {
super.initState();
if (widget.loginModel != null &&
widget.loginModel?.authType == AuthenticateTypeLogin) {
emailController = TextEditingController(text: widget.loginModel?.login);
widget.loginModel.authType == AuthenticateTypeLogin) {
emailController = TextEditingController(text: widget.loginModel.login);
passwordController =
TextEditingController(text: widget.loginModel?.password);
TextEditingController(text: widget.loginModel.password);
} else {
emailController = TextEditingController();
passwordController = TextEditingController();
@ -65,97 +65,97 @@ class _LoginViewState extends State<LoginView> {
@override
Widget build(BuildContext context) {
return StoreConnector<AppState, UserState>(
converter: (store) => store.state.userState!,
converter: (store) => store.state.userState,
builder: (context, vm) {
return Scaffold(
key: _scaffoldKey,
backgroundColor: fillColor,
body: SingleChildScrollView(
physics: BouncingScrollPhysics(),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 50),
child: Column(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
verticalSpaceLarge,
Stack(
alignment: Alignment.bottomLeft,
children: <Widget>[
SizedBox(
height: 150,
child: Image.asset('assets/images/logo.png'),
),
Positioned(
child: Text(
'онлайн касса',
style: TextStyle(fontWeight: FontWeight.bold),
key: _scaffoldKey,
backgroundColor: fillColor,
body: SingleChildScrollView(
physics: BouncingScrollPhysics(),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 50),
child: Column(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[
verticalSpaceLarge,
Stack(
alignment: Alignment.bottomLeft,
children: <Widget>[
SizedBox(
height: 150,
child: Image.asset('assets/images/logo.png'),
),
bottom: 23.0,
left: 25.0,
),
],
),
Positioned(
child: Text(
'онлайн касса',
style: TextStyle(fontWeight: FontWeight.bold),
),
bottom: 23.0,
left: 25.0,
),
],
),
InputField(
placeholder: 'Электронная почта',
controller: emailController,
textInputType: TextInputType.emailAddress,
nextFocusNode: passwordNode,
additionalNote: vm.loginFormMessage?.email,
),
verticalSpaceSmall,
InputField(
placeholder: 'Пароль',
password: true,
controller: passwordController,
fieldFocusNode: passwordNode,
additionalNote: vm.loginFormMessage?.password,
enterPressed: _pressBtnEnter,
textInputAction: TextInputAction.done,
),
verticalSpaceMedium,
Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.end,
children: [
SizedBox(
width: 150,
child: BusyButton(
title: 'Войти',
busy: vm.isLoading ?? false,
onPressed: _pressBtnEnter,
),
)
],
),
verticalSpaceLarge,
InputField(
placeholder: 'Электронная почта',
controller: emailController,
textInputType: TextInputType.emailAddress,
nextFocusNode: passwordNode,
additionalNote: vm.loginFormMessage.email,
),
verticalSpaceSmall,
InputField(
placeholder: 'Пароль',
password: true,
controller: passwordController,
fieldFocusNode: passwordNode,
additionalNote: vm.loginFormMessage.password,
enterPressed: _pressBtnEnter,
textInputAction: TextInputAction.done,
),
verticalSpaceMedium,
Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.end,
children: [
SizedBox(
width: 150,
child: BusyButton(
title: 'Войти',
busy: vm.isLoading,
onPressed: _pressBtnEnter,
),
)
],
),
verticalSpaceLarge,
// TextLink(
// 'Регистрация',
// onPressed: () {},
// ),
IconButton(
icon: Icon(MdiIcons.qrcodeScan),
iconSize: 40,
tooltip: "Scan",
onPressed: scan,
)
],
IconButton(
icon: Icon(MdiIcons.qrcodeScan),
iconSize: 40,
tooltip: "Scan",
onPressed: scan,
)
],
),
),
),
),
);
));
});
}
_pressBtnEnter() async {
if (emailController.text.toLowerCase().trim().startsWith('test')) {
if (emailController.text != null &&
emailController.text.toLowerCase().trim().startsWith('test')) {
_apiService.test = true;
} else {
_apiService.test = false;
}
Redux.store!
Redux.store
.dispatch(authenticate(emailController.text, passwordController.text));
}
@ -172,13 +172,14 @@ class _LoginViewState extends State<LoginView> {
// print(result.format); // The barcode format (as enum)
// print(result
// .formatNote); // If a unknown format was scanned this field contains a note
if (result.type == ResultType.Barcode && result.rawContent.length == 60) {
if (result.type == ResultType.Barcode &&
result.rawContent?.length == 60) {
if (result.rawContent.toLowerCase().trim().startsWith('test')) {
_apiService.test = true;
} else {
_apiService.test = false;
}
Redux.store!.dispatch(authenticateToken(result.rawContent));
Redux.store.dispatch(authenticateToken(result.rawContent));
} else if (result.type == ResultType.Error) {
_dialogService.showDialog(description: 'Не верный формат QR кода');
}
@ -199,9 +200,8 @@ class _LoginViewState extends State<LoginView> {
}
class LoginModel {
final String? authType;
final String? login;
final String? password;
final String authType;
final String login;
final String password;
LoginModel({this.authType, this.login, this.password});
}

158
lib/views/payment/forte_pos_service.dart
View File

@ -1,158 +0,0 @@
import 'package:aman_kassa_flutter/core/locator.dart';
import 'package:aman_kassa_flutter/core/logger.dart';
import 'package:aman_kassa_flutter/core/models/forte/forte_close_day_dao.dart'
as Cd;
import 'package:aman_kassa_flutter/core/models/forte/forte_response_dao.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/navigator_service.dart';
import 'package:aman_kassa_flutter/redux/store.dart';
import 'package:logger/logger.dart';
import '../../core/models/aman_dao.dart';
import '../../core/models/card_data.dart';
import '../../core/models/forte/forte_post_session.dart';
import '../../core/services/ForteService.dart';
import '../../redux/state/bank_state.dart';
ForteService _bankService = locator<ForteService>();
DialogService _dialogService = locator<DialogService>();
final DataService _dataService = locator<DataService>();
final NavigatorService _navigatorService = locator<NavigatorService>();
Logger log = getLogger('PaymentNfcView');
Future<AmanDao<CardData>> paymentFortePos(double total) async {
//Авторизация
String token = Redux.store!.state.userState!.user!.token!;
BankState bankState = Redux.store!.state.bankState!;
//права доступа
FortePosSession? session = await _bankService.renewToken(
token: token, login: bankState.login!, password: bankState.password!);
if (session == null || session.token == null) {
return sessionDeclineDao(session);
}
//Инициализация
ForteResponse response =
await _bankService.pay(token: session.token!, amount: total);
if (response.result?.code == 0) {
CardData cardData = new CardData(
authorizationCode:
response.transaction?.instrumentSpecificData?.authorizationCode,
cardholderName:
response.transaction?.instrumentSpecificData?.cardholderName,
cardNumber: response.transaction?.instrumentSpecificData?.maskedPan,
operationDay: response.transaction?.operationDay,
transactionNumber: response.transaction?.transactionNumber,
terminalId: response.transaction?.terminalId,
transactionType: 'payment');
return AmanDao<CardData>(
msg: response.result?.description, success: true, data: cardData);
}
return AmanDao<CardData>(
msg: response.result?.errorData != null
? response.result!.errorData!.description
: response.result!.description,
success: false);
}
AmanDao<CardData> sessionDeclineDao(FortePosSession? session) {
String msg = 'Отказано в доступе к API банка';
if(session!=null && session.result?.Response?.Description != null) {
msg = '${session.result?.Response?.Description} (${session.result?.Response?.Code}) ';
}
return AmanDao<CardData>(success: false, msg: msg);
}
Future<AmanDao<CardData>> refundFortePos(
CardData refundData, double total) async {
//Авторизация
String token = Redux.store!.state.userState!.user!.token!;
BankState bankState = Redux.store!.state.bankState!;
//права доступа
FortePosSession? session = await _bankService.renewToken(
token: token, login: bankState.login!, password: bankState.password!);
if (session == null || session.token == null) {
return sessionDeclineDao(session);
}
ForteResponse response = await _bankService.refund(
token: session.token!,
amount: total,
operDay: refundData.operationDay!,
terminalId: refundData.terminalId!,
transNum: refundData.transactionNumber!);
if (response.result?.code == 0) {
CardData cardData = new CardData(
authorizationCode:
response.transaction?.instrumentSpecificData?.authorizationCode,
cardholderName:
response.transaction?.instrumentSpecificData?.cardholderName,
cardNumber: response.transaction?.instrumentSpecificData?.maskedPan,
operationDay: response.transaction?.operationDay,
transactionNumber: response.transaction?.transactionNumber,
terminalId: response.transaction?.terminalId,
transactionType: 'refund');
return AmanDao<CardData>(
msg: response.result?.description, success: true, data: cardData);
}
return AmanDao<CardData>(
msg: response.result?.errorData != null
? response.result!.errorData!.description
: response.result!.description,
success: false);
}
Future<AmanDao<CardData>> reversalFortePos(
CardData refundData, double total) async {
//Авторизация
String token = Redux.store!.state.userState!.user!.token!;
BankState bankState = Redux.store!.state.bankState!;
//права доступа
FortePosSession? session = await _bankService.renewToken(
token: token, login: bankState.login ?? '', password: bankState.password ?? '');
if (session == null || session.token == null) {
return sessionDeclineDao(session);
}
log.i(refundData.toJson());
ForteResponse response = await _bankService.reversal(
token: session.token!,
operDay: refundData.operationDay!,
terminalId: refundData.terminalId!,
transNum: refundData.transactionNumber!);
if (response.result?.code == 0) {
CardData cardData = new CardData(
authorizationCode:
response.transaction?.instrumentSpecificData?.authorizationCode,
cardholderName:
response.transaction?.instrumentSpecificData?.cardholderName,
cardNumber: response.transaction?.instrumentSpecificData?.maskedPan,
operationDay: response.transaction?.operationDay,
transactionNumber: response.transaction?.transactionNumber,
terminalId: response.transaction?.terminalId,
transactionType: 'reversal');
return AmanDao<CardData>(
msg: response.result?.description, success: true, data: cardData);
}
return AmanDao<CardData>(
msg: response.result?.errorData != null
? response.result!.errorData!.description
: response.result!.description,
success: false);
}
Future<Cd.ForteCloseDayDao?> closeDayFortePos() async {
//Авторизация
String token = Redux.store!.state.userState!.user!.token!;
BankState bankState = Redux.store!.state.bankState!;
//права доступа
FortePosSession? session = await _bankService.renewToken(
token: token, login: bankState.login ?? '', password: bankState.password ?? '');
if (session== null || session.token == null) {
return new Cd.ForteCloseDayDao(
result: Cd.ResultBean(
description: 'Отказано в доступе к API банка', code: -1));
}
//Инициализация
Cd.ForteCloseDayDao? response =
await _bankService.closeDay(token: session.token!);
return response;
}

136
lib/views/payment/halyk_pos_service.dart
View File

@ -22,43 +22,43 @@ Logger log = getLogger('PaymentNfcView');
Future<AmanDao<CardData>> paymentHalykPos(double total) async {
//Авторизация
String token = Redux.store!.state.userState!.user!.token!;
BankState bankState = Redux.store!.state.bankState!;
String token = Redux.store.state.userState.user.token;
BankState bankState = Redux.store.state.bankState;
//права доступа
HalykPosSession? session = await _bankService.renewToken(
token: token, login: bankState.login!, password: bankState.password!);
if (session == null || session.token == null) {
HalykPosSession session = await _bankService.renewToken(
token: token, login: bankState.login, password: bankState.password);
if (session.token == null) {
return sessionDeclineDao(session);
}
//Инициализация
HalykResponse response =
await _bankService.pay(token: session.token!, amount: total);
if (response.result?.code == 0) {
await _bankService.pay(token: session.token, amount: total);
if (response.result.code == 0) {
CardData cardData = new CardData(
authorizationCode:
response.transaction?.instrumentSpecificData?.authorizationCode,
response.transaction.instrumentSpecificData.authorizationCode,
cardholderName:
response.transaction?.instrumentSpecificData?.cardholderName,
cardNumber: response.transaction?.instrumentSpecificData?.maskedPan,
operationDay: response.transaction?.operationDay,
transactionNumber: response.transaction?.transactionNumber,
terminalId: response.transaction?.terminalId,
response.transaction.instrumentSpecificData.cardholderName,
cardNumber: response.transaction.instrumentSpecificData.maskedPan,
operationDay: response.transaction.operationDay,
transactionNumber: response.transaction.transactionNumber,
terminalId: response.transaction.terminalId,
transactionType: 'payment');
return AmanDao<CardData>(
msg: response.result?.description, success: true, data: cardData);
msg: response.result.description, success: true, data: cardData);
}
return AmanDao<CardData>(
msg: response.result?.errorData != null
? response.result!.errorData!.description
: response.result!.description,
msg: response.result.errorData != null
? response.result.errorData.description
: response.result.description,
success: false);
}
AmanDao<CardData> sessionDeclineDao(HalykPosSession? session) {
AmanDao<CardData> sessionDeclineDao(HalykPosSession session) {
String msg = 'Отказано в доступе к API банка';
if(session!=null && session.result?.Response?.Description != null) {
msg = '${session.result?.Response?.Description} (${session.result?.Response?.Code}) ';
if(session.result?.Response?.Description != null) {
msg = '${session.result.Response.Description} (${session.result.Response.Code}) ';
}
return AmanDao<CardData>(success: false, msg: msg);
}
@ -66,93 +66,93 @@ AmanDao<CardData> sessionDeclineDao(HalykPosSession? session) {
Future<AmanDao<CardData>> refundHalykPos(
CardData refundData, double total) async {
//Авторизация
String token = Redux.store!.state.userState!.user!.token!;
BankState bankState = Redux.store!.state.bankState!;
String token = Redux.store.state.userState.user.token;
BankState bankState = Redux.store.state.bankState;
//права доступа
HalykPosSession? session = await _bankService.renewToken(
token: token, login: bankState.login!, password: bankState.password!);
if (session == null || session.token == null) {
HalykPosSession session = await _bankService.renewToken(
token: token, login: bankState.login, password: bankState.password);
if (session.token == null) {
return sessionDeclineDao(session);
}
HalykResponse response = await _bankService.refund(
token: session.token!,
token: session.token,
amount: total,
operDay: refundData.operationDay!,
terminalId: refundData.terminalId!,
transNum: refundData.transactionNumber!);
if (response.result?.code == 0) {
operDay: refundData.operationDay,
terminalId: refundData.terminalId,
transNum: refundData.transactionNumber);
if (response.result.code == 0) {
CardData cardData = new CardData(
authorizationCode:
response.transaction?.instrumentSpecificData?.authorizationCode,
response.transaction.instrumentSpecificData.authorizationCode,
cardholderName:
response.transaction?.instrumentSpecificData?.cardholderName,
cardNumber: response.transaction?.instrumentSpecificData?.maskedPan,
operationDay: response.transaction?.operationDay,
transactionNumber: response.transaction?.transactionNumber,
terminalId: response.transaction?.terminalId,
response.transaction.instrumentSpecificData.cardholderName,
cardNumber: response.transaction.instrumentSpecificData.maskedPan,
operationDay: response.transaction.operationDay,
transactionNumber: response.transaction.transactionNumber,
terminalId: response.transaction.terminalId,
transactionType: 'refund');
return AmanDao<CardData>(
msg: response.result?.description, success: true, data: cardData);
msg: response.result.description, success: true, data: cardData);
}
return AmanDao<CardData>(
msg: response.result?.errorData != null
? response.result!.errorData!.description
: response.result!.description,
msg: response.result.errorData != null
? response.result.errorData.description
: response.result.description,
success: false);
}
Future<AmanDao<CardData>> reversalHalykPos(
CardData refundData, double total) async {
//Авторизация
String token = Redux.store!.state.userState!.user!.token!;
BankState bankState = Redux.store!.state.bankState!;
String token = Redux.store.state.userState.user.token;
BankState bankState = Redux.store.state.bankState;
//права доступа
HalykPosSession? session = await _bankService.renewToken(
token: token, login: bankState.login ?? '', password: bankState.password ?? '');
if (session == null || session.token == null) {
HalykPosSession session = await _bankService.renewToken(
token: token, login: bankState.login, password: bankState.password);
if (session.token == null) {
return sessionDeclineDao(session);
}
log.i(refundData.toJson());
HalykResponse response = await _bankService.reversal(
token: session.token!,
operDay: refundData.operationDay!,
terminalId: refundData.terminalId!,
transNum: refundData.transactionNumber!);
if (response.result?.code == 0) {
token: session.token,
operDay: refundData.operationDay,
terminalId: refundData.terminalId,
transNum: refundData.transactionNumber);
if (response.result.code == 0) {
CardData cardData = new CardData(
authorizationCode:
response.transaction?.instrumentSpecificData?.authorizationCode,
response.transaction.instrumentSpecificData.authorizationCode,
cardholderName:
response.transaction?.instrumentSpecificData?.cardholderName,
cardNumber: response.transaction?.instrumentSpecificData?.maskedPan,
operationDay: response.transaction?.operationDay,
transactionNumber: response.transaction?.transactionNumber,
terminalId: response.transaction?.terminalId,
response.transaction.instrumentSpecificData.cardholderName,
cardNumber: response.transaction.instrumentSpecificData.maskedPan,
operationDay: response.transaction.operationDay,
transactionNumber: response.transaction.transactionNumber,
terminalId: response.transaction.terminalId,
transactionType: 'reversal');
return AmanDao<CardData>(
msg: response.result?.description, success: true, data: cardData);
msg: response.result.description, success: true, data: cardData);
}
return AmanDao<CardData>(
msg: response.result?.errorData != null
? response.result!.errorData!.description
: response.result!.description,
msg: response.result.errorData != null
? response.result.errorData.description
: response.result.description,
success: false);
}
Future<Cd.HalykCloseDayDao?> closeDayHalykPos() async {
Future<Cd.HalykCloseDayDao> closeDayHalykPos() async {
//Авторизация
String token = Redux.store!.state.userState!.user!.token!;
BankState bankState = Redux.store!.state.bankState!;
String token = Redux.store.state.userState.user.token;
BankState bankState = Redux.store.state.bankState;
//права доступа
HalykPosSession? session = await _bankService.renewToken(
token: token, login: bankState.login ?? '', password: bankState.password ?? '');
if (session== null || session.token == null) {
HalykPosSession session = await _bankService.renewToken(
token: token, login: bankState.login, password: bankState.password);
if (session.token == null) {
return new Cd.HalykCloseDayDao(
result: Cd.ResultBean(
description: 'Отказано в доступе к API банка', code: -1));
}
//Инициализация
Cd.HalykCloseDayDao? response =
await _bankService.closeDay(token: session.token!);
Cd.HalykCloseDayDao response =
await _bankService.closeDay(token: session.token);
return response;
}

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

@ -9,7 +9,6 @@ import 'package:aman_kassa_flutter/core/models/product_dao.dart';
import 'package:aman_kassa_flutter/core/models/response.dart';
import 'package:aman_kassa_flutter/core/route_names.dart';
import 'package:aman_kassa_flutter/core/services/BankService.dart';
import 'package:aman_kassa_flutter/core/services/ForteService.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/navigator_service.dart';
@ -28,7 +27,6 @@ import 'package:aman_kassa_flutter/shared/ui_helpers.dart';
import 'package:aman_kassa_flutter/views/check/image_show_container.dart';
import 'package:aman_kassa_flutter/widgets/components/calculator/calculator.dart';
import 'package:aman_kassa_flutter/widgets/fields/busy_button.dart';
import 'package:aman_kassa_flutter/widgets/fields/input_field.dart';
import 'package:aman_kassa_flutter/widgets/loader/Dialogs.dart';
import 'package:flutter/material.dart';
import 'package:flutter_redux/flutter_redux.dart';
@ -38,12 +36,11 @@ import 'package:aman_kassa_flutter/views/payment/halyk_pos_service.dart';
import '../../core/models/aman_dao.dart';
import '../../core/models/card_data.dart';
import '../../core/models/card_data.dart';
import 'forte_pos_service.dart';
class PaymentView extends StatefulWidget {
final PaymentModel model;
const PaymentView({Key? key, required this.model}) : super(key: key);
const PaymentView({Key key, this.model}) : super(key: key);
@override
_PaymentViewState createState() => _PaymentViewState();
@ -53,13 +50,10 @@ class _PaymentViewState extends State<PaymentView> {
final GlobalKey<State> _keyLoader = new GlobalKey<State>();
final DataService _dataService = locator<DataService>();
final DialogService _dialogService = locator<DialogService>();
dynamic _bankService;
BankService _bankService = locator<BankService>();
final NavigatorService _navigatorService = locator<NavigatorService>();
final TextEditingController _iinController = new TextEditingController();
late bool isBusy;
late bool isBankApiAccess;
var height = AppBar().preferredSize.height;
bool isBusy;
bool isBankApiAccess;
@override
void initState() {
@ -69,32 +63,13 @@ class _PaymentViewState extends State<PaymentView> {
_bankInit();
}
@override
void dispose() {
_iinController.dispose();
super.dispose();
}
_bankInit() async {
BankState? state = Redux.store?.state.bankState;
print(state?.toJson());
if (state?.sessionType == 'Halyk' && state?.session != null) {
_bankService = locator<BankService>();
} else if (state?.sessionType == 'Forte' && state?.session != null) {
_bankService = locator<ForteService>();
} else {
setState(() {
isBankApiAccess = false;
});
return;
}
int version = await _bankService.version();
setState(() {
isBankApiAccess = version >= _bankService.sdkVersion;
});
if (version >= _bankService.sdkVersion) {
setState(() {
isBankApiAccess = true;
});
}
}
@override
@ -119,27 +94,22 @@ class _PaymentViewState extends State<PaymentView> {
style: TextStyle(color: Colors.black87),
),
),
body: SingleChildScrollView(
child: SizedBox(
height: ScreenUtil().screenHeight - ScreenUtil().statusBarHeight - height,
child: Container(
padding: const EdgeInsets.symmetric(vertical: 12.0, horizontal: 12.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
dataText(),
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.black26,
fontSize: 15),
),
buildStoreConnector(),
verticalSpaceLarge,
_buildBodyContent(),
],
body: Container(
padding: const EdgeInsets.symmetric(vertical: 12.0, horizontal: 12.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Text(
dataText(),
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.black26,
fontSize: 15),
),
),
buildStoreConnector(),
verticalSpaceLarge,
_buildBodyContent(),
],
),
),
),
@ -157,9 +127,9 @@ class _PaymentViewState extends State<PaymentView> {
StoreConnector buildStoreConnector() {
if (widget.model.mode == SettingModeCalc) {
return StoreConnector<AppState, CalcState>(
converter: (store) => store.state.calcState!,
converter: (store) => store.state.calcState,
builder: (_, vm) {
return Text('${totalCalc(vm.calcItems!)} тнг',
return Text('${totalCalc(vm.calcItems)} тнг',
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.black87,
@ -167,9 +137,9 @@ class _PaymentViewState extends State<PaymentView> {
});
}
return StoreConnector<AppState, KassaState>(
converter: (store) => store.state.kassaState!,
converter: (store) => store.state.kassaState,
builder: (_, vm) {
return Text('${totalKassa(vm.kassaItems!)} тнг',
return Text('${totalKassa(vm.kassaItems)} тнг',
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.black87,
@ -181,13 +151,6 @@ class _PaymentViewState extends State<PaymentView> {
return Expanded(
child: Column(
children: <Widget>[
TextField(
keyboardType: TextInputType.number,
controller: _iinController,
maxLength: 12,
decoration: InputDecoration(
labelText: 'ИИН Покупателя', hintText: "Введите ИИН покупателя"),
),
Container(
height: 150,
child: Row(
@ -202,15 +165,6 @@ class _PaymentViewState extends State<PaymentView> {
mainColor: primaryColor,
)),
horizontalSpaceSmall,
Expanded(
child: BusyButton(
title: 'Мобильный',
onPressed: () {
pressPayment('mobile', null);
},
mainColor: redColor,
)),
horizontalSpaceSmall,
Expanded(
child: BusyButton(
title: 'Наличными',
@ -248,87 +202,87 @@ class _PaymentViewState extends State<PaymentView> {
return StoreConnector<AppState, AppState>(
converter: (store) => store.state,
builder: (_, _state) {
BankState state = _state.bankState!;
BankState state = _state.bankState;
double _total;
if (widget.model.mode == SettingModeCalc) {
String value = totalCalc(_state.calcState!.calcItems!);
String value = totalCalc(_state.calcState.calcItems);
_total = double.parse(value);
} else {
String value = totalKassa(_state.kassaState!.kassaItems!);
String value = totalKassa(_state.kassaState.kassaItems);
_total = double.parse(value);
}
if (state.password == null || state.login == null ||
state.password!.length < 1 || state.login!.length < 1) {
if (state.password == null || state.login == null || state.password.length < 1 || state.login.length < 1) {
return Container();
}
final bool isForteSessionActive = state.sessionType == 'Forte';
final String imageAsset = isForteSessionActive
? 'assets/images/fortepos.png'
: 'assets/images/halykpos.png';
final Color sessionColor = isForteSessionActive ? forteColor : halykColor;
final Future<AmanDao<CardData>> Function(double) paymentMethod =
isForteSessionActive ? paymentFortePos : paymentHalykPos;
return InkWell(
onTap: isBusy ?
() {} :
() async {
onTap: () async {
var today = new DateTime.now();
var yesterday = today.subtract(new Duration(days: 1));
if (Redux.store!.state.userState == null
|| Redux.store!.state.userState!.smena == null
|| Redux.store!.state.userState!.smena!.startedAt == null
|| yesterday.isAfter(
Redux.store!.state.userState!.smena!.startedAt!)) {
_dialogService.showDialog(
description: 'Текущая смена открыта более 24 ч. Необходимо закрыть смену и открыть ее заново.');
if( Redux.store.state.userState == null
|| Redux.store.state.userState.smena == null
|| Redux.store.state.userState.smena.startedAt == null
|| yesterday.isAfter(Redux.store.state.userState.smena.startedAt)) {
_dialogService.showDialog(description: 'Текущая смена открыта более 24 ч. Необходимо закрыть смену и открыть ее заново.');
return;
}
setState(() {
isBusy = true;
});
try {
await Redux.store!.dispatch(changePinSkipFromSetting(true));
AmanDao<CardData> data = await paymentMethod(_total);
if (data.success == true) {
pressPayment('card', data.data);
await Redux.store.dispatch(changePinSkipFromSetting(true));
AmanDao<CardData> data = await paymentHalykPos(_total);
if (data.success) {
pressPayment(widget.model.operationType, data.data);
} else {
_dialogService.showDialog(description: data.msg ?? '');
_dialogService.showDialog(description: data.msg);
}
} finally {
await Redux.store!.dispatch(changePinSkipFromSetting(false));
setState(() {
isBusy = false;
});
await Redux.store.dispatch(changePinSkipFromSetting(false));
}
},
splashColor: halykColor.withOpacity(0.4),
borderRadius: BorderRadius.circular(10.0),
highlightColor: halykColor.withOpacity(0.1),
child: SizedBox(
width: ScreenUtil().setSp(80.0),
height: ScreenUtil().setSp(80.0),
child: Container(
decoration: BoxDecoration(
color: Colors.white,
border: Border.all(color: Colors.white),
borderRadius: BorderRadius.circular(10.0),
image: DecorationImage(
image: AssetImage(imageAsset),
fit: BoxFit.fitWidth
),
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.5),
spreadRadius: 5,
blurRadius: 7,
offset: Offset(0, 3), // changes position of shadow
child: Container(
width: ScreenUtil().setSp(100.0),
padding: const EdgeInsets.symmetric(vertical: 8.0),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10.0)
),
child: Column(
children: [
Container(
width: ScreenUtil().setSp(80.0),
height: ScreenUtil().setSp(80.0),
margin: const EdgeInsets.only(bottom: 8.0),
decoration: BoxDecoration(
border: Border.all(color: Colors.white),
borderRadius: BorderRadius.circular(10.0),
image: DecorationImage(
image: AssetImage('assets/images/halykpos.png'), fit: BoxFit.fitWidth
),
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.5),
spreadRadius: 5,
blurRadius: 7,
offset: Offset(0, 3), // changes position of shadow
),
],
),
],
),
),
// Row(
// mainAxisAlignment: MainAxisAlignment.center,
// children: [
// Icon(
// MdiIcons.nfc,
// color: halykColor,
// size: ScreenUtil().setSp(20.0),
// ),
// Text('Tap2Phone',style: TextStyle(fontSize: ScreenUtil().setSp(10.0), color: halykColor, fontWeight: FontWeight.bold ),),
// ],
// ),
],
),
),
);
@ -336,22 +290,22 @@ class _PaymentViewState extends State<PaymentView> {
);
}
pressPayment(String type, CardData? cardData) async {
pressPayment(String type, CardData cardData) async {
setState(() {
isBusy = true;
});
Dialogs.showLoadingDialog(context, _keyLoader);
try {
AppState _state = Redux.store!.state;
String _token = _state.userState!.user!.token!;
String _tradeType = _state.settingState!.tradeType!;
String _mode = _state.settingState!.mode!;
AppState _state = Redux.store.state;
String _token = _state.userState.user.token;
String _tradeType = _state.settingState.tradeType;
String _mode = _state.settingState.mode;
if (_mode == SettingModeCalc) {
_tradeType = SettingTradeTypeGood;
}
List<ProductDao> kassaItems = _state.kassaState!.kassaItems!;
List<CalcModel> calcItems = _state.calcState!.calcItems!;
Response<dynamic>? response = await _dataService.sellOrReturn(
List<ProductDao> kassaItems = _state.kassaState.kassaItems;
List<CalcModel> calcItems = _state.calcState.calcItems;
Response<dynamic> response = await _dataService.sellOrReturn(
token: _token,
kassaItems: kassaItems,
paymentType: type,
@ -359,8 +313,7 @@ class _PaymentViewState extends State<PaymentView> {
tradeType: _tradeType,
calcItems: calcItems,
mode: _mode,
cardData: cardData,
contragent: _iinController.text
cardData: cardData
);
setState(() {
isBusy = false;
@ -370,39 +323,37 @@ class _PaymentViewState extends State<PaymentView> {
String message = response.body['message'];
String check = response.body['check'];
var checkText = response.body['check_text'];
String url = response.body['link'];
String url = response?.body['link'];
print('url : $url');
if (_mode == SettingModeCalc) {
Redux.store!.dispatch(cleanCalcItems);
Redux.store.dispatch(cleanCalcItems);
} else if (_mode == SettingModeKassa) {
Redux.store!.dispatch(cleanKassaItems);
Redux.store.dispatch(cleanKassaItems);
}
Redux.store!.dispatch(checkMoney);
Redux.store!.dispatch(openSmenaPseudo);
Navigator.of(_keyLoader.currentContext!, rootNavigator: true).pop();
Redux.store.dispatch(checkMoney);
Redux.store.dispatch(openSmenaPseudo);
Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
_navigatorService.pop();
_navigatorService.push(ImageShowRoute,
arguments: ImageShowModel(data: new CheckImageModal(
base64Data: check,
textData: checkText != null ? jsonEncode(checkText) : null),
base64Data: check, textData: checkText != null ? jsonEncode(checkText) : null),
title: message,
url: url));
} else if (!response.operation &&
![401, 402, 403, 412, 500].contains(response.status)) {
Navigator.of(_keyLoader.currentContext!, rootNavigator: true).pop();
} else if (!response.operation && ![401, 402, 403, 412, 500].contains(response.status)) {
Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
_dialogService.showDialog(description: response.body['message']);
} else if (!response.operation && response.body['message'] != null) {
Navigator.of(_keyLoader.currentContext!, rootNavigator: true).pop();
Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
_dialogService.showDialog(description: response.body['message']);
} else {
Navigator.of(_keyLoader.currentContext!, rootNavigator: true).pop();
Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
}
} else {
Navigator.of(_keyLoader.currentContext!, rootNavigator: true).pop();
Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
}
} catch (e) {
print(e);
Navigator.of(_keyLoader.currentContext!, rootNavigator: true).pop();
Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
} finally {
//Navigator.of(context, rootNavigator: true).pop();
setState(() {
@ -424,7 +375,7 @@ class _PaymentViewState extends State<PaymentView> {
items.forEach((element) {
if (element.operation == Calculations.MULTIPLY) {
double num1 = element.num1 == null ? 0.0 : double.parse(element.num1);
double num2 = element.num2 == null ? 0.0 : double.parse(element.num2!);
double num2 = element.num2 == null ? 0.0 : double.parse(element.num2);
total += num1 * num2;
} else {
total += element.num1 == null ? 0.0 : double.parse(element.num1);
@ -437,9 +388,8 @@ class _PaymentViewState extends State<PaymentView> {
class PaymentModel {
String operationType;
String mode;
Voucher? voucher;
CardData? cardData;
Voucher voucher;
CardData cardData;
PaymentModel(
{required this.mode, required this.operationType, this.voucher, this.cardData});
PaymentModel({this.mode, this.operationType, this.voucher, this.cardData});
}

76
lib/views/payment_nfc/payment_nfc_view.dart
View File

@ -44,7 +44,7 @@ import 'package:logger/logger.dart';
class PaymentNfcView extends StatefulWidget {
final PaymentModel model;
const PaymentNfcView({Key? key, required this.model}) : super(key: key);
const PaymentNfcView({Key key, this.model}) : super(key: key);
@override
_PaymentNfcViewState createState() => _PaymentNfcViewState();
@ -57,9 +57,9 @@ class _PaymentNfcViewState extends State<PaymentNfcView> {
final DataService _dataService = locator<DataService>();
final NavigatorService _navigatorService = locator<NavigatorService>();
Logger log = getLogger('PaymentNfcView');
late bool isBusy;
late bool isPhoneScaled;
late int status;
bool isBusy;
bool isPhoneScaled;
int status;
@override
void initState() {
@ -73,12 +73,12 @@ class _PaymentNfcViewState extends State<PaymentNfcView> {
void start() async {
//Авторизация
String token = Redux.store!.state.userState!.user!.token!;
BankState bankState = Redux.store!.state.bankState!;
String token = Redux.store.state.userState.user.token;
BankState bankState = Redux.store.state.bankState;
//права доступа
HalykPosSession? session = await _bankService.renewToken(token: token, login: bankState.login!, password: bankState.password!);
HalykPosSession session = await _bankService.renewToken(token: token, login: bankState.login, password: bankState.password);
log.i(session);
if (session == null || session.token ==null) {
if (session.token ==null) {
setState(() {
status = 4;
});
@ -100,10 +100,10 @@ class _PaymentNfcViewState extends State<PaymentNfcView> {
var today = new DateTime.now();
var yesterday = today.subtract(new Duration(days: 1));
if( Redux.store!.state.userState == null
|| Redux.store!.state.userState!.smena == null
|| Redux.store!.state.userState!.smena!.startedAt == null
|| yesterday.isAfter(Redux.store!.state.userState!.smena!.startedAt!)) {
if( Redux.store.state.userState == null
|| Redux.store.state.userState.smena == null
|| Redux.store.state.userState.smena.startedAt == null
|| yesterday.isAfter(Redux.store.state.userState.smena.startedAt)) {
_dialogService.showDialog(description: 'Текущая смена открыта более 24 ч. Необходимо закрыть смену и открыть ее заново.');
_navigatorService.pop();
return;
@ -163,7 +163,7 @@ class _PaymentNfcViewState extends State<PaymentNfcView> {
}
refund() async {
//CardData _cardData = widget.model.cardData;
CardData _cardData = widget.model.cardData;
// AmanDao findTransaction = await _bankService.findTransaction(transactionNumber: _cardData.transactionNumber, authorizationCode: _cardData.authorizationCode);
// if(!findTransaction.success){
// _dialogService.showDialog(description: findTransaction.msg);
@ -264,18 +264,18 @@ class _PaymentNfcViewState extends State<PaymentNfcView> {
});
Dialogs.showLoadingDialog(context, _keyLoader);
try {
AppState _state = Redux.store!.state;
String _token = _state.userState!.user!.token!;
String _tradeType = _state.settingState!.tradeType!;
String _mode = _state.settingState!.mode!;
AppState _state = Redux.store.state;
String _token = _state.userState.user.token;
String _tradeType = _state.settingState.tradeType;
String _mode = _state.settingState.mode;
if (_mode == SettingModeCalc) {
_tradeType = SettingTradeTypeGood;
}
CardData? cardData = cardDataDynamic != null ? CardData.fromJson(cardDataDynamic) : null;
CardData cardData = cardDataDynamic != null ? CardData.fromJson(cardDataDynamic) : null;
List<ProductDao> kassaItems = _state.kassaState!.kassaItems!;
List<CalcModel> calcItems = _state.calcState!.calcItems!;
Response<dynamic>? response = await _dataService.sellOrReturn(
List<ProductDao> kassaItems = _state.kassaState.kassaItems;
List<CalcModel> calcItems = _state.calcState.calcItems;
Response<dynamic> response = await _dataService.sellOrReturn(
token: _token,
kassaItems: kassaItems,
paymentType: type,
@ -293,31 +293,31 @@ class _PaymentNfcViewState extends State<PaymentNfcView> {
String message = response.body['message'];
String check = response.body['check'];
var checkText = response.body['check_text'];
String url = response.body['link'];
String url = response?.body['link'];
if (_mode == SettingModeCalc) {
Redux.store!.dispatch(cleanCalcItems);
Redux.store.dispatch(cleanCalcItems);
} else if (_mode == SettingModeKassa) {
Redux.store!.dispatch(cleanKassaItems);
Redux.store.dispatch(cleanKassaItems);
}
Redux.store!.dispatch(checkMoney);
Redux.store!.dispatch(openSmenaPseudo);
Navigator.of(_keyLoader.currentContext!, rootNavigator: true).pop();
Redux.store.dispatch(checkMoney);
Redux.store.dispatch(openSmenaPseudo);
Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
_navigatorService.replace(HomeViewRoute);
_navigatorService.push(ImageShowRoute,
arguments: ImageShowModel(data: new CheckImageModal(base64Data: check, textData: checkText !=null ? jsonEncode(checkText) : null ), title: message, url: url));
} else if (!response.operation &&
![401, 402, 403, 412, 500].contains(response.status)) {
Navigator.of(_keyLoader.currentContext!, rootNavigator: true).pop();
Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
_dialogService.showDialog(description: response.body['message']);
} else {
Navigator.of(_keyLoader.currentContext!, rootNavigator: true).pop();
Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
}
} else {
Navigator.of(_keyLoader.currentContext!, rootNavigator: true).pop();
Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
}
} catch (e) {
print(e);
Navigator.of(_keyLoader.currentContext!, rootNavigator: true).pop();
Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
} finally {
//Navigator.of(context, rootNavigator: true).pop();
setState(() {
@ -470,9 +470,9 @@ class _PaymentNfcViewState extends State<PaymentNfcView> {
StoreConnector buildStoreConnector() {
if (widget.model.mode == SettingModeCalc) {
return StoreConnector<AppState, CalcState>(
converter: (store) => store.state.calcState!,
converter: (store) => store.state.calcState,
builder: (_, vm) {
return Text('${totalCalc(vm.calcItems!)} тнг',
return Text('${totalCalc(vm.calcItems)} тнг',
style: TextStyle(
fontWeight: FontWeight.bold,
color: whiteColor,
@ -481,9 +481,9 @@ class _PaymentNfcViewState extends State<PaymentNfcView> {
}
if(widget.model.voucher !=null) {
return StoreConnector<AppState, KassaState>(
converter: (store) => store.state.kassaState!,
converter: (store) => store.state.kassaState,
builder: (_, vm) {
return Text('${widget.model.voucher?.total} тнг',
return Text('${widget.model.voucher.total} тнг',
style: TextStyle(
fontWeight: FontWeight.bold,
color: whiteColor,
@ -491,9 +491,9 @@ class _PaymentNfcViewState extends State<PaymentNfcView> {
});
}
return StoreConnector<AppState, KassaState>(
converter: (store) => store.state.kassaState!,
converter: (store) => store.state.kassaState,
builder: (_, vm) {
return Text('${totalKassa(vm.kassaItems!)} тнг',
return Text('${totalKassa(vm.kassaItems)} тнг',
style: TextStyle(
fontWeight: FontWeight.bold,
color: whiteColor,
@ -514,7 +514,7 @@ class _PaymentNfcViewState extends State<PaymentNfcView> {
items.forEach((element) {
if (element.operation == Calculations.MULTIPLY) {
double num1 = element.num1 == null ? 0.0 : double.parse(element.num1);
double num2 = element.num2 == null ? 0.0 : double.parse(element.num2!);
double num2 = element.num2 == null ? 0.0 : double.parse(element.num2);
total += num1 * num2;
} else {
total += element.num1 == null ? 0.0 : double.parse(element.num1);

14
lib/views/payment_nfc/widgets/action_view.dart
View File

@ -5,14 +5,14 @@ import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
class ActionView extends StatelessWidget {
final String? acceptText;
final String? declineText;
final void Function()? acceptCallback;
final void Function()? declineCallback;
final String acceptText;
final String declineText;
final void Function() acceptCallback;
final void Function() declineCallback;
final bool show;
const ActionView(
{Key? key,
{Key key,
this.acceptText,
this.declineText,
this.acceptCallback,
@ -39,10 +39,10 @@ class ActionView extends StatelessWidget {
return Row(
children: <Widget>[
if (acceptCallback !=null && acceptText !=null)
Expanded(child: BusyButton(title: acceptText!, onPressed: acceptCallback!)),
Expanded(child: BusyButton(title: acceptText, onPressed: acceptCallback)),
SizedBox(width: 5.0,),
if (declineCallback !=null && declineText !=null)
BusyButton(title: declineText!, onPressed: declineCallback!, mainColor: redColor,)
BusyButton(title: declineText, onPressed: declineCallback, mainColor: redColor,)
],
);
}

2
lib/views/payment_nfc/widgets/phone_view.dart
View File

@ -8,7 +8,7 @@ import 'package:material_design_icons_flutter/material_design_icons_flutter.dart
class PhoneView extends StatefulWidget {
final bool scaled;
final int? status;
final int status;
const PhoneView({this.scaled = false, this.status });

4
lib/views/payment_nfc/widgets/text_state.dart
View File

@ -5,10 +5,10 @@ import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
class TextStateView extends StatelessWidget {
final int? status;
final int status;
final String text;
const TextStateView({Key? key, this.status, this.text = ''}) : super(key: key);
const TextStateView({Key key, this.status, this.text = ''}) : super(key: key);
@override
Widget build(BuildContext context) {

2
lib/views/qr_view/qr_view.dart
View File

@ -27,7 +27,7 @@ class _QrViewState extends State<QrView> {
body: Container(
child: Center(
child: QrImage(
data: widget.data.url!,
data: widget.data.url,
version: QrVersions.auto,
size: 220.0,
),

Some files were not shown because too many files have changed in this diff Show More