Merge remote-tracking branch 'upstream/v5-develop' into v5-mollie-bancontact

VERSION.txt

@@ -1 +1 @@
-5.3.16
+5.3.17

app/Factory/RecurringInvoiceToInvoiceFactory.php

@@ -14,6 +14,7 @@ namespace App\Factory;
 use App\Models\Client;
 use App\Models\Invoice;
 use App\Models\RecurringInvoice;
+use App\Utils\Helpers;
 
 class RecurringInvoiceToInvoiceFactory
 {
@@ -24,14 +25,15 @@ class RecurringInvoiceToInvoiceFactory
         $invoice->discount = $recurring_invoice->discount;
         $invoice->is_amount_discount = $recurring_invoice->is_amount_discount;
         $invoice->po_number = $recurring_invoice->po_number;
-        $invoice->footer = $recurring_invoice->footer;
-        $invoice->terms = $recurring_invoice->terms;
-        $invoice->public_notes = $recurring_invoice->public_notes;
+        $invoice->footer = self::tranformObject($recurring_invoice->footer, $client);
+        $invoice->terms = self::tranformObject($recurring_invoice->terms, $client);
+        $invoice->public_notes = self::tranformObject($recurring_invoice->public_notes, $client);
         $invoice->private_notes = $recurring_invoice->private_notes;
         //$invoice->date = now()->format($client->date_format());
         //$invoice->due_date = $recurring_invoice->calculateDueDate(now());
         $invoice->is_deleted = $recurring_invoice->is_deleted;
-        $invoice->line_items = $recurring_invoice->line_items;
+//        $invoice->line_items = $recurring_invoice->line_items;
+        $invoice->line_items = self::transformItems($recurring_invoice, $client);
         $invoice->tax_name1 = $recurring_invoice->tax_name1;
         $invoice->tax_rate1 = $recurring_invoice->tax_rate1;
         $invoice->tax_name2 = $recurring_invoice->tax_name2;
@@ -45,6 +47,7 @@ class RecurringInvoiceToInvoiceFactory
         $invoice->custom_value3 = $recurring_invoice->custom_value3;
         $invoice->custom_value4 = $recurring_invoice->custom_value4;
         $invoice->amount = $recurring_invoice->amount;
+        $invoice->uses_inclusive_taxes = $recurring_invoice->uses_inclusive_taxes;
         // $invoice->balance = $recurring_invoice->balance;
         $invoice->user_id = $recurring_invoice->user_id;
         $invoice->assigned_user_id = $recurring_invoice->assigned_user_id;
@@ -57,4 +60,25 @@ class RecurringInvoiceToInvoiceFactory
         
         return $invoice;
     }
+
+    private static function transformItems($recurring_invoice, $client)
+    {
+        
+        $line_items = $recurring_invoice->line_items;
+
+        foreach($line_items as $key => $item){
+
+            if(property_exists($line_items[$key], 'notes'))
+                $line_items[$key]->notes = Helpers::processReservedKeywords($item->notes, $client);
+
+        }
+
+        return $line_items;
+
+    }
+
+    private static function tranformObject($object, $client)
+    {
+        return Helpers::processReservedKeywords($object, $client);
+    }
 }

app/Http/Controllers/EmailController.php

@@ -115,8 +115,8 @@ class EmailController extends BaseController
     {
         $entity = $request->input('entity');
         $entity_obj = $entity::find($request->input('entity_id'));
-        $subject = $request->input('subject');
-        $body = $request->input('body');
+        $subject = $request->has('subject') ? $request->input('subject') : '';
+        $body = $request->has('body') ? $request->input('body') : '';
         $entity_string = strtolower(class_basename($entity_obj));
         $template = str_replace("email_template_", "", $request->input('template'));
 

app/Http/Requests/Email/SendEmailRequest.php

@@ -39,8 +39,8 @@ class SendEmailRequest extends Request
             'template' => 'required',
             'entity' => 'required',
             'entity_id' => 'required',
-            'subject' => 'required',
-            'body' => 'required',
+            // 'subject' => 'required',
+            // 'body' => 'required',
         ];
     }
 

