diff --git a/android/app/src/main/java/com/dinect/checker/ScannerActivity.java b/android/app/src/main/java/com/dinect/checker/ScannerActivity.java
index 3d7e33b..30352e3 100644
--- a/android/app/src/main/java/com/dinect/checker/ScannerActivity.java
+++ b/android/app/src/main/java/com/dinect/checker/ScannerActivity.java
@@ -170,10 +170,12 @@ public class ScannerActivity extends AppCompatActivity implements
@Override
public void onClick(View v) {
- if (mSearchType == SearchType.CARD) {
- resetSearchType(SearchType.PHONE_NUMBER, R.drawable.ic_phone, "enter_phone");
- } else {
- resetSearchType(SearchType.CARD, R.drawable.ic_card, "enter_manual");
+ if (!"crypto".equals(BuildConfig.FLAVOR)) {
+ if (mSearchType == SearchType.CARD) {
+ resetSearchType(SearchType.PHONE_NUMBER, R.drawable.ic_phone, "enter_phone");
+ } else {
+ resetSearchType(SearchType.CARD, R.drawable.ic_card, "enter_manual");
+ }
}
}
diff --git a/assets/values-en/strings.xml b/assets/values-en/strings.xml
index 5b7b782..0015bb0 100644
--- a/assets/values-en/strings.xml
+++ b/assets/values-en/strings.xml
@@ -23,6 +23,7 @@
Сonfirmation
No
A purchase of %s %s was completed
+ The payment of %s %s was completed
Registration
Usage
Support contacts
diff --git a/assets/values-es/strings.xml b/assets/values-es/strings.xml
index 1fa7283..55630dd 100644
--- a/assets/values-es/strings.xml
+++ b/assets/values-es/strings.xml
@@ -23,6 +23,7 @@
Confirmacón
No
Compra por %s %s está realizada
+ The payment of %s %s was completed
Registro
Explotación
Contactos del soporte técnico
diff --git a/assets/values-ru/strings.xml b/assets/values-ru/strings.xml
index a6d0f16..d51ed37 100644
--- a/assets/values-ru/strings.xml
+++ b/assets/values-ru/strings.xml
@@ -23,6 +23,7 @@
Подтверждение
Нет
Покупка на сумму %s %s проведена
+ Оплата на %s %s совершена
Регистрация
Использование
Контакты поддержки
diff --git a/assets/values-ua/strings.xml b/assets/values-ua/strings.xml
index 6e70247..44a320b 100644
--- a/assets/values-ua/strings.xml
+++ b/assets/values-ua/strings.xml
@@ -23,6 +23,7 @@
Підтвердження
Ні
Купівля на суму %s %s проведена
+ The payment of %s %s was completed
Реєстрація
Використання
Контакти підтримки
diff --git a/ios/Runner/AppDelegate.m b/ios/Runner/AppDelegate.m
index f9e3ce3..a2ccbb5 100644
--- a/ios/Runner/AppDelegate.m
+++ b/ios/Runner/AppDelegate.m
@@ -63,7 +63,18 @@
@"appTitle" : @"Autobonus",
@"showBonus" : @NO,
},
- @"digital.joys.checker" : @{
+ @"digital.joys.checker.app" : @{
+ @"locale" : @"ru",
+ @"flavor" : @"crypto",
+ @"currency" : @643,
+ @"supportPhone" : @"support@joys.digital",
+ @"supportUrl" : @"https://joys.digital/",
+ @"endPoint" : @"https://pos.api.joys.digital/20130701/",
+ @"appToken" : @"bdea0f3ba9034b688019a7cac753d1209e2b227f",
+ @"appTitle" : @"POSapp Joys",
+ @"showBonus" : @YES,
+ },
+ @"digital.joys.checker.int" : @{
@"locale" : @"ru",
@"flavor" : @"crypto",
@"currency" : @643,
@@ -71,7 +82,7 @@
@"supportUrl" : @"https://joys.digital/",
@"endPoint" : @"https://pos-api-crypto-int.dinect.com/20130701/",
@"appToken" : @"bdea0f3ba9034b688019a7cac753d1209e2b227f",
- @"appTitle" : @"POSapp Joys",
+ @"appTitle" : @"POSapp Joys INT",
@"showBonus" : @YES,
},
@"com.dinect.checker.pip" : @{
diff --git a/lib/resources.dart b/lib/resources.dart
index 38d9bc4..39768dd 100644
--- a/lib/resources.dart
+++ b/lib/resources.dart
@@ -5,16 +5,11 @@ class Resources {
static String getLogo(String app) => 'assets/${app}_logo.png';
static String getSplash(String app) {
- if (app == 'autobonus') {
return 'assets/${app}_splash.png';
- } else {
- return 'assets/dinect_splash.png';
- }
}
static Color getPrimaryColor(String app) {
switch (app) {
- case 'pip': return new Color(0xff008794);
case 'autobonus': return new Color(0xffeb0004);
case 'dinect': return new Color(0xff3daee3);
case 'crypto': return new Color(0xff0f3d87);
@@ -25,13 +20,11 @@ class Resources {
static Color getButtonColor(String app) {
switch (app) {
- case 'pip': return new Color(0xfff49935);
case 'autobonus': return new Color(0xffeb0004);
case 'dinect': return new Color(0xff33cc99);
case 'crypto': return new Color(0xffffc34d);
case 'biohacker': return new Color(0xffff6134);
default: return new Color(0xffffffff);
-
}
}
}
diff --git a/lib/screens/purchase.dart b/lib/screens/purchase.dart
index 5e0c20e..2140b76 100644
--- a/lib/screens/purchase.dart
+++ b/lib/screens/purchase.dart
@@ -78,10 +78,8 @@ class PurchaseScreenState extends BaseState {
widgetList.add(getValueWithDescription(StringsLocalization.reward(), loyalty));
}
- if (bonus.length > 0) {
- if (app == 'crypto') {
- widgetList.add(getValueWithDescription(StringsLocalization.joys(), bonus));
- } else {
+ if (app != 'crypto') {
+ if (bonus.length > 0) {
widgetList.add(getValueWithDescription(StringsLocalization.bonus(), bonus));
}
}
@@ -89,7 +87,7 @@ class PurchaseScreenState extends BaseState {
widgetList.add(getHintLabel());
widgetList.add(getInputField()); // Нельзя добавить еще одно поле таким же способом
- if (app != 'autobonus') {
+ if ((app != 'autobonus') || (app != 'crypto')) {
if (this.loyalityType == 'bonus') {
widgetList.add(getBonusInputField());
diff --git a/lib/screens/purchase_success.dart b/lib/screens/purchase_success.dart
index 16ff417..d497d38 100644
--- a/lib/screens/purchase_success.dart
+++ b/lib/screens/purchase_success.dart
@@ -98,9 +98,7 @@ class PurchaseSuccessScreenState extends BaseState {
}
if (bonusMinus > 0) {
- widgetList.add(getValueWithDescription(app == 'crypto'
- ? StringsLocalization.joysMinus()
- : StringsLocalization.bonusMinus(), bonusMinus.toString()));
+ widgetList.add(getValueWithDescription(StringsLocalization.bonusMinus(), bonusMinus.toString()));
}
if (app != 'autobonus') {
@@ -167,7 +165,11 @@ class PurchaseSuccessScreenState extends BaseState {
getMessageTitle() {
if (currency != null) {
- return StringsLocalization.purchaseCompleted(sum, currency);
+ if (app != 'crypto') {
+ return StringsLocalization.paymentCompleted(sum, currency);
+ } else {
+ return StringsLocalization.purchaseCompleted(sum, currency);
+ }
} else {
return '';
}
diff --git a/lib/strings.dart b/lib/strings.dart
index 026c2a7..8061b96 100644
--- a/lib/strings.dart
+++ b/lib/strings.dart
@@ -85,27 +85,27 @@ class StringsLocalization {
nominative = nominativeManat();
singular = singularManat();
plural = pluralManat();
- break;
+ break;
case 051:
nominative = nominativeDram();
singular = singularDram();
plural = pluralDram();
- break;
+ break;
case 417:
nominative = nominativeSom();
singular = singularSom();
plural = pluralSom();
- break;
+ break;
case 498:
nominative = nominativeLeu();
singular = singularLeu();
plural = pluralLeu();
- break;
+ break;
case 972:
nominative = nominativeSomoni();
singular = singularSomoni();
plural = pluralSomoni();
- break;
+ break;
}
return [nominative, singular, plural];
@@ -121,6 +121,10 @@ class StringsLocalization {
String trimmedVal = val.substring(0, val.length - 3);
return sprintf(strings['purchase_complite'], [val, declineCurrency(int.parse(trimmedVal), code)]);
}
+ static String paymentCompleted(String val, int code) {
+ String trimmedVal = val.substring(0, val.length - 3);
+ return sprintf(strings['payment_complite'], [val, declineCurrency(int.parse(trimmedVal), code)]);
+ }
static String registration() => strings['registration'];
static String usage() => strings['usage'];
@@ -167,12 +171,12 @@ class StringsLocalization {
static String ukhryvnia() => strings['uk_hryvnia'];
static String kztenge() => strings['kz_tenge'];
static String beruble() => strings['be_ruble'];
- static String uzbsum() => strings['uz_sum'];
- static String azbman() => strings['az_manat'];
- static String armdram() => strings['ar_dram'];
- static String kgssom() => strings['kg_som'];
- static String mdlleu() => strings['md_leu'];
- static String tjssomoni() => strings['tj_somoni'];
+ static String uzbsum() => strings['uz_sum'];
+ static String azbman() => strings['az_manat'];
+ static String armdram() => strings['ar_dram'];
+ static String kgssom() => strings['kg_som'];
+ static String mdlleu() => strings['md_leu'];
+ static String tjssomoni() => strings['tj_somoni'];
static String nominativeRuble() => strings['nominative_ruble'];
static String singularRuble() => strings['singular_ruble'];
static String pluralRuble() => strings['plural_ruble'];