diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index d39e2a554680..9fc0a4ec0511 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -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); diff --git a/app/Mail/Admin/EntityCreatedObject.php b/app/Mail/Admin/EntityCreatedObject.php index f33c7cd540ce..ba773ac3c5f9 100644 --- a/app/Mail/Admin/EntityCreatedObject.php +++ b/app/Mail/Admin/EntityCreatedObject.php @@ -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; } } diff --git a/app/Models/CompanyGateway.php b/app/Models/CompanyGateway.php index 063153d36b63..9ca4e81b42ea 100644 --- a/app/Models/CompanyGateway.php +++ b/app/Models/CompanyGateway.php @@ -65,6 +65,7 @@ class CompanyGateway extends BaseModel '3758e7f7c6f4cecf0f4f348b9a00f456' => 304, '3b6621f970ab18887c4f6dca78d3f8bb' => 305, '54faab2ab6e3223dbe848b1686490baa' => 306, + 'd14dd26a47cecc30fdd65700bfb67b34' => 301, ]; protected $touches = []; diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 1bebb2cc44cf..4adf5fa1d78d 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -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.',