Merge branch 'master' into backend_nfc

# Conflicts:
#	lib/views/home/tabs/AdditionalTab.dart

ios/Podfile

@@ -37,5 +37,49 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
+
+
+    target.build_configurations.each do |config|
+
+      # You can enable the permissions needed here. For example to enable camera
+      # permission, just remove the `#` character in front so it looks like this:
+      config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
+        '$(inherited)',
+
+        ## dart: PermissionGroup.calendar
+         'PERMISSION_EVENTS=0',
+
+        ## dart: PermissionGroup.reminders
+         'PERMISSION_REMINDERS=0',
+
+        ## dart: PermissionGroup.contacts
+         'PERMISSION_CONTACTS=0',
+
+        ## dart: PermissionGroup.camera
+         'PERMISSION_CAMERA=0',
+
+        ## dart: PermissionGroup.microphone
+         'PERMISSION_MICROPHONE=0',
+
+        ## dart: PermissionGroup.speech
+         'PERMISSION_SPEECH_RECOGNIZER=0',
+
+        ## dart: PermissionGroup.photos
+         'PERMISSION_PHOTOS=0',
+
+        ## dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse]
+         'PERMISSION_LOCATION=0',
+
+        ## dart: PermissionGroup.notification
+         'PERMISSION_NOTIFICATIONS=0',
+
+        ## dart: PermissionGroup.mediaLibrary
+         'PERMISSION_MEDIA_LIBRARY=0',
+
+        ## dart: PermissionGroup.sensors
+         'PERMISSION_SENSORS=0'
+      ]
+
+    end
   end
 end

ios/Podfile.lock

@@ -20,6 +20,8 @@ PODS:
   - MTBBarcodeScanner (5.0.11)
   - path_provider (0.0.1):
     - Flutter
+  - "permission_handler (5.1.0+2)":
+    - Flutter
   - shared_preferences (0.0.1):
     - Flutter
   - sqflite (0.0.2):
@@ -38,6 +40,7 @@ DEPENDENCIES:
   - flutter_bluetooth_basic (from `.symlinks/plugins/flutter_bluetooth_basic/ios`)
   - local_auth (from `.symlinks/plugins/local_auth/ios`)
   - path_provider (from `.symlinks/plugins/path_provider/ios`)
+  - permission_handler (from `.symlinks/plugins/permission_handler/ios`)
   - shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
   - sqflite (from `.symlinks/plugins/sqflite/ios`)
   - url_launcher (from `.symlinks/plugins/url_launcher/ios`)
@@ -65,6 +68,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/local_auth/ios"
   path_provider:
     :path: ".symlinks/plugins/path_provider/ios"
+  permission_handler:
+    :path: ".symlinks/plugins/permission_handler/ios"
   shared_preferences:
     :path: ".symlinks/plugins/shared_preferences/ios"
   sqflite:
@@ -83,11 +88,12 @@ SPEC CHECKSUMS:
   local_auth: 25938960984c3a7f6e3253e3f8d962fdd16852bd
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
   path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
+  permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
   shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
   sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
   SwiftProtobuf: ecbec1be9036d15655f6b3443a1c4ea693c97932
   url_launcher: 6fef411d543ceb26efce54b05a0a40bfd74cbbef
 
-PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
+PODFILE CHECKSUM: 5aafc9b59da66d8d46f05cbbbd21261eb9757176
 
 COCOAPODS: 1.10.1

ios/Runner.xcodeproj/project.pbxproj

