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

Upgrade to support new version

Browse Source
This commit is contained in:
Nikita Tepliakov
2018-11-08 21:58:31 +08:00
parent 22e8bcd5f5
commit cf60ec41f4
6 changed files with 32 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/screens/finish_registration.dart
View File

@@ -77,7 +77,7 @@ class RegistrationScreenState extends BaseState<FinishRegistrationScreen> {
helper.getToken().then((token) {
getCheckTokenStatusRequest(token).then((response) {
setState(() {
_tokenActive = JSON.decode(response.body)['active'];
_tokenActive = json.decode(response.body)['active'];
});
}).catchError((error) {
print(error.toString());

10
lib/screens/purchase.dart
View File

@@ -37,7 +37,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
bool isAutomaticallyImplyLeading() => false;
PurchaseScreenState(SqliteHelper helper, String app, String userString, String card) : super(helper, app) {
this.user = JSON.decode(userString);
this.user = json.decode(userString);
this.card = card;
}
@@ -239,8 +239,8 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
} catch(error) {
print(error.toString());
}
Map loyality = JSON.decode(response.body);
Map coupons = JSON.decode(couponResponse.body);
Map loyality = json.decode(response.body);
Map coupons = json.decode(couponResponse.body);
coupons['results'].forEach((couponItem) {
couponItem['isSet'] = false;
@@ -378,7 +378,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
try {
purchaseResponse = await getPurchaseRequest(user['purchases_url'], body, token);
purchase = JSON.decode(purchaseResponse.body);
purchase = json.decode(purchaseResponse.body);
} catch(error) {
purchaseInProgress = false;
print(error.toString());
@@ -402,7 +402,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
print(error.toString());
}
Map coupons = JSON.decode(couponsResponse.body);
Map coupons = json.decode(couponsResponse.body);
new Future.delayed(const Duration(milliseconds: 200), () {
print('show purchase success!');

2
lib/screens/registration.dart
View File

@@ -106,7 +106,7 @@ class RegistrationScreenState extends BaseState<RegistrationScreen> {
print(response.body);
print(response.statusCode.toString());
Map parsedMap = JSON.decode(response.body);
Map parsedMap = json.decode(response.body);
if (response.statusCode == 201) {
helper.createSession(merchantID, posID, parsedMap['token']).then((_) {

8
lib/screens/splash.dart
View File

@@ -120,7 +120,7 @@ class _SplashScreenState extends BaseState<SplashScreen> {
showNextScreen(new RegistrationScreen(helper, app));
});
} else {
Map status = JSON.decode(statusResponse.body);
Map status = json.decode(statusResponse.body);
bool active = status['active'] == null ? false : status['active'];
if (active) {
@@ -161,7 +161,7 @@ class _SplashScreenState extends BaseState<SplashScreen> {
/// Очищаем бд, делаем запрос на удаление токена.
Future clearToken(Response response, SqliteHelper helper) async {
helper.clear().then((_) {
Map parsedMap = JSON.decode(response.body);
Map parsedMap = json.decode(response.body);
getDeleteTokenRequest(parsedMap['token']).then((_) {
showNextScreen(new RegistrationScreen(helper, app));
}).catchError((error) {
@@ -201,7 +201,7 @@ class _SplashScreenState extends BaseState<SplashScreen> {
if (userResponse != null) {
print('I have user in method handler!');
List<dynamic> users = JSON.decode(userResponse.body);
List<dynamic> users = json.decode(userResponse.body);
if (users.length > 0) {
return users[0];
} else {
@@ -238,7 +238,7 @@ class _SplashScreenState extends BaseState<SplashScreen> {
} else {
String userString = call.arguments[0] is String
? call.arguments[0]
: JSON.encode(call.arguments[0]);
: json.encode(call.arguments[0]);
print(userString);
String card = call.arguments[1];
showNextScreen(new PurchaseScreen(helper, app, userString, card));