Merge pull request #7160 from turbo124/v5-stable

v5.3.51

.env.example

@@ -1,57 +0,0 @@
-APP_NAME="Invoice Ninja"
-APP_ENV=production
-APP_KEY=s7epnjtomsdond5zgfqgaqmwhhcjct02
-APP_DEBUG=false
-
-APP_URL=http://localhost
-
-DB_CONNECTION=mysql
-MULTI_DB_ENABLED=false
-
-DB_HOST=localhost
-DB_DATABASE=ninja
-DB_USERNAME=ninja
-DB_PASSWORD=ninja
-DB_PORT=3306
-
-DEMO_MODE=false
-
-BROADCAST_DRIVER=log
-LOG_CHANNEL=stack
-CACHE_DRIVER=file
-QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_MAILER=smtp
-MAIL_HOST=smtp.mailtrap.io
-MAIL_PORT=2525
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS='user@example.com'
-MAIL_FROM_NAME='Self Hosted User'
-
-POSTMARK_API_TOKEN=
-REQUIRE_HTTPS=false
-
-GOOGLE_MAPS_API_KEY=
-ERROR_EMAIL=
-TRUSTED_PROXIES=
-
-NINJA_ENVIRONMENT=selfhost
-
-#options - snappdf / phantom / hosted_ninja
-PDF_GENERATOR=phantom 
-
-PHANTOMJS_KEY='a-demo-key-with-low-quota-per-ip-address'
-PHANTOMJS_SECRET=secret
-
-UPDATE_SECRET=secret
-
-COMPOSER_AUTH='{"github-oauth": {"github.com": "${{ secrets.GITHUB_TOKEN }}"}}'
-SENTRY_LARAVEL_DSN=https://32f01ea994744fa08a0f688769cef78a@sentry.invoicing.co/9

VERSION.txt

@@ -1 +1 @@
-5.3.49
+5.3.51

app/DataMapper/Analytics/AccountPlatform.php

@@ -0,0 +1,61 @@
+<?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\DataMapper\Analytics;
+
+use Turbo124\Beacon\ExampleMetric\GenericMixedMetric;
+
+class AccountPlatform extends GenericMixedMetric
+{
+    /**
+     * The type of Sample.
+     *
+     * Monotonically incrementing counter
+     *
+     * 	- counter
+     *
+     * @var string
+     */
+    public $type = 'mixed_metric';
+
+    /**
+     * The name of the counter.
+     * @var string
+     */
+    public $name = 'account.platform';
+
+    /**
+     * The datetime of the counter measurement.
+     *
+     * date("Y-m-d H:i:s")
+     *
+     * @var DateTime
+     */
+    public $datetime;
+
+    /**
+     * The Class failure name
+     * set to 0.
+     *
+     * @var string
+     */
+    public $string_metric5 = 'platform';
+
+    public $string_metric6 = 'user_agent';
+
+    public $string_metric7 = 'ip_address';
+
+    public function __construct($string_metric5, $string_metric6, $string_metric7) {
+        $this->string_metric5 = $string_metric5;
+        $this->string_metric6 = $string_metric6;
+        $this->string_metric7 = $string_metric7;
+    }
+}

app/Filters/ClientFilters.php

@@ -70,6 +70,16 @@ class ClientFilters extends QueryFilters
 
     }
 
+    public function client_id(string $client_id = '') :Builder
+    {
+        if (strlen($client_id) == 0) {
+            return $this->builder;
+        }
+
+        return $this->builder->where('id', $this->decodePrimaryKey($client_id));
+        
+    }
+
     public function id_number(string $id_number):Builder
     {
         return $this->builder->where('id_number', $id_number);

app/Helpers/Mail/GmailTransport.php

@@ -76,7 +76,24 @@ class GmailTransport extends Transport
 
         } 
 
-        $this->gmail->send();
+        /**
+         * Google is very strict with their
+         * sending limits, if we hit 429s, sleep and
+         * retry again later.
+         */
+        try{
+
+            $this->gmail->send();
+
+        }
+        catch(\Google\Service\Exception $e)
+        {
+            nlog("gmail exception");
+            nlog($e->getErrors());
+
+            sleep(5);
+            $this->gmail->send();
+        }
 
         $this->sendPerformed($message);
 

app/Http/Controllers/Auth/ContactLoginController.php

@@ -152,6 +152,7 @@ class ContactLoginController extends Controller
     public function logout()
     {
         Auth::guard('contact')->logout();
+        request()->session()->invalidate();
 
         return redirect('/client/login');
     }

app/Http/Controllers/ChartController.php

@@ -12,6 +12,7 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\Chart\ShowChartRequest;
+use App\Services\Chart\ChartService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
@@ -25,8 +26,8 @@ class ChartController extends BaseController
 
     /**
      * @OA\Post(
-     *      path="/api/v1/charts",
+     *      path="/api/v1/charts/totals",
-     *      operationId="getCharts",
+     *      operationId="getChartTotals",
      *      tags={"charts"},
      *      summary="Get chart data",
      *      description="Get chart data",
@@ -67,10 +68,18 @@ class ChartController extends BaseController
      * @param Request $request
      * @return Response|mixed
      */
-    public function index(ShowChartRequest $request)
+    public function totals(ShowChartRequest $request)
     {
+        $cs = new ChartService(auth()->user()->company());
 
-        return response()->json([],200);
+        return response()->json($cs->totals($request->input('start_date'), $request->input('end_date')), 200);
+    }
+
+    public function chart_summary(ShowChartRequest $request)
+    {
+        $cs = new ChartService(auth()->user()->company());
+
+        return response()->json($cs->chart_summary($request->input('start_date'), $request->input('end_date')), 200);
     }
 
 }

app/Http/Controllers/ClientPortal/InvitationController.php

@@ -98,6 +98,7 @@ class InvitationController extends Controller
             $client_contact->email = Str::random(15) . "@example.com"; $client_contact->save();
 
         if (request()->has('client_hash') && request()->input('client_hash') == $invitation->contact->client->client_hash) {
+            request()->session()->invalidate();
             auth()->guard('contact')->loginUsingId($client_contact->id, true);
 
         } elseif ((bool) $invitation->contact->client->getSetting('enable_client_portal_password') !== false) {
@@ -106,6 +107,7 @@ class InvitationController extends Controller
 
         } else {
             nlog("else - default - login contact");
+            request()->session()->invalidate();
             auth()->guard('contact')->loginUsingId($client_contact->id, true);
         }
 

app/Http/Controllers/ClientPortal/PaymentController.php

@@ -90,12 +90,15 @@ class PaymentController extends Controller
 
     public function response(PaymentResponseRequest $request)
     {
+        
         $gateway = CompanyGateway::findOrFail($request->input('company_gateway_id'));
-
+        $payment_hash = PaymentHash::where('hash', $request->payment_hash)->first();
-        $payment_hash = PaymentHash::whereRaw('BINARY `hash`= ?', [$request->payment_hash])->first();
+        $invoice = Invoice::with('client')->find($payment_hash->fee_invoice_id);
+        $client = $invoice ? $invoice->client : auth()->user()->client;
 
             return $gateway
-                ->driver(auth()->user()->client)
+                // ->driver(auth()->user()->client)
+                ->driver($client)
                 ->setPaymentMethod($request->input('payment_method_id'))
                 ->setPaymentHash($payment_hash)
                 ->checkRequirements()

app/Http/Controllers/DesignController.php

@@ -401,7 +401,7 @@ class DesignController extends BaseController
         }
 
         $design->design = $d;
-        $design->save();
+       // $design->save();
 
 /*
  This is required as the base template does not know to inject the table elements 

app/Http/Controllers/QuoteController.php

@@ -18,6 +18,7 @@ use App\Factory\CloneQuoteToInvoiceFactory;
 use App\Factory\QuoteFactory;
 use App\Filters\QuoteFilters;
 use App\Http\Requests\Quote\ActionQuoteRequest;
+use App\Http\Requests\Quote\BulkActionQuoteRequest;
 use App\Http\Requests\Quote\CreateQuoteRequest;
 use App\Http\Requests\Quote\DestroyQuoteRequest;
 use App\Http\Requests\Quote\EditQuoteRequest;
@@ -510,7 +511,7 @@ class QuoteController extends BaseController
      *       ),
      *     )
      */
-    public function bulk()
+    public function bulk(BulkActionQuoteRequest $request)
     {
         $action = request()->input('action');
 

app/Http/Kernel.php

@@ -95,7 +95,7 @@ class Kernel extends HttpKernel
         ],
 
         'api' => [
-            'throttle:300,1',
+            // 'throttle:300,1',
             'bindings',
             'query_logging',
         ],

app/Http/Livewire/BillingPortalPurchase.php

@@ -454,6 +454,7 @@ class BillingPortalPurchase extends Component
 
         $contact = ClientContact::query()
             ->where('email', $this->email)
+            ->where('company_id', $this->subscription->company_id)
             ->first();
 
         $mailer = new NinjaMailerObject();

app/Http/Middleware/ContactKeyLogin.php

@@ -37,6 +37,7 @@ class ContactKeyLogin
     {
         if (Auth::guard('contact')->check()) {
             Auth::guard('contact')->logout();
+            $request->session()->invalidate();
         }
 
         if ($request->segment(2) && $request->segment(2) == 'magic_link' && $request->segment(3)) {

app/Http/Middleware/SessionDomains.php

@@ -35,7 +35,7 @@ class SessionDomains
 
         if (strpos($domain_name, 'invoicing.co') !== false) 
         {
-            config(['session.domain' => '.invoicing.co']);
+            // config(['session.domain' => '.invoicing.co']);
         }            
         else{
 

app/Http/Requests/Chart/ShowChartRequest.php

@@ -29,6 +29,22 @@ class ShowChartRequest extends Request
     public function rules()
     {
         return [
+            'start_date' => 'date',
+            'end_date' => 'date',
         ];
     }
+
+    protected function prepareForValidation()
+    {
+        $input = $this->all();
+
+            if(!array_key_exists('start_date', $input))
+                $input['start_date'] = now()->subDays(20);
+
+            if(!array_key_exists('end_date', $input))
+                $input['end_date'] = now();
+
+        $this->replace($input);
+
+    }
 }

app/Http/Requests/Expense/UpdateExpenseRequest.php

@@ -34,10 +34,10 @@ class UpdateExpenseRequest extends Request
     public function rules()
     {
         /* Ensure we have a client name, and that all emails are unique*/
+        $rules = [];
+        // $rules['country_id'] = 'integer|nullable';
 
-        $rules['country_id'] = 'integer|nullable';
+        // $rules['contacts.*.email'] = 'nullable|distinct';
-
-        $rules['contacts.*.email'] = 'nullable|distinct';
 
         if (isset($this->number)) {
             $rules['number'] = Rule::unique('expenses')->where('company_id', auth()->user()->company()->id)->ignore($this->expense->id);

app/Http/Requests/Quote/BulkActionQuoteRequest.php

@@ -0,0 +1,41 @@
+<?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\Http\Requests\Quote;
+
+use App\Http\Requests\Request;
+use App\Http\ValidationRules\Quote\ConvertableQuoteRule;
+
+class BulkActionQuoteRequest extends Request
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize() : bool
+    {
+        return true;
+    }
+
+    public function rules()
+    {
+        $input = $this->all();
+
+        $rules = [];
+
+        if($input['action'] == 'convert_to_invoice')
+            $rules['action'] = [new ConvertableQuoteRule()]; 
+
+        return $rules;
+    }
+
+}

app/Http/ValidationRules/PaymentAppliedValidAmount.php

@@ -74,6 +74,7 @@ class PaymentAppliedValidAmount implements Rule
             }
         }
 
-        return  $payment_amounts >= $invoice_amounts;
+        // nlog("{round($payment_amounts,3)} >= {round($invoice_amounts,3)}");
+        return  round($payment_amounts,3) >= round($invoice_amounts,3);
     }
 }

