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

small fix

Browse Source
This commit is contained in:
Semyon Babushkin
2017-10-31 17:27:04 +03:00
parent 2bf999ce48
commit 52aab9a6e0
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/app/src/main/java/com/dinect/checker/AbstractScannerActivity.java
View File

@@ -136,10 +136,8 @@ public abstract class AbstractScannerActivity extends AppCompatActivity {
private void initManualInput() { private void initManualInput() {
EditText manualInput = (EditText) findViewById(R.id.manual_input); 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() { manualInput.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override @Override

11
lib/screens/purchase.dart
View File

@@ -52,6 +52,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
Map user; Map user;
String card = ''; String card = '';
String flavor = ''; String flavor = '';
String loyalityType = '';
String loyalty = ''; String loyalty = '';
String bonus = ''; String bonus = '';
bool dataLoaded = false; bool dataLoaded = false;
@@ -75,7 +76,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
widgets.add(getInputField()); // Нельзя добавить еще одно поле таким же способом widgets.add(getInputField()); // Нельзя добавить еще одно поле таким же способом
if (this.flavor != 'autobonus') { if (this.loyalityType == 'bonus') {
widgets.add(getBonusInputField()); widgets.add(getBonusInputField());
} }
@@ -195,9 +196,11 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
getLoyaltyRequest(url, helper).then((response) { getLoyaltyRequest(url, helper).then((response) {
print(response); print(response);
this.dataLoaded = true; this.dataLoaded = true;
Map loyality = JSON.decode(response.body);
setState(() { setState(() {
this.flavor = flavor; this.flavor = flavor;
setBonuses(JSON.decode(response.body), showBonus ); this.loyalityType = loyality['type'];
setBonuses(loyality, showBonus);
}); });
}).catchError((error) { }).catchError((error) {
print(error.toString()); print(error.toString());
@@ -355,7 +358,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
} }
void setBonuses(Map bonuses, bool showBonus) { void setBonuses(Map bonuses, bool showBonus) {
print('kifio ' + bonuses['type']); print('kifio ' + this.loyalityType);
if (bonuses['type'] == 'amount') { if (bonuses['type'] == 'amount') {
this.loyalty = '${user['discount']}%'; this.loyalty = '${user['discount']}%';
} else { } else {
@@ -364,7 +367,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
this.loyalty = '${loyaltyVal.toStringAsFixed(0)}%'; this.loyalty = '${loyaltyVal.toStringAsFixed(0)}%';
} }
if (showBonus && (bonuses['type'] == 'bonus')) { if (showBonus && (this.loyalityType == 'bonus')) {
this.bonus = '${user['bonus']}'; this.bonus = '${user['bonus']}';
} }
print('kifio ' + this.loyalty); print('kifio ' + this.loyalty);