Merge branch 'master' into develop

buckaroo-it · Nov 15, 2023 · 2911ab8 · 2911ab8
2 parents 1512e7b + 2760da8
commit 2911ab8
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,11 @@
     "name": "buckaroo/sdk",
     "description": "Buckaroo payment SDK",
     "license": "MIT",
+<<<<<<< HEAD
     "version": "1.9.0",
+=======
+    "version": "1.8.1",
+>>>>>>> master
     "type": "library",
     "require": {
         "php": ">=7.4|^8.0",

diff --git a/example/transactions/in3.php b/example/transactions/in3.php
@@ -60,7 +60,11 @@
             'identifier' => 'Articlenumber1',
             'type' => 'Physical',
             'description' => 'Blue Toy Car',
+<<<<<<< HEAD
             'category' => 'test product1',
+=======
+            'category' => 'test product',
+>>>>>>> master
             'vatPercentage' => '21',
             'quantity' => '2',
             'price' => '20.10',
@@ -69,7 +73,11 @@
             'identifier' => 'Articlenumber2',
             'type' => 'Physical',
             'description' => 'Red Toy Car',
+<<<<<<< HEAD
             'category' => 'test product2',
+=======
+            'category' => 'test product',
+>>>>>>> master
             'vatPercentage' => '21',
             'quantity' => '1',
             'price' => '10.10',
@@ -78,7 +86,11 @@
             'identifier' => 'USPShippingID',
             'type' => 'Physical',
             'description' => 'UPS',
+<<<<<<< HEAD
             'category' => 'test product3',
+=======
+            'category' => 'test product',
+>>>>>>> master
             'vatPercentage' => '21',
             'quantity' => '1',
             'price' => '2',

diff --git a/example/transactions/in3old.php b/example/transactions/in3old.php
@@ -1,6 +1,10 @@
 <?php
 
+<<<<<<< HEAD
 require_once '../bootstrap.php';
+=======
+require('../bootstrap.php');
+>>>>>>> master
 
 use Buckaroo\BuckarooClient;
 use Buckaroo\Resources\Constants\Gender;

diff --git a/example/transactions/payment_initiation.php b/example/transactions/payment_initiation.php
@@ -1,6 +1,10 @@
 <?php
 
+<<<<<<< HEAD
 require_once '../bootstrap.php';
+=======
+require('../bootstrap.php');
+>>>>>>> master
 
 use Buckaroo\BuckarooClient;
 
@@ -20,4 +24,8 @@
     'invoice' => '', //Set invoice number of the transaction to refund
     'originalTransactionKey' => '', //Set transaction key of the transaction to refund
     'amountCredit' => 10,
+<<<<<<< HEAD
 ]);
+=======
+]);
+>>>>>>> master
diff --git a/src/PaymentMethods/In3/Service/ParameterKeys/PhoneAdapter.php b/src/PaymentMethods/In3/Service/ParameterKeys/PhoneAdapter.php
@@ -25,6 +25,12 @@
 class PhoneAdapter extends ServiceParametersKeysAdapter
 {
     protected array $keys = [
+<<<<<<< HEAD
         'mobile' => 'MobilePhone'
+=======
+        'landLine' => 'Phone',
+        'mobile' => 'MobilePhone',
+        'phone' => 'Phone'
+>>>>>>> master
     ];
 }
diff --git a/src/PaymentMethods/In3Old/Service/ParameterKeys/PhoneAdapter.php b/src/PaymentMethods/In3Old/Service/ParameterKeys/PhoneAdapter.php
@@ -25,6 +25,10 @@
 class PhoneAdapter extends ServiceParametersKeysAdapter
 {
     protected array $keys = [
+<<<<<<< HEAD
         'mobile' => 'Phone'
+=======
+        'mobile' => 'Phone',
+>>>>>>> master
     ];
 }