From 52aab9a6e0c991ea34714c15fbc64e5ffb88db3a Mon Sep 17 00:00:00 2001
From: Semyon Babushkin <sbabushkin@sinergo.ru>
Date: Tue, 31 Oct 2017 17:27:04 +0300
Subject: [PATCH] small fix

---
 .../com/dinect/checker/AbstractScannerActivity.java   |  6 ++----
 lib/screens/purchase.dart                             | 11 +++++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/android/app/src/main/java/com/dinect/checker/AbstractScannerActivity.java b/android/app/src/main/java/com/dinect/checker/AbstractScannerActivity.java
index d8c5003..32200b1 100644
--- a/android/app/src/main/java/com/dinect/checker/AbstractScannerActivity.java
+++ b/android/app/src/main/java/com/dinect/checker/AbstractScannerActivity.java
@@ -136,10 +136,8 @@ public abstract class AbstractScannerActivity extends AppCompatActivity {
   private void initManualInput() {
     EditText manualInput = (EditText) findViewById(R.id.manual_input);
 
-    //if (BuildConfig.applicationId == "com.dinect.develop") {
-      // для удобства, чтоб не вводить постоянно руками при разработке
-      //manualInput.setText("4620011139016317023320337");
-    //}
+    // для удобства, чтоб не вводить постоянно руками при разработке
+//    manualInput.setText("4620011139016317023320337");
 
     manualInput.setOnEditorActionListener(new TextView.OnEditorActionListener() {
       @Override
diff --git a/lib/screens/purchase.dart b/lib/screens/purchase.dart
index f4097da..0941f90 100644
--- a/lib/screens/purchase.dart
+++ b/lib/screens/purchase.dart
@@ -52,6 +52,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
   Map user;
   String card = '';
   String flavor = '';
+  String loyalityType = '';
   String loyalty = '';
   String bonus = '';
   bool dataLoaded = false;
@@ -75,7 +76,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
 
     widgets.add(getInputField()); // Нельзя добавить еще одно поле таким же способом
 
-    if (this.flavor != 'autobonus') {
+    if (this.loyalityType == 'bonus') {
       widgets.add(getBonusInputField());
     }
 
@@ -195,9 +196,11 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
       getLoyaltyRequest(url, helper).then((response) {
         print(response);
         this.dataLoaded = true;
+        Map loyality = JSON.decode(response.body);
         setState(() {
           this.flavor = flavor;
-          setBonuses(JSON.decode(response.body), showBonus );
+          this.loyalityType = loyality['type'];
+          setBonuses(loyality, showBonus);
         });
       }).catchError((error) {
         print(error.toString());
@@ -355,7 +358,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
   }
 
   void setBonuses(Map bonuses, bool showBonus) {
-    print('kifio ' + bonuses['type']);
+    print('kifio ' + this.loyalityType);
     if (bonuses['type'] == 'amount') {
       this.loyalty = '${user['discount']}%';
     } else {
@@ -364,7 +367,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
       this.loyalty = '${loyaltyVal.toStringAsFixed(0)}%';
     }
 
-    if (showBonus && (bonuses['type'] == 'bonus')) {
+    if (showBonus && (this.loyalityType == 'bonus')) {
       this.bonus = '${user['bonus']}';
     }
     print('kifio ' + this.loyalty);