@@ -393,7 +393,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 94BM6VL7L8;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -530,7 +530,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 94BM6VL7L8;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -562,7 +562,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = 94BM6VL7L8;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (

lib/views/home/tabs/AdditionalTab.dart

@@ -2,10 +2,9 @@ import 'dart:convert';
 
 import 'package:aman_kassa_flutter/core/entity/Voucher.dart';
 import 'package:aman_kassa_flutter/core/locator.dart';
-
+import 'package:aman_kassa_flutter/core/models/check_image_modal.dart';
 import 'package:aman_kassa_flutter/core/models/close_day_data.dart';
 import 'package:aman_kassa_flutter/core/models/halyk/halyk_close_day_dao.dart';
-import 'file:///D:/Work/serik/Flutter/aman-kassa-flutter/lib/core/models/halyk/halyk_response_dao.dart';
 import 'package:aman_kassa_flutter/core/models/money.dart';
 import 'package:aman_kassa_flutter/core/models/response.dart';
 import 'package:aman_kassa_flutter/core/models/dialog_models.dart';
@@ -110,9 +109,11 @@ class _AdditionalTabState extends State<AdditionalTab> {
       User user = Redux.store.state.userState.user;
       Response response = await _api.xReport(user.token);
       if (response.operation) {
+        String check = response.body['check'];
+        var checkText = response.body['check_text'];
         _navigator.push(ImageShowRoute,
             arguments:
-                ImageShowModel(data: response.body['check'], title: 'X Отчет'));
+                ImageShowModel(data: CheckImageModal(base64Data: check, textData: checkText !=null ? jsonEncode(checkText) : null ), title: 'X Отчет'));
         String url = response?.body['link'];
         _dataService.insertVoucher(
             user: user,

lib/views/home/tabs/KassaTab.dart

@@ -248,27 +248,40 @@ class KassaTab extends StatelessWidget {
 
 
   void showModalBottomSheetCatalog(BuildContext context, String action) {
-    showModalBottomSheet(
+
-        context: context,
+    if (action == 'add') {
-        isScrollControlled: true,
+      Navigator.push(
-        backgroundColor: Colors.transparent,
+          context,
-        builder: (context) {
+          MaterialPageRoute(builder: (context) => ProductAddBottomSheet())
-          return DraggableScrollableSheet(
+      );
-            initialChildSize: 0.8,
+    } else {
-            maxChildSize: 0.95,
+      Navigator.push(
-            minChildSize: 0.5,
+          context,
-            builder: (BuildContext context, ScrollController scrollController) {
+          MaterialPageRoute(builder: (context) => CatalogBottomSheet())
-              if (action == 'add') {
+      );
-                return ProductAddBottomSheet(
+    }
-                  scrollController: scrollController,
+
-                );
+    // showModalBottomSheet(
-              } else {
+    //     context: context,
-                return CatalogBottomSheet(
+    //     isScrollControlled: true,
-                  scrollController: scrollController,
+    //     backgroundColor: Colors.transparent,
-                );
+    //     builder: (context) {
-              }
+    //       return DraggableScrollableSheet(
-            },
+    //         initialChildSize: 0.8,
-          );
+    //         maxChildSize: 0.95,
-        });
+    //         minChildSize: 0.5,
+    //         builder: (BuildContext context, ScrollController scrollController) {
+    //           if (action == 'add') {
+    //             return ProductAddBottomSheet(
+    //               scrollController: scrollController,
+    //             );
+    //           } else {
+    //             return CatalogBottomSheet(
+    //               scrollController: scrollController,
+    //             );
+    //           }
+    //         },
+    //       );
+    //     });
   }
 }

lib/views/home/tabs/kassaView/ProductAddBottomSheet.dart

@@ -51,7 +51,7 @@ class _ProductAddBottomSheetState extends State<ProductAddBottomSheet> {
           ),
         ),
         body: Padding(
-          padding: const EdgeInsets.only(top: 15, left: 10, right: 15),
+          padding: EdgeInsets.only(top: 15, left: 10, right: 15, bottom: 0 ),
           child: ListView(
             controller: widget.scrollController,
             children: <Widget>[

pubspec.yaml

@@ -1,6 +1,6 @@
 name: aman_kassa_flutter
 description: A new Flutter project.
-version: 1.2.1+27
+version: 1.2.3+29
 environment:
     sdk: '>=2.3.0 <3.0.0'
 dependencies: