fixed conflicts

Mangopay · Sep 18, 2023 · a1a6fc4 · a1a6fc4
1 parent b2744af
commit a1a6fc4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/mangopay/resources.py b/mangopay/resources.py
@@ -475,10 +475,11 @@ def cast(cls, result):
             ("PREAUTHORIZED", "DIRECT"): PreAuthorizedPayIn,
             ("BANK_WIRE", "DIRECT"): BankWirePayIn,
             ("BANK_WIRE", "EXTERNAL_INSTRUCTION"): BankWirePayInExternalInstruction,
-            ("APPLEPAY", "WEB"): ApplepayPayIn,
+            ("APPLEPAY", "DIRECT"): ApplepayPayIn,
             ("GOOGLEPAY", "DIRECT"): GooglepayPayIn,
             ("GOOGLE_PAY", "DIRECT"): GooglePayDirectPayIn,
-            ("MBWAY", "WEB"): MbwayPayIn
+            ("MBWAY", "WEB"): MbwayPayIn,
+            ("PAYPAL", "WEB"): PayPalWebPayIn
         }
 
         return types.get((payment_type, execution_type), cls)

diff --git a/tests/test_payins.py b/tests/test_payins.py
@@ -9,7 +9,8 @@
 
 from mangopay.resources import DirectDebitDirectPayIn, Mandate, ApplepayPayIn, GooglepayPayIn, \
     RecurringPayInRegistration, \
-    RecurringPayInCIT, PayInRefund, RecurringPayInMIT, CardPreAuthorizedDepositPayIn, MbwayPayIn, PayPalWebPayIn
+    RecurringPayInCIT, PayInRefund, RecurringPayInMIT, CardPreAuthorizedDepositPayIn, MbwayPayIn, PayPalWebPayIn, \
+    GooglePayDirectPayIn
 from mangopay.utils import (Money, ShippingAddress, Shipping, Billing, Address, SecurityInfo, ApplepayPaymentData,
                             GooglepayPaymentData, DebitedBankAccount, BrowserInfo, LineItem)