Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for translation of task statuses

Browse Source
This commit is contained in:
David Bomba 2022-04-07 07:07:59 +10:00
parent 4210d11fc1
commit 7174939fe0
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/Reports/ClientReportController.php
View File

@ -13,6 +13,7 @@ namespace App\Http\Controllers\Reports;
use App\Http\Controllers\BaseController; use App\Http\Controllers\BaseController;
use App\Http\Requests\Report\ClientReportRequest; use App\Http\Requests\Report\ClientReportRequest;
use App\Models\Client;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use Illuminate\Http\Response; use Illuminate\Http\Response;
use League\Csv\Writer; use League\Csv\Writer;
@ -21,7 +22,17 @@ class ClientReportController extends BaseController
{ {
use MakesHash; use MakesHash;
public Writer $csv; private Writer $csv;
private array $keys;
/*
[
'client',
'contacts',
''
]
*/
public function __construct() public function __construct()
{ {
@ -64,6 +75,7 @@ class ClientReportController extends BaseController
$company = auth()->user()->company(); $company = auth()->user()->company();
$header = ['first name', 'last name', 'email']; $header = ['first name', 'last name', 'email'];
$this->keys = $request->input('keys');
//load the CSV document from a string //load the CSV document from a string
$this->csv = Writer::createFromString(); $this->csv = Writer::createFromString();
@ -76,10 +88,14 @@ class ClientReportController extends BaseController
//insert all the records //insert all the records
// $this->csv->insertAll($records); // $this->csv->insertAll($records);
Client::with('contacts')->where('company_id') Client::with('contacts')->where('company_id')
->where('is_deleted',0) ->where('is_deleted',0)
->cursor() ->cursor()
->each(function ($client){
// $row =
});
echo $this->csv->toString(); echo $this->csv->toString();

5
app/Jobs/Company/CreateCompanyTaskStatuses.php
View File

@ -15,6 +15,7 @@ use App\Libraries\MultiDB;
use App\Models\TaskStatus; use App\Models\TaskStatus;
use App\Utils\Traits\MakesHash; use App\Utils\Traits\MakesHash;
use Illuminate\Foundation\Bus\Dispatchable; use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Support\Facades\App;
class CreateCompanyTaskStatuses class CreateCompanyTaskStatuses
{ {
@ -51,6 +52,10 @@ class CreateCompanyTaskStatuses
if(TaskStatus::where('company_id', $this->company->id)->count() > 0) if(TaskStatus::where('company_id', $this->company->id)->count() > 0)
return; return;
App::forgetInstance('translator');
$t = app('translator');
App::setLocale($this->company->locale());
$task_statuses = [ $task_statuses = [
['name' => ctrans('texts.backlog'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now(), 'status_order' => 1], ['name' => ctrans('texts.backlog'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now(), 'status_order' => 1],
['name' => ctrans('texts.ready_to_do'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now(), 'status_order' => 2], ['name' => ctrans('texts.ready_to_do'), 'company_id' => $this->company->id, 'user_id' => $this->user->id, 'created_at' => now(), 'updated_at' => now(), 'status_order' => 2],