refund fix

android/app/src/main/kotlin/kz/com/aman/kassa/MainActivity.kt

@@ -88,7 +88,9 @@ class MainActivity : FlutterActivity() {
         val operDay = call.argument<String>("operDay").toString()
         val transNum = call.argument<String>("transNum").toString()
         val operationParameters = createOperationParameters(token)
-        startOperation(OperationType.REVERSAL, JsonForExternalCall.getReversalJson(operationParameters.authToken, terminalId, operDay, transNum))
+        val body = JsonForExternalCall.getReversalJson(operationParameters.authToken, terminalId, operDay, transNum);
+        println(body)
+        startOperation(OperationType.REVERSAL, body)
     }
 
     private fun operationCloseDay(call: MethodCall) {

lib/core/services/BankService.dart

@@ -83,6 +83,20 @@ class BankService extends BaseService {
     }
   }
 
+  Future<HalykResponse> reversal({ String token, int terminalId, int operDay, int transNum }) async {
+    try {
+      String response = await _channel.invokeMethod("reversal", <String, dynamic>{
+         'token': token , 'terminalId': terminalId, 'operDay': operDay, 'transNum': transNum
+      });
+      log.i(response);
+      HalykResponse dao = HalykResponse.fromMap(json.decode(response));
+      return dao;
+    } catch (e, stack) {
+      log.e("BankService", e, stack);
+      return new HalykResponse(result: ResultBean(description: 'Ошибка при возврате', code: -1));
+    }
+  }
+
 
   CloseDayData closeDayDataConvert(Cd.TransactionsBean transactions) {
     final DateFormat formatter = DateFormat('dd.MM.yyyy');

lib/views/check/image_show_container.dart

@@ -45,7 +45,6 @@ class ImageShowContainer extends StatefulWidget {
 }
 
 class _ImageShowContainerState extends State<ImageShowContainer> {
-
   final PrinterBluetoothManager printerManager = PrinterBluetoothManager();
   final DialogService _dialogService = locator<DialogService>();
 
@@ -64,11 +63,9 @@ class _ImageShowContainerState extends State<ImageShowContainer> {
         if (val == 12) {
           print('on');
           _print();
-
         } else if (val == 10) {
           print('off');
-          _dialogService.showDialog(
+          _dialogService.showDialog(description: 'Отсутвует соеденение Bluetooth или он отключен', title: 'Bluetooth');
-              description: 'Отсутвует соеденение Bluetooth или он отключен' , title: 'Bluetooth');
         }
         print('state is $val');
       });
@@ -77,7 +74,7 @@ class _ImageShowContainerState extends State<ImageShowContainer> {
 
   void _print() async {
     final SettingState state = Redux.store.state.settingState;
-    if(state.printerBT == null) {
+    if (state.printerBT == null) {
       _dialogService.showDialog(description: 'Укажите в настройках принтер для печати чеков');
       return;
     }
@@ -86,7 +83,7 @@ class _ImageShowContainerState extends State<ImageShowContainer> {
     int chunkSizeBytes = 3096;
     int queueSleepTimeMs = 100;
 
-    if(isIos){
+    if (isIos) {
       chunkSizeBytes = 75;
       queueSleepTimeMs = 10;
     }
@@ -96,9 +93,7 @@ class _ImageShowContainerState extends State<ImageShowContainer> {
     });
     try {
       printerManager.selectPrinter(PrinterBluetooth(state.printerBT));
-      PaperSize paper = state.printerPaperSize == SettingPrinterPaperM80
+      PaperSize paper = state.printerPaperSize == SettingPrinterPaperM80 ? PaperSize.mm80 : PaperSize.mm58;
-          ? PaperSize.mm80
-          : PaperSize.mm58;
       if (SettingPrinterEncodingImage == state.printerEncoding) {
         final PosPrintResult res = await printerManager.printTicket(
             await printImageCheck(paper, widget.showModel.data.base64Data),
@@ -109,9 +104,7 @@ class _ImageShowContainerState extends State<ImageShowContainer> {
         }
       } else {
         final PosPrintResult res = await printerManager.printTicket(
-            await printTextCheck(
+            await printTextCheck(paper, state.printerEncoding, jsonDecode(widget.showModel.data.textData)),
-                paper, state.printerEncoding,
-                jsonDecode(widget.showModel.data.textData)),
             chunkSizeBytes: chunkSizeBytes,
             queueSleepTimeMs: queueSleepTimeMs);
         if (res.value != 1) {
@@ -134,7 +127,7 @@ class _ImageShowContainerState extends State<ImageShowContainer> {
         //backgroundColor: fillColor,
         title: Text(widget.showModel.title),
         actions: [
-          if(_printing)
+          if (_printing)
             Padding(
               padding: const EdgeInsets.only(right: 8.0),
               child: SizedBox(
@@ -142,8 +135,7 @@ class _ImageShowContainerState extends State<ImageShowContainer> {
                 child: Center(
                   child: CircularProgressIndicator(
                     strokeWidth: 2,
-                    valueColor: new AlwaysStoppedAnimation<Color>(
+                    valueColor: new AlwaysStoppedAnimation<Color>(whiteColor),
-                        whiteColor),
                   ),
                 ),
               ),
@@ -179,7 +171,9 @@ class ImageShowModel {
 
 class MyFloatingActionButton extends StatefulWidget {
   final ImageShowModel data;
+
   MyFloatingActionButton(this.data);
+
   @override
   _MyFloatingActionButtonState createState() => _MyFloatingActionButtonState();
 }
@@ -191,27 +185,56 @@ class _MyFloatingActionButtonState extends State<MyFloatingActionButton> {
   final GlobalKey<State> _keyLoader = new GlobalKey<State>();
   final DataService _dataService = locator<DataService>();
 
-
   double sheetHeight = 260;
 
-
-
   @override
   Widget build(BuildContext context) {
-
-
     if (showFab) {
       return Column(
         mainAxisAlignment: MainAxisAlignment.end,
         children: [
-          if (widget.data.cardData != null &&  widget.data.cardData.transactionType == "payment") FloatingActionButton(
+          if (widget.data.cardData != null && widget.data.cardData.transactionType == "payment")
+            FloatingActionButton(
               backgroundColor: redColor,
+              tooltip: 'Отмена',
+              child: Icon(
+                Icons.cancel,
+                color: whiteColor,
+              ),
+              onPressed: () async {
+
+                try {
+                  await Redux.store.dispatch(changePinSkipFromSetting(true));
+                  AmanDao<CardData> response = await reversalHalykPos(widget.data.cardData, widget.data.voucher.total);
+                  if (response.success) {
+                    pressRefund();
+                  } else {
+                    _dialog.showDialog(description: response.msg);
+                  }
+                } finally {
+                  await Redux.store.dispatch(changePinSkipFromSetting(false));
+                }
+                _navigatorService.replace(HomeViewRoute);
+              },
+              heroTag: null,
+            )
+          else
+            SizedBox(
+              height: 0,
+            ),
+          SizedBox(
+            height: 10,
+          ),
+          if (widget.data.cardData != null && widget.data.cardData.transactionType == "payment")
+            FloatingActionButton(
+              backgroundColor: redColor,
+              tooltip: 'Возврат',
               child: Icon(
                 Icons.settings_backup_restore,
                 color: whiteColor,
               ),
               onPressed: () async {
-              _navigatorService.replace(HomeViewRoute);
+
                 try {
                   await Redux.store.dispatch(changePinSkipFromSetting(true));
                   AmanDao<CardData> response = await refundHalykPos(widget.data.cardData, widget.data.voucher.total);
@@ -223,10 +246,11 @@ class _MyFloatingActionButtonState extends State<MyFloatingActionButton> {
                 } finally {
                   await Redux.store.dispatch(changePinSkipFromSetting(false));
                 }
-
               },
               heroTag: null,
-          ) else SizedBox(
+            )
+          else
+            SizedBox(
               height: 0,
             ),
           SizedBox(
@@ -242,12 +266,7 @@ class _MyFloatingActionButtonState extends State<MyFloatingActionButton> {
                       decoration: BoxDecoration(
                           color: Colors.white,
                           borderRadius: BorderRadius.all(Radius.circular(15)),
-                          boxShadow: [
+                          boxShadow: [BoxShadow(blurRadius: 10, color: Colors.grey[300], spreadRadius: 5)]),
-                            BoxShadow(
-                                blurRadius: 10,
-                                color: Colors.grey[300],
-                                spreadRadius: 5)
-                          ]),
                       height: 260,
                       child: Column(
                         children: <Widget>[
@@ -296,11 +315,8 @@ class _MyFloatingActionButtonState extends State<MyFloatingActionButton> {
       String _token = _state.userState.user.token;
       CardData _cardData = widget.data.cardData;
       CheckData _checkData = CheckData.fromJson(json.decode(widget.data.voucher.data));
-      Response<dynamic> response = await _dataService.refundM4Bank(
+      Response<dynamic> response =
-          token: _token,
+          await _dataService.refundM4Bank(token: _token, cardData: _cardData, checkData: _checkData);
-          cardData: _cardData,
-          checkData: _checkData
-      );
       if (response != null) {
         if (response.operation) {
           String message = response.body['message'];
@@ -313,9 +329,12 @@ class _MyFloatingActionButtonState extends State<MyFloatingActionButton> {
           Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
           _navigatorService.replace(HomeViewRoute);
           _navigatorService.push(ImageShowRoute,
-              arguments: ImageShowModel(data: new CheckImageModal(base64Data: check, textData: checkText !=null ? jsonEncode(checkText) : null ), title: message, url: url));
+              arguments: ImageShowModel(
-        } else if (!response.operation &&
+                  data: new CheckImageModal(
-            ![401, 402, 403, 412, 500].contains(response.status)) {
+                      base64Data: check, textData: checkText != null ? jsonEncode(checkText) : null),
+                  title: message,
+                  url: url));
+        } else if (!response.operation && ![401, 402, 403, 412, 500].contains(response.status)) {
           Navigator.of(_keyLoader.currentContext, rootNavigator: true).pop();
           _dialog.showDialog(description: response.body['message']);
         } else {
@@ -332,25 +351,19 @@ class _MyFloatingActionButtonState extends State<MyFloatingActionButton> {
 
   void shareFile() async {
     try {
-      await Share.file('Aman Kassa', 'aman_kassa_check.png',
+      await Share.file('Aman Kassa', 'aman_kassa_check.png', base64Decode(widget.data.data.base64Data), 'image/png');
-          base64Decode(widget.data.data.base64Data), 'image/png');
     } catch (e) {
       print('error: $e');
     }
   }
 
   void qrGenerate() async {
-    _navigatorService.push(QrViewRoute,
+    _navigatorService.push(QrViewRoute, arguments: ImageShowModel(url: widget.data.url, title: 'Спасибо за покупку'));
-        arguments:
-            ImageShowModel(url: widget.data.url, title: 'Спасибо за покупку'));
   }
 
   void callWhatsApp() async {
     DialogResponse response = await _dialog.showConfirmationDialogInput(
-        description: 'Номер телефона',
+        description: 'Номер телефона', cancelTitle: 'Отмена', confirmationTitle: 'Отправить', formatType: 'phone');
-        cancelTitle: 'Отмена',
-        confirmationTitle: 'Отправить',
-        formatType: 'phone');
     if (response.confirmed) {
       String phoneNumber = response.responseText;
       String msg = "Спасибо за покупку! \r\n ${widget.data.url} ";
@@ -382,5 +395,4 @@ class _MyFloatingActionButtonState extends State<MyFloatingActionButton> {
       showFab = value;
     });
   }
-
 }

lib/views/payment/halyk_pos_service.dart

@@ -66,7 +66,34 @@ Future<AmanDao<CardData>> refundHalykPos(CardData refundData, double total) asyn
         operationDay: response.transaction.operationDay,
         transactionNumber: response.transaction.transactionNumber,
         terminalId: response.transaction.terminalId,
-        transactionType: 'payment'
+        transactionType: 'refund'
+    );
+    return AmanDao<CardData>(msg: response.result.description, success: true, data: cardData);
+  }
+  return AmanDao<CardData>(msg: response.result.errorData !=null ? response.result.errorData.description : response.result.description, success: false);
+}
+
+Future<AmanDao<CardData>> reversalHalykPos(CardData refundData, double total) async {
+  //Авторизация
+  String token = Redux.store.state.userState.user.token;
+  BankState bankState = Redux.store.state.bankState;
+  //права доступа
+  HalykPosSession session =
+  await _bankService.renewToken(token: token, login: bankState.login, password: bankState.password);
+  if (session.token == null) {
+    return AmanDao<CardData>(success: false, msg: 'Отказано в доступе к API банка');
+  }
+  log.i(refundData.toJson());
+  HalykResponse response = await _bankService.reversal(token: session.token, operDay: refundData.operationDay, terminalId: refundData.terminalId, transNum: refundData.transactionNumber );
+  if (response.result.code == 0) {
+    CardData cardData = new CardData(
+        authorizationCode: response.transaction.instrumentSpecificData.authorizationCode,
+        cardholderName: response.transaction.instrumentSpecificData.cardholderName,
+        cardNumber: response.transaction.instrumentSpecificData.maskedPan,
+        operationDay: response.transaction.operationDay,
+        transactionNumber: response.transaction.transactionNumber,
+        terminalId: response.transaction.terminalId,
+        transactionType: 'reversal'
     );
     return AmanDao<CardData>(msg: response.result.description, success: true, data: cardData);
   }