app/Http/ValidationRules/Quote/ConvertableQuoteRule.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * Quote Ninja (https://quoteninja.com).
+ *
+ * @link https://github.com/quoteninja/quoteninja source repository
+ *
+ * @copyright Copyright (c) 2021. Quote Ninja LLC (https://quoteninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Http\ValidationRules\Quote;
+
+use App\Models\Quote;
+use App\Utils\Traits\MakesHash;
+use Illuminate\Contracts\Validation\Rule;
+
+/**
+ * Class ConvertableQuoteRule.
+ */
+class ConvertableQuoteRule implements Rule
+{
+    use MakesHash;
+
+    public function __construct()
+    {
+
+    }
+
+    /**
+     * @param string $attribute
+     * @param mixed $value
+     * @return bool
+     */
+    public function passes($attribute, $value)
+    {
+        return $this->checkQuoteIsConvertable(); //if it exists, return false!
+    }
+
+    /**
+     * @return string
+     */
+    public function message()
+    {
+        return ctrans('texts.quote_has_expired');
+    }
+
+    /**
+     * @return bool
+     */
+    private function checkQuoteIsConvertable() : bool
+    {
+        $ids = request()->input('ids');
+
+        $quotes = Quote::withTrashed()->whereIn('id', $this->transformKeys($ids))->company()->get();
+
+        foreach($quotes as $quote){
+
+            if(!$quote->service()->isConvertable())
+                return false;
+
+        }
+
+        return true;
+
+    }
+}

app/Import/Transformers/Csv/InvoiceTransformer.php

@@ -45,7 +45,7 @@ class InvoiceTransformer extends BaseTransformer {
 			'client_id'         => $this->getClient( $this->getString( $invoice_data, 'client.name' ), $this->getString( $invoice_data, 'client.email' ) ),
 			'discount'          => $this->getFloat( $invoice_data, 'invoice.discount' ),
 			'po_number'         => $this->getString( $invoice_data, 'invoice.po_number' ),
-			'date'              => isset( $invoice_data['invoice.date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['invoice.date'] ) ) : null,
+			'date'              => isset( $invoice_data['invoice.date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['invoice.date'] ) ) : now()->format('Y-m-d'),
 			'due_date'          => isset( $invoice_data['invoice.due_date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['invoice.due_date'] ) ) : null,
 			'terms'             => $this->getString( $invoice_data, 'invoice.terms' ),
 			'public_notes'      => $this->getString( $invoice_data, 'invoice.public_notes' ),
@@ -72,7 +72,7 @@ class InvoiceTransformer extends BaseTransformer {
 			'status_id'         => $invoiceStatusMap[ $status =
 					strtolower( $this->getString( $invoice_data, 'invoice.status' ) ) ] ??
 				Invoice::STATUS_SENT,
-			'viewed'            => $status === 'viewed',
+			// 'viewed'            => $status === 'viewed',
 			'archived'          => $status === 'archived',
 		];
 

app/Import/Transformers/Waveaccounting/InvoiceTransformer.php

@@ -35,7 +35,8 @@ class InvoiceTransformer extends BaseTransformer {
 			'company_id'  => $this->maps['company']->id,
 			'client_id'   => $this->getClient( $customer_name = $this->getString( $invoice_data, 'Customer' ), null ),
 			'number'      => $invoice_number = $this->getString( $invoice_data, 'Invoice Number' ),
-			'date'        => isset( $invoice_data['Invoice Date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['Transaction Date'] ) ) : null,
+			'date'        => date( 'Y-m-d', strtotime( $invoice_data['Transaction Date'] ) ) ?: now()->format('Y-m-d'), //27-01-2022
+			// 'date'        => isset( $invoice_data['Invoice Date'] ) ? date( 'Y-m-d', strtotime( $invoice_data['Transaction Date'] ) ) : null,
 			'currency_id' => $this->getCurrencyByCode( $invoice_data, 'Currency' ),
 			'status_id'   => Invoice::STATUS_SENT,
 		];

app/Jobs/Account/CreateAccount.php

@@ -12,6 +12,7 @@
 namespace App\Jobs\Account;
 
 use App\DataMapper\Analytics\AccountCreated as AnalyticsAccountCreated;
+use App\DataMapper\Analytics\AccountPlatform;
 use App\Events\Account\AccountCreated;
 use App\Jobs\Company\CreateCompany;
 use App\Jobs\Company\CreateCompanyPaymentTerms;
@@ -137,52 +138,55 @@ class CreateAccount
         LightLogs::create(new AnalyticsAccountCreated())
                  ->increment()
                  ->queue();
+                 
+        $ip = request()->hasHeader('Cf-Connecting-Ip') ? request()->header('Cf-Connecting-Ip') : request()->getClientIp();
+        $platform = request()->has('platform') ? request()->input('platform') : 'www';
 
-        
+        LightLogs::create(new AccountPlatform($platform, request()->server('HTTP_USER_AGENT'), $ip))
-
+                 ->queue();        
 
         return $sp794f3f;
     }
 
-    private function processSettings($settings)
+    // private function processSettings($settings)
-    {
+    // {
-        if(Ninja::isHosted() && Cache::get('currencies'))
+    //     if(Ninja::isHosted() && Cache::get('currencies'))
-        {
+    //     {
 
-            $currency = Cache::get('currencies')->filter(function ($item) use ($currency_code) {
+    //         $currency = Cache::get('currencies')->filter(function ($item) use ($currency_code) {
-                return strtolower($item->code) == $currency_code;
+    //             return strtolower($item->code) == $currency_code;
-            })->first();
+    //         })->first();
 
-            if ($currency) {
+    //         if ($currency) {
-                $settings->currency_id = (string)$currency->id;
+    //             $settings->currency_id = (string)$currency->id;
-            }
+    //         }
 
-            $country = Cache::get('countries')->filter(function ($item) use ($country_code) {
+    //         $country = Cache::get('countries')->filter(function ($item) use ($country_code) {
-                return strtolower($item->iso_3166_2) == $country_code || strtolower($item->iso_3166_3) == $country_code;
+    //             return strtolower($item->iso_3166_2) == $country_code || strtolower($item->iso_3166_3) == $country_code;
-            })->first();
+    //         })->first();
 
-            if ($country) {
+    //         if ($country) {
-                $settings->country_id = (string)$country->id;
+    //             $settings->country_id = (string)$country->id;
-            }
+    //         }
             
-            $language = Cache::get('languages')->filter(function ($item) use ($currency_code) {
+    //         $language = Cache::get('languages')->filter(function ($item) use ($currency_code) {
-                return strtolower($item->locale) == $currency_code;
+    //             return strtolower($item->locale) == $currency_code;
-            })->first();
+    //         })->first();
 
-            if ($language) {
+    //         if ($language) {
-                $settings->language_id = (string)$language->id;
+    //             $settings->language_id = (string)$language->id;
-            }
+    //         }
 
-            if($timezone) {
+    //         if($timezone) {
-                $settings->timezone_id = (string)$timezone->id;
+    //             $settings->timezone_id = (string)$timezone->id;
-            }
+    //         }
 
-            return $settings;
+    //         return $settings;
-        }
+    //     }
 
 
-        return $settings;
+    //     return $settings;
-    }
+    // }
 }
 
 

app/Jobs/Company/CompanyImport.php

@@ -1381,7 +1381,13 @@ class CompanyImport implements ShouldQueue
                 $new_obj->company_id = $this->company->id;
                 $new_obj->fill($obj_array);
                 $new_obj->save(['timestamps' => false]);
-                $new_obj->number = $this->getNextRecurringExpenseNumber($client = Client::find($obj_array['client_id']), $new_obj);   
+                $new_obj->number = $this->getNextRecurringExpenseNumber($new_obj);   
+            }
+            elseif($class == 'App\Models\CompanyLedger'){
+                $new_obj = $class::firstOrNew(
+                        [$match_key => $obj->{$match_key}, 'company_id' => $this->company->id],
+                        $obj_array,
+                    );
             }
             else{
                 $new_obj = $class::withTrashed()->firstOrNew(

app/Jobs/Mail/NinjaMailerJob.php

@@ -211,15 +211,15 @@ class NinjaMailerJob implements ShouldQueue
             }
 
                 //17-01-2022 - ensure we have a token otherwise we fail gracefully to default sending engine
-                if(strlen($user->oauth_user_token) == 0){
+                // if(strlen($user->oauth_user_token) == 0){
-                    $this->nmo->settings->email_sending_method = 'default';
+                //     $this->nmo->settings->email_sending_method = 'default';
-                    return $this->setMailDriver();
+                //     return $this->setMailDriver();
-                }
+                // }
 
             $google->getClient()->setAccessToken(json_encode($user->oauth_user_token));
 
             //need to slow down gmail requests otherwise we hit 429's
-            sleep(rand(1,3));
+            sleep(rand(2,6));
         }
         catch(\Exception $e) {
             $this->logMailError('Gmail Token Invalid', $this->company->clients()->first());

app/Models/Account.php

@@ -54,6 +54,7 @@ class Account extends BaseModel
         'utm_term',
         'utm_content',
         'user_agent',
+        'platform',
     ];
 
     /**

app/Models/Gateway.php

@@ -97,7 +97,7 @@ class Gateway extends StaticModel
                 ];
             case 15:
                 return [
-                    GatewayType::PAYPAL => ['refund' => true, 'token_billing' => false]
+                    GatewayType::PAYPAL => ['refund' => false, 'token_billing' => false]
                 ]; //Paypal
                 break;
             case 20:
@@ -140,15 +140,15 @@ class Gateway extends StaticModel
                     GatewayType::BANK_TRANSFER => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable','charge.succeeded']],
                     GatewayType::ALIPAY => ['refund' => false, 'token_billing' => false],
                     GatewayType::APPLE_PAY => ['refund' => false, 'token_billing' => false],
-                    GatewayType::SOFORT => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']], //Stripe
+                    GatewayType::SOFORT => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']], //Stripe
-                    GatewayType::SEPA => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
+                    GatewayType::SEPA => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']],
-                    GatewayType::PRZELEWY24 => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
+                    GatewayType::PRZELEWY24 => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']],
-                    GatewayType::GIROPAY => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
+                    GatewayType::GIROPAY => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']],
-                    GatewayType::EPS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
+                    GatewayType::EPS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']],
-                    GatewayType::BANCONTACT => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
+                    GatewayType::BANCONTACT => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']],
-                    GatewayType::BECS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
+                    GatewayType::BECS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']],
-                    GatewayType::IDEAL => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
+                    GatewayType::IDEAL => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']],
-                    GatewayType::ACSS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded']],
+                    GatewayType::ACSS => ['refund' => true, 'token_billing' => true, 'webhooks' => ['source.chargeable', 'charge.succeeded','payment_intent.succeeded']],
                 ];
                 break;
             case 57:

app/Models/Payment.php

@@ -13,6 +13,7 @@ namespace App\Models;
 
 use App\Events\Payment\PaymentWasRefunded;
 use App\Events\Payment\PaymentWasVoided;
+use App\Models\GatewayType;
 use App\Services\Ledger\LedgerService;
 use App\Services\Payment\PaymentService;
 use App\Utils\Ninja;
@@ -148,6 +149,11 @@ class Payment extends BaseModel
         return $this->belongsTo(PaymentType::class);
     }
 
+    public function gateway_type()
+    {
+        return $this->belongsTo(GatewayType::class);
+    }
+
     public function paymentables()
     {
         return $this->hasMany(Paymentable::class);

app/PaymentDrivers/Authorize/AuthorizePaymentMethod.php

@@ -156,7 +156,8 @@ class AuthorizePaymentMethod
         $paymentOne = new PaymentType();
         $paymentOne->setOpaqueData($op);
 
-        $contact = $this->authorize->client->primary_contact()->first();
+        $contact = $this->authorize->client->primary_contact()->first() ?: $this->authorize->client->contacts()->first();
+
         $billto = false;
         
         if ($contact) {

app/PaymentDrivers/BaseDriver.php

@@ -418,12 +418,15 @@ class BaseDriver extends AbstractPaymentDriver
         throw new PaymentFailed($error, $e->getCode());
     }
 
-    public function sendFailureMail($error = '')
+    public function sendFailureMail($error)
     {
 
         if (!is_null($this->payment_hash)) {
             $this->unWindGatewayFees($this->payment_hash);
         }
+
+        if(!$error)
+            $error = '';
         
         PaymentFailedMailer::dispatch(
             $this->payment_hash,

app/PaymentDrivers/Stripe/ACSS.php

@@ -127,6 +127,8 @@ class ACSS
 
     public function paymentView(array $data)
     {
+        $this->stripe->init();
+        
         $data['gateway'] = $this->stripe;
         $data['return_url'] = $this->buildReturnUrl();
         $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
@@ -141,6 +143,10 @@ class ACSS
             'payment_method_types' => ['acss_debit'],
             'customer' => $this->stripe->findOrCreateCustomer(),
             'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
+            'metadata' => [
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::ACSS,
+            ],
             'payment_method_options' => [
                 'acss_debit' => [
                     'mandate_options' => [
@@ -148,10 +154,9 @@ class ACSS
                         'interval_description' => 'when any invoice becomes due',
                         'transaction_type' => 'personal' // TODO: check if is company or personal https://stripe.com/docs/payments/acss-debit
                     ],
-                    'currency' => $this->stripe->client->currency()->code,
                 ]
             ]
-        ]);
+        ], $this->stripe->stripe_connect_auth);
 
         $data['pi_client_secret'] = $intent->client_secret;
 

app/PaymentDrivers/Stripe/ApplePay.php

@@ -48,6 +48,10 @@ class ApplePay
         $data['intent'] =  \Stripe\PaymentIntent::create([
                               'amount' => $data['stripe_amount'],
                               'currency' => $this->stripe_driver->client->getCurrencyCode(),
+                              'metadata' => [
+                                    'payment_hash' => $this->stripe_driver->payment_hash->hash,
+                                    'gateway_type_id' => GatewayType::APPLE_PAY,
+                                ],
                             ], $this->stripe_driver->stripe_connect_auth);
 
         $this->stripe_driver->payment_hash->data = array_merge((array) $this->stripe_driver->payment_hash->data, ['stripe_amount' => $data['stripe_amount']]);

app/PaymentDrivers/Stripe/BECS.php

@@ -39,6 +39,8 @@ class BECS
 
     public function paymentView(array $data)
     {
+        $this->stripe->init();
+        
         $data['gateway'] = $this->stripe;
         $data['payment_method_id'] = GatewayType::BECS;
         $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
@@ -54,8 +56,11 @@ class BECS
             'setup_future_usage' => 'off_session',
             'customer' => $this->stripe->findOrCreateCustomer(),
             'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
-
+            'metadata' => [
-        ]);
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::BECS,
+            ],
+        ], $this->stripe->stripe_connect_auth);
 
         $data['pi_client_secret'] = $intent->client_secret;
 

app/PaymentDrivers/Stripe/Bancontact.php

@@ -37,6 +37,8 @@ class Bancontact
 
     public function paymentView(array $data)
     {
+        $this->stripe->init();
+        
         $data['gateway'] = $this->stripe;
         $data['return_url'] = $this->buildReturnUrl();
         $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
@@ -50,8 +52,12 @@ class Bancontact
             'payment_method_types' => ['bancontact'],
             'customer' => $this->stripe->findOrCreateCustomer(),
             'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
+            'metadata' => [
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::BANCONTACT,
+            ],
 
-        ]);
+        ], $this->stripe->stripe_connect_auth);
 
         $data['pi_client_secret'] = $intent->client_secret;
 

app/PaymentDrivers/Stripe/BrowserPay.php

@@ -71,6 +71,10 @@ class BrowserPay implements MethodInterface
             'currency' => $this->stripe->client->getCurrencyCode(),
             'customer' => $this->stripe->findOrCreateCustomer(),
             'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
+            'metadata' => [
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::APPLE_PAY,
+            ],
         ];
 
         $data['gateway'] = $this->stripe;

app/PaymentDrivers/Stripe/Charge.php

@@ -78,6 +78,10 @@ class Charge
               'customer' => $cgt->gateway_customer_reference,
               'confirm' => true,
               'description' => $description,
+              'metadata' => [
+                'payment_hash' => $payment_hash->hash,
+                'gateway_type_id' => GatewayType::CREDIT_CARD,
+                ],
             ];
 
             $response = $this->stripe->createPaymentIntent($data, $this->stripe->stripe_connect_auth);

app/PaymentDrivers/Stripe/CreditCard.php

@@ -63,10 +63,13 @@ class CreditCard
             'currency' => $this->stripe->client->getCurrencyCode(),
             'customer' => $this->stripe->findOrCreateCustomer(),
             'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
+            'metadata' => [
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::CREDIT_CARD,
+            ],
+            'setup_future_usage' => 'off_session',
         ];
 
-        $payment_intent_data['setup_future_usage'] = 'off_session';
-
         $data['intent'] = $this->stripe->createPaymentIntent($payment_intent_data);
         $data['gateway'] = $this->stripe;
 

app/PaymentDrivers/Stripe/EPS.php

@@ -37,6 +37,8 @@ class EPS
 
     public function paymentView(array $data)
     {
+        $this->stripe->init();
+        
         $data['gateway'] = $this->stripe;
         $data['return_url'] = $this->buildReturnUrl();
         $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
@@ -50,8 +52,11 @@ class EPS
             'payment_method_types' => ['eps'],
             'customer' => $this->stripe->findOrCreateCustomer(),
             'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
-
+            'metadata' => [
-        ]);
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::EPS,
+            ],
+        ], $this->stripe->stripe_connect_auth);
 
         $data['pi_client_secret'] = $intent->client_secret;
 

app/PaymentDrivers/Stripe/FPX.php

@@ -38,6 +38,8 @@ class FPX
 
     public function paymentView(array $data)
     {
+        $this->stripe->init();
+        
         $data['gateway'] = $this->stripe;
         $data['return_url'] = $this->buildReturnUrl();
         $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
@@ -47,12 +49,15 @@ class FPX
 
         $intent = \Stripe\PaymentIntent::create([
             'amount' => $data['stripe_amount'],
-            'currency' => 'eur',
+            'currency' => $this->stripe->client->getCurrencyCode(),
             'payment_method_types' => ['fpx'],
             'customer' => $this->stripe->findOrCreateCustomer(),
             'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
-
+            'metadata' => [
-        ]);
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::FPX,
+            ],
+        ], $this->stripe->stripe_connect_auth);
 
         $data['pi_client_secret'] = $intent->client_secret;
 

app/PaymentDrivers/Stripe/GIROPAY.php

@@ -37,6 +37,8 @@ class GIROPAY
 
     public function paymentView(array $data)
     {
+        $this->stripe->init();
+        
         $data['gateway'] = $this->stripe;
         $data['return_url'] = $this->buildReturnUrl();
         $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
@@ -50,8 +52,11 @@ class GIROPAY
             'payment_method_types' => ['giropay'],
             'customer' => $this->stripe->findOrCreateCustomer(),
             'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
-
+            'metadata' => [
-        ]);
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::GIROPAY,
+            ],
+        ], $this->stripe->stripe_connect_auth);
 
         $data['pi_client_secret'] = $intent->client_secret;
 

app/PaymentDrivers/Stripe/Jobs/PaymentIntentWebhook.php

@@ -0,0 +1,201 @@
+<?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\Stripe\Jobs;
+
+use App\Jobs\Util\SystemLogger;
+use App\Libraries\MultiDB;
+use App\Models\Company;
+use App\Models\CompanyGateway;
+use App\Models\GatewayType;
+use App\Models\Invoice;
+use App\Models\Payment;
+use App\Models\PaymentHash;
+use App\Models\PaymentType;
+use App\Models\SystemLog;
+use App\PaymentDrivers\Stripe\Utilities;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class PaymentIntentWebhook implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels, Utilities;
+
+    public $tries = 1; //number of retries
+
+    public $deleteWhenMissingModels = true;
+
+    public $stripe_request;
+
+    public $company_key;
+
+    private $company_gateway_id;
+
+    public $payment_completed = false;
+
+    public function __construct($stripe_request, $company_key, $company_gateway_id)
+    {
+        $this->stripe_request = $stripe_request;
+        $this->company_key = $company_key;
+        $this->company_gateway_id = $company_gateway_id;
+    }
+
+    public function handle()
+    {
+        // nlog($this->stripe_request);
+        // nlog(optional($this->stripe_request['object']['charges']['data'][0]['metadata'])['gateway_type_id']);
+        // nlog(optional($this->stripe_request['object']['charges']['data'][0]['metadata'])['payment_hash']);
+        // nlog(optional($this->stripe_request['object']['charges']['data'][0]['payment_method_details']['card'])['brand']);
+
+        MultiDB::findAndSetDbByCompanyKey($this->company_key);
+
+        $company = Company::where('company_key', $this->company_key)->first();
+
+            foreach ($this->stripe_request as $transaction) {
+
+                if(array_key_exists('payment_intent', $transaction))
+                {
+                    $payment = Payment::query()
+                        ->where('company_id', $company->id)
+                        ->where(function ($query) use ($transaction) {
+                            $query->where('transaction_reference', $transaction['payment_intent'])
+                                  ->orWhere('transaction_reference', $transaction['id']);
+                                })
+                        ->first();
+                }
+                else
+                {
+                     $payment = Payment::query()
+                        ->where('company_id', $company->id)
+                        ->where('transaction_reference', $transaction['id'])
+                        ->first();
+                }
+
+                if ($payment) {
+                    $payment->status_id = Payment::STATUS_COMPLETED;
+                    $payment->save();
+    
+                    $this->payment_completed = true;
+                }
+            }
+
+
+        if($this->payment_completed)
+            return;
+
+
+        if(optional($this->stripe_request['object']['charges']['data'][0])['id']){
+
+            $company = Company::where('company_key', $this->company_key)->first();
+
+            $payment = Payment::query()
+                             ->where('company_id', $company->id)
+                             ->where('transaction_reference', $this->stripe_request['object']['charges']['data'][0]['id'])
+                             ->first();
+
+             //return early
+            if($payment && $payment->status_id == Payment::STATUS_COMPLETED){
+                nlog(" payment found and status correct - returning "); 
+                return;
+            }
+            elseif($payment){
+                $payment->status_id = Payment::STATUS_COMPLETED;
+                $payment->save();
+            }
+
+
+            $hash = optional($this->stripe_request['object']['charges']['data'][0]['metadata'])['payment_hash'];
+
+            $payment_hash = PaymentHash::where('hash', $hash)->first();
+
+            nlog("no payment found");
+
+            if(optional($this->stripe_request['object']['charges']['data'][0]['metadata']['payment_hash']) && in_array('card', $this->stripe_request['object']['allowed_source_types']))
+            {
+                nlog("hash found");
+
+                $hash = $this->stripe_request['object']['charges']['data'][0]['metadata']['payment_hash'];
+
+                $payment_hash = PaymentHash::where('hash', $hash)->first();
+                $invoice = Invoice::with('client')->find($payment_hash->fee_invoice_id);
+                $client = $invoice->client;
+
+                $this->updateCreditCardPayment($payment_hash, $client);
+            }
+
+        }
+
+    }
+
+    private function updateCreditCardPayment($payment_hash, $client)
+    {
+        $company_gateway = CompanyGateway::find($this->company_gateway_id);
+        $payment_method_type = optional($this->stripe_request['object']['charges']['data'][0]['metadata'])['gateway_type_id'];
+        $driver = $company_gateway->driver($client)->init()->setPaymentMethod($payment_method_type);
+
+        $payment_hash->data = array_merge((array) $payment_hash->data, $this->stripe_request);
+        $payment_hash->save();
+        $driver->setPaymentHash($payment_hash);
+
+        $data = [
+            'payment_method' => $payment_hash->data->object->payment_method,
+            'payment_type' => PaymentType::parseCardType(strtolower(optional($this->stripe_request['object']['charges']['data'][0]['payment_method_details']['card'])['brand'])) ?: PaymentType::CREDIT_CARD_OTHER,
+            'amount' => $payment_hash->data->amount_with_fee,
+            'transaction_reference' => $this->stripe_request['object']['charges']['data'][0]['id'],
+            'gateway_type_id' => GatewayType::CREDIT_CARD,
+        ];
+        
+        $payment = $driver->createPayment($data, Payment::STATUS_COMPLETED);
+
+        SystemLogger::dispatch(
+            ['response' => $this->stripe_request, 'data' => $data],
+            SystemLog::CATEGORY_GATEWAY_RESPONSE,
+            SystemLog::EVENT_GATEWAY_SUCCESS,
+            SystemLog::TYPE_STRIPE,
+            $client,
+            $client->company,
+        );
+
+    }
+
+        //charge # optional($this->stripe_request['object']['charges']['data'][0])['id']
+        //metadata # optional($this->stripe_request['object']['charges']['data'][0]['metadata']['gateway_type_id']
+        //metadata # optional($this->stripe_request['object']['charges']['data'][0]['metadata']['payment_hash']
+
+
+/**
+ * 
+                * $intent = \Stripe\PaymentIntent::retrieve('{{PAYMENT_INTENT_ID}}');
+                $charges = $intent->charges->data;
+ * 
+ * 
+ *                      $payment = Payment::query()
+                        ->where('company_id', $request->getCompany()->id)
+                        ->where('transaction_reference', $transaction['id'])
+                        ->first();
+
+
+                    if ($payment) {
+                    $payment->status_id = Payment::STATUS_COMPLETED;
+                    $payment->save();
+                }
+
+
+
+
+ * */
+
+    
+
+}

app/PaymentDrivers/Stripe/PRZELEWY24.php

@@ -37,6 +37,8 @@ class PRZELEWY24
 
     public function paymentView(array $data)
     {
+        $this->stripe->init();
+
         $data['gateway'] = $this->stripe;
         $data['return_url'] = $this->buildReturnUrl();
         $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
@@ -50,8 +52,11 @@ class PRZELEWY24
             'payment_method_types' => ['p24'],
             'customer' => $this->stripe->findOrCreateCustomer(),
             'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
-
+            'metadata' => [
-        ]);
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::PRZELEWY24,
+            ],
+        ], $this->stripe->stripe_connect_auth);
 
         $data['pi_client_secret'] = $intent->client_secret;
 

app/PaymentDrivers/Stripe/SEPA.php

@@ -54,7 +54,11 @@ class SEPA
             'setup_future_usage' => 'off_session',
             'customer' => $this->stripe->findOrCreateCustomer(),
             'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
-        ]);
+            'metadata' => [
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::SEPA,
+            ],
+        ], $this->stripe->stripe_connect_auth);
 
         $data['pi_client_secret'] = $intent->client_secret;
 

app/PaymentDrivers/Stripe/SOFORT.php

@@ -37,6 +37,8 @@ class SOFORT
 
     public function paymentView(array $data)
     {
+        $this->stripe->init();
+        
         $data['gateway'] = $this->stripe;
         $data['return_url'] = $this->buildReturnUrl();
         $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
@@ -50,8 +52,11 @@ class SOFORT
             'payment_method_types' => ['sofort'],
             'customer' => $this->stripe->findOrCreateCustomer(),
             'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
-
+            'metadata' => [
-        ]);
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::SOFORT,
+            ],
+        ], $this->stripe->stripe_connect_auth);
 
         $data['pi_client_secret'] = $intent->client_secret;
 

app/PaymentDrivers/Stripe/Utilities.php

@@ -18,7 +18,7 @@ trait Utilities
     public function convertFromStripeAmount($amount, $precision, $currency)
     {
 
-       if(in_array($amount, ["BIF","CLP","DJF","GNF","JPY","KMF","KRW","MGA","PYG","RWF","UGX","VND","VUV","XAF","XOF","XPF"]))
+       if(in_array($currency->code, ["BIF","CLP","DJF","GNF","JPY","KMF","KRW","MGA","PYG","RWF","UGX","VND","VUV","XAF","XOF","XPF"]))
             return $amount;
 
         return $amount / pow(10, $precision);
@@ -28,7 +28,7 @@ trait Utilities
     public function convertToStripeAmount($amount, $precision, $currency)
     {
 
-       if(in_array($amount, ["BIF","CLP","DJF","GNF","JPY","KMF","KRW","MGA","PYG","RWF","UGX","VND","VUV","XAF","XOF","XPF"]))
+       if(in_array($currency->code, ["BIF","CLP","DJF","GNF","JPY","KMF","KRW","MGA","PYG","RWF","UGX","VND","VUV","XAF","XOF","XPF"]))
             return $amount; 
 
         return round(($amount * pow(10, $precision)),0);

app/PaymentDrivers/Stripe/iDeal.php

@@ -37,6 +37,8 @@ class iDeal
 
     public function paymentView(array $data)
     {
+        $this->stripe->init();
+        
         $data['gateway'] = $this->stripe;
         $data['return_url'] = $this->buildReturnUrl();
         $data['stripe_amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
@@ -50,8 +52,11 @@ class iDeal
             'payment_method_types' => ['ideal'],
             'customer' => $this->stripe->findOrCreateCustomer(),
             'description' => $this->stripe->decodeUnicodeString(ctrans('texts.invoices') . ': ' . collect($data['invoices'])->pluck('invoice_number')),
-
+            'metadata' => [
-        ]);
+                'payment_hash' => $this->stripe->payment_hash->hash,
+                'gateway_type_id' => GatewayType::IDEAL,
+            ],
+        ], $this->stripe->stripe_connect_auth);
 
         $data['pi_client_secret'] = $intent->client_secret;
 

app/PaymentDrivers/StripePaymentDriver.php

@@ -25,25 +25,26 @@ use App\Models\PaymentHash;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
 use App\PaymentDrivers\Stripe\ACH;
+use App\PaymentDrivers\Stripe\ACSS;
 use App\PaymentDrivers\Stripe\Alipay;
 use App\PaymentDrivers\Stripe\ApplePay;
+use App\PaymentDrivers\Stripe\BECS;
+use App\PaymentDrivers\Stripe\Bancontact;
+use App\PaymentDrivers\Stripe\BrowserPay;
 use App\PaymentDrivers\Stripe\Charge;
 use App\PaymentDrivers\Stripe\Connect\Verify;
 use App\PaymentDrivers\Stripe\CreditCard;
-use App\PaymentDrivers\Stripe\ImportCustomers;
-use App\PaymentDrivers\Stripe\SOFORT;
-use App\PaymentDrivers\Stripe\SEPA;
-use App\PaymentDrivers\Stripe\PRZELEWY24;
-use App\PaymentDrivers\Stripe\GIROPAY;
-use App\PaymentDrivers\Stripe\iDeal;
 use App\PaymentDrivers\Stripe\EPS;
-use App\PaymentDrivers\Stripe\Bancontact;
-use App\PaymentDrivers\Stripe\BECS;
-use App\PaymentDrivers\Stripe\ACSS;
-use App\PaymentDrivers\Stripe\BrowserPay;
 use App\PaymentDrivers\Stripe\FPX;
+use App\PaymentDrivers\Stripe\GIROPAY;
+use App\PaymentDrivers\Stripe\ImportCustomers;
+use App\PaymentDrivers\Stripe\Jobs\PaymentIntentWebhook;
+use App\PaymentDrivers\Stripe\PRZELEWY24;
+use App\PaymentDrivers\Stripe\SEPA;
+use App\PaymentDrivers\Stripe\SOFORT;
 use App\PaymentDrivers\Stripe\UpdatePaymentMethods;
 use App\PaymentDrivers\Stripe\Utilities;
+use App\PaymentDrivers\Stripe\iDeal;
 use App\Utils\Traits\MakesHash;
 use Exception;
 use Illuminate\Http\RedirectResponse;
@@ -93,6 +94,7 @@ class StripePaymentDriver extends BaseDriver
         GatewayType::BANCONTACT => Bancontact::class,
         GatewayType::BECS => BECS::class,
         GatewayType::ACSS => ACSS::class,
+        GatewayType::FPX => FPX::class,
     ];
 
     const SYSTEM_LOG_TYPE = SystemLog::TYPE_STRIPE;
