Merge pull request #7852 from turbo124/v5-stable

v5.5.27
2024-11-13 06:32:40 +01:00 · 2022-10-06 19:14:32 +11:00 · 2022-10-06 19:14:32 +11:00 · ca1132ebb7
commit ca1132ebb7
parent 4853b7b680 1a9780c878
16 changed files with 346 additions and 48 deletions
--- a/VERSION.txt
+++ b/VERSION.txt
@ -1 +1 @@
-5.5.26
+5.5.27
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@ -773,8 +773,16 @@ class BaseController extends Controller
        // 10-01-2022 need to ensure we snake case properly here to ensure permissions work as expected
        // 28-03-2022 this is definitely correct here, do not append _ to the view, it resolved correctly when snake cased
        if (auth()->user() && ! auth()->user()->hasPermission('view'.lcfirst(class_basename(Str::snake($this->entity_type))))) {
-            //03-09-2022
-            $query->where('user_id', '=', auth()->user()->id)->orWhere('assigned_user_id', auth()->user()->id);
+
+            //06-10-2022 - some entities do not have assigned_user_id - this becomes an issue when we have a large company and low permission users
+            if(lcfirst(class_basename(Str::snake($this->entity_type))) == 'user')
+                $query->where('id', auth()->user()->id);
+            elseif(in_array(lcfirst(class_basename(Str::snake($this->entity_type))),['design','group_setting','payment_term'])){
+                //need to pass these back regardless
+            }
+            else
+                $query->where('user_id', '=', auth()->user()->id)->orWhere('assigned_user_id', auth()->user()->id);
+
        }

        if (request()->has('updated_at') && request()->input('updated_at') > 0) {
--- a/app/Import/Definitions/ExpenseMap.php
+++ b/app/Import/Definitions/ExpenseMap.php
@ -28,6 +28,15 @@ class ExpenseMap
            9 => 'expense.transaction_reference',
            10 => 'expense.public_notes',
            11 => 'expense.private_notes',
+            12 => 'expense.tax_name1',
+            13 => 'expense.tax_rate1',
+            14 => 'expense.tax_name2',
+            15 => 'expense.tax_rate2',
+            16 => 'expense.tax_name3',
+            17 => 'expense.tax_rate3',
+            18 => 'expense.uses_inclusive_taxes',
+            19 => 'expense.payment_date',
+
        ];
    }

@ -46,6 +55,15 @@ class ExpenseMap
            9 => 'texts.transaction_reference',
            10 => 'texts.public_notes',
            11 => 'texts.private_notes',
+            12 => 'texts.tax_name1',
+            13 => 'texts.tax_rate1',
+            14 => 'texts.tax_name2',
+            15 => 'texts.tax_rate2',
+            16 => 'texts.tax_name3',
+            17 => 'texts.tax_rate3',
+            18 => 'texts.uses_inclusive_taxes',
+            19 => 'texts.payment_date',
+
        ];
    }
 }
--- a/app/Import/Transformer/Csv/ExpenseTransformer.php
+++ b/app/Import/Transformer/Csv/ExpenseTransformer.php
@ -42,7 +42,7 @@ class ExpenseTransformer extends BaseTransformer
            'client_id' => isset($data['expense.client'])
                ? $this->getClientId($data['expense.client'])
                : null,
-            'date' => strlen($this->getString($data, 'expense.date') > 1) ? date('Y-m-d', strtotime($this->getString($data, 'expense.date'))) : now()->format('Y-m-d'),
+            'date' => strlen($this->getString($data, 'expense.date') > 1) ? date('Y-m-d', strtotime(str_replace("/","-",$data['expense.date']))) : now()->format('Y-m-d'),
            'public_notes' => $this->getString($data, 'expense.public_notes'),
            'private_notes' => $this->getString($data, 'expense.private_notes'),
            'category_id' => isset($data['expense.category'])
@ -55,7 +55,7 @@ class ExpenseTransformer extends BaseTransformer
                ? $this->getPaymentTypeId($data['expense.payment_type'])
                : null,
            'payment_date' => isset($data['expense.payment_date'])
