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

Merge pull request #7281 from turbo124/v5-develop

Browse Source 
Change default autobill time schedule
This commit is contained in:
David Bomba 2022-03-13 12:22:42 +11:00 committed by GitHub
commit 10e6889936
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Kernel.php
View File

@ -64,7 +64,7 @@ class Kernel extends ConsoleKernel
$schedule->job(new RecurringExpensesCron)->dailyAt('00:10')->withoutOverlapping(); $schedule->job(new RecurringExpensesCron)->dailyAt('00:10')->withoutOverlapping();
$schedule->job(new AutoBillCron)->dailyAt('12:20')->withoutOverlapping(); $schedule->job(new AutoBillCron)->dailyAt('06:00')->withoutOverlapping();
$schedule->job(new SchedulerCheck)->daily()->withoutOverlapping(); $schedule->job(new SchedulerCheck)->daily()->withoutOverlapping();

7
app/Http/Controllers/Auth/ContactRegisterController.php
View File

@ -17,8 +17,10 @@ use App\Http\Controllers\Controller;
use App\Http\Requests\ClientPortal\RegisterRequest; use App\Http\Requests\ClientPortal\RegisterRequest;
use App\Models\Client; use App\Models\Client;
use App\Models\Company; use App\Models\Company;
use App\Utils\Ninja;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\App;
class ContactRegisterController extends Controller class ContactRegisterController extends Controller
{ {
@ -29,10 +31,15 @@ class ContactRegisterController extends Controller
public function showRegisterForm(string $company_key = '') public function showRegisterForm(string $company_key = '')
{ {
$key = request()->session()->has('company_key') ? request()->session()->get('company_key') : $company_key; $key = request()->session()->has('company_key') ? request()->session()->get('company_key') : $company_key;
$company = Company::where('company_key', $key)->firstOrFail(); $company = Company::where('company_key', $key)->firstOrFail();
App::forgetInstance('translator');
$t = app('translator');
$t->replace(Ninja::transformTranslations($company->settings));
return render('auth.register', ['company' => $company, 'account' => $company->account]); return render('auth.register', ['company' => $company, 'account' => $company->account]);
} }

4
app/Jobs/Ninja/TransactionLog.php
View File

@ -86,8 +86,8 @@ class TransactionLog implements ShouldQueue
*/ */
public function handle() public function handle()
{ {
// if(!Ninja::isHosted()) if(!Ninja::isHosted())
// return; return;
$this->setTransformer(); $this->setTransformer();