diff --git a/android/app/build.gradle b/android/app/build.gradle
index 80c2b69..c1623e1 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -47,7 +47,7 @@ android {
buildConfigField "String", "locale", "\"ru\""
buildConfigField "String", "flavor", "\"dinect\""
buildConfigField "int", "currency", "643"
- buildConfigField "String", "supportPhone", "\"8-800-77-55-032\""
+ buildConfigField "String", "supportPhone", "\"support@dinect.com\""
buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
buildConfigField "String", "endpoint", "\"https://pos-api.dinect.com/20130701/\""
buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\""
@@ -61,7 +61,7 @@ android {
buildConfigField "String", "locale", "\"ru\""
buildConfigField "String", "flavor", "\"dinect\""
buildConfigField "int", "currency", "643"
- buildConfigField "String", "supportPhone", "\"8-800-77-55-032\""
+ buildConfigField "String", "supportPhone", "\"support@dinect.com\""
buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
buildConfigField "String", "endpoint", "\"https://pos-api-int.dinect.com/20130701/\""
buildConfigField "String", "appToken", "\"9fec83cdca38c357e6b65dbb17514cdd36bf2a08\""
@@ -75,7 +75,7 @@ android {
buildConfigField "String", "locale", "\"ru\""
buildConfigField "String", "flavor", "\"dinect\""
buildConfigField "int", "currency", "643"
- buildConfigField "String", "supportPhone", "\"8-800-77-55-032\""
+ buildConfigField "String", "supportPhone", "\"support@dinect.com\""
buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
buildConfigField "String", "endpoint", "\"https://pos-api-ote.dinect.com/20130701/\""
buildConfigField "String", "appToken", "\"9fec83cdca38c357e6b65dbb17514cdd36bf2a08\""
@@ -89,7 +89,7 @@ android {
buildConfigField "String", "locale", "\"ru\""
buildConfigField "String", "flavor", "\"dinect\""
buildConfigField "int", "currency", "643"
- buildConfigField "String", "supportPhone", "\"8-800-77-55-032\""
+ buildConfigField "String", "supportPhone", "\"support@dinect.com\""
buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
buildConfigField "String", "endpoint", "\"https://pos-api-testing.dinect.com/20130701/\""
buildConfigField "String", "appToken", "\"9fec83cdca38c357e6b65dbb17514cdd36bf2a08\""
@@ -103,7 +103,7 @@ android {
buildConfigField "String", "locale", "\"ru\""
buildConfigField "String", "flavor", "\"dinect\""
buildConfigField "int", "currency", "643"
- buildConfigField "String", "supportPhone", "\"8-800-77-55-032\""
+ buildConfigField "String", "supportPhone", "\"support@dinect.com\""
buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
buildConfigField "String", "endpoint", "\"https://pos-api-staging.dinect.com/20130701/\""
buildConfigField "String", "appToken", "\"9fec83cdca38c357e6b65dbb17514cdd36bf2a08\""
@@ -141,13 +141,13 @@ android {
crypto {
applicationId 'com.dinect.checker.crypto'
buildConfigField "String", "locale", "\"ru\""
- buildConfigField "String", "flavor", "\"dinect\""
+ buildConfigField "String", "flavor", "\"crypto\""
buildConfigField "int", "currency", "643"
- buildConfigField "String", "supportPhone", "\"8-800-77-55-032\""
+ buildConfigField "String", "supportPhone", "\"support@dinect.com\""
buildConfigField "String", "supportUrl", "\"http://www.dinect.com\""
buildConfigField "String", "endpoint", "\"https://pos-api-crypto-int.dinect.com/20130701/\""
buildConfigField "String", "appToken", "\"bdea0f3ba9034b688019a7cac753d1209e2b227f\""
- buildConfigField "String", "appTitle", "\"Dinect Crypto\""
+ buildConfigField "String", "appTitle", "\"Crypto Joys\""
buildConfigField "boolean", "showBonus", "true"
}
@@ -157,8 +157,8 @@ android {
buildConfigField "String", "locale", "\"ru\""
buildConfigField "String", "flavor", "\"dinect\""
buildConfigField "int", "currency", "643"
- buildConfigField "String", "supportPhone", "\"8 800 555 35 35\""
- buildConfigField "String", "supportUrl", "\"http://yandex.ru/\""
+ buildConfigField "String", "supportPhone", "\"support@dinect.com\""
+ buildConfigField "String", "supportUrl", "\"http://dinect.com/\""
buildConfigField "String", "endpoint", "\"https://pos-api-int.dinect.com/20130701/\""
buildConfigField "String", "appToken", "\"9fec83cdca38c357e6b65dbb17514cdd36bf2a08\""
buildConfigField "String", "appTitle", "\"dinect (develop)\""
diff --git a/android/app/src/crypto/res/values/strings.xml b/android/app/src/crypto/res/values/strings.xml
index ee90d67..7cf01ce 100644
--- a/android/app/src/crypto/res/values/strings.xml
+++ b/android/app/src/crypto/res/values/strings.xml
@@ -1,3 +1,3 @@
- Dinect Crypto
+ Crypto
diff --git a/assets/values-en/strings.xml b/assets/values-en/strings.xml
index e1682f9..a891e06 100644
--- a/assets/values-en/strings.xml
+++ b/assets/values-en/strings.xml
@@ -110,5 +110,7 @@ Our website:
To improve barcode scanning quality, adjust the distance between the camera and the barcode so that the border around the barcode (if any) is not visible. Otherwise the vertical lines of the border could be wrongly considered as part of the code.
-
+ Joys on account
+ Joys was charged
+ Joys to charge
diff --git a/assets/values-ru/strings.xml b/assets/values-ru/strings.xml
index 786a9f4..051c571 100644
--- a/assets/values-ru/strings.xml
+++ b/assets/values-ru/strings.xml
@@ -98,9 +98,9 @@
Рекомендуйте покупателям установить мобильное приложение дисконтной системы и получайте новых лояльных покупателей.
-При некорректной работе приложения просьба сразу обратиться по телефону нашей технической поддержки.
+При некорректной работе приложения просьба сразу обратиться в нашу техническую поддержку.
-Телефон:
+Связь с техподдержкой:
%s
Наш сайт:
%s
@@ -109,5 +109,7 @@
Для эффективного считывания штрих-кода карты участника системы лояльности необходимо камеру сканера поднести так, чтобы в неё не попадали вертикальные полосы рамки (если они есть). Они расцениваются сканером как часть штрих-кода.
-
+ Joys на счету
+ Joys было списано
+ Joys списать
diff --git a/assets/values-ua/strings.xml b/assets/values-ua/strings.xml
index 1c82490..11c0465 100644
--- a/assets/values-ua/strings.xml
+++ b/assets/values-ua/strings.xml
@@ -111,5 +111,7 @@
Для ефективного зчитування штрих-коду карти учасника системи лояльності необхідно камеру сканера піднести так, щоб в неї не потрапляли вертикальні смуги рамки. Вони розцінюються сканером як частина штрих-коду.
-
+ Joys на рахунку
+ Joys списано
+ Скільки Joys списати?
diff --git a/ios/Runner/AppDelegate.m b/ios/Runner/AppDelegate.m
index b0ea311..9cd89dd 100644
--- a/ios/Runner/AppDelegate.m
+++ b/ios/Runner/AppDelegate.m
@@ -23,7 +23,7 @@
@"locale" : @"ru",
@"flavor" : @"dinect",
@"currency" : @643,
- @"supportPhone" : @"8-800-77-55-032",
+ @"supportPhone" : @"support@dinect.com",
@"supportUrl" : @"http://www.dinect.com",
@"endPoint" : @"https://pos-api.dinect.com/20130701/",
@"appToken" : @"bdea0f3ba9034b688019a7cac753d1209e2b227f",
@@ -34,7 +34,7 @@
@"locale" : @"ru",
@"flavor" : @"autobonus",
@"currency" : @643,
- @"supportPhone" : @"8 800 555 35 35",
+ @"supportPhone" : @"support@dinect.com",
@"supportUrl" : @"http://yandex.ru",
@"endPoint" : @"https://pos-api-int.dinect.com/20130701/",
@"appToken" : @"9fec83cdca38c357e6b65dbb17514cdd36bf2a08",
@@ -51,6 +51,17 @@
@"appToken" : @"bdea0f3ba9034b688019a7cac753d1209e2b227f",
@"appTitle" : @"Autobonus",
@"showBonus" : @NO,
+ },
+ @"com.dinect.checker.dinect" : @{
+ @"locale" : @"ru",
+ @"flavor" : @"crypto",
+ @"currency" : @643,
+ @"supportPhone" : @"support@dinect.com",
+ @"supportUrl" : @"http://www.dinect.com",
+ @"endPoint" : @"https://pos-api.dinect.com/20130701/",
+ @"appToken" : @"bdea0f3ba9034b688019a7cac753d1209e2b227f",
+ @"appTitle" : @"Crypto",
+ @"showBonus" : @YES,
},
@"com.dinect.checker.pip" : @{
@"locale" : @"ua",
diff --git a/lib/resources.dart b/lib/resources.dart
index 45bf646..027731e 100644
--- a/lib/resources.dart
+++ b/lib/resources.dart
@@ -19,6 +19,7 @@ class Resources {
case 'pip': return new Color(0xff008794);
case 'autobonus': return new Color(0xffeb0004);
case 'dinect': return new Color(0xff3daee3);
+ case 'crypto': return new Color(0xff0f3d87);
default: return new Color(0xffffffff);
}
}
@@ -28,7 +29,9 @@ class Resources {
case 'pip': return new Color(0xfff49935);
case 'autobonus': return new Color(0xffeb0004);
case 'dinect': return new Color(0xff33cc99);
+ case 'crypto': return new Color(0xffffc34d);
default: return new Color(0xffffffff);
+
}
}
}
diff --git a/pubspec.lock b/pubspec.lock
index 13141de..81e2909 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,5 +1,5 @@
# Generated by pub
-# See http://pub.dartlang.org/doc/glossary.html#lockfile
+# See https://www.dartlang.org/tools/pub/glossary#lockfile
packages:
async:
dependency: transitive
@@ -7,7 +7,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
- version: "2.0.3"
+ version: "2.0.6"
charcode:
dependency: transitive
description:
@@ -61,7 +61,7 @@ packages:
name: meta
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.1"
+ version: "1.1.2"
path:
dependency: transitive
description:
@@ -85,10 +85,8 @@ packages:
version: "1.7.0"
sky_engine:
dependency: transitive
- description:
- path: "../flutter/bin/cache/pkg/sky_engine"
- relative: true
- source: path
+ description: flutter
+ source: sdk
version: "0.0.99"
source_span:
dependency: transitive
@@ -110,14 +108,14 @@ packages:
name: sqflite
url: "https://pub.dartlang.org"
source: hosted
- version: "0.6.2+2"
+ version: "0.8.2"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.dartlang.org"
source: hosted
- version: "1.9.1"
+ version: "1.9.2"
string_scanner:
dependency: transitive
description:
@@ -131,14 +129,14 @@ packages:
name: synchronized
url: "https://pub.dartlang.org"
source: hosted
- version: "1.2.0"
+ version: "1.3.0"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
- version: "1.1.4"
+ version: "1.1.5"
vector_math:
dependency: transitive
description:
@@ -154,4 +152,4 @@ packages:
source: hosted
version: "2.6.0"
sdks:
- dart: ">=2.0.0-dev.15.0 <=2.0.0-dev.16.0"
+ dart: ">=2.0.0-dev.23.0 <=2.0.0-edge.0d5cf900b021bf5c9fa593ffa12b15bcd1cc5fe0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 39ea140..fdccaa0 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -29,11 +29,13 @@ flutter:
- assets/autobonus_logo.png
- assets/pip_logo.png
- assets/dinect_logo.png
+ - assets/crypto_logo.png
- assets/autobonus_splash.png
- assets/pip_splash.png
- assets/dinect_splash.png
-
+ - assets/crypto_splash.png
+
- assets/settings.png
- assets/settings_arrow.png
- assets/help.png