@@ -471,10 +473,7 @@ class StripePaymentDriver extends BaseDriver
         $response = null;
 
         try {
-            // $response = $this->stripe
+            
-            //     ->refunds
-            //     ->create(['charge' => $payment->transaction_reference, 'amount' => $this->convertToStripeAmount($amount, $this->client->currency()->precision, $this->client->currency())], $meta);
-
             $response = \Stripe\Refund::create([
                 'charge' => $payment->transaction_reference,
                 'amount' => $this->convertToStripeAmount($amount, $this->client->currency()->precision, $this->client->currency())
@@ -531,7 +530,15 @@ class StripePaymentDriver extends BaseDriver
         // Allow app to catch up with webhook request.
         sleep(2);
 
-        if ($request->type === 'charge.succeeded' || $request->type === 'payment_intent.succeeded') {
+        //payment_intent.succeeded - this will confirm or cancel the payment
+        if($request->type === 'payment_intent.succeeded'){
+            PaymentIntentWebhook::dispatch($request->data, $request->company_key, $this->company_gateway->id)->delay(10);
+            // PaymentIntentWebhook::dispatch($request->data, $request->company_key, $this->company_gateway->id);
+            return response()->json([], 200);
+        }
+
+        if ($request->type === 'charge.succeeded') {
+        // if ($request->type === 'charge.succeeded' || $request->type === 'payment_intent.succeeded') {
 
             foreach ($request->data as $transaction) {
 
@@ -558,6 +565,7 @@ class StripePaymentDriver extends BaseDriver
                     $payment->save();
                 }
             }
+
         } elseif ($request->type === 'source.chargeable') {
             $this->init();
 

app/Providers/RouteServiceProvider.php

@@ -34,7 +34,6 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
         parent::boot();
     }
 

app/Services/Chart/ChartQueries.php

@@ -11,6 +11,9 @@
 
 namespace App\Services\Chart;
 
+use App\Models\Expense;
+use App\Models\Invoice;
+use App\Models\Payment;
 use Illuminate\Support\Facades\DB;
 
 /**
@@ -19,13 +22,19 @@ use Illuminate\Support\Facades\DB;
 trait ChartQueries
 {
 
+        // $currencies = Payment::withTrashed()
+        //     ->where('company_id', $this->company->id)
+        //     ->where('is_deleted', 0)
+        //     ->distinct()
+        //     ->get(['currency_id']);
+
     public function getRevenueQuery($start_date, $end_date)
     {
 
         return DB::select( DB::raw("
             SELECT
             sum(invoices.paid_to_date) as paid_to_date,
-            JSON_EXTRACT( settings, '$.currency_id' ) AS currency_id
+            IFNULL(JSON_EXTRACT( settings, '$.currency_id' ), :company_currency) AS currency_id
             FROM clients
             JOIN invoices
             on invoices.client_id = clients.id
@@ -36,7 +45,7 @@ trait ChartQueries
             AND invoices.is_deleted = 0
             AND (invoices.date BETWEEN :start_date AND :end_date)
             GROUP BY currency_id
-        "), ['company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]  );
+        "), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]  );
 
     }
 
@@ -44,6 +53,162 @@ trait ChartQueries
     {
 
         return DB::select( DB::raw("
+            SELECT
+            sum(invoices.balance) as balance,
+            IFNULL(JSON_EXTRACT( settings, '$.currency_id' ), :company_currency) AS currency_id
+            FROM clients
+            JOIN invoices
+            on invoices.client_id = clients.id
+            WHERE invoices.status_id IN (2,3)
+            AND invoices.company_id = :company_id
+            AND invoices.balance > 0
+            AND clients.is_deleted = 0
+            AND invoices.is_deleted = 0
+            AND (invoices.due_date BETWEEN :start_date AND :end_date)
+            GROUP BY currency_id
+        "), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]  );
+    
+    }
+
+    public function getExpenseQuery($start_date, $end_date)
+    {
+
+        return DB::select( DB::raw("
+            SELECT sum(expenses.amount) as amount,
+            IFNULL(expenses.currency_id, :company_currency) as currency_id
+            FROM expenses
+            WHERE expenses.is_deleted = 0
+            AND expenses.company_id = :company_id
+            AND (expenses.date BETWEEN :start_date AND :end_date)
+            GROUP BY currency_id
+        "), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]  );
+    
+    }
+
+    public function getPaymentQuery($start_date, $end_date)
+    {
+        return DB::select( DB::raw("
+            SELECT sum(expenses.amount) as amount,
+            IFNULL(expenses.currency_id, :company_currency) as currency_id
+            FROM expenses
+            WHERE expenses.is_deleted = 0
+            AND expenses.company_id = :company_id
+            AND (expenses.date BETWEEN :start_date AND :end_date)
+            GROUP BY currency_id
+        "), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]  );
+    }
+
+    public function getInvoiceChartQuery($start_date, $end_date, $currency_id)
+    {
+
+         return DB::select( DB::raw("
+            SELECT
+            sum(invoices.amount) as total,
+            invoices.date,
+            IFNULL(CAST(JSON_EXTRACT( settings, '$.currency_id' ) AS SIGNED), :company_currency) AS currency_id
+            FROM clients
+            JOIN invoices
+            on invoices.client_id = clients.id
+            WHERE invoices.status_id IN (2,3,4)
+            AND (invoices.date BETWEEN :start_date AND :end_date)
+            AND invoices.company_id = :company_id
+            AND clients.is_deleted = 0
+            AND invoices.is_deleted = 0
+            GROUP BY invoices.date
+            HAVING currency_id = :currency_id
+        "), [
+            'company_currency' => $this->company->settings->currency_id,
+            'currency_id' => $currency_id,
+            'company_id' => $this->company->id, 
+            'start_date' => $start_date, 
+            'end_date' => $end_date
+        ]);
+    }
+
+    public function getPaymentChartQuery($start_date, $end_date, $currency_id)
+    {
+
+         return DB::select( DB::raw("
+            SELECT
+            sum(payments.amount - payments.refunded) as total,
+            payments.date,
+            IFNULL(payments.currency_id, :company_currency) AS currency_id
+            FROM payments
+            WHERE payments.status_id IN (4,5,6)
+            AND (payments.date BETWEEN :start_date AND :end_date)
+            AND payments.company_id = :company_id
+            AND payments.is_deleted = 0
+            GROUP BY payments.date
+            HAVING currency_id = :currency_id
+        "), [
+            'company_currency' => $this->company->settings->currency_id,
+            'currency_id' => $currency_id,
+            'company_id' => $this->company->id, 
+            'start_date' => $start_date, 
+            'end_date' => $end_date
+        ]);
+    }
+
+    public function getExpenseChartQuery($start_date, $end_date, $currency_id)
+    {
+
+         return DB::select( DB::raw("
+            SELECT
+            sum(expenses.amount) as total,
+            expenses.date,
+            IFNULL(expenses.currency_id, :company_currency) AS currency_id
+            FROM expenses
+            WHERE (expenses.date BETWEEN :start_date AND :end_date)
+            AND expenses.company_id = :company_id
+            AND expenses.is_deleted = 0
+            GROUP BY expenses.date
+            HAVING currency_id = :currency_id
+        "), [
+            'company_currency' => $this->company->settings->currency_id,
+            'currency_id' => $currency_id,
+            'company_id' => $this->company->id, 
+            'start_date' => $start_date, 
+            'end_date' => $end_date
+        ]);
+    }
+
+
+}
+
+
+
+
+/*
+    public function payments($accountId, $userId, $viewAll)
+    {
+        $payments = DB::table('payments')
+                    ->leftJoin('clients', 'clients.id', '=', 'payments.client_id')
+                    ->leftJoin('contacts', 'contacts.client_id', '=', 'clients.id')
+                    ->leftJoin('invoices', 'invoices.id', '=', 'payments.invoice_id')
+                    ->where('payments.account_id', '=', $accountId)
+                    ->where('payments.is_deleted', '=', false)
+                    ->where('invoices.is_deleted', '=', false)
+                    ->where('clients.is_deleted', '=', false)
+                    ->where('contacts.deleted_at', '=', null)
+                    ->where('contacts.is_primary', '=', true)
+                    ->whereNotIn('payments.payment_status_id', [PAYMENT_STATUS_VOIDED, PAYMENT_STATUS_FAILED]);
+
+        if (! $viewAll) {
+            $payments = $payments->where('payments.user_id', '=', $userId);
+        }
+
+        return $payments->select(['payments.payment_date', DB::raw('(payments.amount - payments.refunded) as amount'), 'invoices.public_id', 'invoices.invoice_number', 'clients.name as client_name', 'contacts.email', 'contacts.first_name', 'contacts.last_name', 'clients.currency_id', 'clients.public_id as client_public_id', 'clients.user_id as client_user_id'])
+                    ->orderBy('payments.payment_date', 'desc')
+                    ->take(100)
+                    ->get();
+    }
+
+    public function oustanding($start_date, $end_date)
+    {
+
+        $company_currency = (int) $this->company->settings->currency_id;
+
+        $results = \DB::select( \DB::raw("
             SELECT
             sum(invoices.balance) as balance,
             JSON_EXTRACT( settings, '$.currency_id' ) AS currency_id
@@ -57,24 +222,19 @@ trait ChartQueries
             AND invoices.is_deleted = 0
             AND (invoices.due_date BETWEEN :start_date AND :end_date)
             GROUP BY currency_id
-        "), ['company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]  );
+        "), ['company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date] );
     
-    }
+        //return $results;
 
-    public function getExpenseQuery($start_date, $end_date)
+        //the output here will most likely contain a currency_id = null value - we need to merge this value with the company currency
-    {
 
-        return DB::select( DB::raw("
-            SELECT sum(expenses.amount) as amount,
-            expenses.currency_id as currency_id
-            FROM expenses
-            WHERE expenses.is_deleted = 0
-            AND expenses.company_id = :company_id
-            AND (expenses.date BETWEEN :start_date AND :end_date)
-            GROUP BY currency_id
-        "), ['company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]  );
-    
     }
 
 
-}
+
+
+
+
+
+
+    */

app/Services/Chart/ChartService.php

@@ -35,13 +35,6 @@ class ChartService
      */
     public function getCurrencyCodes() :array
     {
-
-        // $currencies = Payment::withTrashed()
-        //     ->where('company_id', $this->company->id)
-        //     ->where('is_deleted', 0)
-        //     ->distinct()
-        //     ->get(['currency_id']);
-
         /* Get all the distinct client currencies */
         $currencies = Client::withTrashed()
             ->where('company_id', $this->company->id)
@@ -57,7 +50,7 @@ class ChartService
             ->where('company_id', $this->company->id)
             ->where('is_deleted', 0)
             ->distinct()
-            ->get(['currency_id']);
+            ->pluck('currency_id as id');
 
         /* Merge and filter by unique */
         $currencies = $currencies->merge($expense_currencies)->unique();
@@ -77,112 +70,95 @@ class ChartService
 
     }
 
+/* Chart Data */
+    public function chart_summary($start_date, $end_date) :array
+    {
+        $currencies = $this->getCurrencyCodes();
 
+        $data = [];
 
-    public function totals($start_date, $end_date)
+        foreach($currencies as $key => $value)
+        {
+            $data[$key]['invoices'] = $this->getInvoiceChartQuery($start_date, $end_date, $key);
+            $data[$key]['payments'] = $this->getPaymentChartQuery($start_date, $end_date, $key);
+            $data[$key]['expenses'] = $this->getExpenseChartQuery($start_date, $end_date, $key);
+        }
+
+        return $data;
+    }
+
+/* Chart Data */
+
+/* Totals */
+
+    public function totals($start_date, $end_date) :array
     {
         $data = [];
 
-        $data['revenue'] = $this->getRevenue($start_date, $end_date);
+        $data['currencies'] = $this->getCurrencyCodes();
-        $data['outstanding'] = $this->getOutstanding($start_date, $end_date);
+
-        $data['expenses'] = $this->getExpenses($start_date, $end_date);
+        foreach($data['currencies'] as $key => $value)
+        {
+            $revenue = $this->getRevenue($start_date, $end_date);
+            $outstanding = $this->getOutstanding($start_date, $end_date);
+            $expenses = $this->getExpenses($start_date, $end_date);
+
+            $data[$key]['revenue'] = count($revenue) > 0 ? $revenue[array_search($key,array_column($revenue,'currency_id'))] : new \stdClass;
+            $data[$key]['outstanding'] = count($outstanding) > 0 ? $outstanding[array_search($key,array_column($outstanding,'currency_id'))] : new \stdClass;
+            $data[$key]['expenses'] = count($expenses) > 0 ? $expenses[array_search($key,array_column($expenses,'currency_id'))] : new \stdClass;
+
+        }
 
         return $data;
     }    
 
-    public function oustanding($start_date, $end_date)
+    public function getRevenue($start_date, $end_date) :array
-    {
-
-        $company_currency = (int) $this->company->settings->currency_id;
-
-        $results = \DB::select( \DB::raw("
-            SELECT
-            sum(invoices.balance) as balance,
-            JSON_EXTRACT( settings, '$.currency_id' ) AS currency_id
-            FROM clients
-            JOIN invoices
-            on invoices.client_id = clients.id
-            WHERE invoices.status_id IN (2,3)
-            AND invoices.company_id = :company_id
-            AND invoices.balance > 0
-            AND clients.is_deleted = 0
-            AND invoices.is_deleted = 0
-            AND (invoices.due_date BETWEEN :start_date AND :end_date)
-            GROUP BY currency_id
-        "), ['company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date] );
-    
-        //return $results;
-
-        //the output here will most likely contain a currency_id = null value - we need to merge this value with the company currency
-
-    }
-
-    private function getRevenue($start_date, $end_date)
     {
         $revenue = $this->getRevenueQuery($start_date, $end_date);
-        $revenue = $this->parseTotals($revenue);
+        $revenue = $this->addCurrencyCodes($revenue);
-        $revenue = $this->addCountryCodes($revenue);
 
         return $revenue;
     }
 
-    private function getOutstanding($start_date, $end_date)
+    public function getOutstanding($start_date, $end_date) :array
     {
         $outstanding = $this->getOutstandingQuery($start_date, $end_date);   
-        $outstanding = $this->parseTotals($outstanding);
+        $outstanding = $this->addCurrencyCodes($outstanding);
-        $outstanding = $this->addCountryCodes($outstanding);
     
         return $outstanding;
     }
 
-    private function getExpenses($start_date, $end_date)
+    public function getExpenses($start_date, $end_date) :array
     {
         $expenses = $this->getExpenseQuery($start_date, $end_date);
-        $expenses = $this->parseTotals($expenses);
+        $expenses = $this->addCurrencyCodes($expenses);
-        $expenses = $this->addCountryCodes($expenses);
 
         return $expenses;
     }
 
-    private function parseTotals($data_set)
+/* Totals */
-    {
-        /* Find the key where the company currency amount lives*/
-        $c_key = array_search($this->company->id , array_column($data_set, 'currency_id')); 
 
-        if(!$c_key)
+/* Helpers */
-            return $data_set;
 
-        /* Find the key where null currency_id lives */
+    private function addCurrencyCodes($data_set) :array
-        $key = array_search(null , array_column($data_set, 'currency_id')); 
-
-        if(!$key)
-            return $data_set;
-
-        $null_currency_amount = $data_set[$key]['amount'];
-        unset($data_set[$key]);
-
-        $data_set[$c_key]['amount'] += $null_currency_amount;
-
-        return $data_set;
-
-    }
-
-    private function addCountryCodes($data_set)
     {
 
         $currencies = Cache::get('currencies');
 
         foreach($data_set as $key => $value)
         {
-            $data_set[$key]['code'] = $this->getCode($currencies, $value); 
+            $data_set[$key]->currency_id = str_replace('"', '', $value->currency_id);
+            $data_set[$key]->code = $this->getCode($currencies, $data_set[$key]->currency_id); 
         }
 
         return $data_set;
 
     }
 
-    private function getCode($currencies, $currency_id)
+    private function getCode($currencies, $currency_id) :string
     {
+        $currency_id = str_replace('"', '', $currency_id);
+
         $currency = $currencies->filter(function ($item) use($currency_id) {
             return $item->id == $currency_id;
         })->first();

app/Services/Client/Statement.php

@@ -174,15 +174,17 @@ class Statement
                 $item->tax_rate1 = 5;
             }
 
-            $product = Product::first();
+            //$product = Product::first();
 
-            $item->cost = (float) $product->cost;
+            $product = new \stdClass;
-            $item->product_key = $product->product_key;
+
-            $item->notes = $product->notes;
+            $item->cost = (float) 10;
-            $item->custom_value1 = $product->custom_value1;
+            $item->product_key = 'test';
-            $item->custom_value2 = $product->custom_value2;
+            $item->notes = 'test notes';
-            $item->custom_value3 = $product->custom_value3;
+            $item->custom_value1 = 'custom value1';
-            $item->custom_value4 = $product->custom_value4;
+            $item->custom_value2 = 'custom value2';
+            $item->custom_value3 = 'custom value3';
+            $item->custom_value4 = 'custom value4';
 
             $line_items[] = $item;
         }

app/Services/Credit/CreditService.php

@@ -108,6 +108,7 @@ class CreditService
 
         $this->updateBalance($adjustment)
              ->updatePaidToDate($adjustment)
+             ->setStatus(Credit::STATUS_APPLIED)
              ->save();
 
         //create a negative payment of total $this->credit->balance
@@ -136,7 +137,6 @@ class CreditService
              ->client
              ->service()
              ->updatePaidToDate($adjustment)
-             ->setStatus(Credit::STATUS_APPLIED)
              ->save();
 
         event('eloquent.created: App\Models\Payment', $payment);

app/Services/Payment/UpdateInvoicePayment.php

@@ -55,6 +55,16 @@ class UpdateInvoicePayment
             if($paid_amount > $invoice->partial && $paid_amount > $invoice->balance)
                 $paid_amount = $invoice->balance;
 
+            /*Improve performance here - 26-01-2022 - also change the order of events for invoice first*/
+            $invoice->service() //caution what if we amount paid was less than partial - we wipe it!
+                ->clearPartial()
+                ->updateBalance($paid_amount * -1)
+                ->updatePaidToDate($paid_amount)
+                ->updateStatus()
+                ->touchPdf()
+                ->workFlow()
+                ->save();
+
             /* Updates the company ledger */
             $this->payment
                  ->ledger()
@@ -77,19 +87,22 @@ class UpdateInvoicePayment
 
             $this->payment->applied += $paid_amount;
 
-            $invoice->service() //caution what if we amount paid was less than partial - we wipe it!
+            // $invoice->service() //caution what if we amount paid was less than partial - we wipe it!
-                ->clearPartial()
+            //     ->clearPartial()
-                ->updateBalance($paid_amount * -1)
+            //     ->updateBalance($paid_amount * -1)
-                ->updatePaidToDate($paid_amount)
+            //     ->updatePaidToDate($paid_amount)
-                ->updateStatus()
+            //     ->updateStatus()
-                ->save();
+            //     ->save();
+
+            //     $invoice->refresh();
+
+            //     $invoice->service()
+            //             ->touchPdf(true)
+            //             ->workFlow()
+            //             ->save();
+
 
-                $invoice->refresh();
 
-                $invoice->service()
-                        ->touchPdf(true)
-                        ->workFlow()
-                        ->save();
 
         });
         

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.49',
+    'app_version' => '5.3.51',
-    'app_tag' => '5.3.49',
+    'app_tag' => '5.3.51',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),

database/migrations/2014_10_13_000000_create_users_table.php

@@ -592,7 +592,7 @@ class CreateUsersTable extends Migration
             $t->unsignedInteger('credit_id')->index();
             $t->string('key')->index();
             $t->string('transaction_reference')->nullable();
-            $t->string('message_id')->nullable();
+            $t->string('message_id')->nullable()->index();
             $t->mediumText('email_error')->nullable();
             $t->text('signature_base64')->nullable();
             $t->datetime('signature_date')->nullable();
@@ -829,7 +829,7 @@ class CreateUsersTable extends Migration
             $t->unsignedInteger('invoice_id')->index();
             $t->string('key')->index();
             $t->string('transaction_reference')->nullable();
-            $t->string('message_id')->nullable();
+            $t->string('message_id')->nullable()->index();
             $t->mediumText('email_error')->nullable();
             $t->text('signature_base64')->nullable();
             $t->datetime('signature_date')->nullable();
@@ -858,7 +858,7 @@ class CreateUsersTable extends Migration
             $t->unsignedInteger('quote_id')->index();
             $t->string('key')->index();
             $t->string('transaction_reference')->nullable();
-            $t->string('message_id')->nullable();
+            $t->string('message_id')->nullable()->index();
             $t->mediumText('email_error')->nullable();
             $t->text('signature_base64')->nullable();
             $t->datetime('signature_date')->nullable();

database/migrations/2022_01_19_085907_add_platform_column_to_accounts_table.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddPlatformColumnToAccountsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('accounts', function (Blueprint $table) {
+            $table->string('platform', 128)->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+    }
+}

public/assets/NOTICES

@@ -2357,35 +2357,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
---------------------------------------------------------------------------------
-bitsdojo_window
-bitsdojo_window_linux
-bitsdojo_window_macos
-bitsdojo_window_platform_interface
-bitsdojo_window_windows
-
-MIT License
-
-Copyright (c) 2020-2021 Bogdan Hobeanu
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
 --------------------------------------------------------------------------------
 boardview
 

public/flutter_service_worker.js

@@ -3,42 +3,42 @@ const MANIFEST = 'flutter-app-manifest';
 const TEMP = 'flutter-temp-cache';
 const CACHE_NAME = 'flutter-app-cache';
 const RESOURCES = {
-  "icons/Icon-512.png": "0f9aff01367f0a0c69773d25ca16ef35",
+"/": "51844665e8fec0a53d23ef02352f25de",
-"icons/Icon-192.png": "bb1cf5f6982006952211c7c8404ffbed",
+"version.json": "cba1586be50a4df1f43838f82c6ee0c3",
 "manifest.json": "ef43d90e57aa7682d7e2cfba2f484a40",
+"main.dart.js": "299c8c3d3960e8f023d17ada686c94ce",
+"canvaskit/profiling/canvaskit.wasm": "6d1b0fc1ec88c3110db88caa3393c580",
+"canvaskit/profiling/canvaskit.js": "3783918f48ef691e230156c251169480",
+"canvaskit/canvaskit.wasm": "b179ba02b7a9f61ebc108f82c5a1ecdb",
+"canvaskit/canvaskit.js": "62b9906717d7215a6ff4cc24efbd1b5c",
+"favicon.png": "dca91c54388f52eded692718d5a98b8b",
+"favicon.ico": "51636d3a390451561744c42188ccd628",
+"icons/Icon-192.png": "bb1cf5f6982006952211c7c8404ffbed",
+"icons/Icon-512.png": "0f9aff01367f0a0c69773d25ca16ef35",
+"assets/FontManifest.json": "cf3c681641169319e61b61bd0277378f",
 "assets/AssetManifest.json": "38d9aea341601f3a5c6fa7b5a1216ea5",
-"assets/assets/images/logo_light.png": "e5f46d5a78e226e7a9553d4ca6f69219",
+"assets/packages/material_design_icons_flutter/lib/fonts/materialdesignicons-webfont.ttf": "015400679694f1f51047e46da0e1dc98",
+"assets/fonts/MaterialIcons-Regular.otf": "4e6447691c9509f7acdbf8a931a85ca1",
+"assets/NOTICES": "224588855e3a5da7f1c34f0db1837839",
+"assets/assets/images/google_logo.png": "0f118259ce403274f407f5e982e681c3",
 "assets/assets/images/payment_types/carteblanche.png": "d936e11fa3884b8c9f1bd5c914be8629",
-"assets/assets/images/payment_types/other.png": "d936e11fa3884b8c9f1bd5c914be8629",
-"assets/assets/images/payment_types/discover.png": "6c0a386a00307f87db7bea366cca35f5",
-"assets/assets/images/payment_types/mastercard.png": "6f6cdc29ee2e22e06b1ac029cb52ef71",
-"assets/assets/images/payment_types/visa.png": "3ddc4a4d25c946e8ad7e6998f30fd4e3",
-"assets/assets/images/payment_types/solo.png": "2030c3ccaccf5d5e87916a62f5b084d6",
-"assets/assets/images/payment_types/laser.png": "b4e6e93dd35517ac429301119ff05868",
-"assets/assets/images/payment_types/switch.png": "4fa11c45327f5fdc20205821b2cfd9cc",
-"assets/assets/images/payment_types/ach.png": "7433f0aff779dc98a649b7a2daf777cf",
-"assets/assets/images/payment_types/dinerscard.png": "06d85186ba858c18ab7c9caa42c92024",
-"assets/assets/images/payment_types/maestro.png": "e533b92bfb50339fdbfa79e3dfe81f08",
 "assets/assets/images/payment_types/amex.png": "c49a4247984b3732a4af50a3390aa978",
 "assets/assets/images/payment_types/unionpay.png": "7002f52004e0ab8cc0b7450b0208ccb2",
+"assets/assets/images/payment_types/switch.png": "4fa11c45327f5fdc20205821b2cfd9cc",
+"assets/assets/images/payment_types/visa.png": "3ddc4a4d25c946e8ad7e6998f30fd4e3",
+"assets/assets/images/payment_types/solo.png": "2030c3ccaccf5d5e87916a62f5b084d6",
 "assets/assets/images/payment_types/paypal.png": "8e06c094c1871376dfea1da8088c29d1",
+"assets/assets/images/payment_types/discover.png": "6c0a386a00307f87db7bea366cca35f5",
+"assets/assets/images/payment_types/other.png": "d936e11fa3884b8c9f1bd5c914be8629",
+"assets/assets/images/payment_types/maestro.png": "e533b92bfb50339fdbfa79e3dfe81f08",
+"assets/assets/images/payment_types/ach.png": "7433f0aff779dc98a649b7a2daf777cf",
+"assets/assets/images/payment_types/laser.png": "b4e6e93dd35517ac429301119ff05868",
+"assets/assets/images/payment_types/dinerscard.png": "06d85186ba858c18ab7c9caa42c92024",
 "assets/assets/images/payment_types/jcb.png": "07e0942d16c5592118b72e74f2f7198c",
-"assets/assets/images/icon.png": "090f69e23311a4b6d851b3880ae52541",
+"assets/assets/images/payment_types/mastercard.png": "6f6cdc29ee2e22e06b1ac029cb52ef71",
+"assets/assets/images/logo_light.png": "e5f46d5a78e226e7a9553d4ca6f69219",
 "assets/assets/images/logo_dark.png": "a233ed1d4d0f7414bf97a9a10f11fb0a",
-"assets/assets/images/google_logo.png": "0f118259ce403274f407f5e982e681c3",
+"assets/assets/images/icon.png": "090f69e23311a4b6d851b3880ae52541"
-"assets/NOTICES": "d65d61fad9c25ab599ca7fdc78cc0072",
-"assets/packages/material_design_icons_flutter/lib/fonts/materialdesignicons-webfont.ttf": "015400679694f1f51047e46da0e1dc98",
-"assets/FontManifest.json": "cf3c681641169319e61b61bd0277378f",
-"assets/fonts/MaterialIcons-Regular.otf": "4e6447691c9509f7acdbf8a931a85ca1",
-"/": "854475c3df4e34c07a33807e1806745b",
-"version.json": "b685694a4de24b3b41bd9b5e756ba0fc",
-"favicon.ico": "51636d3a390451561744c42188ccd628",
-"favicon.png": "dca91c54388f52eded692718d5a98b8b",
-"main.dart.js": "7dfd02ea7b43f28d6b087971fe418e99",
-"canvaskit/profiling/canvaskit.js": "3783918f48ef691e230156c251169480",
-"canvaskit/profiling/canvaskit.wasm": "6d1b0fc1ec88c3110db88caa3393c580",
-"canvaskit/canvaskit.js": "62b9906717d7215a6ff4cc24efbd1b5c",
-"canvaskit/canvaskit.wasm": "b179ba02b7a9f61ebc108f82c5a1ecdb"
 };
 
 // The application shell files that are downloaded before a service worker can

public/js/clients/payments/stripe-ach.js

@@ -1,2 +1,2 @@
 /*! For license information please see stripe-ach.js.LICENSE.txt */
-(()=>{function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function t(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}(new(function(){function n(){var e,r=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,n),t(this,"setupStripe",(function(){return r.stripe=Stripe(r.key),r.stripe_connect&&(r.stripe.stripeAccount=r.stripe_connect),r})),t(this,"getFormData",(function(){return{country:document.getElementById("country").value,currency:document.getElementById("currency").value,routing_number:document.getElementById("routing-number").value,account_number:document.getElementById("account-number").value,account_holder_name:document.getElementById("account-holder-name").value,account_holder_type:document.querySelector('input[name="account-holder-type"]:checked').value}})),t(this,"handleError",(function(e){document.getElementById("save-button").disabled=!1,document.querySelector("#save-button > svg").classList.add("hidden"),document.querySelector("#save-button > span").classList.remove("hidden"),r.errors.textContent="",r.errors.textContent=e,r.errors.hidden=!1})),t(this,"handleSuccess",(function(e){document.getElementById("gateway_response").value=JSON.stringify(e),document.getElementById("server_response").submit()})),t(this,"handleSubmit",(function(e){document.getElementById("save-button").disabled=!0,document.querySelector("#save-button > svg").classList.remove("hidden"),document.querySelector("#save-button > span").classList.add("hidden"),e.preventDefault(),r.errors.textContent="",r.errors.hidden=!0,r.stripe.createToken("bank_account",r.getFormData()).then((function(e){return e.hasOwnProperty("error")?r.handleError(e.error.message):r.handleSuccess(e)}))})),this.errors=document.getElementById("errors"),this.key=document.querySelector('meta[name="stripe-publishable-key"]').content,this.stripe_connect=null===(e=document.querySelector('meta[name="stripe-account-id"]'))||void 0===e?void 0:e.content}var r,o,u;return r=n,(o=[{key:"handle",value:function(){var e=this;document.getElementById("save-button").addEventListener("click",(function(t){return e.handleSubmit(t)}))}}])&&e(r.prototype,o),u&&e(r,u),n}())).setupStripe().handle()})();
+(()=>{function e(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function t(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}(new(function(){function n(){var e,r=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,n),t(this,"setupStripe",(function(){return r.stripeConnect?r.stripe=Stripe(r.key,{stripeAccount:r.stripeConnect}):r.stripe=Stripe(r.key),r})),t(this,"getFormData",(function(){return{country:document.getElementById("country").value,currency:document.getElementById("currency").value,routing_number:document.getElementById("routing-number").value,account_number:document.getElementById("account-number").value,account_holder_name:document.getElementById("account-holder-name").value,account_holder_type:document.querySelector('input[name="account-holder-type"]:checked').value}})),t(this,"handleError",(function(e){document.getElementById("save-button").disabled=!1,document.querySelector("#save-button > svg").classList.add("hidden"),document.querySelector("#save-button > span").classList.remove("hidden"),r.errors.textContent="",r.errors.textContent=e,r.errors.hidden=!1})),t(this,"handleSuccess",(function(e){document.getElementById("gateway_response").value=JSON.stringify(e),document.getElementById("server_response").submit()})),t(this,"handleSubmit",(function(e){document.getElementById("save-button").disabled=!0,document.querySelector("#save-button > svg").classList.remove("hidden"),document.querySelector("#save-button > span").classList.add("hidden"),e.preventDefault(),r.errors.textContent="",r.errors.hidden=!0,r.stripe.createToken("bank_account",r.getFormData()).then((function(e){return e.hasOwnProperty("error")?r.handleError(e.error.message):r.handleSuccess(e)}))})),this.errors=document.getElementById("errors"),this.key=document.querySelector('meta[name="stripe-publishable-key"]').content,this.stripe_connect=null===(e=document.querySelector('meta[name="stripe-account-id"]'))||void 0===e?void 0:e.content}var r,o,u;return r=n,(o=[{key:"handle",value:function(){var e=this;document.getElementById("save-button").addEventListener("click",(function(t){return e.handleSubmit(t)}))}}])&&e(r.prototype,o),u&&e(r,u),n}())).setupStripe().handle()})();

