Fix Apple Pay (#7)

* fix null exception in apple pay source response

* update the merchant id

* update the readme

* pump the version with the changelog

Author: Fghurayri

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.1
+
+- [Apple Pay] Fix handling the Apple Pay response when the `company` and `name` fields aren't returned from the API.
+- [Docs] Fix a typo in the installation command.
+- [Docs] Improve the application description in pub.dev
+
 ## 1.0.0
 
 - Build the Dart Moyasar API wrapper.

README.md

@@ -50,7 +50,7 @@ android {
 ### Installation
 
 ```sh
-flutter pub get moyasar
+flutter pub add moyasar
 ```
 
 ## Usage

example/assets/default_payment_profile_apple_pay.json

@@ -1,7 +1,7 @@
 {
   "provider": "apple_pay",
   "data": {
-    "merchantIdentifier": "merchant.nuha.io.second",
+    "merchantIdentifier": "merchant.mysr.fghurayri",
     "displayName": "Coffee Shop",
     "merchantCapabilities": ["3DS", "debit", "credit"],
     "supportedNetworks": ["amex", "visa", "mada", "masterCard"],

example/ios/Runner/Runner.entitlements

@@ -4,7 +4,7 @@
 <dict>
 	<key>com.apple.developer.in-app-payments</key>
 	<array>
-		<string>merchant.nuha.io.second</string>
+		<string>merchant.mysr.fghurayri</string>
 	</array>
 </dict>
 </plist>

example/pubspec.lock

@@ -134,7 +134,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.0"
+    version: "1.0.1"
   path:
     dependency: transitive
     description:

lib/src/models/sources/apple_pay/apple_pay_response_source.dart

@@ -1,15 +1,11 @@
 import 'package:moyasar/src/models/payment_type.dart';
-import 'package:moyasar/src/models/sources/card/card_company.dart';
 import 'package:moyasar/src/models/sources/payment_response_source.dart';
 
 /// The response source from Moyasar API for the Apple Pay payment.
 class ApplePayPaymentResponseSource implements PaymentResponseSource {
   @override
   PaymentType type = PaymentType.applepay;
 
-  final CardCompany company;
-  final String name;
-
   /// The [number] is masked.
   /// For example, `"XXXX-XXXX-XXXX-1115"`
   final String number; // masked!
@@ -19,18 +15,14 @@ class ApplePayPaymentResponseSource implements PaymentResponseSource {
   String? message;
 
   ApplePayPaymentResponseSource({
-    required this.company,
-    required this.name,
     required this.number,
     required this.gatewayId,
     this.referenceNumber,
     this.message,
   });
 
   ApplePayPaymentResponseSource.fromJson(Map<String, dynamic> json)
-      : company = CardCompany.values.byName(json['company']),
-        name = json['name'],
-        number = json['number'],
+      : number = json['number'],
         gatewayId = json['gateway_id'],
         referenceNumber = json['reference_number'],
         message = json['message'];

lib/src/moyasar.dart

@@ -5,7 +5,7 @@ import 'package:moyasar/moyasar.dart';
 
 import 'package:moyasar/src/models/payment_request.dart';
 
-const version = "1.0.0";
+const version = "1.0.1";
 
 class Moyasar {
   static const String apiUrl = 'https://api.moyasar.com/v1/payments';

pubspec.yaml

@@ -1,6 +1,6 @@
 name: moyasar
 description: The Official Moyasar Flutter SDK.
-version: 1.0.0
+version: 1.0.1
 homepage: https://moyasar.com/en/
 repository: https://github.com/moyasar/moyasar-flutter
 issue_tracker: https://github.com/moyasar/moyasar-flutter/issues