app/Jobs/RecurringInvoice/SendRecurring.php

@@ -19,13 +19,14 @@ use App\Models\Invoice;
 use App\Models\RecurringInvoice;
 use App\Utils\Ninja;
 use App\Utils\Traits\GeneratesCounter;
+use App\Utils\Traits\MakesInvoiceValues;
+use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Turbo124\Beacon\Facades\LightLogs;
-use Carbon\Carbon;
 
 class SendRecurring implements ShouldQueue
 {

app/Models/Gateway.php

@@ -90,6 +90,8 @@ class Gateway extends StaticModel
             case 7:
                 return [
                     GatewayType::CREDIT_CARD => ['refund' => false, 'token_billing' => true], // Mollie
+                    GatewayType::BANK_TRANSFER => ['refund' => false, 'token_billing' => true],
+                    GatewayType::KBC => ['refund' => false, 'token_billing' => false],
                     GatewayType::BANCONTACT => ['refund' => false, 'token_billing' => false],
                 ];
             case 15:

app/Models/GatewayType.php

@@ -25,6 +25,7 @@ class GatewayType extends StaticModel
     const APPLE_PAY = 8;
     const SEPA = 9;
     const CREDIT = 10;
+    const KBC = 11;
     const BANCONTACT = 12;
     
     public function gateway()
@@ -67,6 +68,9 @@ class GatewayType extends StaticModel
             case self::SEPA:
                 return ctrans('texts.sepa');
                 break;
+            case self::KBC:
+                return ctrans('texts.kbc_cbc');
+                break;
 
             default:
                 return 'Undefined.';

app/Models/PaymentType.php

@@ -42,6 +42,8 @@ class PaymentType extends StaticModel
     const SEPA = 29;
     const GOCARDLESS = 30;
     const CRYPTO = 31;
+    const MOLLIE_BANK_TRANSFER = 34;
+    const KBC = 35;
     const BANCONTACT = 36;
 
     public static function parseCardType($cardName)

app/PaymentDrivers/Mollie/BankTransfer.php

@@ -0,0 +1,212 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\PaymentDrivers\Mollie;
+
+use App\Exceptions\PaymentFailed;
+use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
+use App\Http\Requests\Request;
+use App\Jobs\Mail\PaymentFailureMailer;
+use App\Jobs\Util\SystemLogger;
+use App\Models\GatewayType;
+use App\Models\Payment;
+use App\Models\PaymentType;
+use App\Models\SystemLog;
+use App\PaymentDrivers\Common\MethodInterface;
+use App\PaymentDrivers\MolliePaymentDriver;
+use Exception;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Routing\Redirector;
+use Illuminate\View\View;
+use Mollie\Api\Resources\Payment as ResourcesPayment;
+
+class BankTransfer implements MethodInterface
+{
+    protected MolliePaymentDriver $mollie;
+
+    public function __construct(MolliePaymentDriver $mollie)
+    {
+        $this->mollie = $mollie;
+
+        $this->mollie->init();
+    }
+
+    /**
+     * Show the authorization page for bank transfer.
+     *
+     * @param array $data
+     * @return View
+     */
+    public function authorizeView(array $data): View
+    {
+        return render('gateways.mollie.bank_transfer.authorize', $data);
+    }
+
+    /**
+     * Handle the authorization for bank transfer.
+     *
+     * @param Request $request
+     * @return RedirectResponse
+     */
+    public function authorizeResponse(Request $request): RedirectResponse
+    {
+        return redirect()->route('client.payment_methods.index');
+    }
+
+    /**
+     * Show the payment page for bank transfer.
+     *
+     * @param array $data
+     * @return Redirector|RedirectResponse
+     */
+    public function paymentView(array $data)
+    {
+        $this->mollie->payment_hash
+            ->withData('gateway_type_id', GatewayType::BANK_TRANSFER)
+            ->withData('client_id', $this->mollie->client->id);
+
+        try {
+            $payment = $this->mollie->gateway->payments->create([
+                'method' => 'banktransfer',
+                'amount' => [
+                    'currency' => $this->mollie->client->currency()->code,
+                    'value' => $this->mollie->convertToMollieAmount((float) $this->mollie->payment_hash->data->amount_with_fee),
+                ],
+                'description' => \sprintf('Invoices: %s', collect($data['invoices'])->pluck('invoice_number')),
+                'redirectUrl' => route('client.payments.response', [
+                    'company_gateway_id' => $this->mollie->company_gateway->id,
+                    'payment_hash' => $this->mollie->payment_hash->hash,
+                    'payment_method_id' => GatewayType::BANK_TRANSFER,
+                ]),
+                'webhookUrl' => $this->mollie->company_gateway->webhookUrl(),
+                'metadata' => [
+                    'client_id' => $this->mollie->client->hashed_id,
+                ],
+            ]);
+
+            $this->mollie->payment_hash->withData('payment_id', $payment->id);
+
+            return redirect(
+                $payment->getCheckoutUrl()
+            );
+        } catch (\Mollie\Api\Exceptions\ApiException | \Exception $exception) {
+            return $this->processUnsuccessfulPayment($exception);
+        }
+    }
+
+    /**
+     * Handle unsuccessful payment.
+     *
+     * @param Exception $e
+     * @throws PaymentFailed
+     * @return void
+     */
+    public function processUnsuccessfulPayment(\Exception $e): void
+    {
+        PaymentFailureMailer::dispatch(
+            $this->mollie->client,
+            $e->getMessage(),
+            $this->mollie->client->company,
+            $this->mollie->payment_hash->data->amount_with_fee
+        );
+
+        SystemLogger::dispatch(
+            $e->getMessage(),
+            SystemLog::CATEGORY_GATEWAY_RESPONSE,
+            SystemLog::EVENT_GATEWAY_FAILURE,
+            SystemLog::TYPE_MOLLIE,
+            $this->mollie->client,
+            $this->mollie->client->company,
+        );
+
+        throw new PaymentFailed($e->getMessage(), $e->getCode());
+    }
+
+    /**
+     * Handle the payments for the bank transfer.
+     *
+     * @param PaymentResponseRequest $request
+     * @return mixed
+     */
+    public function paymentResponse(PaymentResponseRequest $request)
+    {
+        if (! \property_exists($this->mollie->payment_hash->data, 'payment_id')) {
+            return $this->processUnsuccessfulPayment(
+                new PaymentFailed('Whoops, something went wrong. Missing required [payment_id] parameter. Please contact administrator. Reference hash: ' . $this->mollie->payment_hash->hash)
+            );
+        }
+
+        try {
+            $payment = $this->mollie->gateway->payments->get(
+                $this->mollie->payment_hash->data->payment_id
+            );
+
+            if ($payment->status === 'paid') {
+                return $this->processSuccessfulPayment($payment);
+            }
+
+            if ($payment->status === 'open') {
+                return $this->processOpenPayment($payment);
+            }
+
+            return $this->processUnsuccessfulPayment(
+                new PaymentFailed(ctrans('texts.status_voided'))
+            );
+        } catch (\Mollie\Api\Exceptions\ApiException | \Exception $exception) {
+            return $this->processUnsuccessfulPayment($exception);
+        }
+    }
+
+    /**
+     * Handle the successful payment for bank transfer.
+     *
+     * @param ResourcesPayment $payment
+     * @param string $status
+     * @return RedirectResponse
+     */
+    public function processSuccessfulPayment(\Mollie\Api\Resources\Payment $payment, $status = 'paid'): RedirectResponse
+    {
+        $data = [
+            'gateway_type_id' => GatewayType::BANK_TRANSFER,
+            'amount' => array_sum(array_column($this->mollie->payment_hash->invoices(), 'amount')) + $this->mollie->payment_hash->fee_total,
+            'payment_type' => PaymentType::MOLLIE_BANK_TRANSFER,
+            'transaction_reference' => $payment->id,
+        ];
+
+        $payment_record = $this->mollie->createPayment(
+            $data,
+            $status === 'paid' ? Payment::STATUS_COMPLETED : Payment::STATUS_PENDING
+        );
+
+        SystemLogger::dispatch(
+            ['response' => $payment, 'data' => $data],
+            SystemLog::CATEGORY_GATEWAY_RESPONSE,
+            SystemLog::EVENT_GATEWAY_SUCCESS,
+            SystemLog::TYPE_MOLLIE,
+            $this->mollie->client,
+            $this->mollie->client->company,
+        );
+
+        return redirect()->route('client.payments.show', ['payment' => $this->mollie->encodePrimaryKey($payment_record->id)]);
+    }
+
+    /**
+     * Handle 'open' payment status for bank transfer.
+     *
+     * @param ResourcesPayment $payment
+     * @return RedirectResponse
+     */
+    public function processOpenPayment(\Mollie\Api\Resources\Payment $payment): RedirectResponse
+    {
+        return $this->processSuccessfulPayment($payment, 'open');
+    }
+}

app/PaymentDrivers/Mollie/KBC.php

@@ -0,0 +1,199 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\PaymentDrivers\Mollie;
+
+use App\Exceptions\PaymentFailed;
+use App\Http\Requests\Request;
+use App\Http\Requests\ClientPortal\Payments\PaymentResponseRequest;
+use App\Jobs\Mail\PaymentFailureMailer;
+use App\Jobs\Util\SystemLogger;
+use App\Models\GatewayType;
+use App\Models\Payment;
+use App\Models\PaymentType;
+use App\Models\SystemLog;
+use App\PaymentDrivers\Common\MethodInterface;
+use App\PaymentDrivers\MolliePaymentDriver;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\View\View;
+
+class KBC implements MethodInterface
+{
+    protected MolliePaymentDriver $mollie;
+
+    public function __construct(MolliePaymentDriver $mollie)
+    {
+        $this->mollie = $mollie;
+
+        $this->mollie->init();
+    }
+
+    /**
+     * Show the authorization page for KBC.
+     *
+     * @param array $data
+     * @return View
+     */
+    public function authorizeView(array $data): View
+    {
+        return render('gateways.mollie.kbc.authorize', $data);
+    }
+
+    /**
+     * Handle the authorization for KBC.
+     *
+     * @param Request $request
+     * @return RedirectResponse
+     */
+    public function authorizeResponse(Request $request): RedirectResponse
+    {
+        return redirect()->route('client.payment_methods.index');
+    }
+
+    /**
+     * Show the payment page for KBC.
+     *
+     * @param array $data
+     * @return Redirector|RedirectResponse
+     */
+    public function paymentView(array $data)
+    {
+        $this->mollie->payment_hash
+            ->withData('gateway_type_id', GatewayType::KBC)
+            ->withData('client_id', $this->mollie->client->id);
+
+        try {
+            $payment = $this->mollie->gateway->payments->create([
+                'method' => 'kbc',
+                'amount' => [
+                    'currency' => $this->mollie->client->currency()->code,
+                    'value' => $this->mollie->convertToMollieAmount((float) $this->mollie->payment_hash->data->amount_with_fee),
+                ],
+                'description' => \sprintf('Invoices: %s', collect($data['invoices'])->pluck('invoice_number')),
+                'redirectUrl' => route('client.payments.response', [
+                    'company_gateway_id' => $this->mollie->company_gateway->id,
+                    'payment_hash' => $this->mollie->payment_hash->hash,
+                    'payment_method_id' => GatewayType::KBC,
+                ]),
+                'webhookUrl' => $this->mollie->company_gateway->webhookUrl(),
+                'metadata' => [
+                    'client_id' => $this->mollie->client->hashed_id,
+                ],
+            ]);
+
+            $this->mollie->payment_hash->withData('payment_id', $payment->id);
+
+            return redirect(
+                $payment->getCheckoutUrl()
+            );
+        } catch (\Mollie\Api\Exceptions\ApiException | \Exception $exception) {
+            return $this->processUnsuccessfulPayment($exception);
+        }
+    }
+
+        /**
+     * Handle unsuccessful payment.
+     *
+     * @param Exception $exception
+     * @throws PaymentFailed
+     * @return void
+     */
+    public function processUnsuccessfulPayment(\Exception $exception): void
+    {
+        PaymentFailureMailer::dispatch(
+            $this->mollie->client,
+            $exception->getMessage(),
+            $this->mollie->client->company,
+            $this->mollie->payment_hash->data->amount_with_fee
+        );
+
+        SystemLogger::dispatch(
+            $exception->getMessage(),
+            SystemLog::CATEGORY_GATEWAY_RESPONSE,
+            SystemLog::EVENT_GATEWAY_FAILURE,
+            SystemLog::TYPE_MOLLIE,
+            $this->mollie->client,
+            $this->mollie->client->company,
+        );
+
+        throw new PaymentFailed($exception->getMessage(), $exception->getCode());
+    }
+
+    /**
+     * Handle the payments for the KBC.
+     *
+     * @param PaymentResponseRequest $request
+     * @return mixed
+     */
+    public function paymentResponse(PaymentResponseRequest $request)
+    {
+        if (! \property_exists($this->mollie->payment_hash->data, 'payment_id')) {
+            return $this->processUnsuccessfulPayment(
+                new PaymentFailed('Whoops, something went wrong. Missing required [payment_id] parameter. Please contact administrator. Reference hash: ' . $this->mollie->payment_hash->hash)
+            );
+        }
+
+        try {
+            $payment = $this->mollie->gateway->payments->get(
+                $this->mollie->payment_hash->data->payment_id
+            );
+
+            if ($payment->status === 'paid') {
+                return $this->processSuccessfulPayment($payment);
+            }
+
+            if ($payment->status === 'failed') {
+                return $this->processUnsuccessfulPayment(
+                    new PaymentFailed(ctrans('texts.status_failed'))
+                );
+            }
+
+            return $this->processUnsuccessfulPayment(
+                new PaymentFailed(ctrans('texts.status_voided'))
+            );
+        } catch (\Mollie\Api\Exceptions\ApiException | \Exception $exception) {
+            return $this->processUnsuccessfulPayment($exception);
+        }
+    }
+
+    /**
+     * Handle the successful payment for KBC.
+     *
+     * @param ResourcesPayment $payment
+     * @return RedirectResponse
+     */
+    public function processSuccessfulPayment(\Mollie\Api\Resources\Payment $payment): RedirectResponse
+    {
+        $data = [
+            'gateway_type_id' => GatewayType::KBC,
+            'amount' => array_sum(array_column($this->mollie->payment_hash->invoices(), 'amount')) + $this->mollie->payment_hash->fee_total,
+            'payment_type' => PaymentType::KBC,
+            'transaction_reference' => $payment->id,
+        ];
+
+        $payment_record = $this->mollie->createPayment(
+            $data,
+            $payment->status === 'paid' ? Payment::STATUS_COMPLETED : Payment::STATUS_PENDING
+        );
+
+        SystemLogger::dispatch(
+            ['response' => $payment, 'data' => $data],
+            SystemLog::CATEGORY_GATEWAY_RESPONSE,
+            SystemLog::EVENT_GATEWAY_SUCCESS,
+            SystemLog::TYPE_MOLLIE,
+            $this->mollie->client,
+            $this->mollie->client->company,
+        );
+
+        return redirect()->route('client.payments.show', ['payment' => $this->mollie->encodePrimaryKey($payment_record->id)]);
+    }
+}

app/PaymentDrivers/MolliePaymentDriver.php

@@ -25,7 +25,9 @@ use App\Models\PaymentHash;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
 use App\PaymentDrivers\Mollie\Bancontact;
+use App\PaymentDrivers\Mollie\BankTransfer;
 use App\PaymentDrivers\Mollie\CreditCard;
+use App\PaymentDrivers\Mollie\KBC;
 use App\Utils\Traits\MakesHash;
 use Illuminate\Support\Facades\Validator;
 use Mollie\Api\Exceptions\ApiException;
@@ -66,6 +68,8 @@ class MolliePaymentDriver extends BaseDriver
     public static $methods = [
         GatewayType::CREDIT_CARD => CreditCard::class,
         GatewayType::BANCONTACT => Bancontact::class,
+        GatewayType::BANK_TRANSFER => BankTransfer::class,
+        GatewayType::KBC => KBC::class,
     ];
 
     const SYSTEM_LOG_TYPE = SystemLog::TYPE_MOLLIE;
@@ -87,6 +91,8 @@ class MolliePaymentDriver extends BaseDriver
 
         $types[] = GatewayType::CREDIT_CARD;
         $types[] = GatewayType::BANCONTACT;
+        $types[] = GatewayType::BANK_TRANSFER;
+        $types[] = GatewayType::KBC;
 
         return $types;
     }

app/Services/Recurring/RecurringService.php

@@ -97,6 +97,12 @@ class RecurringService
         return $this;
     }
     
+    public function fillDefaults()
+    {
+
+        return $this;
+    }
+    
     public function save()
     {
         $this->recurring_entity->save();

app/Utils/HtmlEngine.php

@@ -18,7 +18,9 @@ use App\Models\InvoiceInvitation;
 use App\Models\QuoteInvitation;
 use App\Models\RecurringInvoiceInvitation;
 use App\Services\PdfMaker\Designs\Utilities\DesignHelpers;
+use App\Utils\Ninja;
 use App\Utils\Traits\MakesDates;
+use App\Utils\transformTranslations;
 use Exception;
 use Illuminate\Support\Facades\App;
 
@@ -96,6 +98,11 @@ class HtmlEngine
             exit;
         }
 
+        App::forgetInstance('translator');
+        $t = app('translator');
+        App::setLocale($this->contact->preferredLocale());
+        $t->replace(Ninja::transformTranslations($this->settings));
+
         $data = [];
         $data['$global_margin'] = ['value' => '6.35mm', 'label' => ''];
         $data['$tax'] = ['value' => '', 'label' => ctrans('texts.tax')];

config/ninja.php

@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.3.16',
-    'app_tag' => '5.3.16',
+    'app_version' => '5.3.17',
+    'app_tag' => '5.3.17',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),
@@ -37,7 +37,7 @@ return [
     'trusted_proxies' => env('TRUSTED_PROXIES', false),
     'is_docker' => env('IS_DOCKER', false),
     'local_download' => env('LOCAL_DOWNLOAD', false),
-    'sentry_dsn' => env('SENTRY_LARAVEL_DSN', 'https://9b4e15e575214354a7d666489783904a@sentry.invoicing.co/6'),
+    'sentry_dsn' => env('SENTRY_LARAVEL_DSN', 'https://32f01ea994744fa08a0f688769cef78a@sentry.invoicing.co/9'),
     'environment' => env('NINJA_ENVIRONMENT', 'selfhost'), // 'hosted', 'development', 'selfhost', 'reseller'
 	'preconfigured_install' => env('PRECONFIGURED_INSTALL',false),
     'update_secret' => env('UPDATE_SECRET', ''),

database/migrations/2021_09_24_201319_add_mollie_bank_transfer_to_payment_types.php

@@ -0,0 +1,24 @@
+<?php
+
+use App\Models\GatewayType;
+use App\Models\PaymentType;
+use Illuminate\Database\Migrations\Migration;
+
+class AddMollieBankTransferToPaymentTypes extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $type = new PaymentType();
+
+        $type->id = 34;
+        $type->name = 'Mollie Bank Transfer';
+        $type->gateway_type_id = GatewayType::BANK_TRANSFER;
+
+        $type->save();
+    }
+}

