Merge pull request #40 from MadBrains/3.0.8

3.0.8

Makefile

@@ -4,14 +4,14 @@ PANA_SCRIPT=../../tool/verify_pub_score.sh 100
 
 DART_PATH= packages/tinkoff_acquiring
 FLUTTER_PATH= packages/tinkoff_acquiring_flutter
-EXAMPLE_PATH= example
+PACKAGES_PATH= $(DART_PATH) $(FLUTTER_PATH) example
 
 FVM = fvm
 FVM_FLUTTER = $(FVM) flutter
 FVM_DART = $(FVM) dart
 
 init:
-	$(FVM) use 3.0.1 --force; $(FVM_DART) pub global activate pana;
+	$(FVM) use 3.3.5 --force; $(FVM_DART) pub global activate pana;
 
 version:
 	$(FVM_FLUTTER) --version; $(FVM_DART) --version;
@@ -29,49 +29,17 @@ bump:
 build_runner:
 	cd $(DART_PATH); $(FVM_FLUTTER) pub run build_runner build --delete-conflicting-outputs;
 
-pub_get: pub_get_dart pub_get_flutter pub_get_example
+pub_get:
+	$(foreach v, $(PACKAGES_PATH), cd $(v); $(FVM_FLUTTER) packages get; cd ../..;)
 
-pub_get_dart: 
-	cd $(DART_PATH); $(FVM_FLUTTER) packages get;
+clean:
+	$(foreach v, $(PACKAGES_PATH), cd $(v); $(FVM_FLUTTER) clean; cd ../..;)
 
-pub_get_flutter: 
-	cd $(FLUTTER_PATH); $(FVM_FLUTTER) packages get;
+fix:
+	$(foreach v, $(PACKAGES_PATH), cd $(v); $(FVM_FLUTTER) format .; cd ../..;)
 
-pub_get_example: 
-	cd $(EXAMPLE_PATH); $(FVM_FLUTTER) packages get;
-
-clean: clean_dart clean_flutter clean_example
-
-clean_dart:
-	cd $(DART_PATH); $(FVM_FLUTTER) clean;
-
-clean_flutter:
-	cd $(FLUTTER_PATH); $(FVM_FLUTTER) clean;
-
-clean_example:
-	cd $(EXAMPLE_PATH); $(FVM_FLUTTER) clean;
-
-fix: fix_dart fix_flutter fix_example
-
-fix_dart:
-	cd $(DART_PATH); $(FVM_FLUTTER) format .;
-
-fix_flutter:
-	cd $(FLUTTER_PATH); $(FVM_FLUTTER) format .;
-
-fix_example:
-	cd $(EXAMPLE_PATH); $(FVM_FLUTTER) format .;
-
-analyze: analyze_dart analyze_flutter analyze_example
-
-analyze_dart:
-	cd $(DART_PATH); $(FVM_FLUTTER) analyze . --fatal-infos;
-
-analyze_flutter:
-	cd $(FLUTTER_PATH); $(FVM_FLUTTER) analyze . --fatal-infos;
-
-analyze_example:
-	cd $(EXAMPLE_PATH); $(FVM_FLUTTER) analyze . --fatal-infos;
+analyze:
+	$(foreach v, $(PACKAGES_PATH), cd $(v); $(FVM_FLUTTER) analyze . --fatal-infos; cd ../..;)
 
 pana: pana_dart pana_flutter
 

README.md

@@ -6,7 +6,7 @@ Acquiring SDK allows you to integrate [Tinkoff Internet Acquiring][acquiring] in
 
 [Available API Documentation][documentation].
 
-EACQ protocol version with PCI DSS: 1.42 (30.08.2022)
+EACQ protocol version with PCI DSS: 1.50 (09.12.2022)
 
 ## SDK Features
 

example/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>

example/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '9.0'
+# platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

example/ios/Runner.xcodeproj/project.pbxproj

@@ -340,7 +340,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -418,7 +418,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -467,7 +467,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

example/pubspec.yaml

@@ -10,8 +10,8 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  tinkoff_acquiring: ^3.0.7
-  tinkoff_acquiring_flutter: ^3.0.7
+  tinkoff_acquiring: ^3.0.8
+  tinkoff_acquiring_flutter: ^3.0.8
 
 dependency_overrides:
   tinkoff_acquiring:

packages/tinkoff_acquiring/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 3.0.8
+
+* Fixed & add/remove new request and response models (Sync with documentation)
+* Fix readme
+* Update dependency webview_flutter to 4.0.0
+
 # 3.0.7
 
 * Add PaymentId to AddCardResponse

packages/tinkoff_acquiring/README.md

@@ -21,8 +21,8 @@ Acquiring SDK allows you to integrate [Tinkoff Internet Acquiring][acquiring] in
 Add this to your package's pubspec.yaml file:
 ```yaml
 dependencies:
-  tinkoff_acquiring: <lastles>
-  tinkoff_acquiring_flutter: <lastles> # for UI
+  tinkoff_acquiring: ^3.0.8
+  tinkoff_acquiring_flutter: ^3.0.8
 ```
 
 ## Before usage
@@ -78,8 +78,8 @@ If you want to use a proxy, use the following constructor:
 ```dart
 final TinkoffAcquiring acquiring = TinkoffAcquiring(
   TinkoffAcquiringConfig.proxy(
-    proxyDomain: terminalKey,
-    proxyPath: password,
+    proxyDomain: 'myserver.com',
+    proxyPath: '/acquiring',
     isDebugMode: false,
     globalHeaders: <String, String>{...},
     mapping: (AcquiringRequest request, bool isDebugMode) {

packages/tinkoff_acquiring/README.ru.md

@@ -19,8 +19,8 @@ Acquiring SDK позволяет интегрировать [Интернет-Э
 Для подключения добавьте в файл Pubspec зависимости:
 ```yaml
 dependencies:
-  tinkoff_acquiring: <lastles>
-  tinkoff_acquiring_flutter: <lastles> # for UI
+  tinkoff_acquiring: ^3.0.8
+  tinkoff_acquiring_flutter: ^3.0.8
 ```
 
 ## Подготовка к работе
@@ -76,8 +76,8 @@ request.copyWith(signToken: ...);
 ```dart
 final TinkoffAcquiring acquiring = TinkoffAcquiring(
   TinkoffAcquiringConfig.proxy(
-    proxyDomain: terminalKey,
-    proxyPath: password,
+    proxyDomain: 'myserver.com',
+    proxyPath: '/acquiring',
     isDebugMode: false,
     globalHeaders: <String, String>{...},
     mapping: (AcquiringRequest request, bool isDebugMode) {

packages/tinkoff_acquiring/lib/src/constants.dart

@@ -136,13 +136,20 @@ abstract class JsonKeys {
   static const String isRejected = 'IsRejected';
   static const String notificationTypes = 'NotificationTypes';
   static const String residentState = 'ResidentState';
+  static const String qrMemberId = 'QrMemberId';
+  static const String operatingCheckProps = 'OperatingCheckProps';
+  static const String sectoralCheckProps = 'SectoralCheckProps';
+  static const String addUserProp = 'AddUserProp';
+  static const String additionalCheckProps = 'AdditionalCheckProps';
+  static const String timestamp = 'Timestamp';
 }
 
 abstract class NetworkSettings {
-  static const String apiVersion = 'v2';
   static const String domainDebug = 'rest-api-test.tinkoff.ru';
   static const String domainRelease = 'securepay.tinkoff.ru';
-  static const String apiPath = '$apiVersion/';
+  static const String apiPath = '/';
+  static const String apiVersion2 = 'v2';
+  static const String apiVersionCashbox = 'cashbox';
 
   static const Duration timeout = Duration(seconds: 40);
 

packages/tinkoff_acquiring/lib/src/core/models/add_card/add_card_request.dart

@@ -69,14 +69,14 @@ class AddCardRequest extends AcquiringRequest {
   ///
   /// Возможные значения:
   /// 1. NO – сохранить карту без проверок. Rebill ID для рекуррентных платежей не возвращается;
-  /// 2. – при сохранении сделать списание на 0 руб.*
+  /// 2. HOLD – при сохранении сделать списание на 0 руб.*
   /// RebillID возвращается для терминалов без поддержки 3DS.
   /// 3. 3DS – при сохранении карты выполнить проверку 3DS и выполнить списание на 0 р.*
   /// В этом случае RebillID будет только для 3DS карт.
   /// Карты, не поддерживающие 3DS, привязаны не будут.
   /// 4. 3DSHOLD – при привязке карты выполняем проверку, поддерживает карта 3DS или нет.
-  /// Для карт МИР с 3DS v1 выполняется списание, а затем отмена на 1р.
-  /// Для прочих карт выполняется списание на 0р.
+  ///
+  /// Для всех карт выполняется списание на 0р.
   @JsonKey(name: JsonKeys.checkType)
   final CheckType? checkType;
 

packages/tinkoff_acquiring/lib/src/core/models/base/acquiring_request.dart

@@ -24,6 +24,12 @@ abstract class AcquiringRequest extends BaseRequest {
   /// Метод запроса
   String get apiMethod;
 
+  /// Версия метода запроса
+  String get apiVersion => NetworkSettings.apiVersion2;
+
+  /// Полный путь до метода запроса (версия + метод)
+  String get apiMethodPath => '$apiVersion/$apiMethod';
+
   /// Опциональный параметр: готовая подпись запроса
   @JsonKey(name: JsonKeys.token)
   final String? signToken;

packages/tinkoff_acquiring/lib/src/core/models/cancel/cancel_request.dart

@@ -2,7 +2,6 @@ import 'package:json_annotation/json_annotation.dart';
 
 import '../base/acquiring_request.dart';
 import '../common/receipt.dart';
-import '../common/receipts.dart';
 import '../common/shops.dart';
 
 part 'cancel_request.g.dart';
@@ -15,6 +14,12 @@ part 'cancel_request.g.dart';
 /// - CONFIRMED -> PARTIAL_REFUNDED – если отмена не на полную сумму
 /// - CONFIRMED -> REFUNDED – если отмена на полную сумму
 ///
+/// \* в случае отмены статуса NEW поле Amount, даже если оно проставлено, игнорируется.
+/// Отмена производится на полную сумму.
+///
+/// \** в случае полной отмены структура чека не передается.
+/// В случае частичной отмены необходимо передавать те товары, которые нужно отменить.
+///
 /// [CancelRequest](https://www.tinkoff.ru/kassa/develop/api/payments/cancel-description/)
 @JsonSerializable(includeIfNull: false)
 class CancelRequest extends AcquiringRequest {
@@ -25,7 +30,7 @@ class CancelRequest extends AcquiringRequest {
     this.amount,
     this.receipt,
     this.shops,
-    this.receipts,
+    this.qrMemberId,
     String? signToken,
   }) : super(signToken);
 
@@ -47,7 +52,6 @@ class CancelRequest extends AcquiringRequest {
         JsonKeys.ip: ip,
         JsonKeys.receipt: receipt,
         JsonKeys.shops: shops,
-        JsonKeys.receipts: receipts,
       };
 
   @override
@@ -58,7 +62,6 @@ class CancelRequest extends AcquiringRequest {
     String? ip,
     Receipt? receipt,
     List<Shops>? shops,
-    List<Receipts>? receipts,
   }) {
     return CancelRequest(
       signToken: signToken ?? this.signToken,
@@ -67,7 +70,6 @@ class CancelRequest extends AcquiringRequest {
       ip: ip ?? this.ip,
       receipt: receipt ?? this.receipt,
       shops: shops ?? this.shops,
-      receipts: receipts ?? this.receipts,
     );
   }
 
@@ -81,13 +83,6 @@ class CancelRequest extends AcquiringRequest {
       }
     }
 
-    final List<Receipts>? receipts = this.receipts;
-    if (receipts != null) {
-      for (int i = 0; i < receipts.length; i++) {
-        receipts[i].validate();
-      }
-    }
-
     paymentId.validateId(JsonKeys.paymentId, checkNull: true);
     amount.validateAmount(JsonKeys.amount);
     ip.validateIp(JsonKeys.ip);
@@ -121,9 +116,9 @@ class CancelRequest extends AcquiringRequest {
   @JsonKey(name: JsonKeys.shops)
   final List<Shops>? shops;
 
-  /// Массив объектов с чеками для каждого ShopCode из объекта Shops
+  /// Код банка в классификации СБП, в который необходимо выполнить возврат
   ///
-  /// Имеет приоритет над данными, переданными в методе `Init`
-  @JsonKey(name: JsonKeys.receipts)
-  final List<Receipts>? receipts;
+  /// См параметр [memberId] в Методе [QrMembersList]
+  @JsonKey(name: JsonKeys.qrMemberId)
+  final String? qrMemberId;
 }