initial commit

This commit is contained in:
Admin
2017-10-05 12:16:55 +03:00
parent d6a65b6de2
commit 23dce005b4
11 changed files with 238 additions and 20 deletions

19
android/android.iml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/../build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

148
android/app/app.iml Normal file
View File

@@ -0,0 +1,148 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":app" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="autobonusDebug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleAutobonusDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileAutobonusDebugSources" />
<afterSyncTasks>
<task>generateAutobonusDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../../build/app/intermediates/classes/autobonus/debug" />
<output-test url="file://$MODULE_DIR$/../../build/app/intermediates/classes/test/autobonus/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/autobonusDebug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/autobonusDebug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/autobonusDebug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/autobonusDebug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/autobonusDebug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/autobonusDebug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/autobonusDebug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testAutobonusDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testAutobonusDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testAutobonusDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testAutobonusDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testAutobonusDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testAutobonusDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testAutobonusDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/autobonus/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/autobonus/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/autobonus/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/autobonus/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/autobonus/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/autobonus/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/autobonus/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testAutobonus/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testAutobonus/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testAutobonus/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testAutobonus/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testAutobonus/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testAutobonus/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testAutobonus/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAutobonus/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAutobonus/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAutobonus/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAutobonus/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAutobonus/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAutobonus/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTestAutobonus/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
</content>
<content url="file://$MODULE_DIR$/../../build/app">
<sourceFolder url="file://$MODULE_DIR$/../../build/app/generated/source/r/autobonus/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../build/app/generated/source/aidl/autobonus/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../build/app/generated/source/buildConfig/autobonus/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../build/app/generated/source/rs/autobonus/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../build/app/generated/source/apt/autobonus/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../build/app/generated/res/rs/autobonus/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/../../build/app/generated/res/resValues/autobonus/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/../../build/app/generated/source/r/androidTest/autobonus/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../build/app/generated/source/aidl/androidTest/autobonus/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../build/app/generated/source/buildConfig/androidTest/autobonus/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../build/app/generated/source/rs/androidTest/autobonus/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../build/app/generated/source/apt/androidTest/autobonus/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/../../build/app/generated/res/rs/androidTest/autobonus/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/../../build/app/generated/res/resValues/androidTest/autobonus/debug" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/../../build/app/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/../../build/app/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/../../build/app/intermediates/flutter" />
<excludeFolder url="file://$MODULE_DIR$/../../build/app/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/../../build/app/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/../../build/app/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/../../build/app/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/../../build/app/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/../../build/app/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/../../build/app/outputs" />
</content>
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="zbar" level="project" />
<orderEntry type="library" exported="" name="okio-1.13.0" level="project" />
<orderEntry type="library" exported="" name="zxing-1.9.8" level="project" />
<orderEntry type="library" exported="" name="core-3.3.0" level="project" />
<orderEntry type="library" exported="" name="support-core-ui-25.3.1" level="project" />
<orderEntry type="library" exported="" name="okhttp-3.8.1" level="project" />
<orderEntry type="library" exported="" name="flutter" level="project" />
<orderEntry type="library" exported="" name="support-v4-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-media-compat-25.3.1" level="project" />
<orderEntry type="library" exported="" name="flutter-x86" level="project" />
<orderEntry type="library" exported="" name="core-1.9.8" level="project" />
<orderEntry type="library" exported="" name="support-annotations-25.3.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-vector-drawable-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-compat-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-core-utils-25.3.1" level="project" />
<orderEntry type="library" exported="" name="support-fragment-25.3.1" level="project" />
<orderEntry type="library" exported="" name="animated-vector-drawable-25.3.1" level="project" />
</component>
</module>

View File

@@ -51,6 +51,8 @@ android {
buildConfigField "String", "supportUrl", "\"http://www.dinect.com\"" buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
buildConfigField "String", "endpoint", "\"https://pos-api.dinect.com/20130701/\"" buildConfigField "String", "endpoint", "\"https://pos-api.dinect.com/20130701/\""
buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\"" buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\""
buildConfigField "String", "appTitle", "\"Dinect\""
buildConfigField "boolean", "showBonus", "true"
} }
@@ -63,6 +65,8 @@ android {
buildConfigField "String", "supportUrl", "\"https://www.auto-club.biz\"" buildConfigField "String", "supportUrl", "\"https://www.auto-club.biz\""
buildConfigField "String", "endpoint", "\"https://pos-api-autoclub.dinect.com/20130701/\"" buildConfigField "String", "endpoint", "\"https://pos-api-autoclub.dinect.com/20130701/\""
buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\"" buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\""
buildConfigField "String", "appTitle", "\"Autobonus\""
buildConfigField "boolean", "showBonus", "false"
} }
pip { pip {
@@ -74,6 +78,8 @@ android {
buildConfigField "String", "supportUrl", "\"http://discount.kiev.ua/\"" buildConfigField "String", "supportUrl", "\"http://discount.kiev.ua/\""
buildConfigField "String", "endpoint", "\"https://pos-api.discount.kiev.ua/20130701/\"" buildConfigField "String", "endpoint", "\"https://pos-api.discount.kiev.ua/20130701/\""
buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\"" buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\""
buildConfigField "String", "appTitle", "\"PIP\""
buildConfigField "boolean", "showBonus", "true"
} }
develop { develop {
@@ -85,6 +91,8 @@ android {
buildConfigField "String", "supportUrl", "\"http://yandex.ru/\"" buildConfigField "String", "supportUrl", "\"http://yandex.ru/\""
buildConfigField "String", "endpoint", "\"https://pos-api-int.dinect.com/20130701/\"" buildConfigField "String", "endpoint", "\"https://pos-api-int.dinect.com/20130701/\""
buildConfigField "String", "appToken", "\"9fec83cdca38c357e6b65dbb17514cdd36bf2a08\"" buildConfigField "String", "appToken", "\"9fec83cdca38c357e6b65dbb17514cdd36bf2a08\""
buildConfigField "String", "appTitle", "\"Autobonus\""
buildConfigField "boolean", "showBonus", "false"
} }
} }

View File

