tret2003/checker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into RG-3433

Browse Source
This commit is contained in:
Ivan Murashov
2017-09-04 19:00:01 +03:00
parent 6e8269b4df 4c803a7d05
commit 671b3afe6d
4 changed files with 26 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.dinect.checker" package="com.dinect.checker"
android:versionCode="1" android:versionCode="1"
android:versionName="0.4"> android:versionName="0.6">
<uses-sdk <uses-sdk
android:minSdkVersion="16" android:minSdkVersion="16"

8
checker.sublime-project
View File

@@ -1,8 +0,0 @@
{
"folders":
[
{
"path": "."
}
]
}

235
checker.sublime-workspace
View File

@@ -1,235 +0,0 @@
{
"auto_complete":
{
"selected_items":
[
[
"e",
"else"
],
[
"pre",
"previewing"
],
[
"purc",
"_purchase"
]
]
},
"buffers":
[
],
"build_system": "",
"build_system_choices":
[
],
"build_varint": "",
"command_palette":
{
"height": 392.0,
"last_filter": "packa",
"selected_items":
[
[
"packa",
"Package Control: Install Package"
],
[
"pac",
"Install Package Control"
]
],
"width": 485.0
},
"console":
{
"height": 0.0,
"history":
[
]
},
"distraction_free":
{
"menu_visible": true,
"show_minimap": false,
"show_open_files": false,
"show_tabs": false,
"side_bar_visible": false,
"status_bar_visible": false
},
"expanded_folders":
[
"/home/kifio/checker"
],
"file_history":
[
"/home/kifio/checker/lib/purchase.dart",
"/home/kifio/checker/lib/base_state.dart",
"/home/kifio/checker/lib/main.dart",
"/home/kifio/checker/lib/network.dart",
"/home/kifio/checker/pubspec.yaml",
"/home/kifio/checker/lib/registration.dart",
"/home/kifio/checker/lib/activate_token.dart",
"/home/kifio/checker/lib/common.dart",
"/home/kifio/checker/lib/consts.dart",
"/home/kifio/checker/android/app/src/main/AndroidManifest.xml",
"/home/kifio/checker/lib/splash.dart",
"/home/kifio/checker/lib/faq.dart",
"/home/kifio/checker/android/app/src/main/java/com/dinect/checker/activity/CameraActivity.java",
"/home/kifio/checker/android/app/src/main/java/com/dinect/checker/activity/MainActivity.java",
"/Users/kifio/FlutterProjects/checker/lib/consts.dart",
"/Users/kifio/FlutterProjects/checker/lib/activate_token.dart",
"/Users/kifio/FlutterProjects/checker/lib/registration.dart",
"/Users/kifio/FlutterProjects/checker/lib/purchase_success.dart",
"/Users/kifio/FlutterProjects/checker/lib/purchase.dart",
"/Users/kifio/FlutterProjects/checker/lib/main.dart",
"/Users/kifio/FlutterProjects/checker/lib/faq.dart",
"/home/kifio/ShitCoding/checker/lib/main.dart",
"/home/kifio/ShitCoding/checker/lib/base_state.dart",
"/home/kifio/ShitCoding/checker/lib/splash.dart",
"/home/kifio/ShitCoding/checker/lib/registration.dart",
"/home/kifio/ShitCoding/checker/lib/activate_token.dart"
],
"find":
{
"height": 23.0
},
"find_in_files":
{
"height": 93.0,
"where_history":
[
""
]
},
"find_state":
{
"case_sensitive": true,
"find_history":
[
"intToken",
"http://pos-api-autoclub.dinect.com/20130701/",
"intUrl",
"async",
"common",
" \treturn new Text('Покупка на сумму 1234.00 руб. проведена', style: new TextStyle(color: tokenActiveTextColor, decorationColor: const Color(0x8ae28aff)));\n",
"getProgressIndicator",
"direc",
"_loading",
"_merchantID",
" \n",
"getPaddingForTextField",
"horiz",
"horizontaMargin",
"28.0",
"merchantID"
],
"highlight": true,
"in_selection": false,
"preserve_case": false,
"regex": false,
"replace_history":
[
"loading",
"textFieldValue",
"verticalMargin",
"_merchantID"
],
"reverse": false,
"show_context": true,
"use_buffer2": true,
"whole_word": false,
"wrap": true
},
"groups":
[
{
"sheets":
[
]
}
],
"incremental_find":
{
"height": 23.0
},
"input":
{
"height": 33.0
},
"layout":
{
"cells":
[
[
0,
0,
1,
1
]
],
"cols":
[
0.0,
1.0
],
"rows":
[
0.0,
1.0
]
},
"menu_visible": true,
"output.find_results":
{
"height": 0.0
},
"pinned_build_system": "",
"project": "checker.sublime-project",
"replace":
{
"height": 42.0
},
"save_all_on_build": true,
"select_file":
{
"height": 0.0,
"last_filter": "",
"selected_items":
[
],
"width": 0.0
},
"select_project":
{
"height": 0.0,
"last_filter": "",
"selected_items":
[
],
"width": 0.0
},
"select_symbol":
{
"height": 0.0,
"last_filter": "",
"selected_items":
[
],
"width": 0.0
},
"selected_group": 0,
"settings":
{
},
"show_minimap": true,
"show_open_files": false,
"show_tabs": true,
"side_bar_visible": true,
"side_bar_width": 241.0,
"status_bar_visible": true,
"template_settings":
{
}
}

7
lib/purchase/purchase.dart
View File

@@ -29,6 +29,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
getLoyality(user['loyalty_url']); getLoyality(user['loyalty_url']);
} }
bool purchaseInProgress = false;
Map user; Map user;
String card = ''; String card = '';
String loyality = ''; String loyality = '';
@@ -186,9 +187,9 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
} }
purchase(String sumTotal) async { purchase(String sumTotal) async {
if (await platform.invokeMethod('isOnline')) { if (await platform.invokeMethod('isOnline')) {
if (!purchaseInProgress) {
purchaseInProgress = true;
platform.invokeMethod('getDocID').then((result) { platform.invokeMethod('getDocID').then((result) {
String url = user['purchases_url']; String url = user['purchases_url'];
@@ -212,9 +213,11 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
pushRoute(context, new PurchaseSuccessScreen(sumTotal, user['first_name'] == null ? '' : user['first_name'])); pushRoute(context, new PurchaseSuccessScreen(sumTotal, user['first_name'] == null ? '' : user['first_name']));
}).catchError((error) { }).catchError((error) {
purchaseInProgress = false;
print(error.toString()); print(error.toString());
}); });
}); });
} }
} }
}
} }