public/js/clients/payments/stripe-acss.js

@@ -1,2 +1,2 @@
 /*! For license information please see stripe-acss.js.LICENSE.txt */
-(()=>{var e,t,n,r;function o(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var d=function(){function e(t,n){var r=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),a(this,"setupStripe",(function(){return r.stripe=Stripe(r.key),r.stripeConnect&&(r.stripe.stripeAccount=c),r})),a(this,"handle",(function(){document.getElementById("pay-now").addEventListener("click",(function(e){var t=document.getElementById("errors");return""===document.getElementById("acss-name").value?(document.getElementById("acss-name").focus(),t.textContent=document.querySelector("meta[name=translation-name-required]").content,void(t.hidden=!1)):""===document.getElementById("acss-email-address").value?(document.getElementById("acss-email-address").focus(),t.textContent=document.querySelector("meta[name=translation-email-required]").content,void(t.hidden=!1)):(document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),void r.stripe.confirmAcssDebitPayment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{billing_details:{name:document.getElementById("acss-name").value,email:document.getElementById("acss-email-address").value}}}).then((function(e){return e.error?r.handleFailure(e.error.message):r.handleSuccess(e)})))}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}var t,n,r;return t=e,(n=[{key:"handleSuccess",value:function(e){document.querySelector('input[name="gateway_response"]').value=JSON.stringify(e.paymentIntent),document.getElementById("server-response").submit()}},{key:"handleFailure",value:function(e){var t=document.getElementById("errors");t.textContent="",t.textContent=e,t.hidden=!1,document.getElementById("pay-now").disabled=!1,document.querySelector("#pay-now > svg").classList.add("hidden"),document.querySelector("#pay-now > span").classList.remove("hidden")}}])&&o(t.prototype,n),r&&o(t,r),e}(),i=null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",c=null!==(n=null===(r=document.querySelector('meta[name="stripe-account-id"]'))||void 0===r?void 0:r.content)&&void 0!==n?n:"";new d(i,c).setupStripe().handle()})();
+(()=>{var e,t,n,r;function o(e,t){for(var n=0;n<t.length;n++){var r=t[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var i=function(){function e(t,n){var r=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),a(this,"setupStripe",(function(){return r.stripeConnect?r.stripe=Stripe(r.key,{stripeAccount:r.stripeConnect}):r.stripe=Stripe(r.key),r})),a(this,"handle",(function(){document.getElementById("pay-now").addEventListener("click",(function(e){var t=document.getElementById("errors");return""===document.getElementById("acss-name").value?(document.getElementById("acss-name").focus(),t.textContent=document.querySelector("meta[name=translation-name-required]").content,void(t.hidden=!1)):""===document.getElementById("acss-email-address").value?(document.getElementById("acss-email-address").focus(),t.textContent=document.querySelector("meta[name=translation-email-required]").content,void(t.hidden=!1)):(document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),void r.stripe.confirmAcssDebitPayment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{billing_details:{name:document.getElementById("acss-name").value,email:document.getElementById("acss-email-address").value}}}).then((function(e){return e.error?r.handleFailure(e.error.message):r.handleSuccess(e)})))}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}var t,n,r;return t=e,(n=[{key:"handleSuccess",value:function(e){document.querySelector('input[name="gateway_response"]').value=JSON.stringify(e.paymentIntent),document.getElementById("server-response").submit()}},{key:"handleFailure",value:function(e){var t=document.getElementById("errors");t.textContent="",t.textContent=e,t.hidden=!1,document.getElementById("pay-now").disabled=!1,document.querySelector("#pay-now > svg").classList.add("hidden"),document.querySelector("#pay-now > span").classList.remove("hidden")}}])&&o(t.prototype,n),r&&o(t,r),e}();new i(null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",null!==(n=null===(r=document.querySelector('meta[name="stripe-account-id"]'))||void 0===r?void 0:r.content)&&void 0!==n?n:"").setupStripe().handle()})();

public/js/clients/payments/stripe-alipay.js

@@ -1,2 +1,2 @@
 /*! For license information please see stripe-alipay.js.LICENSE.txt */
-(()=>{var e,t,n,r;function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}new function e(t,n){var r=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),o(this,"setupStripe",(function(){return r.stripe=Stripe(r.key),r.stripeConnect&&(r.stripe.stripeAccount=r.stripeConnect),r})),o(this,"handle",(function(){var e={type:"alipay",amount:document.querySelector('meta[name="amount"]').content,currency:document.querySelector('meta[name="currency"]').content,redirect:{return_url:document.querySelector('meta[name="return-url"]').content}};document.getElementById("pay-now").addEventListener("click",(function(t){document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.add("hidden"),document.querySelector("#pay-now > span").classList.remove("hidden"),r.stripe.createSource(e).then((function(e){if(e.hasOwnProperty("source"))return window.location=e.source.redirect.url;document.getElementById("pay-now").disabled=!1,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),this.errors.textContent="",this.errors.textContent=e.error.message,this.errors.hidden=!1}))}))})),this.key=t,this.stripeConnect=n,this.errors=document.getElementById("errors")}(null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",null!==(n=null===(r=document.querySelector('meta[name="stripe-account-id"]'))||void 0===r?void 0:r.content)&&void 0!==n?n:"").setupStripe().handle()})();
+(()=>{var e,t,n,r;function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}new function e(t,n){var r=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),o(this,"setupStripe",(function(){return r.stripeConnect?r.stripe=Stripe(r.key,{stripeAccount:r.stripeConnect}):r.stripe=Stripe(r.key),r})),o(this,"handle",(function(){var e={type:"alipay",amount:document.querySelector('meta[name="amount"]').content,currency:document.querySelector('meta[name="currency"]').content,redirect:{return_url:document.querySelector('meta[name="return-url"]').content}};document.getElementById("pay-now").addEventListener("click",(function(t){document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.add("hidden"),document.querySelector("#pay-now > span").classList.remove("hidden"),r.stripe.createSource(e).then((function(e){if(e.hasOwnProperty("source"))return window.location=e.source.redirect.url;document.getElementById("pay-now").disabled=!1,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),this.errors.textContent="",this.errors.textContent=e.error.message,this.errors.hidden=!1}))}))})),this.key=t,this.stripeConnect=n,this.errors=document.getElementById("errors")}(null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",null!==(n=null===(r=document.querySelector('meta[name="stripe-account-id"]'))||void 0===r?void 0:r.content)&&void 0!==n?n:"").setupStripe().handle()})();

public/js/clients/payments/stripe-bancontact.js

@@ -1,2 +1,2 @@
 /*! For license information please see stripe-bancontact.js.LICENSE.txt */
-(()=>{var e,t,n,o;function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var a=null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",c=null!==(n=null===(o=document.querySelector('meta[name="stripe-account-id"]'))||void 0===o?void 0:o.content)&&void 0!==n?n:"";new function e(t,n){var o=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),r(this,"setupStripe",(function(){return o.stripe=Stripe(o.key),o.stripeConnect&&(o.stripe.stripeAccount=c),o})),r(this,"handle",(function(){document.getElementById("pay-now").addEventListener("click",(function(e){var t=document.getElementById("errors");if(!document.getElementById("bancontact-name").value)return t.textContent=document.querySelector("meta[name=translation-name-required]").content,t.hidden=!1,void console.log("name");document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),o.stripe.confirmBancontactPayment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{billing_details:{name:document.getElementById("bancontact-name").value}},return_url:document.querySelector('meta[name="return-url"]').content})}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}(a,c).setupStripe().handle()})();
+(()=>{var e,t,n,o;function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}new function e(t,n){var o=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),r(this,"setupStripe",(function(){return o.stripeConnect?o.stripe=Stripe(o.key,{stripeAccount:o.stripeConnect}):o.stripe=Stripe(o.key),o})),r(this,"handle",(function(){document.getElementById("pay-now").addEventListener("click",(function(e){var t=document.getElementById("errors");if(!document.getElementById("bancontact-name").value)return t.textContent=document.querySelector("meta[name=translation-name-required]").content,t.hidden=!1,void console.log("name");document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),o.stripe.confirmBancontactPayment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{billing_details:{name:document.getElementById("bancontact-name").value}},return_url:document.querySelector('meta[name="return-url"]').content})}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}(null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",null!==(n=null===(o=document.querySelector('meta[name="stripe-account-id"]'))||void 0===o?void 0:o.content)&&void 0!==n?n:"").setupStripe().handle()})();

public/js/clients/payments/stripe-becs.js

@@ -1,2 +1,2 @@
 /*! For license information please see stripe-becs.js.LICENSE.txt */
-(()=>{var e,t,n,o;function a(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function c(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var r=function(){function e(t,n){var o=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),c(this,"setupStripe",(function(){o.stripe=Stripe(o.key),o.stripeConnect&&(o.stripe.stripeAccount=i);var e=o.stripe.elements(),t={style:{base:{color:"#32325d",fontSize:"16px","::placeholder":{color:"#aab7c4"},":-webkit-autofill":{color:"#32325d"}},invalid:{color:"#fa755a",iconColor:"#fa755a",":-webkit-autofill":{color:"#fa755a"}}},disabled:!1,hideIcon:!1,iconStyle:"default"};return o.auBankAccount=e.create("auBankAccount",t),o.auBankAccount.mount("#becs-iban"),o})),c(this,"handle",(function(){document.getElementById("pay-now").addEventListener("click",(function(e){var t=document.getElementById("errors");return""===document.getElementById("becs-name").value?(document.getElementById("becs-name").focus(),t.textContent=document.querySelector("meta[name=translation-name-required]").content,void(t.hidden=!1)):""===document.getElementById("becs-email-address").value?(document.getElementById("becs-email-address").focus(),t.textContent=document.querySelector("meta[name=translation-email-required]").content,void(t.hidden=!1)):document.getElementById("becs-mandate-acceptance").checked?(document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),void o.stripe.confirmAuBecsDebitPayment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{au_becs_debit:o.auBankAccount,billing_details:{name:document.getElementById("becs-name").value,email:document.getElementById("becs-email-address").value}}}).then((function(e){return e.error?o.handleFailure(e.error.message):o.handleSuccess(e)}))):(document.getElementById("becs-mandate-acceptance").focus(),t.textContent=document.querySelector("meta[name=translation-terms-required]").content,t.hidden=!1,void console.log("Terms"))}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}var t,n,o;return t=e,(n=[{key:"handleSuccess",value:function(e){document.querySelector('input[name="gateway_response"]').value=JSON.stringify(e.paymentIntent),document.getElementById("server-response").submit()}},{key:"handleFailure",value:function(e){var t=document.getElementById("errors");t.textContent="",t.textContent=e,t.hidden=!1,document.getElementById("pay-now").disabled=!1,document.querySelector("#pay-now > svg").classList.add("hidden"),document.querySelector("#pay-now > span").classList.remove("hidden")}}])&&a(t.prototype,n),o&&a(t,o),e}(),d=null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",i=null!==(n=null===(o=document.querySelector('meta[name="stripe-account-id"]'))||void 0===o?void 0:o.content)&&void 0!==n?n:"";new r(d,i).setupStripe().handle()})();
+(()=>{var e,t,n,o;function a(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function c(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var r=function(){function e(t,n){var o=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),c(this,"setupStripe",(function(){o.stripeConnect?o.stripe=Stripe(o.key,{stripeAccount:o.stripeConnect}):o.stripe=Stripe(o.key);var e=o.stripe.elements(),t={style:{base:{color:"#32325d",fontSize:"16px","::placeholder":{color:"#aab7c4"},":-webkit-autofill":{color:"#32325d"}},invalid:{color:"#fa755a",iconColor:"#fa755a",":-webkit-autofill":{color:"#fa755a"}}},disabled:!1,hideIcon:!1,iconStyle:"default"};return o.auBankAccount=e.create("auBankAccount",t),o.auBankAccount.mount("#becs-iban"),o})),c(this,"handle",(function(){document.getElementById("pay-now").addEventListener("click",(function(e){var t=document.getElementById("errors");return""===document.getElementById("becs-name").value?(document.getElementById("becs-name").focus(),t.textContent=document.querySelector("meta[name=translation-name-required]").content,void(t.hidden=!1)):""===document.getElementById("becs-email-address").value?(document.getElementById("becs-email-address").focus(),t.textContent=document.querySelector("meta[name=translation-email-required]").content,void(t.hidden=!1)):document.getElementById("becs-mandate-acceptance").checked?(document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),void o.stripe.confirmAuBecsDebitPayment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{au_becs_debit:o.auBankAccount,billing_details:{name:document.getElementById("becs-name").value,email:document.getElementById("becs-email-address").value}}}).then((function(e){return e.error?o.handleFailure(e.error.message):o.handleSuccess(e)}))):(document.getElementById("becs-mandate-acceptance").focus(),t.textContent=document.querySelector("meta[name=translation-terms-required]").content,t.hidden=!1,void console.log("Terms"))}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}var t,n,o;return t=e,(n=[{key:"handleSuccess",value:function(e){document.querySelector('input[name="gateway_response"]').value=JSON.stringify(e.paymentIntent),document.getElementById("server-response").submit()}},{key:"handleFailure",value:function(e){var t=document.getElementById("errors");t.textContent="",t.textContent=e,t.hidden=!1,document.getElementById("pay-now").disabled=!1,document.querySelector("#pay-now > svg").classList.add("hidden"),document.querySelector("#pay-now > span").classList.remove("hidden")}}])&&a(t.prototype,n),o&&a(t,o),e}();new r(null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",null!==(n=null===(o=document.querySelector('meta[name="stripe-account-id"]'))||void 0===o?void 0:o.content)&&void 0!==n?n:"").setupStripe().handle()})();

public/js/clients/payments/stripe-eps.js

@@ -1,2 +1,2 @@
 /*! For license information please see stripe-eps.js.LICENSE.txt */
-(()=>{var e,t,n,r;function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var a=null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",i=null!==(n=null===(r=document.querySelector('meta[name="stripe-account-id"]'))||void 0===r?void 0:r.content)&&void 0!==n?n:"";new function e(t,n){var r=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),o(this,"setupStripe",(function(){r.stripe=Stripe(r.key),r.stripeConnect&&(r.stripe.stripeAccount=i);var e=r.stripe.elements();return r.eps=e.create("epsBank",{style:{base:{padding:"10px 12px",color:"#32325d",fontSize:"16px","::placeholder":{color:"#aab7c4"}}}}),r.eps.mount("#eps-bank-element"),r})),o(this,"handle",(function(){document.getElementById("pay-now").addEventListener("click",(function(e){var t=document.getElementById("errors");if(!document.getElementById("eps-name").value)return t.textContent=document.querySelector("meta[name=translation-name-required]").content,t.hidden=!1,void console.log("name");document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),r.stripe.confirmEpsPayment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{eps:r.eps,billing_details:{name:document.getElementById("ideal-name").value}},return_url:document.querySelector('meta[name="return-url"]').content})}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}(a,i).setupStripe().handle()})();
+(()=>{var e,t,n,r;function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}new function e(t,n){var r=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),o(this,"setupStripe",(function(){r.stripeConnect?r.stripe=Stripe(r.key,{stripeAccount:r.stripeConnect}):r.stripe=Stripe(r.key);var e=r.stripe.elements();return r.eps=e.create("epsBank",{style:{base:{padding:"10px 12px",color:"#32325d",fontSize:"16px","::placeholder":{color:"#aab7c4"}}}}),r.eps.mount("#eps-bank-element"),r})),o(this,"handle",(function(){document.getElementById("pay-now").addEventListener("click",(function(e){var t=document.getElementById("errors");if(!document.getElementById("eps-name").value)return t.textContent=document.querySelector("meta[name=translation-name-required]").content,t.hidden=!1,void console.log("name");document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),r.stripe.confirmEpsPayment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{eps:r.eps,billing_details:{name:document.getElementById("ideal-name").value}},return_url:document.querySelector('meta[name="return-url"]').content})}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}(null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",null!==(n=null===(r=document.querySelector('meta[name="stripe-account-id"]'))||void 0===r?void 0:r.content)&&void 0!==n?n:"").setupStripe().handle()})();

public/js/clients/payments/stripe-fpx.js

@@ -1,2 +1,2 @@
 /*! For license information please see stripe-fpx.js.LICENSE.txt */
-(()=>{var e,t,n,r;function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var i=null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",c=null!==(n=null===(r=document.querySelector('meta[name="stripe-account-id"]'))||void 0===r?void 0:r.content)&&void 0!==n?n:"";new function e(t,n){var r=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),o(this,"setupStripe",(function(){r.stripe=Stripe(r.key),r.stripeConnect&&(r.stripe.stripeAccount=c);var e=r.stripe.elements();return r.fpx=e.create("fpxBank",{style:{base:{padding:"10px 12px",color:"#32325d",fontSize:"16px"}},accountHolderType:"individual"}),r.fpx.mount("#fpx-bank-element"),r})),o(this,"handle",(function(){document.getElementById("pay-now").addEventListener("click",(function(e){document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),r.stripe.confirmFpxPayment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{fpx:r.fpx},return_url:document.querySelector('meta[name="return-url"]').content})}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}(i,c).setupStripe().handle()})();
+(()=>{var e,t,n,r;function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}new function e(t,n){var r=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),o(this,"setupStripe",(function(){r.stripeConnect?r.stripe=Stripe(r.key,{stripeAccount:r.stripeConnect}):r.stripe=Stripe(r.key);var e=r.stripe.elements();return r.fpx=e.create("fpxBank",{style:{base:{padding:"10px 12px",color:"#32325d",fontSize:"16px"}},accountHolderType:"individual"}),r.fpx.mount("#fpx-bank-element"),r})),o(this,"handle",(function(){document.getElementById("pay-now").addEventListener("click",(function(e){document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),r.stripe.confirmFpxPayment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{fpx:r.fpx},return_url:document.querySelector('meta[name="return-url"]').content})}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}(null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",null!==(n=null===(r=document.querySelector('meta[name="stripe-account-id"]'))||void 0===r?void 0:r.content)&&void 0!==n?n:"").setupStripe().handle()})();

public/js/clients/payments/stripe-giropay.js

@@ -1,2 +1,2 @@
 /*! For license information please see stripe-giropay.js.LICENSE.txt */
-(()=>{var e,t,n,r;function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var i=null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",c=null!==(n=null===(r=document.querySelector('meta[name="stripe-account-id"]'))||void 0===r?void 0:r.content)&&void 0!==n?n:"";new function e(t,n){var r=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),o(this,"setupStripe",(function(){return r.stripe=Stripe(r.key),r.stripeConnect&&(r.stripe.stripeAccount=c),r})),o(this,"handle",(function(){document.getElementById("pay-now").addEventListener("click",(function(e){var t=document.getElementById("errors");if(!document.getElementById("giropay-mandate-acceptance").checked)return t.textContent=document.querySelector("meta[name=translation-terms-required]").content,t.hidden=!1,void console.log("Terms");document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),r.stripe.confirmGiropayPayment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{billing_details:{name:document.getElementById("giropay-name").value}},return_url:document.querySelector('meta[name="return-url"]').content})}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}(i,c).setupStripe().handle()})();
+(()=>{var e,t,n,r;function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}new function e(t,n){var r=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),o(this,"setupStripe",(function(){return r.stripeConnect?r.stripe=Stripe(r.key,{stripeAccount:r.stripeConnect}):r.stripe=Stripe(r.key),r})),o(this,"handle",(function(){document.getElementById("pay-now").addEventListener("click",(function(e){var t=document.getElementById("errors");if(!document.getElementById("giropay-mandate-acceptance").checked)return t.textContent=document.querySelector("meta[name=translation-terms-required]").content,t.hidden=!1,void console.log("Terms");document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),r.stripe.confirmGiropayPayment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{billing_details:{name:document.getElementById("giropay-name").value}},return_url:document.querySelector('meta[name="return-url"]').content})}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}(null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",null!==(n=null===(r=document.querySelector('meta[name="stripe-account-id"]'))||void 0===r?void 0:r.content)&&void 0!==n?n:"").setupStripe().handle()})();

public/js/clients/payments/stripe-ideal.js

@@ -1,2 +1,2 @@
 /*! For license information please see stripe-ideal.js.LICENSE.txt */
-(()=>{var e,t,n,r;function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var a=null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",i=null!==(n=null===(r=document.querySelector('meta[name="stripe-account-id"]'))||void 0===r?void 0:r.content)&&void 0!==n?n:"";new function e(t,n){var r=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),o(this,"setupStripe",(function(){r.stripe=Stripe(r.key),r.stripeConnect&&(r.stripe.stripeAccount=i);var e=r.stripe.elements();return r.ideal=e.create("idealBank",{style:{base:{padding:"10px 12px",color:"#32325d",fontSize:"16px","::placeholder":{color:"#aab7c4"}}}}),r.ideal.mount("#ideal-bank-element"),r})),o(this,"handle",(function(){document.getElementById("pay-now").addEventListener("click",(function(e){var t=document.getElementById("errors");if(!document.getElementById("ideal-name").value)return t.textContent=document.querySelector("meta[name=translation-name-required]").content,t.hidden=!1,void console.log("name");document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),r.stripe.confirmIdealPayment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{ideal:r.ideal,billing_details:{name:document.getElementById("ideal-name").value}},return_url:document.querySelector('meta[name="return-url"]').content})}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}(a,i).setupStripe().handle()})();
+(()=>{var e,t,n,r;function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}new function e(t,n){var r=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),o(this,"setupStripe",(function(){r.stripeConnect?r.stripe=Stripe(r.key,{stripeAccount:r.stripeConnect}):r.stripe=Stripe(r.key);var e=r.stripe.elements();return r.ideal=e.create("idealBank",{style:{base:{padding:"10px 12px",color:"#32325d",fontSize:"16px","::placeholder":{color:"#aab7c4"}}}}),r.ideal.mount("#ideal-bank-element"),r})),o(this,"handle",(function(){document.getElementById("pay-now").addEventListener("click",(function(e){var t=document.getElementById("errors");if(!document.getElementById("ideal-name").value)return t.textContent=document.querySelector("meta[name=translation-name-required]").content,t.hidden=!1,void console.log("name");document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),r.stripe.confirmIdealPayment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{ideal:r.ideal,billing_details:{name:document.getElementById("ideal-name").value}},return_url:document.querySelector('meta[name="return-url"]').content})}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}(null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",null!==(n=null===(r=document.querySelector('meta[name="stripe-account-id"]'))||void 0===r?void 0:r.content)&&void 0!==n?n:"").setupStripe().handle()})();

public/js/clients/payments/stripe-przelewy24.js

@@ -1,2 +1,2 @@
 /*! For license information please see stripe-przelewy24.js.LICENSE.txt */
-(()=>{var e,t,n,a;function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var d=null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",c=null!==(n=null===(a=document.querySelector('meta[name="stripe-account-id"]'))||void 0===a?void 0:a.content)&&void 0!==n?n:"";new function e(t,n){var a=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),o(this,"setupStripe",(function(){a.stripe=Stripe(a.key),a.stripeConnect&&(a.stripe.stripeAccount=c);var e=a.stripe.elements();return a.p24bank=e.create("p24Bank",{style:{base:{padding:"10px 12px",color:"#32325d",fontSize:"16px","::placeholder":{color:"#aab7c4"}}}}),a.p24bank.mount("#p24-bank-element"),a})),o(this,"handle",(function(){document.getElementById("pay-now").addEventListener("click",(function(e){var t=document.getElementById("errors");return""===document.getElementById("p24-name").value?(document.getElementById("p24-name").focus(),t.textContent=document.querySelector("meta[name=translation-name-required]").content,void(t.hidden=!1)):""===document.getElementById("p24-email-address").value?(document.getElementById("p24-email-address").focus(),t.textContent=document.querySelector("meta[name=translation-email-required]").content,void(t.hidden=!1)):document.getElementById("p24-mandate-acceptance").checked?(document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),void a.stripe.confirmP24Payment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{p24:a.p24bank,billing_details:{name:document.getElementById("p24-name").value,email:document.getElementById("p24-email-address").value}},payment_method_options:{p24:{tos_shown_and_accepted:document.getElementById("p24-mandate-acceptance").checked}},return_url:document.querySelector('meta[name="return-url"]').content})):(document.getElementById("p24-mandate-acceptance").focus(),t.textContent=document.querySelector("meta[name=translation-terms-required]").content,void(t.hidden=!1))}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}(d,c).setupStripe().handle()})();
+(()=>{var e,t,n,o;function a(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}new function e(t,n){var o=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),a(this,"setupStripe",(function(){o.stripeConnect?o.stripe=Stripe(o.key,{stripeAccount:o.stripeConnect}):o.stripe=Stripe(o.key);var e=o.stripe.elements();return o.p24bank=e.create("p24Bank",{style:{base:{padding:"10px 12px",color:"#32325d",fontSize:"16px","::placeholder":{color:"#aab7c4"}}}}),o.p24bank.mount("#p24-bank-element"),o})),a(this,"handle",(function(){document.getElementById("pay-now").addEventListener("click",(function(e){var t=document.getElementById("errors");return""===document.getElementById("p24-name").value?(document.getElementById("p24-name").focus(),t.textContent=document.querySelector("meta[name=translation-name-required]").content,void(t.hidden=!1)):""===document.getElementById("p24-email-address").value?(document.getElementById("p24-email-address").focus(),t.textContent=document.querySelector("meta[name=translation-email-required]").content,void(t.hidden=!1)):document.getElementById("p24-mandate-acceptance").checked?(document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),void o.stripe.confirmP24Payment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{p24:o.p24bank,billing_details:{name:document.getElementById("p24-name").value,email:document.getElementById("p24-email-address").value}},payment_method_options:{p24:{tos_shown_and_accepted:document.getElementById("p24-mandate-acceptance").checked}},return_url:document.querySelector('meta[name="return-url"]').content})):(document.getElementById("p24-mandate-acceptance").focus(),t.textContent=document.querySelector("meta[name=translation-terms-required]").content,void(t.hidden=!1))}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}(null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",null!==(n=null===(o=document.querySelector('meta[name="stripe-account-id"]'))||void 0===o?void 0:o.content)&&void 0!==n?n:"").setupStripe().handle()})();

public/js/clients/payments/stripe-sepa.js

@@ -1,2 +1,2 @@
 /*! For license information please see stripe-sepa.js.LICENSE.txt */
-(()=>{var e,t,n,o;function a(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var c=function(){function e(t,n){var o=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),r(this,"setupStripe",(function(){o.stripe=Stripe(o.key),o.stripeConnect&&(o.stripe.stripeAccount=d);var e=o.stripe.elements(),t={style:{base:{color:"#32325d",fontFamily:'-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif',fontSmoothing:"antialiased",fontSize:"16px","::placeholder":{color:"#aab7c4"},":-webkit-autofill":{color:"#32325d"}},invalid:{color:"#fa755a",iconColor:"#fa755a",":-webkit-autofill":{color:"#fa755a"}}},supportedCountries:["SEPA"],placeholderCountry:document.querySelector('meta[name="country"]').content};return o.iban=e.create("iban",t),o.iban.mount("#sepa-iban"),o})),r(this,"handle",(function(){var e=document.getElementById("errors");Array.from(document.getElementsByClassName("toggle-payment-with-token")).forEach((function(e){return e.addEventListener("click",(function(e){document.getElementById("stripe--payment-container").classList.add("hidden"),document.getElementById("save-card--container").style.display="none",document.querySelector("input[name=token]").value=e.target.dataset.token}))})),document.getElementById("toggle-payment-with-new-bank-account").addEventListener("click",(function(e){document.getElementById("stripe--payment-container").classList.remove("hidden"),document.getElementById("save-card--container").style.display="grid",document.querySelector("input[name=token]").value=""})),document.getElementById("pay-now").addEventListener("click",(function(t){return 0!==document.querySelector("input[name=token]").value.length?(document.querySelector("#errors").hidden=!0,document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),void o.stripe.confirmSepaDebitSetup(document.querySelector("meta[name=si-client-secret").content,{payment_method:document.querySelector("input[name=token]").value}).then((function(e){if(!e.error)return document.querySelector('input[name="gateway_response"]').value=JSON.stringify(e.setupIntent),document.querySelector("#server-response").submit();console.error(error)})).catch((function(t){e.textContent=t,e.hidden=!1}))):""===document.getElementById("sepa-name").value?(document.getElementById("sepa-name").focus(),e.textContent=document.querySelector("meta[name=translation-name-required]").content,void(e.hidden=!1)):""===document.getElementById("sepa-email-address").value?(document.getElementById("sepa-email-address").focus(),e.textContent=document.querySelector("meta[name=translation-email-required]").content,void(e.hidden=!1)):document.getElementById("sepa-mandate-acceptance").checked?(document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),void o.stripe.confirmSepaDebitPayment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{sepa_debit:o.iban,billing_details:{name:document.getElementById("sepa-name").value,email:document.getElementById("sepa-email-address").value}}}).then((function(e){return e.error?o.handleFailure(e.error.message):o.handleSuccess(e)}))):(e.textContent=document.querySelector("meta[name=translation-terms-required]").content,e.hidden=!1,void console.log("Terms"))}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}var t,n,o;return t=e,(n=[{key:"handleSuccess",value:function(e){document.querySelector('input[name="gateway_response"]').value=JSON.stringify(e.paymentIntent);var t=document.querySelector('input[name="token-billing-checkbox"]:checked');t&&(document.querySelector('input[name="store_card"]').value=t.value),document.getElementById("server-response").submit()}},{key:"handleFailure",value:function(e){var t=document.getElementById("errors");t.textContent="",t.textContent=e,t.hidden=!1,document.getElementById("pay-now").disabled=!1,document.querySelector("#pay-now > svg").classList.add("hidden"),document.querySelector("#pay-now > span").classList.remove("hidden")}}])&&a(t.prototype,n),o&&a(t,o),e}(),i=null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",d=null!==(n=null===(o=document.querySelector('meta[name="stripe-account-id"]'))||void 0===o?void 0:o.content)&&void 0!==n?n:"";new c(i,d).setupStripe().handle()})();
+(()=>{var e,t,n,o;function a(e,t){for(var n=0;n<t.length;n++){var o=t[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}function r(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var c=function(){function e(t,n){var o=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),r(this,"setupStripe",(function(){o.stripeConnect?o.stripe=Stripe(o.key,{stripeAccount:o.stripeConnect}):o.stripe=Stripe(o.key);var e=o.stripe.elements(),t={style:{base:{color:"#32325d",fontFamily:'-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif',fontSmoothing:"antialiased",fontSize:"16px","::placeholder":{color:"#aab7c4"},":-webkit-autofill":{color:"#32325d"}},invalid:{color:"#fa755a",iconColor:"#fa755a",":-webkit-autofill":{color:"#fa755a"}}},supportedCountries:["SEPA"],placeholderCountry:document.querySelector('meta[name="country"]').content};return o.iban=e.create("iban",t),o.iban.mount("#sepa-iban"),o})),r(this,"handle",(function(){var e=document.getElementById("errors");Array.from(document.getElementsByClassName("toggle-payment-with-token")).forEach((function(e){return e.addEventListener("click",(function(e){document.getElementById("stripe--payment-container").classList.add("hidden"),document.getElementById("save-card--container").style.display="none",document.querySelector("input[name=token]").value=e.target.dataset.token}))})),document.getElementById("toggle-payment-with-new-bank-account").addEventListener("click",(function(e){document.getElementById("stripe--payment-container").classList.remove("hidden"),document.getElementById("save-card--container").style.display="grid",document.querySelector("input[name=token]").value=""})),document.getElementById("pay-now").addEventListener("click",(function(t){return 0!==document.querySelector("input[name=token]").value.length?(document.querySelector("#errors").hidden=!0,document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),void o.stripe.confirmSepaDebitSetup(document.querySelector("meta[name=si-client-secret").content,{payment_method:document.querySelector("input[name=token]").value}).then((function(e){if(!e.error)return document.querySelector('input[name="gateway_response"]').value=JSON.stringify(e.setupIntent),document.querySelector("#server-response").submit();console.error(error)})).catch((function(t){e.textContent=t,e.hidden=!1}))):""===document.getElementById("sepa-name").value?(document.getElementById("sepa-name").focus(),e.textContent=document.querySelector("meta[name=translation-name-required]").content,void(e.hidden=!1)):""===document.getElementById("sepa-email-address").value?(document.getElementById("sepa-email-address").focus(),e.textContent=document.querySelector("meta[name=translation-email-required]").content,void(e.hidden=!1)):document.getElementById("sepa-mandate-acceptance").checked?(document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),void o.stripe.confirmSepaDebitPayment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{sepa_debit:o.iban,billing_details:{name:document.getElementById("sepa-name").value,email:document.getElementById("sepa-email-address").value}}}).then((function(e){return e.error?o.handleFailure(e.error.message):o.handleSuccess(e)}))):(e.textContent=document.querySelector("meta[name=translation-terms-required]").content,e.hidden=!1,void console.log("Terms"))}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}var t,n,o;return t=e,(n=[{key:"handleSuccess",value:function(e){document.querySelector('input[name="gateway_response"]').value=JSON.stringify(e.paymentIntent);var t=document.querySelector('input[name="token-billing-checkbox"]:checked');t&&(document.querySelector('input[name="store_card"]').value=t.value),document.getElementById("server-response").submit()}},{key:"handleFailure",value:function(e){var t=document.getElementById("errors");t.textContent="",t.textContent=e,t.hidden=!1,document.getElementById("pay-now").disabled=!1,document.querySelector("#pay-now > svg").classList.add("hidden"),document.querySelector("#pay-now > span").classList.remove("hidden")}}])&&a(t.prototype,n),o&&a(t,o),e}();new c(null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",null!==(n=null===(o=document.querySelector('meta[name="stripe-account-id"]'))||void 0===o?void 0:o.content)&&void 0!==n?n:"").setupStripe().handle()})();

public/js/clients/payments/stripe-sofort.js

@@ -1,2 +1,2 @@
 /*! For license information please see stripe-sofort.js.LICENSE.txt */
-(()=>{var e,t,n,r;function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var c=null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",i=null!==(n=null===(r=document.querySelector('meta[name="stripe-account-id"]'))||void 0===r?void 0:r.content)&&void 0!==n?n:"";new function e(t,n){var r=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),o(this,"setupStripe",(function(){return r.stripe=Stripe(r.key),r.stripeConnect&&(r.stripe.stripeAccount=i),r})),o(this,"handle",(function(){document.getElementById("pay-now").addEventListener("click",(function(e){document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),r.stripe.confirmSofortPayment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{sofort:{country:document.querySelector('meta[name="country"]').content}},return_url:document.querySelector('meta[name="return-url"]').content})}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}(c,i).setupStripe().handle()})();
+(()=>{var e,t,n,r;function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}new function e(t,n){var r=this;!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,e),o(this,"setupStripe",(function(){return r.stripeConnect?r.stripe=Stripe(r.key,{stripeAccount:r.stripeConnect}):r.stripe=Stripe(r.key),r})),o(this,"handle",(function(){document.getElementById("pay-now").addEventListener("click",(function(e){document.getElementById("pay-now").disabled=!0,document.querySelector("#pay-now > svg").classList.remove("hidden"),document.querySelector("#pay-now > span").classList.add("hidden"),r.stripe.confirmSofortPayment(document.querySelector("meta[name=pi-client-secret").content,{payment_method:{sofort:{country:document.querySelector('meta[name="country"]').content}},return_url:document.querySelector('meta[name="return-url"]').content})}))})),this.key=t,this.errors=document.getElementById("errors"),this.stripeConnect=n}(null!==(e=null===(t=document.querySelector('meta[name="stripe-publishable-key"]'))||void 0===t?void 0:t.content)&&void 0!==e?e:"",null!==(n=null===(r=document.querySelector('meta[name="stripe-account-id"]'))||void 0===r?void 0:r.content)&&void 0!==n?n:"").setupStripe().handle()})();

public/mix-manifest.json

@@ -2,11 +2,11 @@
     "/js/app.js": "/js/app.js?id=0e3959ab851d3350364d",
     "/js/clients/payment_methods/authorize-authorize-card.js": "/js/clients/payment_methods/authorize-authorize-card.js?id=de4468c682d6861847de",
     "/js/clients/payments/authorize-credit-card-payment.js": "/js/clients/payments/authorize-credit-card-payment.js?id=cfe5de1cf87a0b01568d",
-    "/js/clients/payments/stripe-ach.js": "/js/clients/payments/stripe-ach.js?id=5e74bc0d346beeb57ee9",
+    "/js/clients/payments/stripe-ach.js": "/js/clients/payments/stripe-ach.js?id=a5f14c885c3aeef6c744",
     "/js/clients/invoices/action-selectors.js": "/js/clients/invoices/action-selectors.js?id=6b79265cbb8c963eef19",
     "/js/clients/invoices/payment.js": "/js/clients/invoices/payment.js?id=2cccf9e51b60a0ab17b8",
-    "/js/clients/payments/stripe-sofort.js": "/js/clients/payments/stripe-sofort.js?id=926c7b9d1ee48bbf786b",
+    "/js/clients/payments/stripe-sofort.js": "/js/clients/payments/stripe-sofort.js?id=22fc06e698dea2c3bdf3",
-    "/js/clients/payments/stripe-alipay.js": "/js/clients/payments/stripe-alipay.js?id=1e159400d6a5ca4662c1",
+    "/js/clients/payments/stripe-alipay.js": "/js/clients/payments/stripe-alipay.js?id=d471e0433c57e23051ed",
     "/js/clients/payments/checkout-credit-card.js": "/js/clients/payments/checkout-credit-card.js?id=0b47ce36fe20191adb33",
     "/js/clients/quotes/action-selectors.js": "/js/clients/quotes/action-selectors.js?id=63f0688329be80ee8693",
     "/js/clients/quotes/approve.js": "/js/clients/quotes/approve.js?id=795d2f44cf3d117a554e",
@@ -27,17 +27,17 @@
     "/js/clients/payments/square-credit-card.js": "/js/clients/payments/square-credit-card.js?id=8f05ce6bd2d6cae7e5f2",
     "/js/clients/statements/view.js": "/js/clients/statements/view.js?id=4ed4c8a09803ddd0a9a7",
     "/js/clients/payments/razorpay-aio.js": "/js/clients/payments/razorpay-aio.js?id=c36ab5621413ef1de7c8",
-    "/js/clients/payments/stripe-sepa.js": "/js/clients/payments/stripe-sepa.js?id=cbd7bb4c483ca75333f4",
+    "/js/clients/payments/stripe-sepa.js": "/js/clients/payments/stripe-sepa.js?id=2daa1a70aa5f8e6988f5",
     "/js/clients/payment_methods/authorize-checkout-card.js": "/js/clients/payment_methods/authorize-checkout-card.js?id=61becda97682c7909f29",
-    "/js/clients/payments/stripe-giropay.js": "/js/clients/payments/stripe-giropay.js?id=cdf300d72a1564d19b72",
+    "/js/clients/payments/stripe-giropay.js": "/js/clients/payments/stripe-giropay.js?id=2a973971ed2b890524ee",
-    "/js/clients/payments/stripe-acss.js": "/js/clients/payments/stripe-acss.js?id=ec4f85eaeacd1d2135f5",
+    "/js/clients/payments/stripe-acss.js": "/js/clients/payments/stripe-acss.js?id=41367f4e80e52a0ab436",
-    "/js/clients/payments/stripe-bancontact.js": "/js/clients/payments/stripe-bancontact.js?id=66bbac90bf652dd16313",
+    "/js/clients/payments/stripe-bancontact.js": "/js/clients/payments/stripe-bancontact.js?id=8469db468493337fc122",
-    "/js/clients/payments/stripe-becs.js": "/js/clients/payments/stripe-becs.js?id=46f2e5093f6c879f274e",
+    "/js/clients/payments/stripe-becs.js": "/js/clients/payments/stripe-becs.js?id=b378dd507ceacebc99e4",
-    "/js/clients/payments/stripe-eps.js": "/js/clients/payments/stripe-eps.js?id=1ed972f879869de66c8a",
+    "/js/clients/payments/stripe-eps.js": "/js/clients/payments/stripe-eps.js?id=6bed81ba3f73a695de95",
-    "/js/clients/payments/stripe-ideal.js": "/js/clients/payments/stripe-ideal.js?id=73ce56676f9252b0cecf",
+    "/js/clients/payments/stripe-ideal.js": "/js/clients/payments/stripe-ideal.js?id=188426574f27660936e2",
-    "/js/clients/payments/stripe-przelewy24.js": "/js/clients/payments/stripe-przelewy24.js?id=f3a14f78bec8209c30ba",
+    "/js/clients/payments/stripe-przelewy24.js": "/js/clients/payments/stripe-przelewy24.js?id=e240b907ad163cac04c0",
     "/js/clients/payments/stripe-browserpay.js": "/js/clients/payments/stripe-browserpay.js?id=71e49866d66a6d85b88a",
-    "/js/clients/payments/stripe-fpx.js": "/js/clients/payments/stripe-fpx.js?id=915712157bc0634b9b21",
+    "/js/clients/payments/stripe-fpx.js": "/js/clients/payments/stripe-fpx.js?id=3a1cac8fb671c2e4337f",
     "/css/app.css": "/css/app.css?id=cab8a6526b0f9f71842d",
     "/css/card-js.min.css": "/css/card-js.min.css?id=62afeb675235451543ad"
 }

public/version.json

@@ -1 +1 @@
-{"app_name":"invoiceninja_flutter","version":"5.0.73","build_number":"73","package_name":"invoiceninja_flutter"}
+{"app_name":"invoiceninja_flutter","version":"5.0.75","build_number":"75","package_name":"invoiceninja_flutter"}

resources/js/clients/payments/stripe-ach.js

@@ -20,10 +20,19 @@ class AuthorizeACH {
     }
 
     setupStripe = () => {
-        this.stripe = Stripe(this.key);
 
-        if(this.stripe_connect)
+        if (this.stripeConnect){
-            this.stripe.stripeAccount = this.stripe_connect;
+           // this.stripe.stripeAccount = this.stripeConnect;
+           
+           this.stripe = Stripe(this.key, {
+              stripeAccount: this.stripeConnect,
+            }); 
+           
+        }
+        else {
+            this.stripe = Stripe(this.key);
+        }
+
 
         return this;
     };

resources/js/clients/payments/stripe-acss.js

@@ -16,10 +16,19 @@ class ProcessACSS {
     }
 
     setupStripe = () => {
-        this.stripe = Stripe(this.key);
 
-        if(this.stripeConnect)
+        if (this.stripeConnect){
-            this.stripe.stripeAccount = stripeConnect;
+           // this.stripe.stripeAccount = this.stripeConnect;
+           
+           this.stripe = Stripe(this.key, {
+              stripeAccount: this.stripeConnect,
+            }); 
+           
+        }
+        else {
+            this.stripe = Stripe(this.key);
+        }
+
         return this;
     };
 

resources/js/clients/payments/stripe-alipay.js

@@ -17,10 +17,19 @@ class ProcessAlipay {
     }
 
     setupStripe = () => {
-        this.stripe = Stripe(this.key);
 
-        if(this.stripeConnect)
+        if (this.stripeConnect){
-            this.stripe.stripeAccount = this.stripeConnect;
+           // this.stripe.stripeAccount = this.stripeConnect;
+           
+           this.stripe = Stripe(this.key, {
+              stripeAccount: this.stripeConnect,
+            }); 
+           
+        }
+        else {
+            this.stripe = Stripe(this.key);
+        }
+
         
         return this;
     };

resources/js/clients/payments/stripe-bancontact.js

@@ -16,10 +16,19 @@ class ProcessBANCONTACTPay {
     }
 
     setupStripe = () => {
-        this.stripe = Stripe(this.key);
 
-        if(this.stripeConnect)
+        if (this.stripeConnect){
-            this.stripe.stripeAccount = stripeConnect;
+           // this.stripe.stripeAccount = this.stripeConnect;
+           
+           this.stripe = Stripe(this.key, {
+              stripeAccount: this.stripeConnect,
+            }); 
+           
+        }
+        else {
+            this.stripe = Stripe(this.key);
+        }
+
         return this;
     };
 

resources/js/clients/payments/stripe-becs.js

@@ -16,10 +16,19 @@ class ProcessBECS {
     }
 
     setupStripe = () => {
-        this.stripe = Stripe(this.key);
 
-        if(this.stripeConnect)
+        if (this.stripeConnect){
-            this.stripe.stripeAccount = stripeConnect;
+           // this.stripe.stripeAccount = this.stripeConnect;
+           
+           this.stripe = Stripe(this.key, {
+              stripeAccount: this.stripeConnect,
+            }); 
+           
+        }
+        else {
+            this.stripe = Stripe(this.key);
+        }
+
         const elements = this.stripe.elements();
         const style = {
             base: {

resources/js/clients/payments/stripe-eps.js

@@ -16,10 +16,21 @@ class ProcessEPSPay {
     }
 
     setupStripe = () => {
-        this.stripe = Stripe(this.key);
 
-        if(this.stripeConnect)
+
-            this.stripe.stripeAccount = stripeConnect;
+        if (this.stripeConnect){
+           // this.stripe.stripeAccount = this.stripeConnect;
+           
+           this.stripe = Stripe(this.key, {
+              stripeAccount: this.stripeConnect,
+            }); 
+           
+        }
+        else {
+            this.stripe = Stripe(this.key);
+        }
+
+
         let elements = this.stripe.elements();
         var options = {
             style: {

resources/js/clients/payments/stripe-fpx.js

@@ -16,10 +16,20 @@ class ProcessFPXPay {
     }
 
     setupStripe = () => {
-        this.stripe = Stripe(this.key);
 
-        if(this.stripeConnect)
+
-            this.stripe.stripeAccount = stripeConnect;
+        if (this.stripeConnect){
+           // this.stripe.stripeAccount = this.stripeConnect;
+           
+           this.stripe = Stripe(this.key, {
+              stripeAccount: this.stripeConnect,
+            }); 
+           
+        }
+        else {
+            this.stripe = Stripe(this.key);
+        }
+
         let elements = this.stripe.elements();
         let style = {
             base: {

resources/js/clients/payments/stripe-giropay.js

@@ -16,10 +16,19 @@ class ProcessGiroPay {
     }
 
     setupStripe = () => {
-        this.stripe = Stripe(this.key);
 
-        if(this.stripeConnect)
+        if (this.stripeConnect){
-            this.stripe.stripeAccount = stripeConnect;
+           // this.stripe.stripeAccount = this.stripeConnect;
+           
+           this.stripe = Stripe(this.key, {
+              stripeAccount: this.stripeConnect,
+            }); 
+           
+        }
+        else {
+            this.stripe = Stripe(this.key);
+        }
+
 
         return this;
     };

resources/js/clients/payments/stripe-ideal.js

@@ -16,10 +16,21 @@ class ProcessIDEALPay {
     }
 
     setupStripe = () => {
-        this.stripe = Stripe(this.key);
 
-        if(this.stripeConnect)
+
-            this.stripe.stripeAccount = stripeConnect;
+        if (this.stripeConnect){
+           // this.stripe.stripeAccount = this.stripeConnect;
+           
+           this.stripe = Stripe(this.key, {
+              stripeAccount: this.stripeConnect,
+            }); 
+           
+        }
+        else {
+            this.stripe = Stripe(this.key);
+        }
+
+
         let elements = this.stripe.elements();
         var options = {
             style: {

resources/js/clients/payments/stripe-przelewy24.js

@@ -16,10 +16,20 @@ class ProcessPRZELEWY24 {
     }
 
     setupStripe = () => {
-        this.stripe = Stripe(this.key);
 
-        if(this.stripeConnect)
+        if (this.stripeConnect){
-            this.stripe.stripeAccount = stripeConnect;
+           // this.stripe.stripeAccount = this.stripeConnect;
+           
+           this.stripe = Stripe(this.key, {
+              stripeAccount: this.stripeConnect,
+            }); 
+           
+        }
+        else {
+            this.stripe = Stripe(this.key);
+        }
+
+        
         let elements = this.stripe.elements()
         var options = {
             // Custom styling can be passed to options when creating an Element

resources/js/clients/payments/stripe-sepa.js

@@ -16,9 +16,21 @@ class ProcessSEPA {
     }
 
     setupStripe = () => {
-        this.stripe = Stripe(this.key);
 
-        if (this.stripeConnect) this.stripe.stripeAccount = stripeConnect;
+        if (this.stripeConnect){
+           // this.stripe.stripeAccount = this.stripeConnect;
+           
+           this.stripe = Stripe(this.key, {
+              stripeAccount: this.stripeConnect,
+            }); 
+           
+        }
+        else {
+            this.stripe = Stripe(this.key);
+        }
+
+
+
         const elements = this.stripe.elements();
         var style = {
             base: {

resources/js/clients/payments/stripe-sofort.js

@@ -16,10 +16,19 @@ class ProcessSOFORT {
     }
 
     setupStripe = () => {
-        this.stripe = Stripe(this.key);
 
-        if(this.stripeConnect)
+
-            this.stripe.stripeAccount = stripeConnect;
+        if (this.stripeConnect){
+           // this.stripe.stripeAccount = this.stripeConnect;
+           
+           this.stripe = Stripe(this.key, {
+              stripeAccount: this.stripeConnect,
+            }); 
+           
+        }
+        else {
+            this.stripe = Stripe(this.key);
+        }
 
         return this;
     };

resources/views/email/template/client.blade.php

@@ -114,6 +114,7 @@
 
                             <img
                                 style="margin-top: 40px; height: 40px; display: block; margin-left: auto; margin-right: auto;"
+                                alt=""
                                 src="{{ $logo ?? '' }}"/>
                         </div>
                     </td>

resources/views/portal/ninja2020/gateways/stripe/sofort/pay.blade.php

@@ -1,7 +1,14 @@
 @extends('portal.ninja2020.layout.payments', ['gateway_title' => 'SOFORT', 'card_title' => 'SOFORT'])
 
 @section('gateway_head')
-    <meta name="stripe-publishable-key" content="{{ $gateway->getPublishableKey() }}">
+
+    @if($gateway->company_gateway->getConfigField('account_id'))
+        <meta name="stripe-account-id" content="{{ $gateway->company_gateway->getConfigField('account_id') }}">
+        <meta name="stripe-publishable-key" content="{{ config('ninja.ninja_stripe_publishable_key') }}">
+    @else
+        <meta name="stripe-publishable-key" content="{{ $gateway->getPublishableKey() }}">
+    @endif
+
     <meta name="stripe-account-id" content="{{ $gateway->company_gateway->getConfigField('account_id') }}">
     <meta name="return-url" content="{{ $return_url }}">
     <meta name="amount" content="{{ $stripe_amount }}">

routes/api.php

@@ -13,17 +13,17 @@
 
 use Illuminate\Support\Facades\Route;
 
-Route::group(['middleware' => ['api_secret_check']], function () {
+Route::group(['middleware' => ['throttle:300,1', 'api_secret_check']], function () {
     Route::post('api/v1/signup', 'AccountController@store')->name('signup.submit');
     Route::post('api/v1/oauth_login', 'Auth\LoginController@oauthApiLogin');
 });
 
-Route::group(['middleware' => ['api_secret_check','email_db']], function () {
+Route::group(['middleware' => ['throttle:10,1','api_secret_check','email_db']], function () {
     Route::post('api/v1/login', 'Auth\LoginController@apiLogin')->name('login.submit');
     Route::post('api/v1/reset_password', 'Auth\ForgotPasswordController@sendResetLinkEmail');
 });
 
-Route::group(['middleware' => ['api_db', 'token_auth', 'locale'], 'prefix' => 'api/v1', 'as' => 'api.'], function () {
+Route::group(['middleware' => ['throttle:300,1', 'api_db', 'token_auth', 'locale'], 'prefix' => 'api/v1', 'as' => 'api.'], function () {
     Route::post('check_subdomain', 'SubdomainController@index')->name('check_subdomain');
     Route::get('ping', 'PingController@index')->name('ping');
     Route::get('health_check', 'PingController@health')->name('health_check');
@@ -31,6 +31,10 @@ Route::group(['middleware' => ['api_db', 'token_auth', 'locale'], 'prefix' => 'a
     Route::get('activities', 'ActivityController@index');
     Route::get('activities/download_entity/{activity}', 'ActivityController@downloadHistoricalEntity');
 
+
+    Route::post('charts/totals', 'ChartController@totals')->name('chart.totals');
+    Route::post('charts/chart_summary', 'ChartController@chart_summary')->name('chart.chart_summary');
+
     Route::post('claim_license', 'LicenseController@index')->name('license.index');
 
     Route::resource('clients', 'ClientController'); // name = (clients. index / create / show / update / destroy / edit
@@ -213,17 +217,17 @@ Route::group(['middleware' => ['api_db', 'token_auth', 'locale'], 'prefix' => 'a
 });
 
 Route::match(['get', 'post'], 'payment_webhook/{company_key}/{company_gateway_id}', 'PaymentWebhookController')
-    ->middleware(['guest'])
+    ->middleware(['throttle:1000,1','guest'])
     ->name('payment_webhook');
 
 Route::match(['get', 'post'], 'payment_notification_webhook/{company_key}/{company_gateway_id}/{client}', 'PaymentNotificationWebhookController')
-    ->middleware(['guest'])
+    ->middleware(['throttle:1000,1', 'guest'])
     ->name('payment_notification_webhook');
 
-Route::post('api/v1/postmark_webhook', 'PostMarkController@webhook')->middleware(['throttle:10000,1']);
+Route::post('api/v1/postmark_webhook', 'PostMarkController@webhook')->middleware('throttle:1000,1');
-Route::get('token_hash_router', 'OneTimeTokenController@router');
+Route::get('token_hash_router', 'OneTimeTokenController@router')->middleware('throttle:100,1');
-Route::get('webcron', 'WebCronController@index');
+Route::get('webcron', 'WebCronController@index')->middleware('throttle:100,1');;
-Route::post('api/v1/get_migration_account', 'HostedMigrationController@getAccount')->middleware('guest');
+Route::post('api/v1/get_migration_account', 'HostedMigrationController@getAccount')->middleware('guest')->middleware('throttle:100,1');;
-Route::post('api/v1/confirm_forwarding', 'HostedMigrationController@confirmForwarding')->middleware('guest');
+Route::post('api/v1/confirm_forwarding', 'HostedMigrationController@confirmForwarding')->middleware('guest')->middleware('throttle:100,1');;
 
 Route::fallback('BaseController@notFound');

routes/client.php

@@ -28,7 +28,7 @@ Route::get('error', 'ClientPortal\ContactHashLoginController@errorPage')->name('
 Route::get('client/payment/{contact_key}/{payment_id}', 'ClientPortal\InvitationController@paymentRouter')->middleware(['domain_db','contact_key_login']);
 Route::get('client/ninja/{contact_key}/{company_key}', 'ClientPortal\NinjaPlanController@index')->name('client.ninja_contact_login')->middleware(['domain_db']);
 
-Route::group(['middleware' => ['auth:contact', 'locale', 'check_client_existence','domain_db'], 'prefix' => 'client', 'as' => 'client.'], function () {
+Route::group(['middleware' => ['auth:contact', 'locale', 'domain_db'], 'prefix' => 'client', 'as' => 'client.'], function () {
     Route::get('dashboard', 'ClientPortal\DashboardController@index')->name('dashboard'); // name = (dashboard. index / create / show / update / destroy / edit
 
     Route::get('plan', 'ClientPortal\NinjaPlanController@plan')->name('plan'); // name = (dashboard. index / create / show / update / destroy / edit

tests/Unit/Chart/ChartCurrencyTest.php

@@ -10,17 +10,23 @@
  */
 namespace Tests\Unit\Chart;
 
+use App\DataMapper\ClientSettings;
+use App\Models\Client;
+use App\Models\Invoice;
 use App\Services\Chart\ChartService;
 use App\Utils\Ninja;
+use Illuminate\Foundation\Testing\DatabaseTransactions;
 use Tests\MockAccountData;
 use Tests\TestCase;
 
 /**
  * @test
+ * @covers  App\Services\Chart\ChartService
  */
 class ChartCurrencyTest extends TestCase
 {
     use MockAccountData;
+    use DatabaseTransactions;
 
     public function setUp() :void
     {
@@ -29,80 +35,160 @@ class ChartCurrencyTest extends TestCase
         $this->makeTestData();
     }
 
-    // public function testClientServiceDataSetBuild()
+    public function testRevenueValues()
-    // {
+    {
 
-    //     $haystack = [
+        Invoice::factory()->create([
-    //         [
+            'client_id' => $this->client->id,
-    //         'currency_id' => null,
+            'user_id' => $this->user->id,
-    //         'amount' => 10
+            'company_id' => $this->company->id,
-    //         ],
+            'paid_to_date' => 100,
-    //         [
+            'status_id' => 4,
-    //         'currency_id' => 1,
+            'date' => now(),
-    //         'amount' => 11
+            'due_date'=> now(),
-    //         ],
+            'number' => 'db_record'
-    //         [
+        ]);
-    //         'currency_id' => 2,
-    //         'amount' => 12
-    //         ],
-    //         [
-    //         'currency_id' => 3,
-    //         'amount' => 13
-    //         ],
-    //     ];
 
-    //     $cs = new ChartService($this->company);
+        $this->assertDatabaseHas('invoices', ['number' => 'db_record']);  
 
-    //     nlog($cs->totals(now()->subYears(10), now()));
+        $cs = new ChartService($this->company);
+        // nlog($cs->getRevenueQuery(now()->subDays(20)->format('Y-m-d'), now()->addDays(100)->format('Y-m-d')));
 
-    //     $this->assertTrue(is_array($cs->totals(now()->subYears(10), now())));
+        $data = [
+            'start_date' => now()->subDays(30)->format('Y-m-d'),
+            'end_date' => now()->addDays(100)->format('Y-m-d')
+        ];
 
-    // }
+        $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/charts/totals', $data);
 
-    // /* coalesces the company currency with the null currencies */
+        $response->assertStatus(200);
-    // public function testFindNullValueinArray()
-    // {
 
-    //     $haystack = [
+    }
-    //         [
-    //         'currency_id' => null,
-    //         'amount' => 10
-    //         ],
-    //         [
-    //         'currency_id' => 1,
-    //         'amount' => 11
-    //         ],
-    //         [
-    //         'currency_id' => 2,
-    //         'amount' => 12
-    //         ],
-    //         [
-    //         'currency_id' => 3,
-    //         'amount' => 13
-    //         ],
-    //     ];
 
-    //     $company_currency_id = 1;
 
-    //     $c_key = array_search($company_currency_id , array_column($haystack, 'currency_id')); 
+    public function testgetCurrencyCodes()
+    {
+        $settings = ClientSettings::defaults();
+        $settings->currency_id = "1"; //USD
 
-    //     $this->assertNotEquals($c_key, 2);
+        Client::factory()->create([
-    //     $this->assertEquals($c_key, 1);
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'settings' => $settings,
+        ]);
 
-    //     $key = array_search(null , array_column($haystack, 'currency_id')); 
+        $settings = ClientSettings::defaults();
+        $settings->currency_id = "2"; //GBP
 
-    //     $this->assertNotEquals($key, 39);
+        Client::factory()->create([
-    //     $this->assertEquals($key, 0);
+            'user_id' => $this->user->id,
+            'company_id' => $this->company->id,
+            'settings' => $settings,
+        ]);
 
-    //     $null_currency_amount = $haystack[$key]['amount'];
+        $cs = new ChartService($this->company);
 
-    //     unset($haystack[$key]);
+        $this->assertTrue(is_array($cs->getCurrencyCodes()));
 
-    //     $haystack[$c_key]['amount'] += $null_currency_amount;
+        $this->assertTrue(in_array("GBP", $cs->getCurrencyCodes()));
+        $this->assertTrue(in_array("USD", $cs->getCurrencyCodes()));
+        $this->assertFalse(in_array("AUD", $cs->getCurrencyCodes()));
+    }
 
-    //     $this->assertEquals($haystack[$c_key]['amount'], 21);
+    public function testGetChartTotalsApi()
+    {
 
-    // }
+        $data = [
+            'start_date' => now()->subDays(30)->format('Y-m-d'),
+            'end_date' => now()->format('Y-m-d')
+        ];
+
+        $response = $this->withHeaders([
+                'X-API-SECRET' => config('ninja.api_secret'),
+                'X-API-TOKEN' => $this->token,
+            ])->post('/api/v1/charts/totals', $data);
+
+        $response->assertStatus(200);
+
+    }
+
+    public function testClientServiceDataSetBuild()
+    {
+
+        $haystack = [
+            [
+            'currency_id' => null,
+            'amount' => 10
+            ],
+            [
+            'currency_id' => 1,
+            'amount' => 11
+            ],
+            [
+            'currency_id' => 2,
+            'amount' => 12
+            ],
+            [
+            'currency_id' => 3,
+            'amount' => 13
+            ],
+        ];
+
+        $cs = new ChartService($this->company);
+
+        // nlog($cs->totals(now()->subYears(10), now()));
+
+        $this->assertTrue(is_array($cs->totals(now()->subYears(10), now())));
+
+    }
+
+    /* coalesces the company currency with the null currencies */
+    public function testFindNullValueinArray()
+    {
+
+        $haystack = [
+            [
+            'currency_id' => null,
+            'amount' => 10
+            ],
+            [
+            'currency_id' => 1,
+            'amount' => 11
+            ],
+            [
+            'currency_id' => 2,
+            'amount' => 12
+            ],
+            [
+            'currency_id' => 3,
+            'amount' => 13
+            ],
+        ];
+
+        $company_currency_id = 1;
+
+        $c_key = array_search($company_currency_id , array_column($haystack, 'currency_id')); 
+
+        $this->assertNotEquals($c_key, 2);
+        $this->assertEquals($c_key, 1);
+
+        $key = array_search(null , array_column($haystack, 'currency_id')); 
+
+        $this->assertNotEquals($key, 39);
+        $this->assertEquals($key, 0);
+
+        $null_currency_amount = $haystack[$key]['amount'];
+
+        unset($haystack[$key]);
+
+        $haystack[$c_key]['amount'] += $null_currency_amount;
+
+        $this->assertEquals($haystack[$c_key]['amount'], 21);
+
+    }
 
 
     public function testCollectionMerging()