database/migrations/2021_09_24_211504_add_kbc_to_payment_types.php

@@ -0,0 +1,26 @@
+<?php
+
+use App\Models\GatewayType;
+use App\Models\PaymentType;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddKbcToPaymentTypes extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $type = new PaymentType();
+
+        $type->id = 35;
+        $type->name = 'KBC/CBC';
+        $type->gateway_type_id = GatewayType::KBC;
+
+        $type->save();
+    }
+}

public/flutter_service_worker.js

@@ -4,7 +4,7 @@ const TEMP = 'flutter-temp-cache';
 const CACHE_NAME = 'flutter-app-cache';
 const RESOURCES = {
   "favicon.png": "dca91c54388f52eded692718d5a98b8b",
-"/": "d54a2d8f5df9a52b1936136260e327b3",
+"/": "7ccd553077f4c46170640a5bdd357b1c",
 "assets/NOTICES": "9eb7e2eb2888ea5bae5f536720db37cd",
 "assets/assets/images/logo_light.png": "e5f46d5a78e226e7a9553d4ca6f69219",
 "assets/assets/images/payment_types/dinerscard.png": "06d85186ba858c18ab7c9caa42c92024",
@@ -34,7 +34,7 @@ const RESOURCES = {
 "favicon.ico": "51636d3a390451561744c42188ccd628",
 "icons/Icon-512.png": "0f9aff01367f0a0c69773d25ca16ef35",
 "icons/Icon-192.png": "bb1cf5f6982006952211c7c8404ffbed",
-"main.dart.js": "d0bf26e6fb4226713654b97cdfef6a53"
+"main.dart.js": "320b22d553182f95f1dd0651afba250d"
 };
 
 // The application shell files that are downloaded before a service worker can

resources/lang/en/texts.php

@@ -4314,6 +4314,7 @@ $LANG = array(
     'generic_gateway_error' => 'Gateway configuration error. Please check your credentials.',
     'my_documents' => 'My documents',
     'payment_method_cannot_be_preauthorized' => 'This payment method cannot be preauthorized.',
+    'kbc_cbc' => 'KBC/CBC',
 );
 
 return $LANG;

resources/views/portal/ninja2020/gateways/mollie/bank_transfer/authorize.blade.php

@@ -0,0 +1,8 @@
+@extends('portal.ninja2020.layout.payments', ['gateway_title' => ctrans('texts.bank_transfer'), 'card_title' =>
+ctrans('texts.bank_transfer')])
+
+@section('gateway_content')
+    @component('portal.ninja2020.components.general.card-element-single')
+        {{ __('texts.payment_method_cannot_be_preauthorized') }}
+    @endcomponent
+@endsection

resources/views/portal/ninja2020/gateways/mollie/kbc/authorize.blade.php

@@ -0,0 +1,8 @@
+@extends('portal.ninja2020.layout.payments', ['gateway_title' => 'KBC/CBC', 'card_title' =>
+'KBC/CBC'])
+
+@section('gateway_content')
+    @component('portal.ninja2020.components.general.card-element-single')
+        {{ __('texts.payment_method_cannot_be_preauthorized') }}
+    @endcomponent
+@endsection

tests/Browser/ClientPortal/Gateways/Mollie/BankTransferTest.php

@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace Tests\Browser\ClientPortal\Gateways\Mollie;
+
+use App\Models\CompanyGateway;
+use Laravel\Dusk\Browser;
+use Tests\DuskTestCase;
+use Tests\Browser\Pages\ClientPortal\Login;
+
+class BankTransferTest extends DuskTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        foreach (static::$browsers as $browser) {
+            $browser->driver->manage()->deleteAllCookies();
+        }
+
+        $this->disableCompanyGateways();
+
+        CompanyGateway::where('gateway_key', '1bd651fb213ca0c9d66ae3c336dc77e8')->restore();
+
+        $this->browse(function (Browser $browser) {
+            $browser
+                ->visit(new Login())
+                ->auth();
+        });
+    }
+
+    public function testSuccessfulPayment(): void
+    {
+        $this->browse(function (Browser $browser) {
+            $browser
+                ->visitRoute('client.invoices.index')
+                ->click('@pay-now')
+                ->press('Pay Now')
+                ->clickLink('Bank Transfer')
+                ->waitForText('Test profile')
+                ->radio('final_state', 'paid')
+                ->press('Continue')
+                ->waitForText('Details of the payment')
+                ->assertSee('Completed');
+        });
+    }
+
+    public function testPendingPayment(): void
+    {
+        $this->browse(function (Browser $browser) {
+            $browser
+                ->visitRoute('client.invoices.index')
+                ->click('@pay-now')
+                ->press('Pay Now')
+                ->clickLink('Bank Transfer')
+                ->waitForText('Test profile')
+                ->radio('final_state', 'open')
+                ->press('Continue')
+                ->waitForText('Details of the payment')
+                ->assertSee('Pending');
+        });
+    }
+}

