From 3052168b1df86914245f7e4aa7907b789454013d Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Mon, 21 Aug 2017 22:10:50 +0300 Subject: [PATCH] GoCardless Integration update #872 --- app/Models/AccountGatewayToken.php | 4 +- .../GoCardlessV2RedirectPaymentDriver.php | 58 ++++++++++++++++++- composer.json | 2 +- composer.lock | 14 ++--- database/seeds/PaymentLibrariesSeeder.php | 2 +- database/setup.sql | 10 ++-- resources/lang/en/texts.php | 2 +- .../views/accounts/account_gateway.blade.php | 2 +- 8 files changed, 76 insertions(+), 18 deletions(-) diff --git a/app/Models/AccountGatewayToken.php b/app/Models/AccountGatewayToken.php index 16fddfe24300..6664e7687363 100644 --- a/app/Models/AccountGatewayToken.php +++ b/app/Models/AccountGatewayToken.php @@ -96,8 +96,10 @@ class AccountGatewayToken extends Eloquent } elseif ($accountGateway->gateway_id == GATEWAY_BRAINTREE) { $merchantId = $accountGateway->getConfigField('merchantId'); $testMode = $accountGateway->getConfigField('testMode'); - return $testMode ? "https://sandbox.braintreegateway.com/merchants/{$merchantId}/customers/{$this->token}" : "https://www.braintreegateway.com/merchants/{$merchantId}/customers/{$this->token}"; + } elseif ($accountGateway->gateway_id == GATEWAY_GOCARDLESS) { + $testMode = $accountGateway->getConfigField('testMode'); + return $testMode ? "https://manage-sandbox.gocardless.com/customers/{$this->token}" : "https://manage.gocardless.com/customers/{$this->token}"; } else { return false; } diff --git a/app/Ninja/PaymentDrivers/GoCardlessV2RedirectPaymentDriver.php b/app/Ninja/PaymentDrivers/GoCardlessV2RedirectPaymentDriver.php index a7fc8819c9a6..b219fef7c071 100644 --- a/app/Ninja/PaymentDrivers/GoCardlessV2RedirectPaymentDriver.php +++ b/app/Ninja/PaymentDrivers/GoCardlessV2RedirectPaymentDriver.php @@ -2,16 +2,72 @@ namespace App\Ninja\PaymentDrivers; +use Session; + class GoCardlessV2RedirectPaymentDriver extends BasePaymentDriver { + protected $transactionReferenceParam = "\x00*\x00id"; + + public function gatewayTypes() + { + $types = [ + GATEWAY_TYPE_BANK_TRANSFER, + GATEWAY_TYPE_TOKEN, + ]; + + return $types; + } + protected function paymentDetails($paymentMethod = false) { $data = parent::paymentDetails($paymentMethod); + if ($paymentMethod) { + $data['mandate_reference'] = $paymentMethod->source_reference; + } + if ($ref = request()->redirect_flow_id) { $data['transaction_reference'] = $ref; } return $data; - } + } + + protected function shouldCreateToken() + { + return false; + } + + public function completeOffsitePurchase($input) + { + $details = $this->paymentDetails(); + $this->purchaseResponse = $response = $this->gateway()->completePurchase($details)->send(); + + if (! $response->isSuccessful()) { + return false; + } + + $paymentMethod = $this->createToken(); + $payment = $this->completeOnsitePurchase(false, $paymentMethod); + + return $payment; + } + + protected function creatingCustomer($customer) + { + $customer->token = $this->purchaseResponse->getCustomerId(); + + return $customer; + } + + protected function creatingPaymentMethod($paymentMethod) + { + $paymentMethod->source_reference = $this->purchaseResponse->getMandateId(); + $paymentMethod->payment_type_id = PAYMENT_TYPE_ACH; + $paymentMethod->status = PAYMENT_METHOD_STATUS_VERIFIED; + + return $paymentMethod; + } + + } diff --git a/composer.json b/composer.json index a0f0645f6adf..7587d6b8d49e 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "descubraomundo/omnipay-pagarme": "dev-master", "digitickets/omnipay-barclays-epdq": "~3.0", "digitickets/omnipay-datacash": "~3.0", - "digitickets/omnipay-gocardlessv2": "dev-master", + "digitickets/omnipay-gocardlessv2": "dev-payment-fix", "digitickets/omnipay-realex": "~5.0", "dioscouri/omnipay-cybersource": "dev-master", "doctrine/dbal": "2.5.x", diff --git a/composer.lock b/composer.lock index 0259d5da7392..f74341e12c94 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "21e71e6ce0568744f92aca427b7f103b", - "content-hash": "a052186eb2c4093936e61fe22d93255f", + "hash": "a39a505121abab0985f7c0cb1734920c", + "content-hash": "4067bb1f3c6d2b3397e3a005b642ddb6", "packages": [ { "name": "agmscode/omnipay-agms", @@ -1429,16 +1429,16 @@ }, { "name": "digitickets/omnipay-gocardlessv2", - "version": "dev-master", + "version": "dev-payment-fix", "source": { "type": "git", "url": "https://github.com/hillelcoren/omnipay-gocardlessv2.git", - "reference": "007c29256a4df6e2d149d8a239474f80028e8601" + "reference": "a264ac71dcdb7c03f42f17cb52c650d87e42f8e0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/hillelcoren/omnipay-gocardlessv2/zipball/007c29256a4df6e2d149d8a239474f80028e8601", - "reference": "007c29256a4df6e2d149d8a239474f80028e8601", + "url": "https://api.github.com/repos/hillelcoren/omnipay-gocardlessv2/zipball/a264ac71dcdb7c03f42f17cb52c650d87e42f8e0", + "reference": "a264ac71dcdb7c03f42f17cb52c650d87e42f8e0", "shasum": "" }, "require": { @@ -1511,7 +1511,7 @@ "support": { "source": "https://github.com/hillelcoren/omnipay-gocardlessv2/tree/master" }, - "time": "2017-08-21 09:54:55" + "time": "2017-08-21 18:05:05" }, { "name": "digitickets/omnipay-realex", diff --git a/database/seeds/PaymentLibrariesSeeder.php b/database/seeds/PaymentLibrariesSeeder.php index 9b4c551ad8fc..664c9bb4d998 100644 --- a/database/seeds/PaymentLibrariesSeeder.php +++ b/database/seeds/PaymentLibrariesSeeder.php @@ -72,7 +72,7 @@ class PaymentLibrariesSeeder extends Seeder ['name' => 'Braintree', 'provider' => 'Braintree', 'sort_order' => 2], ['name' => 'Custom', 'provider' => 'Custom', 'is_offsite' => true, 'sort_order' => 9], ['name' => 'FirstData Payeezy', 'provider' => 'FirstData_Payeezy'], - //['name' => 'GoCardless', 'provider' => 'GoCardlessV2\Redirect', 'sort_order' => 8, 'is_offsite' => true], + ['name' => 'GoCardless', 'provider' => 'GoCardlessV2\Redirect', 'sort_order' => 8, 'is_offsite' => true], ]; foreach ($gateways as $gateway) { diff --git a/database/setup.sql b/database/setup.sql index d22b6eb049d3..a771cf222ec4 100644 --- a/database/setup.sql +++ b/database/setup.sql @@ -1223,7 +1223,7 @@ CREATE TABLE `gateways` ( PRIMARY KEY (`id`), KEY `gateways_payment_library_id_foreign` (`payment_library_id`), CONSTRAINT `gateways_payment_library_id_foreign` FOREIGN KEY (`payment_library_id`) REFERENCES `payment_libraries` (`id`) ON DELETE CASCADE -) ENGINE=InnoDB AUTO_INCREMENT=64 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; +) ENGINE=InnoDB AUTO_INCREMENT=65 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -1232,7 +1232,7 @@ CREATE TABLE `gateways` ( LOCK TABLES `gateways` WRITE; /*!40000 ALTER TABLE `gateways` DISABLE KEYS */; -INSERT INTO `gateways` VALUES (1,'2017-08-17 06:29:17','2017-08-17 06:29:17','Authorize.Net AIM','AuthorizeNet_AIM',1,1,4,0,NULL,0,0),(2,'2017-08-17 06:29:17','2017-08-17 06:29:17','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2017-08-17 06:29:17','2017-08-17 06:29:17','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2017-08-17 06:29:17','2017-08-17 06:29:17','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2017-08-17 06:29:17','2017-08-17 06:29:17','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2017-08-17 06:29:17','2017-08-17 06:29:17','GoCardless','GoCardless',1,1,10000,0,NULL,1,0),(7,'2017-08-17 06:29:17','2017-08-17 06:29:17','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2017-08-17 06:29:17','2017-08-17 06:29:17','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2017-08-17 06:29:17','2017-08-17 06:29:17','Mollie','Mollie',1,1,7,0,NULL,1,0),(10,'2017-08-17 06:29:17','2017-08-17 06:29:17','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2017-08-17 06:29:17','2017-08-17 06:29:17','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2017-08-17 06:29:18','2017-08-17 06:29:18','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2017-08-17 06:29:18','2017-08-17 06:29:18','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2017-08-17 06:29:18','2017-08-17 06:29:18','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2017-08-17 06:29:18','2017-08-17 06:29:18','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2017-08-17 06:29:18','2017-08-17 06:29:18','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2017-08-17 06:29:18','2017-08-17 06:29:18','PayPal Express','PayPal_Express',1,1,3,0,NULL,1,0),(18,'2017-08-17 06:29:18','2017-08-17 06:29:18','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2017-08-17 06:29:18','2017-08-17 06:29:18','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2017-08-17 06:29:18','2017-08-17 06:29:18','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2017-08-17 06:29:18','2017-08-17 06:29:18','SagePay Server','SagePay_Server',1,1,10000,0,NULL,0,0),(22,'2017-08-17 06:29:18','2017-08-17 06:29:18','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2017-08-17 06:29:18','2017-08-17 06:29:18','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2017-08-17 06:29:18','2017-08-17 06:29:18','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2017-08-17 06:29:18','2017-08-17 06:29:18','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2017-08-17 06:29:18','2017-08-17 06:29:18','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2017-08-17 06:29:18','2017-08-17 06:29:18','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2017-08-17 06:29:18','2017-08-17 06:29:18','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2017-08-17 06:29:18','2017-08-17 06:29:18','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2017-08-17 06:29:18','2017-08-17 06:29:18','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2017-08-17 06:29:18','2017-08-17 06:29:18','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2017-08-17 06:29:18','2017-08-17 06:29:18','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2017-08-17 06:29:18','2017-08-17 06:29:18','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2017-08-17 06:29:18','2017-08-17 06:29:18','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2017-08-17 06:29:18','2017-08-17 06:29:18','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2017-08-17 06:29:18','2017-08-17 06:29:18','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2017-08-17 06:29:18','2017-08-17 06:29:18','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2017-08-17 06:29:18','2017-08-17 06:29:18','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2017-08-17 06:29:18','2017-08-17 06:29:18','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2017-08-17 06:29:18','2017-08-17 06:29:18','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2017-08-17 06:29:18','2017-08-17 06:29:18','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2017-08-17 06:29:18','2017-08-17 06:29:18','BitPay','BitPay',1,1,6,0,NULL,1,0),(43,'2017-08-17 06:29:18','2017-08-17 06:29:18','Dwolla','Dwolla',1,1,5,0,NULL,1,0),(44,'2017-08-17 06:29:18','2017-08-17 06:29:18','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2017-08-17 06:29:18','2017-08-17 06:29:18','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2017-08-17 06:29:18','2017-08-17 06:29:18','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2017-08-17 06:29:18','2017-08-17 06:29:18','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2017-08-17 06:29:18','2017-08-17 06:29:18','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2017-08-17 06:29:18','2017-08-17 06:29:18','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2017-08-17 06:29:18','2017-08-17 06:29:18','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2017-08-17 06:29:18','2017-08-17 06:29:18','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2017-08-17 06:29:18','2017-08-17 06:29:18','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2017-08-17 06:29:18','2017-08-17 06:29:18','Multicards','Multicards',1,1,10000,0,NULL,0,0),(54,'2017-08-17 06:29:18','2017-08-17 06:29:18','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2017-08-17 06:29:18','2017-08-17 06:29:18','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2017-08-17 06:29:18','2017-08-17 06:29:18','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2017-08-17 06:29:18','2017-08-17 06:29:18','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2017-08-17 06:29:18','2017-08-17 06:29:18','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2017-08-17 06:29:18','2017-08-17 06:29:18','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2017-08-17 06:29:18','2017-08-17 06:29:18','WePay','WePay',1,1,10000,0,NULL,0,0),(61,'2017-08-17 06:29:18','2017-08-17 06:29:18','Braintree','Braintree',1,1,2,0,NULL,0,0),(62,'2017-08-17 06:29:18','2017-08-17 06:29:18','Custom','Custom',1,1,8,0,NULL,1,0),(63,'2017-08-17 06:29:18','2017-08-17 06:29:18','FirstData Payeezy','FirstData_Payeezy',1,1,10000,0,NULL,0,0); +INSERT INTO `gateways` VALUES (1,'2017-08-21 16:01:55','2017-08-21 16:01:55','Authorize.Net AIM','AuthorizeNet_AIM',1,1,4,0,NULL,0,0),(2,'2017-08-21 16:01:55','2017-08-21 16:01:55','Authorize.Net SIM','AuthorizeNet_SIM',1,2,10000,0,NULL,0,0),(3,'2017-08-21 16:01:55','2017-08-21 16:01:55','CardSave','CardSave',1,1,10000,0,NULL,0,0),(4,'2017-08-21 16:01:55','2017-08-21 16:01:55','Eway Rapid','Eway_RapidShared',1,1,10000,0,NULL,1,0),(5,'2017-08-21 16:01:55','2017-08-21 16:01:55','FirstData Connect','FirstData_Connect',1,1,10000,0,NULL,0,0),(6,'2017-08-21 16:01:55','2017-08-21 16:01:55','GoCardless','GoCardless',1,2,10000,0,NULL,1,0),(7,'2017-08-21 16:01:55','2017-08-21 16:01:55','Migs ThreeParty','Migs_ThreeParty',1,1,10000,0,NULL,0,0),(8,'2017-08-21 16:01:55','2017-08-21 16:01:55','Migs TwoParty','Migs_TwoParty',1,1,10000,0,NULL,0,0),(9,'2017-08-21 16:01:55','2017-08-21 16:01:55','Mollie','Mollie',1,1,7,0,NULL,1,0),(10,'2017-08-21 16:01:55','2017-08-21 16:01:55','MultiSafepay','MultiSafepay',1,1,10000,0,NULL,0,0),(11,'2017-08-21 16:01:55','2017-08-21 16:01:55','Netaxept','Netaxept',1,1,10000,0,NULL,0,0),(12,'2017-08-21 16:01:55','2017-08-21 16:01:55','NetBanx','NetBanx',1,1,10000,0,NULL,0,0),(13,'2017-08-21 16:01:55','2017-08-21 16:01:55','PayFast','PayFast',1,1,10000,0,NULL,1,0),(14,'2017-08-21 16:01:55','2017-08-21 16:01:55','Payflow Pro','Payflow_Pro',1,1,10000,0,NULL,0,0),(15,'2017-08-21 16:01:55','2017-08-21 16:01:55','PaymentExpress PxPay','PaymentExpress_PxPay',1,1,10000,0,NULL,0,0),(16,'2017-08-21 16:01:55','2017-08-21 16:01:55','PaymentExpress PxPost','PaymentExpress_PxPost',1,1,10000,0,NULL,0,0),(17,'2017-08-21 16:01:55','2017-08-21 16:01:55','PayPal Express','PayPal_Express',1,1,3,0,NULL,1,0),(18,'2017-08-21 16:01:55','2017-08-21 16:01:55','PayPal Pro','PayPal_Pro',1,1,10000,0,NULL,0,0),(19,'2017-08-21 16:01:55','2017-08-21 16:01:55','Pin','Pin',1,1,10000,0,NULL,0,0),(20,'2017-08-21 16:01:55','2017-08-21 16:01:55','SagePay Direct','SagePay_Direct',1,1,10000,0,NULL,0,0),(21,'2017-08-21 16:01:55','2017-08-21 16:01:55','SagePay Server','SagePay_Server',1,1,10000,0,NULL,0,0),(22,'2017-08-21 16:01:55','2017-08-21 16:01:55','SecurePay DirectPost','SecurePay_DirectPost',1,1,10000,0,NULL,0,0),(23,'2017-08-21 16:01:55','2017-08-21 16:01:55','Stripe','Stripe',1,1,1,0,NULL,0,0),(24,'2017-08-21 16:01:55','2017-08-21 16:01:55','TargetPay Direct eBanking','TargetPay_Directebanking',1,1,10000,0,NULL,0,0),(25,'2017-08-21 16:01:55','2017-08-21 16:01:55','TargetPay Ideal','TargetPay_Ideal',1,1,10000,0,NULL,0,0),(26,'2017-08-21 16:01:55','2017-08-21 16:01:55','TargetPay Mr Cash','TargetPay_Mrcash',1,1,10000,0,NULL,0,0),(27,'2017-08-21 16:01:55','2017-08-21 16:01:55','TwoCheckout','TwoCheckout',1,1,10000,0,NULL,1,0),(28,'2017-08-21 16:01:55','2017-08-21 16:01:55','WorldPay','WorldPay',1,1,10000,0,NULL,0,0),(29,'2017-08-21 16:01:55','2017-08-21 16:01:55','BeanStream','BeanStream',1,2,10000,0,NULL,0,0),(30,'2017-08-21 16:01:55','2017-08-21 16:01:55','Psigate','Psigate',1,2,10000,0,NULL,0,0),(31,'2017-08-21 16:01:55','2017-08-21 16:01:55','moolah','AuthorizeNet_AIM',1,1,10000,0,NULL,0,0),(32,'2017-08-21 16:01:55','2017-08-21 16:01:55','Alipay','Alipay_Express',1,1,10000,0,NULL,0,0),(33,'2017-08-21 16:01:55','2017-08-21 16:01:55','Buckaroo','Buckaroo_CreditCard',1,1,10000,0,NULL,0,0),(34,'2017-08-21 16:01:55','2017-08-21 16:01:55','Coinbase','Coinbase',1,1,10000,0,NULL,0,0),(35,'2017-08-21 16:01:55','2017-08-21 16:01:55','DataCash','DataCash',1,1,10000,0,NULL,0,0),(36,'2017-08-21 16:01:55','2017-08-21 16:01:55','Neteller','Neteller',1,2,10000,0,NULL,0,0),(37,'2017-08-21 16:01:55','2017-08-21 16:01:55','Pacnet','Pacnet',1,1,10000,0,NULL,0,0),(38,'2017-08-21 16:01:55','2017-08-21 16:01:55','PaymentSense','PaymentSense',1,2,10000,0,NULL,0,0),(39,'2017-08-21 16:01:55','2017-08-21 16:01:55','Realex','Realex_Remote',1,1,10000,0,NULL,0,0),(40,'2017-08-21 16:01:55','2017-08-21 16:01:55','Sisow','Sisow',1,1,10000,0,NULL,0,0),(41,'2017-08-21 16:01:55','2017-08-21 16:01:55','Skrill','Skrill',1,1,10000,0,NULL,1,0),(42,'2017-08-21 16:01:55','2017-08-21 16:01:55','BitPay','BitPay',1,1,6,0,NULL,1,0),(43,'2017-08-21 16:01:55','2017-08-21 16:01:55','Dwolla','Dwolla',1,1,5,0,NULL,1,0),(44,'2017-08-21 16:01:55','2017-08-21 16:01:55','AGMS','Agms',1,1,10000,0,NULL,0,0),(45,'2017-08-21 16:01:55','2017-08-21 16:01:55','Barclays','BarclaysEpdq\\Essential',1,1,10000,0,NULL,0,0),(46,'2017-08-21 16:01:55','2017-08-21 16:01:55','Cardgate','Cardgate',1,1,10000,0,NULL,0,0),(47,'2017-08-21 16:01:55','2017-08-21 16:01:55','Checkout.com','CheckoutCom',1,1,10000,0,NULL,0,0),(48,'2017-08-21 16:01:55','2017-08-21 16:01:55','Creditcall','Creditcall',1,1,10000,0,NULL,0,0),(49,'2017-08-21 16:01:55','2017-08-21 16:01:55','Cybersource','Cybersource',1,1,10000,0,NULL,0,0),(50,'2017-08-21 16:01:55','2017-08-21 16:01:55','ecoPayz','Ecopayz',1,1,10000,0,NULL,0,0),(51,'2017-08-21 16:01:55','2017-08-21 16:01:55','Fasapay','Fasapay',1,1,10000,0,NULL,0,0),(52,'2017-08-21 16:01:55','2017-08-21 16:01:55','Komoju','Komoju',1,1,10000,0,NULL,0,0),(53,'2017-08-21 16:01:55','2017-08-21 16:01:55','Multicards','Multicards',1,1,10000,0,NULL,0,0),(54,'2017-08-21 16:01:55','2017-08-21 16:01:55','Pagar.Me','Pagarme',1,2,10000,0,NULL,0,0),(55,'2017-08-21 16:01:55','2017-08-21 16:01:55','Paysafecard','Paysafecard',1,1,10000,0,NULL,0,0),(56,'2017-08-21 16:01:55','2017-08-21 16:01:55','Paytrace','Paytrace_CreditCard',1,1,10000,0,NULL,0,0),(57,'2017-08-21 16:01:55','2017-08-21 16:01:55','Secure Trading','SecureTrading',1,1,10000,0,NULL,0,0),(58,'2017-08-21 16:01:55','2017-08-21 16:01:55','SecPay','SecPay',1,1,10000,0,NULL,0,0),(59,'2017-08-21 16:01:55','2017-08-21 16:01:55','WeChat Express','WeChat_Express',1,2,10000,0,NULL,0,0),(60,'2017-08-21 16:01:55','2017-08-21 16:01:55','WePay','WePay',1,1,10000,0,NULL,0,0),(61,'2017-08-21 16:01:55','2017-08-21 16:01:55','Braintree','Braintree',1,1,2,0,NULL,0,0),(62,'2017-08-21 16:01:55','2017-08-21 16:01:55','Custom','Custom',1,1,9,0,NULL,1,0),(63,'2017-08-21 16:01:55','2017-08-21 16:01:55','FirstData Payeezy','FirstData_Payeezy',1,1,10000,0,NULL,0,0),(64,'2017-08-21 16:01:55','2017-08-21 16:01:55','GoCardless','GoCardlessV2\\Redirect',1,1,8,0,NULL,1,0); /*!40000 ALTER TABLE `gateways` ENABLE KEYS */; UNLOCK TABLES; @@ -1824,7 +1824,7 @@ CREATE TABLE `payment_libraries` ( LOCK TABLES `payment_libraries` WRITE; /*!40000 ALTER TABLE `payment_libraries` DISABLE KEYS */; -INSERT INTO `payment_libraries` VALUES (1,'2017-08-17 06:29:16','2017-08-17 06:29:16','Omnipay',1),(2,'2017-08-17 06:29:16','2017-08-17 06:29:16','PHP-Payments [Deprecated]',1); +INSERT INTO `payment_libraries` VALUES (1,'2017-08-21 16:01:54','2017-08-21 16:01:54','Omnipay',1),(2,'2017-08-21 16:01:54','2017-08-21 16:01:54','PHP-Payments [Deprecated]',1); /*!40000 ALTER TABLE `payment_libraries` ENABLE KEYS */; UNLOCK TABLES; @@ -1934,7 +1934,7 @@ CREATE TABLE `payment_terms` ( LOCK TABLES `payment_terms` WRITE; /*!40000 ALTER TABLE `payment_terms` DISABLE KEYS */; -INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2017-08-17 06:29:16','2017-08-17 06:29:16',NULL,0,0,1),(2,10,'Net 10','2017-08-17 06:29:16','2017-08-17 06:29:16',NULL,0,0,2),(3,14,'Net 14','2017-08-17 06:29:16','2017-08-17 06:29:16',NULL,0,0,3),(4,15,'Net 15','2017-08-17 06:29:16','2017-08-17 06:29:16',NULL,0,0,4),(5,30,'Net 30','2017-08-17 06:29:16','2017-08-17 06:29:16',NULL,0,0,5),(6,60,'Net 60','2017-08-17 06:29:16','2017-08-17 06:29:16',NULL,0,0,6),(7,90,'Net 90','2017-08-17 06:29:16','2017-08-17 06:29:16',NULL,0,0,7),(8,-1,'Net 0','2017-08-17 06:29:19','2017-08-17 06:29:19',NULL,0,0,0); +INSERT INTO `payment_terms` VALUES (1,7,'Net 7','2017-08-21 16:01:54','2017-08-21 16:01:54',NULL,0,0,1),(2,10,'Net 10','2017-08-21 16:01:54','2017-08-21 16:01:54',NULL,0,0,2),(3,14,'Net 14','2017-08-21 16:01:54','2017-08-21 16:01:54',NULL,0,0,3),(4,15,'Net 15','2017-08-21 16:01:54','2017-08-21 16:01:54',NULL,0,0,4),(5,30,'Net 30','2017-08-21 16:01:54','2017-08-21 16:01:54',NULL,0,0,5),(6,60,'Net 60','2017-08-21 16:01:54','2017-08-21 16:01:54',NULL,0,0,6),(7,90,'Net 90','2017-08-21 16:01:54','2017-08-21 16:01:54',NULL,0,0,7),(8,-1,'Net 0','2017-08-21 16:01:57','2017-08-21 16:01:57',NULL,0,0,0); /*!40000 ALTER TABLE `payment_terms` ENABLE KEYS */; UNLOCK TABLES; @@ -2592,4 +2592,4 @@ UNLOCK TABLES; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2017-08-17 12:29:20 +-- Dump completed on 2017-08-21 22:01:58 diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 5b9023de4738..49a9aa05c875 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -439,7 +439,7 @@ $LANG = array( 'reset_all' => 'Reset All', 'approve' => 'Approve', 'token_billing_type_id' => 'Token Billing', - 'token_billing_help' => 'Store payment details with WePay, Stripe or Braintree.', + 'token_billing_help' => 'Store payment details with WePay, Stripe, Braintree or GoCardless.', 'token_billing_1' => 'Disabled', 'token_billing_2' => 'Opt-in - checkbox is shown but not selected', 'token_billing_3' => 'Opt-out - checkbox is shown and selected', diff --git a/resources/views/accounts/account_gateway.blade.php b/resources/views/accounts/account_gateway.blade.php index 5fade2223f1c..42cd72d677d3 100644 --- a/resources/views/accounts/account_gateway.blade.php +++ b/resources/views/accounts/account_gateway.blade.php @@ -67,7 +67,7 @@