Serik
/
aman-kassa-flutter
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

http://redmine.helios-soft.kz/issues/1791 HalyPos разместить логотип банка при оплате POS

backend_nfc
suvaissov 2021-01-12 11:56:53 +06:00
parent a1b8223980
commit 62f107d7ac
8 changed files with 61 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/src/main/java/kz/com/aman/kassa/handler/CardPaymentHandlerImpl.java
View File

@ -228,7 +228,7 @@ public class CardPaymentHandlerImpl implements CardPaymentCallbackHandler<Result
System.out.println("----->---->---->onTransactionExecutionStatusChanged: " + newStatus.name());
plugin.getActivity().runOnUiThread(() -> {
if(newStatus!=null && newStatus.equals(TransactionExecutionStatus.TAP_CARD)) {
Toast.makeText(plugin.getActivity(), newStatus.name(), Toast.LENGTH_SHORT).show();
Toast.makeText(plugin.getActivity(), "Приложите карту", Toast.LENGTH_SHORT).show();
}
});
}

2
android/app/src/main/java/kz/com/aman/kassa/handler/CardRefundAmanHandlerImpl.java
View File

@ -174,7 +174,7 @@ public class CardRefundAmanHandlerImpl implements EasyCardRefundCallbackHandler<
System.out.println("----->---->---->onTransactionExecutionStatusChanged: " + newStatus.name());
plugin.getActivity().runOnUiThread(() -> {
if(newStatus!=null && newStatus.equals(TransactionExecutionStatus.TAP_CARD)) {
Toast.makeText(plugin.getActivity(), newStatus.name(), Toast.LENGTH_SHORT).show();
Toast.makeText(plugin.getActivity(), "Приложите карту", Toast.LENGTH_SHORT).show();
}
});
}

BIN
assets/images/NBK_Logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 81 KiB

BIN
assets/images/halyk-bank.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

2
lib/shared/app_colors.dart
View File

@ -4,6 +4,8 @@ const Color backgroundColor = Color.fromRGBO(255, 255, 255, 1);
const Color fillColor = Color.fromRGBO(248, 248, 248, 1);
const Color primaryColor = Color.fromRGBO(51, 122, 183, 1);
const Color halykColor = Color.fromRGBO(0, 118, 59, 1);
const Color menuColor = Color.fromRGBO(0, 75, 120, 1);

32
lib/views/payment/payment_view.dart
View File

@ -169,7 +169,7 @@ class _PaymentViewState extends State<PaymentView> {
),
verticalSpaceLarge,
_nfsButtonRender(),
verticalSpaceLarge,
verticalSpaceSmall,
Expanded(
child: Container(),
),
@ -201,26 +201,40 @@ class _PaymentViewState extends State<PaymentView> {
_navigatorService.push(PaymentNfcViewRoute,
arguments: widget.model);
},
splashColor: primaryColor.withOpacity(0.4),
borderRadius: BorderRadius.circular(9.0),
highlightColor: primaryColor.withOpacity(0.1),
child: Container(
splashColor: halykColor.withOpacity(0.4),
borderRadius: BorderRadius.circular(10.0),
highlightColor: halykColor.withOpacity(0.1),
child: Stack(
alignment: Alignment.center,
children: [
Opacity(
opacity: 0.25,
child: Image.asset(
'assets/images/halyk-bank.png',
fit: BoxFit.cover,
width: ScreenUtil().setSp(80.0),
height: ScreenUtil().setSp(90.0),
),
),
Container(
padding: const EdgeInsets.all(8.0),
decoration: BoxDecoration(
border: Border.all(color: primaryColor),
borderRadius: BorderRadius.circular(9.0)
border: Border.all(color: halykColor),
borderRadius: BorderRadius.circular(10.0)
),
child: Column(
children: [
Icon(
MdiIcons.nfc,
color: primaryColor,
color: halykColor,
size: ScreenUtil().setSp(60.0),
),
Text('Tap2Phone',style: TextStyle(fontSize: ScreenUtil().setSp(10.0), color: primaryColor),),
Text('Tap2Phone',style: TextStyle(fontSize: ScreenUtil().setSp(10.0), color: halykColor, fontWeight: FontWeight.bold ),),
],
),
),
],
),
);
}
);

2
lib/views/payment_nfc/payment_nfc_view.dart
View File

@ -29,6 +29,7 @@ import 'package:aman_kassa_flutter/views/payment/payment_view.dart';
import 'package:aman_kassa_flutter/views/payment_nfc/widgets/action_view.dart';
import 'package:aman_kassa_flutter/views/payment_nfc/widgets/background_view.dart';
import 'package:aman_kassa_flutter/views/payment_nfc/widgets/card_view.dart';
import 'package:aman_kassa_flutter/views/payment_nfc/widgets/logo_view.dart';
import 'package:aman_kassa_flutter/views/payment_nfc/widgets/phone_view.dart';
import 'package:aman_kassa_flutter/views/payment_nfc/widgets/text_state.dart';
import 'package:aman_kassa_flutter/widgets/components/calculator/calculator.dart';
@ -408,6 +409,7 @@ class _PaymentNfcViewState extends State<PaymentNfcView> {
child: Stack(
children: <Widget>[
BackgroundView(),
LogoView(),
TextStateView(
status: status,
),

22
lib/views/payment_nfc/widgets/logo_view.dart Normal file
View File

@ -0,0 +1,22 @@
import 'package:aman_kassa_flutter/shared/app_colors.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_screenutil/screenutil.dart';
class LogoView extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Positioned(
bottom: ScreenUtil().setSp(75),
left: ScreenUtil().setSp(25),
right: ScreenUtil().setSp(25),
child: Opacity(
opacity: 0.5,
child: Image.asset(
'assets/images/NBK_Logo.png',
fit: BoxFit.fitHeight,
width: ScreenUtil().setSp(80.0),
height: ScreenUtil().setSp(120.0),
),
));
}
}