Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 02:57:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5599 from turbo124/v5-develop

Browse Source 
Fixes for Stripe Connect
This commit is contained in:
David Bomba 2021-05-04 18:57:52 +10:00 committed by GitHub
commit b2d38ac97c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Jobs/Util/Import.php
View File

@ -31,6 +31,7 @@ use App\Factory\VendorFactory;
use App\Http\Requests\Company\UpdateCompanyRequest;
use App\Http\ValidationRules\ValidCompanyGatewayFeesAndLimitsRule;
use App\Http\ValidationRules\ValidUserForCompany;
use App\Jobs\Company\CreateCompanyTaskStatuses;
use App\Jobs\Company\CreateCompanyToken;
use App\Jobs\Ninja\CheckCompanyData;
use App\Jobs\Ninja\CompanySizeCheck;
@ -82,10 +83,10 @@ use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Http\UploadedFile;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
use Turbo124\Beacon\Facades\LightLogs;
use Illuminate\Support\Facades\Mail;
class Import implements ShouldQueue
{
@ -230,6 +231,9 @@ class Import implements ShouldQueue
$this->company->save();
}
// CreateCompanyPaymentTerms::dispatchNow($sp035a66, $spaa9f78);
CreateCompanyTaskStatuses::dispatchNow($this->company, $this->user);
info('Completed🚀🚀🚀🚀🚀 at '.now());
unlink($this->file_path);

8
app/Mail/Admin/EntityCreatedObject.php
View File

@ -62,20 +62,20 @@ class EntityCreatedObject
switch ($this->entity_type) {
case 'invoice':
$this->template_subject = "texts.notification_invoice_created_subject";
$this->template_body = "texts.notification_invoice_sent";
$this->template_body = "texts.notification_invoice_created_body";
break;
case 'quote':
$this->template_subject = "texts.notification_quote_created_subject";
$this->template_body = "texts.notification_quote_sent";
$this->template_body = "texts.notification_quote_created_body";
break;
case 'credit':
$this->template_subject = "texts.notification_credit_created_subject";
$this->template_body = "texts.notification_credit_sent";
$this->template_body = "texts.notification_credit_created_body";
break;
default:
$this->template_subject = "texts.notification_invoice_created_subject";
$this->template_body = "texts.notification_invoice_sent";
$this->template_body = "texts.notification_invoice_created_body";
break;
}
}

1
app/Models/CompanyGateway.php
View File

@ -65,6 +65,7 @@ class CompanyGateway extends BaseModel
'3758e7f7c6f4cecf0f4f348b9a00f456' => 304,
'3b6621f970ab18887c4f6dca78d3f8bb' => 305,
'54faab2ab6e3223dbe848b1686490baa' => 306,
'd14dd26a47cecc30fdd65700bfb67b34' => 301,
];
protected $touches = [];

6
resources/lang/en/texts.php
View File

@ -4229,11 +4229,11 @@ $LANG = array(
'amount_greater_than_balance_v5' => 'The amount is greater than the invoice balance. You cannot overpay an invoice.',
'click_to_continue' => 'Click to continue',
'notification_invoice_created_subject' => 'Invoice :invoice was created to :client',
'notification_invoice_created_body' => 'The following invoice :invoice was created for client :client for :amount.',
'notification_invoice_created_subject' => 'Invoice :invoice was created for :client',
'notification_quote_created_subject' => 'Quote :invoice was created to :client',
'notification_quote_created_body' => 'The following quote :invoice was created for client :client for :amount.',
'notification_quote_created_subject' => 'Quote :invoice was created for :client',
'notification_credit_created_subject' => 'Credit :invoice was created to :client',
'notification_credit_created_body' => 'The following credit :invoice was created for client :client for :amount.',
'notification_credit_created_subject' => 'Credit :invoice was created for :client',
'max_companies' => 'Maximum companies migrated',
'max_companies_desc' => 'You have reached your maximum number of companies. Delete existing companies to migrate new ones.',