tests/Browser/ClientPortal/Gateways/Mollie/CreditCardTest.php

@@ -12,6 +12,7 @@
 
 namespace Tests\Browser\ClientPortal\Gateways\Mollie;
 
+use App\Models\CompanyGateway;
 use Laravel\Dusk\Browser;
 use Tests\Browser\Pages\ClientPortal\Login;
 use Tests\DuskTestCase;
@@ -26,9 +27,9 @@ class CreditCardTest extends DuskTestCase
             $browser->driver->manage()->deleteAllCookies();
         }
 
-        // $this->disableCompanyGateways();
+        $this->disableCompanyGateways();
 
-        // CompanyGateway::where('gateway_key', '3758e7f7c6f4cecf0f4f348b9a00f456')->restore();
+        CompanyGateway::where('gateway_key', '1bd651fb213ca0c9d66ae3c336dc77e8')->restore();
 
         $this->browse(function (Browser $browser) {
             $browser

tests/Browser/ClientPortal/Gateways/Mollie/KBCTest.php

@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace Tests\Browser\ClientPortal\Gateways\Mollie;
+
+use App\Models\CompanyGateway;
+use Laravel\Dusk\Browser;
+use Tests\DuskTestCase;
+use Tests\Browser\Pages\ClientPortal\Login;
+
+class KBCTest extends DuskTestCase
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        foreach (static::$browsers as $browser) {
+            $browser->driver->manage()->deleteAllCookies();
+        }
+
+        $this->disableCompanyGateways();
+
+        CompanyGateway::where('gateway_key', '1bd651fb213ca0c9d66ae3c336dc77e8')->restore();
+
+        $this->browse(function (Browser $browser) {
+            $browser
+                ->visit(new Login())
+                ->auth();
+        });
+    }
+
+    public function testSuccessfulPayment(): void
+    {
+        $this->browse(function (Browser $browser) {
+            $browser
+                ->visitRoute('client.invoices.index')
+                ->click('@pay-now')
+                ->press('Pay Now')
+                ->clickLink('Undefined.')
+                ->waitForText('Test profile')
+                ->press('CBC')
+                ->radio('final_state', 'paid')
+                ->press('Continue')
+                ->waitForText('Details of the payment')
+                ->assertSee('Completed');
+        });
+    }
+
+    public function testFailedPayment(): void
+    {
+        $this->browse(function (Browser $browser) {
+            $browser
+                ->visitRoute('client.invoices.index')
+                ->click('@pay-now')
+                ->press('Pay Now')
+                ->clickLink('Undefined.')
+                ->waitForText('Test profile')
+                ->press('CBC')
+                ->radio('final_state', 'failed')
+                ->press('Continue')
+                ->waitForText('Failed.');
+        });
+    }
+
+    public function testCancelledTest(): void
+    {
+        $this->browse(function (Browser $browser) {
+            $browser
+                ->visitRoute('client.invoices.index')
+                ->click('@pay-now')
+                ->press('Pay Now')
+                ->clickLink('Undefined.')
+                ->waitForText('Test profile')
+                ->press('CBC')
+                ->radio('final_state', 'canceled')
+                ->press('Continue')
+                ->waitForText('Cancelled.');
+        });
+    }
+}