From da091fa0e7fa27e99559cea74a4168144551dfa0 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 10 Dec 2022 10:10:36 +1100 Subject: [PATCH] v5.5.48 --- app/Models/PaymentType.php | 3 --- app/PaymentDrivers/StripePaymentDriver.php | 3 --- lang/en/texts.php | 5 ----- 3 files changed, 11 deletions(-) diff --git a/app/Models/PaymentType.php b/app/Models/PaymentType.php index d295fcff1..5459a8377 100644 --- a/app/Models/PaymentType.php +++ b/app/Models/PaymentType.php @@ -55,11 +55,8 @@ class PaymentType extends StaticModel const ACSS = 44; const INSTANT_BANK_PAY = 45; const FPX = 46; -<<<<<<< HEAD -======= const KLARNA = 47; const Interac_E_Transfer = 48; ->>>>>>> v5-develop public static function parseCardType($cardName) { diff --git a/app/PaymentDrivers/StripePaymentDriver.php b/app/PaymentDrivers/StripePaymentDriver.php index 3017888f3..b44e63ceb 100644 --- a/app/PaymentDrivers/StripePaymentDriver.php +++ b/app/PaymentDrivers/StripePaymentDriver.php @@ -98,10 +98,7 @@ class StripePaymentDriver extends BaseDriver GatewayType::BECS => BECS::class, GatewayType::ACSS => ACSS::class, GatewayType::FPX => FPX::class, -<<<<<<< HEAD -======= GatewayType::KLARNA => Klarna::class, ->>>>>>> v5-develop ]; const SYSTEM_LOG_TYPE = SystemLog::TYPE_STRIPE; diff --git a/lang/en/texts.php b/lang/en/texts.php index 1114aafaf..090ba0f2d 100644 --- a/lang/en/texts.php +++ b/lang/en/texts.php @@ -4778,13 +4778,8 @@ $LANG = array( 'invoice_task_project' => 'Invoice Task Project', 'invoice_task_project_help' => 'Add the project to the invoice line items', 'bulk_action' => 'Bulk Action', -<<<<<<< HEAD - 'phone_validation_error' => 'This mobile/cell phone number is not valid, please enter in E.164 format', - 'transaction' => 'Transaction', -======= 'phone_validation_error' => 'This mobile (cell) phone number is not valid, please enter in E.164 format', 'transaction' => 'Transaction', ->>>>>>> v5-develop 'disable_2fa' => 'Disable 2FA', 'change_number' => 'Change Number', 'resend_code' => 'Resend Code',