diff --git a/app/Http/Controllers/SubdomainController.php b/app/Http/Controllers/SubdomainController.php index 20334c32c111..6a25f795608d 100644 --- a/app/Http/Controllers/SubdomainController.php +++ b/app/Http/Controllers/SubdomainController.php @@ -29,6 +29,7 @@ class SubdomainController extends BaseController 'preview', 'invoiceninja', 'cname', + 'sandbox', ]; public function __construct() diff --git a/app/Jobs/Import/CSVImport.php b/app/Jobs/Import/CSVImport.php index dd6d22392cc6..b5896b53203b 100644 --- a/app/Jobs/Import/CSVImport.php +++ b/app/Jobs/Import/CSVImport.php @@ -38,6 +38,7 @@ use App\Repositories\BaseRepository; use App\Repositories\ClientRepository; use App\Repositories\InvoiceRepository; use App\Repositories\PaymentRepository; +use App\Utils\Ninja; use App\Utils\Traits\CleanLineItems; use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; @@ -52,6 +53,7 @@ use League\Csv\Reader; use League\Csv\Statement; use Symfony\Component\HttpFoundation\ParameterBag; use Symfony\Component\HttpFoundation\Request; +use Illuminate\Support\Facades\App; class CSVImport implements ShouldQueue { @@ -132,6 +134,10 @@ class CSVImport implements ShouldQueue { 'company' => $this->company, ]; + App::forgetInstance('translator'); + $t = app('translator'); + $t->replace(Ninja::transformTranslations($this->company->settings)); + $nmo = new NinjaMailerObject; $nmo->mailable = new ImportCompleted($this->company, $data); $nmo->company = $this->company;