-                ? date('Y-m-d', strtotime($data['expense.payment_date']))
+                ? date('Y-m-d', strtotime(str_replace("/","-",$data['expense.payment_date'])))
                : null,
            'custom_value1' => $this->getString($data, 'expense.custom_value1'),
            'custom_value2' => $this->getString($data, 'expense.custom_value2'),
@ -66,6 +66,14 @@ class ExpenseTransformer extends BaseTransformer
                'expense.transaction_reference'
            ),
            'should_be_invoiced' => $clientId ? true : false,
+            'uses_inclusive_taxes' => (bool) $this->getString($data, 'expense.uses_inclusive_taxes'),
+            'tax_name1' => $this->getString($data, 'expense.tax_name1'),
+            'tax_rate1' => $this->getFloat($data, 'expense.tax_rate1'),
+            'tax_name2' => $this->getString($data, 'expense.tax_name2'),
+            'tax_rate2' => $this->getFloat($data, 'expense.tax_rate2'),
+            'tax_name3' => $this->getString($data, 'expense.tax_name3'),
+            'tax_rate3' => $this->getFloat($data, 'expense.tax_rate3'),
+
        ];
    }
 }
--- a/app/Import/Transformer/Csv/InvoiceTransformer.php
+++ b/app/Import/Transformer/Csv/InvoiceTransformer.php
@ -57,10 +57,10 @@ class InvoiceTransformer extends BaseTransformer
            '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']))