@@ -82,6 +82,12 @@ public class MainActivity extends FlutterActivity {
case "getAppToken": case "getAppToken":
result.success(BuildConfig.appToken); result.success(BuildConfig.appToken);
break; break;
case "getAppTitle":
result.success(BuildConfig.appTitle);
break;
case "showBonus":
result.success(BuildConfig.showBonus);
break;
default: default:
result.notImplemented(); result.notImplemented();
break; break;

View File

@@ -35,6 +35,7 @@ class MessageLookup extends MessageLookupByLibrary {
"common" : MessageLookupByLibrary.simpleMessage("General information"), "common" : MessageLookupByLibrary.simpleMessage("General information"),
"request_sent_wait_activ" : MessageLookupByLibrary.simpleMessage("The activation request for the application has been sent, wait for confirm activation"), "request_sent_wait_activ" : MessageLookupByLibrary.simpleMessage("The activation request for the application has been sent, wait for confirm activation"),
"reward" : MessageLookupByLibrary.simpleMessage("Reward"), "reward" : MessageLookupByLibrary.simpleMessage("Reward"),
"bonus" : MessageLookupByLibrary.simpleMessage("Bonus on account"),
"scan" : MessageLookupByLibrary.simpleMessage("Scan"), "scan" : MessageLookupByLibrary.simpleMessage("Scan"),
"sign_up" : MessageLookupByLibrary.simpleMessage("Sign Up"), "sign_up" : MessageLookupByLibrary.simpleMessage("Sign Up"),
"specify_din_store" : MessageLookupByLibrary.simpleMessage("Specify the DIN store"), "specify_din_store" : MessageLookupByLibrary.simpleMessage("Specify the DIN store"),

View File

@@ -32,6 +32,7 @@ class MessageLookup extends MessageLookupByLibrary {
"registration" : MessageLookupByLibrary.simpleMessage("El registro"), "registration" : MessageLookupByLibrary.simpleMessage("El registro"),
"request_sent_wait_activ" : MessageLookupByLibrary.simpleMessage("El requieremento de activación de aplicación esta mandado, esperad la activación por el administrador."), "request_sent_wait_activ" : MessageLookupByLibrary.simpleMessage("El requieremento de activación de aplicación esta mandado, esperad la activación por el administrador."),
"reward" : MessageLookupByLibrary.simpleMessage("Gratificación"), "reward" : MessageLookupByLibrary.simpleMessage("Gratificación"),
"bonus" : MessageLookupByLibrary.simpleMessage("Bono por cuenta"),
"scan" : MessageLookupByLibrary.simpleMessage("Escanear"), "scan" : MessageLookupByLibrary.simpleMessage("Escanear"),
"sign_up" : MessageLookupByLibrary.simpleMessage("Registrarse"), "sign_up" : MessageLookupByLibrary.simpleMessage("Registrarse"),
"specify_din_store" : MessageLookupByLibrary.simpleMessage("Hay que dar DIN del negocio"), "specify_din_store" : MessageLookupByLibrary.simpleMessage("Hay que dar DIN del negocio"),

View File

@@ -35,6 +35,7 @@ class MessageLookup extends MessageLookupByLibrary {
"common" : MessageLookupByLibrary.simpleMessage("Общая информация"), "common" : MessageLookupByLibrary.simpleMessage("Общая информация"),
"request_sent_wait_activ" : MessageLookupByLibrary.simpleMessage("Запрос на активацию приложения отправлен, дождитесь подтверждения активации администратором"), "request_sent_wait_activ" : MessageLookupByLibrary.simpleMessage("Запрос на активацию приложения отправлен, дождитесь подтверждения активации администратором"),
"reward" : MessageLookupByLibrary.simpleMessage("Вознаграждение"), "reward" : MessageLookupByLibrary.simpleMessage("Вознаграждение"),
"bonus" : MessageLookupByLibrary.simpleMessage("Бонусов на счету"),
"scan" : MessageLookupByLibrary.simpleMessage("Сканировать"), "scan" : MessageLookupByLibrary.simpleMessage("Сканировать"),
"sign_up" : MessageLookupByLibrary.simpleMessage("Зарегистрироваться"), "sign_up" : MessageLookupByLibrary.simpleMessage("Зарегистрироваться"),
"specify_din_store" : MessageLookupByLibrary.simpleMessage("Необходимо указать DIN магазина"), "specify_din_store" : MessageLookupByLibrary.simpleMessage("Необходимо указать DIN магазина"),

View File

@@ -35,6 +35,7 @@ class MessageLookup extends MessageLookupByLibrary {
"common" : MessageLookupByLibrary.simpleMessage("Загальна інформація"), "common" : MessageLookupByLibrary.simpleMessage("Загальна інформація"),
"request_sent_wait_activ" : MessageLookupByLibrary.simpleMessage("Запит на активацію додатку відправлений, дочекайтеся підтвердження активації адміністратором"), "request_sent_wait_activ" : MessageLookupByLibrary.simpleMessage("Запит на активацію додатку відправлений, дочекайтеся підтвердження активації адміністратором"),
"reward" : MessageLookupByLibrary.simpleMessage("Винагорода"), "reward" : MessageLookupByLibrary.simpleMessage("Винагорода"),
"bonus" : MessageLookupByLibrary.simpleMessage("Бонусів на рахунку"),
"scan" : MessageLookupByLibrary.simpleMessage("Сканувати"), "scan" : MessageLookupByLibrary.simpleMessage("Сканувати"),
"sign_up" : MessageLookupByLibrary.simpleMessage("Зареєструватися"), "sign_up" : MessageLookupByLibrary.simpleMessage("Зареєструватися"),
"specify_din_store" : MessageLookupByLibrary.simpleMessage("Необхідно вказати DIN магазину"), "specify_din_store" : MessageLookupByLibrary.simpleMessage("Необхідно вказати DIN магазину"),

View File

@@ -1,17 +1,30 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:checker/screens/splash.dart'; import 'package:checker/screens/splash.dart';
import 'package:checker/consts.dart'; import 'package:checker/consts.dart';
import 'package:flutter/services.dart';
const platform = const MethodChannel('com.dinect.checker/instance_id');
/// Точка входа в приложение. /// Точка входа в приложение.
///
void main() { void main() {
runApp(new Checker()); platform.invokeMethod('getAppTitle').then((title) {
runApp(new Checker(appName: title));
});
} }
class Checker extends StatelessWidget { class Checker extends StatelessWidget {
Checker({this.appName});
final String appName;
@override Widget build (BuildContext context) { @override Widget build (BuildContext context) {
print('app name = ${appName}');
return new MaterialApp( return new MaterialApp(
title: appName, title: appName,
home: new SplashScreen()); home: new SplashScreen()
);
} }
} }

View File

@@ -50,24 +50,37 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
Map user; Map user;
String card = ''; String card = '';
String loyalty = ''; String loyalty = '';
String bonus = '';
bool dataLoaded = false;
@override @override
Widget getScreenContent() { Widget getScreenContent() {
List<Widget> widgets = [];
widgets.add(getValueWithDescription(
StringsLocalization.buyer(),
user['first_name'] == null ? '' : user['first_name']
));
widgets.add(getValueWithDescription(StringsLocalization.card(), card));
if (bonus.length > 0) {
widgets.add(getValueWithDescription(StringsLocalization.bonus(), bonus));
}
widgets.add(getValueWithDescription(StringsLocalization.reward(), loyalty));
widgets.add(getHintLabel());
widgets.add(getInputField());
widgets.add(wrapButton(getScreenMargins(36.0), getCompleteButton()));
widgets.add(wrapButton(
getScreenMargins(24.0),
getScanButton(
context,
StringsLocalization.scan(),
Resources.getPrimaryColor(app)
)
));
return new Column(children: <Widget>[ return new Column(children: <Widget>[
new Expanded( new Expanded(
child: new ListView(children: <Widget>[ child: new ListView(children: widgets))
getValueWithDescription(StringsLocalization.buyer(),
user['first_name'] == null ? '' : user['first_name']),
getValueWithDescription(StringsLocalization.card(), card),
getValueWithDescription(StringsLocalization.reward(), loyalty),
getHintLabel(),
getInputField(),
wrapButton(getScreenMargins(36.0), getCompleteButton()),
wrapButton(
getScreenMargins(24.0),
getScanButton(context, StringsLocalization.scan(),
Resources.getPrimaryColor(app)))
]))
]); ]);
} }
@@ -122,12 +135,13 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
} }
requestLoyalty(String url) async { requestLoyalty(String url) async {
print(url); bool showBonus = await platform.invokeMethod('showBonus');
if (await platform.invokeMethod('isOnline')) { if (await platform.invokeMethod('isOnline') && !this.dataLoaded) {
getLoyaltyRequest(url, helper).then((response) { getLoyaltyRequest(url, helper).then((response) {
print(response); print(response);
this.dataLoaded = true;
setState(() { setState(() {
setBonuses(JSON.decode(response.body)); setBonuses(JSON.decode(response.body), showBonus );
}); });
}).catchError((error) { }).catchError((error) {
print(error.toString()); print(error.toString());
@@ -245,7 +259,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
} }
} }
void setBonuses(Map bonuses) { void setBonuses(Map bonuses, bool showBonus) {
print('kifio ' + bonuses['type']); print('kifio ' + bonuses['type']);
if (bonuses['type'] == 'amount') { if (bonuses['type'] == 'amount') {
this.loyalty = '${user['discount']}%'; this.loyalty = '${user['discount']}%';
@@ -254,6 +268,11 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
bonuses['amount_to_bonus'][0]) * 100; bonuses['amount_to_bonus'][0]) * 100;
this.loyalty = '${loyaltyVal.toStringAsFixed(0)}%'; this.loyalty = '${loyaltyVal.toStringAsFixed(0)}%';
} }
if (showBonus && (bonuses['type'] == 'bonus')) {
this.bonus = '${user['bonus']}';
}
print('kifio ' + this.loyalty); print('kifio ' + this.loyalty);
print('bonus ' + this.bonus);
} }
} }

View File

@@ -96,6 +96,7 @@ class StringsLocalization {
static String card() => Intl.message('card', name: 'card', locale: Intl.defaultLocale); static String card() => Intl.message('card', name: 'card', locale: Intl.defaultLocale);
static String reward() => Intl.message('reward', name: 'reward', locale: Intl.defaultLocale); static String reward() => Intl.message('reward', name: 'reward', locale: Intl.defaultLocale);
static String sum() => Intl.message('sum', name: 'sum', locale: Intl.defaultLocale); static String sum() => Intl.message('sum', name: 'sum', locale: Intl.defaultLocale);
static String bonus() => Intl.message('bonus', name: 'bonus', locale: Intl.defaultLocale);
static String carryingPurchase() => Intl.message('carry_purchase', name: 'carry_purchase', locale: Intl.defaultLocale); static String carryingPurchase() => Intl.message('carry_purchase', name: 'carry_purchase', locale: Intl.defaultLocale);
static String completePurchase() => Intl.message('complite_purchase', name: 'complite_purchase', locale: Intl.defaultLocale); static String completePurchase() => Intl.message('complite_purchase', name: 'complite_purchase', locale: Intl.defaultLocale);
static String scan() => Intl.message('scan', name: 'scan', locale: Intl.defaultLocale); static String scan() => Intl.message('scan', name: 'scan', locale: Intl.defaultLocale);