+                ? date('Y-m-d', strtotime(str_replace("/","-",$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']))
+                ? date('Y-m-d', strtotime(str_replace("/","-",$invoice_data['invoice.due_date'])))
                : null,
            'terms' => $this->getString($invoice_data, 'invoice.terms'),
            'public_notes' => $this->getString(
--- a/app/Import/Transformer/Csv/QuoteTransformer.php
+++ b/app/Import/Transformer/Csv/QuoteTransformer.php
@ -57,10 +57,10 @@ class QuoteTransformer extends BaseTransformer
            'discount' => $this->getFloat($quote_data, 'quote.discount'),
            'po_number' => $this->getString($quote_data, 'quote.po_number'),
            'date' => isset($quote_data['quote.date'])
-                ? date('Y-m-d', strtotime($quote_data['quote.date']))
+                ? date('Y-m-d', strtotime(str_replace("/","-",$quote_data['quote.date'])))
                : now()->format('Y-m-d'),
            'due_date' => isset($quote_data['quote.due_date'])
-                ? date('Y-m-d', strtotime($quote_data['quote.due_date']))
+                ? date('Y-m-d', strtotime(str_replace("/","-",$quote_data['quote.due_date'])))
                : null,
            'terms' => $this->getString($quote_data, 'quote.terms'),
            'public_notes' => $this->getString(
--- a/app/Notifications/Ninja/DomainFailureNotification.php
+++ b/app/Notifications/Ninja/DomainFailureNotification.php
@ -0,0 +1,86 @@
+<?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2022. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://www.elastic.co/licensing/elastic-license
+ */
+
+namespace App\Notifications\Ninja;
+
+use App\Models\Account;
+use App\Models\Client;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Messages\SlackMessage;
+use Illuminate\Notifications\Notification;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\SerializesModels;
+
+class DomainFailureNotification extends Notification 
+{
+
+    /**
+     * Create a new notification instance.
+     *
+     * @return void
+     */
+
+    protected string $domain;
+
+    public function __construct(string $domain)
+    {
+        $this->domain = $domain;
+    }
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function via($notifiable)
+    {
+        return ['slack'];
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return MailMessage
+     */
+    public function toMail($notifiable)
+    {
+    }
+
+    /**
+     * Get the array representation of the notification.
+     *
+     * @param  mixed  $notifiable
+     * @return array
+     */
+    public function toArray($notifiable)
+    {
+        return [
+            //
+        ];
+    }
+
+    public function toSlack($notifiable)
+    {
+        $content = "Domain Certificate failure:\n";
+        $content .= "{$this->domain}\n";        
+
+        return (new SlackMessage)
+                ->success()
+                ->from(ctrans('texts.notification_bot'))
+                ->image('https://app.invoiceninja.com/favicon.png')
+                ->content($content);
+    }
+}
--- a/app/Notifications/Ninja/NewAccountNotification.php
+++ b/app/Notifications/Ninja/NewAccountNotification.php
@ -79,8 +79,6 @@ class NewAccountNotification extends Notification
    {
        $content = "New Trial Started\n";
        $content .= "{$this->client->name}\n";
-        $content .= "Account key: {$this->account->key}\n";
-        $content .= "Users: {$this->account->users()->pluck('email')}\n";
        $content .= "Contacts: {$this->client->contacts()->pluck('email')}\n";
        

--- a/app/PaymentDrivers/Stripe/ACH.php
+++ b/app/PaymentDrivers/Stripe/ACH.php
@ -165,6 +165,18 @@ class ACH
        $data['payment_method_id'] = GatewayType::BANK_TRANSFER;
        $data['customer'] = $this->stripe->findOrCreateCustomer();
        $data['amount'] = $this->stripe->convertToStripeAmount($data['total']['amount_with_fee'], $this->stripe->client->currency()->precision, $this->stripe->client->currency());
+        $amount = $data['total']['amount_with_fee'];
+
+        $invoice = Invoice::whereIn('id', $this->transformKeys(array_column($this->stripe->payment_hash->invoices(), 'invoice_id')))
+                          ->withTrashed()
+                          ->first();
+
+        if ($invoice) {
+            $description = "Invoice {$invoice->number} for {$amount} for client {$this->stripe->client->present()->name()}";
+        } else {
+            $description = "Payment with no invoice for amount {$amount} for client {$this->stripe->client->present()->name()}";
+        }
+

        $intent = false;

@ -176,6 +188,11 @@ class ACH
                'setup_future_usage' => 'off_session',
                'customer' => $data['customer']->id,
                'payment_method_types' => ['us_bank_account'],
+                'description' => $description,
+                'metadata' => [
+                    'payment_hash' => $this->stripe->payment_hash->hash,
+                    'gateway_type_id' => GatewayType::BANK_TRANSFER,
+                ],
            ]
            );
        }
--- a/app/PaymentDrivers/Stripe/Jobs/PaymentIntentWebhook.php
+++ b/app/PaymentDrivers/Stripe/Jobs/PaymentIntentWebhook.php
@ -13,6 +13,7 @@ namespace App\PaymentDrivers\Stripe\Jobs;

 use App\Jobs\Util\SystemLogger;
 use App\Libraries\MultiDB;
+use App\Models\ClientGatewayToken;
 use App\Models\Company;
 use App\Models\CompanyGateway;
 use App\Models\GatewayType;
@ -21,6 +22,7 @@ use App\Models\Payment;
 use App\Models\PaymentHash;
 use App\Models\PaymentType;
 use App\Models\SystemLog;
+use App\PaymentDrivers\Stripe\UpdatePaymentMethods;
 use App\PaymentDrivers\Stripe\Utilities;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@ -53,7 +55,7 @@ class PaymentIntentWebhook implements ShouldQueue

    public function handle()
    {
-        
+
        MultiDB::findAndSetDbByCompanyKey($this->company_key);

        $company = Company::where('company_key', $this->company_key)->first();
@ -145,7 +147,18 @@ class PaymentIntentWebhook implements ShouldQueue

                $this->updateCreditCardPayment($payment_hash, $client);
            }
+            elseif(array_key_exists('payment_method_types', $this->stripe_request['object']) && optional($this->stripe_request['object']['charges']['data'][0]['metadata']['payment_hash']) && in_array('us_bank_account', $this->stripe_request['object']['payment_method_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->updateAchPayment($payment_hash, $client);
+            }
        }


@ -161,6 +174,81 @@ class PaymentIntentWebhook implements ShouldQueue

    }

+    private function updateAchPayment($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::ACH,
+            'amount' => $payment_hash->data->amount_with_fee,
+            'transaction_reference' => $this->stripe_request['object']['charges']['data'][0]['id'],
+            'gateway_type_id' => GatewayType::BANK_TRANSFER,
+        ];
+        
+        $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,
+        );
+
+        try {
+
+            $customer = $driver->getCustomer($this->stripe_request['object']['charges']['data'][0]['customer']);
+            $method = $driver->getStripePaymentMethod($this->stripe_request['object']['charges']['data'][0]['payment_method']);
+            $payment_method = $this->stripe_request['object']['charges']['data'][0]['payment_method'];
+
+            $token_exists = ClientGatewayToken::where([
+                'gateway_customer_reference' => $customer->id,
+                'token' => $payment_method,
+                'client_id' => $client->id,
+                'company_id' => $client->company_id,
+            ])->exists();
+
+            /* Already exists return */
+            if ($token_exists) {
+                return;
+            }
+
+            $payment_meta = new \stdClass;
+            $payment_meta->brand = (string) \sprintf('%s (%s)', $method->us_bank_account['bank_name'], ctrans('texts.ach'));
+            $payment_meta->last4 = (string) $method->us_bank_account['last4'];
+            $payment_meta->type = GatewayType::BANK_TRANSFER;
+            $payment_meta->state = 'verified';
+
+            $data = [
+                'payment_meta' => $payment_meta,
+                'token' => $payment_method,
+                'payment_method_id' => GatewayType::BANK_TRANSFER,
+            ];
+
+            $additional_data = ['gateway_customer_reference' => $customer->id];
+
+            if ($customer->default_source === $method->id) {
+                $additional_data = ['gateway_customer_reference' => $customer->id, 'is_default' => 1];
+            }
+
+            $driver->storeGatewayToken($data, $additional_data);
+            
+        }
+        catch(\Exception $e){
+            nlog("failed to import payment methods");
+            nlog($e->getMessage());
+        }
+    }
+
+
    private function updateCreditCardPayment($payment_hash, $client)
    {
        $company_gateway = CompanyGateway::find($this->company_gateway_id);
--- a/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php
+++ b/app/PaymentDrivers/Stripe/UpdatePaymentMethods.php
@ -70,7 +70,7 @@ class UpdatePaymentMethods
        $this->importBankAccounts($customer, $client);
    }

-    private function importBankAccounts($customer, $client)
+    public function importBankAccounts($customer, $client)
    {
        $sources = $customer->sources;

--- a/config/ninja.php
+++ b/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.5.26',
-    'app_tag' => '5.5.26',
+    'app_version' => '5.5.27',
+    'app_tag' => '5.5.27',
    'minimum_client_version' => '5.0.16',
    'terms_version' => '1.0.1',
    'api_secret' => env('API_SECRET', ''),
--- a/database/migrations/2022_05_18_162443_create_schedulers_table.php
+++ b/database/migrations/2022_05_18_162443_create_schedulers_table.php
@ -26,8 +26,8 @@ return new class extends Migration {
            $table->boolean('paused')->default(false);
            $table->boolean('is_deleted')->default(false);
            $table->string('repeat_every');
-            $table->timestamp('start_from');
-            $table->timestamp('scheduled_run');
+            $table->timestamp('start_from')->nullable();
+            $table->timestamp('scheduled_run')->nullable();
            $table->foreignIdFor(\App\Models\Company::class);
            $table->timestamps();
            $table->softDeletes();
@ -41,6 +41,6 @@ return new class extends Migration {
     */
    public function down()
    {
-        Schema::dropIfExists('schedulers');
+
    }
 };
--- a/database/migrations/2022_10_06_011344_add_key_to_products.php
+++ b/database/migrations/2022_10_06_011344_add_key_to_products.php
@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('products', function (Blueprint $table) {
+            $table->index(['product_key', 'company_id']);
+        });
+
+        Schema::table('companies', function (Blueprint $table) {
+            $table->index(['subdomain', 'portal_mode']);
+            $table->index(['portal_domain', 'portal_mode']);
+            $table->index('company_key');
+        });
+
+        Schema::table('accounts', function (Blueprint $table) {
+            $table->index('key');
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+
+    }
+};
--- a/database/schema/db-ninja-01-schema.dump
+++ b/database/schema/db-ninja-01-schema.dump
@ -44,11 +44,12 @@ CREATE TABLE `accounts` (
  `set_react_as_default_ap` tinyint(1) NOT NULL DEFAULT '0',
  `is_flagged` tinyint(1) NOT NULL DEFAULT '0',
  `is_verified_account` tinyint(1) NOT NULL DEFAULT '0',
-  `account_sms_verification_code` text COLLATE utf8mb4_unicode_ci,
-  `account_sms_verification_number` text COLLATE utf8mb4_unicode_ci,
+  `account_sms_verification_code` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `account_sms_verification_number` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
  `account_sms_verified` tinyint(1) NOT NULL DEFAULT '0',
  PRIMARY KEY (`id`),
-  KEY `accounts_payment_id_index` (`payment_id`)
+  KEY `accounts_payment_id_index` (`payment_id`),
+  KEY `accounts_key_index` (`key`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS `activities`;
@ -222,6 +223,8 @@ CREATE TABLE `client_contacts` (
  KEY `client_contacts_company_id_index` (`company_id`),
  KEY `client_contacts_client_id_index` (`client_id`),
  KEY `client_contacts_user_id_index` (`user_id`),
+  KEY `client_contacts_contact_key(20)_index` (`contact_key`(20)),
+  KEY `client_contacts_email_index` (`email`),
  CONSTRAINT `client_contacts_client_id_foreign` FOREIGN KEY (`client_id`) REFERENCES `clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@ -333,6 +336,7 @@ CREATE TABLE `clients` (
  KEY `clients_size_id_foreign` (`size_id`),
  KEY `clients_company_id_index` (`company_id`),
  KEY `clients_user_id_index` (`user_id`),
+  KEY `clients_client_hash(20)_index` (`client_hash`(20)),
  CONSTRAINT `clients_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `clients_industry_id_foreign` FOREIGN KEY (`industry_id`) REFERENCES `industries` (`id`),
  CONSTRAINT `clients_size_id_foreign` FOREIGN KEY (`size_id`) REFERENCES `sizes` (`id`)
@ -410,11 +414,16 @@ CREATE TABLE `companies` (
  `inventory_notification_threshold` int NOT NULL DEFAULT '0',
  `stock_notification` tinyint(1) NOT NULL DEFAULT '1',
  `enabled_expense_tax_rates` int unsigned NOT NULL DEFAULT '0',
+  `invoice_task_project` tinyint(1) NOT NULL DEFAULT '0',
+  `report_include_deleted` tinyint(1) NOT NULL DEFAULT '0',
  PRIMARY KEY (`id`),
  UNIQUE KEY `companies_company_key_unique` (`company_key`),
  KEY `companies_industry_id_foreign` (`industry_id`),
  KEY `companies_size_id_foreign` (`size_id`),
  KEY `companies_account_id_index` (`account_id`),
+  KEY `companies_subdomain_portal_mode_index` (`subdomain`,`portal_mode`),
+  KEY `companies_portal_domain_portal_mode_index` (`portal_domain`,`portal_mode`),
+  KEY `companies_company_key_index` (`company_key`),
  CONSTRAINT `companies_account_id_foreign` FOREIGN KEY (`account_id`) REFERENCES `accounts` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `companies_industry_id_foreign` FOREIGN KEY (`industry_id`) REFERENCES `industries` (`id`),
  CONSTRAINT `companies_size_id_foreign` FOREIGN KEY (`size_id`) REFERENCES `sizes` (`id`)
@ -848,7 +857,7 @@ DROP TABLE IF EXISTS `failed_jobs`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `failed_jobs` (
  `id` bigint unsigned NOT NULL AUTO_INCREMENT,
-  `uuid` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `uuid` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
  `connection` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
  `queue` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
  `payload` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
@ -1025,6 +1034,8 @@ CREATE TABLE `invoices` (
  KEY `invoices_company_id_deleted_at_index` (`company_id`,`deleted_at`),
  KEY `invoices_client_id_index` (`client_id`),
  KEY `invoices_company_id_index` (`company_id`),
+  KEY `invoices_recurring_id_index` (`recurring_id`),
+  KEY `invoices_status_id_balance_index` (`status_id`,`balance`),
  CONSTRAINT `invoices_client_id_foreign` FOREIGN KEY (`client_id`) REFERENCES `clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `invoices_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `invoices_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
@ -1070,6 +1081,7 @@ CREATE TABLE `licenses` (
  `is_claimed` tinyint(1) DEFAULT NULL,
  `transaction_reference` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
  `product_id` int unsigned DEFAULT NULL,
+  `recurring_invoice_id` bigint unsigned DEFAULT NULL,
  PRIMARY KEY (`id`),
  UNIQUE KEY `licenses_license_key_unique` (`license_key`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
@ -1169,6 +1181,7 @@ CREATE TABLE `paymentables` (
  `deleted_at` timestamp(6) NULL DEFAULT NULL,
  PRIMARY KEY (`id`),
  KEY `paymentables_payment_id_foreign` (`payment_id`),
+  KEY `paymentables_paymentable_id_index` (`paymentable_id`),
  CONSTRAINT `paymentables_payment_id_foreign` FOREIGN KEY (`payment_id`) REFERENCES `payments` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@ -1210,7 +1223,9 @@ CREATE TABLE `payments` (
  `custom_value2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
  `custom_value3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
  `custom_value4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `idempotency_key` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
  PRIMARY KEY (`id`),
+  UNIQUE KEY `payments_company_id_idempotency_key_unique` (`company_id`,`idempotency_key`),
  KEY `payments_company_id_deleted_at_index` (`company_id`,`deleted_at`),
  KEY `payments_client_contact_id_foreign` (`client_contact_id`),
  KEY `payments_company_gateway_id_foreign` (`company_gateway_id`),
@ -1218,6 +1233,8 @@ CREATE TABLE `payments` (
  KEY `payments_company_id_index` (`company_id`),
  KEY `payments_client_id_index` (`client_id`),
  KEY `payments_status_id_index` (`status_id`),
+  KEY `payments_transaction_reference_index` (`transaction_reference`),
+  KEY `payments_idempotency_key_index` (`idempotency_key`),
  CONSTRAINT `payments_client_contact_id_foreign` FOREIGN KEY (`client_contact_id`) REFERENCES `client_contacts` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `payments_client_id_foreign` FOREIGN KEY (`client_id`) REFERENCES `clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `payments_company_gateway_id_foreign` FOREIGN KEY (`company_gateway_id`) REFERENCES `company_gateways` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
@ -1262,6 +1279,7 @@ CREATE TABLE `products` (
  KEY `products_user_id_foreign` (`user_id`),
  KEY `products_company_id_index` (`company_id`),
  KEY `pro_co_us_up_index` (`company_id`,`user_id`,`assigned_user_id`,`updated_at`),
+  KEY `products_product_key_company_id_index` (`product_key`,`company_id`),
  CONSTRAINT `products_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `products_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
@ -1308,11 +1326,11 @@ CREATE TABLE `purchase_order_invitations` (
  `user_id` int unsigned NOT NULL,
  `vendor_contact_id` int unsigned NOT NULL,
  `purchase_order_id` bigint unsigned NOT NULL,
-  `key` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `transaction_reference` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `message_id` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `email_error` mediumtext COLLATE utf8mb4_unicode_ci,
-  `signature_base64` text COLLATE utf8mb4_unicode_ci,
+  `key` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `transaction_reference` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `message_id` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `email_error` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `signature_base64` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
  `signature_date` datetime DEFAULT NULL,
  `sent_date` datetime DEFAULT NULL,
  `viewed_date` datetime DEFAULT NULL,
@ -1320,6 +1338,7 @@ CREATE TABLE `purchase_order_invitations` (
  `created_at` timestamp(6) NULL DEFAULT NULL,
  `updated_at` timestamp(6) NULL DEFAULT NULL,
  `deleted_at` timestamp(6) NULL DEFAULT NULL,
+  `email_status` enum('delivered','bounced','spam') COLLATE utf8mb4_unicode_ci DEFAULT NULL,
  PRIMARY KEY (`id`),
  UNIQUE KEY `vendor_purchase_unique` (`vendor_contact_id`,`purchase_order_id`),
  KEY `purchase_order_invitations_user_id_foreign` (`user_id`),
@ -1349,25 +1368,25 @@ CREATE TABLE `purchase_orders` (
  `recurring_id` int unsigned DEFAULT NULL,
  `design_id` int unsigned DEFAULT NULL,
  `invoice_id` int unsigned DEFAULT NULL,
-  `number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `number` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
  `discount` double(8,2) NOT NULL DEFAULT '0.00',
  `is_amount_discount` tinyint(1) NOT NULL DEFAULT '0',
-  `po_number` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `po_number` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
  `date` date DEFAULT NULL,
  `last_sent_date` datetime DEFAULT NULL,
  `due_date` date DEFAULT NULL,
  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
-  `line_items` mediumtext COLLATE utf8mb4_unicode_ci,
-  `backup` mediumtext COLLATE utf8mb4_unicode_ci,
-  `footer` text COLLATE utf8mb4_unicode_ci,
-  `public_notes` text COLLATE utf8mb4_unicode_ci,
-  `private_notes` text COLLATE utf8mb4_unicode_ci,
-  `terms` text COLLATE utf8mb4_unicode_ci,
-  `tax_name1` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `line_items` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `backup` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `footer` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `public_notes` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `private_notes` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `terms` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `tax_name1` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
  `tax_rate1` decimal(20,6) NOT NULL DEFAULT '0.000000',
-  `tax_name2` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `tax_name2` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
  `tax_rate2` decimal(20,6) NOT NULL DEFAULT '0.000000',
-  `tax_name3` varchar(191) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `tax_name3` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
  `tax_rate3` decimal(20,6) NOT NULL DEFAULT '0.000000',
  `total_taxes` decimal(20,6) NOT NULL DEFAULT '0.000000',
  `uses_inclusive_taxes` tinyint(1) NOT NULL DEFAULT '0',
@ -1375,10 +1394,10 @@ CREATE TABLE `purchase_orders` (
  `reminder2_sent` date DEFAULT NULL,
  `reminder3_sent` date DEFAULT NULL,
  `reminder_last_sent` date DEFAULT NULL,
-  `custom_value1` text COLLATE utf8mb4_unicode_ci,
-  `custom_value2` text COLLATE utf8mb4_unicode_ci,
-  `custom_value3` text COLLATE utf8mb4_unicode_ci,
-  `custom_value4` text COLLATE utf8mb4_unicode_ci,
+  `custom_value1` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `custom_value2` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `custom_value3` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
+  `custom_value4` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
  `next_send_date` datetime DEFAULT NULL,
  `custom_surcharge1` decimal(20,6) DEFAULT NULL,
  `custom_surcharge2` decimal(20,6) DEFAULT NULL,
@ -1517,6 +1536,7 @@ CREATE TABLE `quotes` (
  KEY `quotes_company_id_deleted_at_index` (`company_id`,`deleted_at`),
  KEY `quotes_client_id_index` (`client_id`),
  KEY `quotes_company_id_index` (`company_id`),
+  KEY `quotes_company_id_updated_at_index` (`company_id`,`updated_at`),
  CONSTRAINT `quotes_client_id_foreign` FOREIGN KEY (`client_id`) REFERENCES `clients` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `quotes_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `quotes_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
@ -1813,16 +1833,16 @@ CREATE TABLE `schedulers` (
  `id` bigint unsigned NOT NULL AUTO_INCREMENT,
  `paused` tinyint(1) NOT NULL DEFAULT '0',
  `is_deleted` tinyint(1) NOT NULL DEFAULT '0',
-  `repeat_every` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `repeat_every` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
  `start_from` timestamp NOT NULL,
  `scheduled_run` timestamp NOT NULL,
  `company_id` bigint unsigned NOT NULL,
  `created_at` timestamp NULL DEFAULT NULL,
  `updated_at` timestamp NULL DEFAULT NULL,
  `deleted_at` timestamp NULL DEFAULT NULL,
-  `action_name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `action_class` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `parameters` mediumtext COLLATE utf8mb4_unicode_ci,
+  `action_name` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `action_class` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  `parameters` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
  PRIMARY KEY (`id`),
  KEY `schedulers_action_name_index` (`action_name`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci ROW_FORMAT=DYNAMIC;
@ -2123,6 +2143,8 @@ CREATE TABLE `vendor_contacts` (
  KEY `vendor_contacts_user_id_foreign` (`user_id`),
  KEY `vendor_contacts_vendor_id_index` (`vendor_id`),
  KEY `vendor_contacts_company_id_email_deleted_at_index` (`company_id`,`email`,`deleted_at`),
+  KEY `vendor_contacts_contact_key(20)_index` (`contact_key`(20)),
+  KEY `vendor_contacts_email_index` (`email`),
  CONSTRAINT `vendor_contacts_company_id_foreign` FOREIGN KEY (`company_id`) REFERENCES `companies` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `vendor_contacts_user_id_foreign` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT `vendor_contacts_vendor_id_foreign` FOREIGN KEY (`vendor_id`) REFERENCES `vendors` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
@ -2359,3 +2381,13 @@ INSERT INTO `migrations` VALUES (154,'2022_07_21_023805_add_hebrew_language',11)
 INSERT INTO `migrations` VALUES (155,'2022_07_26_091216_add_sms_verification_to_hosted_account',11);
 INSERT INTO `migrations` VALUES (156,'2022_07_28_232340_enabled_expense_tax_rates_to_companies_table',11);
 INSERT INTO `migrations` VALUES (157,'2022_07_29_091235_correction_for_companies_table_types',11);
+INSERT INTO `migrations` VALUES (158,'2022_08_11_011534_licenses_table_for_self_host',12);
+INSERT INTO `migrations` VALUES (159,'2022_08_24_215917_invoice_task_project_companies_table',12);
+INSERT INTO `migrations` VALUES (160,'2022_08_26_232500_add_email_status_column_to_purchase_order_invitations_table',12);
+INSERT INTO `migrations` VALUES (161,'2022_08_28_210111_add_index_to_payments_table',12);
+INSERT INTO `migrations` VALUES (162,'2022_09_05_024719_update_designs_for_tech_template',12);
+INSERT INTO `migrations` VALUES (163,'2022_09_07_101731_add_reporting_option_to_companies_table',12);
+INSERT INTO `migrations` VALUES (164,'2022_09_21_012417_add_threeds_to_braintree',12);
+INSERT INTO `migrations` VALUES (165,'2022_09_30_235337_add_idempotency_key_to_payments',12);
+INSERT INTO `migrations` VALUES (166,'2022_10_05_205645_add_indexes_to_client_hash',12);
+INSERT INTO `migrations` VALUES (167,'2022_10_06_011344_add_key_to_products',12);
--- a/resources/views/portal/ninja2020/gateways/stripe/ach/pay.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/ach/pay.blade.php
@ -207,8 +207,10 @@
                gateway_response.value = JSON.stringify(paymentIntent);
                document.getElementById('server-response').submit();

-            } else if (paymentIntent.next_action?.type === "verify_with_microdeposits") {
-
+            } else if (paymentIntent.next_action?.type === "verify_with_microdeposits" || paymentIntent.next_action?.type === "requires_source_action") {
+                  errors.textContent = "You will receive an email with details on how to verify your bank account and process payment.";
+                  errors.hidden = false;
+                  document.getElementById('new-bank').style.visibility = 'hidden'
            }
          });
 @ -1 +1 @@
 .5.26
 .5.27