mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Fixes for download export button
This commit is contained in:
parent
105e1af813
commit
97b49f8df6
@ -24,12 +24,12 @@ class ContactHashLoginController extends Controller
|
||||
*/
|
||||
public function login(string $contact_key)
|
||||
{
|
||||
return redirect('/client/login');
|
||||
return redirect('/client/invoices');
|
||||
}
|
||||
|
||||
public function magicLink(string $magic_link)
|
||||
{
|
||||
return redirect('/client/login');
|
||||
return redirect('/client/invoices');
|
||||
}
|
||||
|
||||
public function errorPage()
|
||||
|
@ -42,7 +42,7 @@ class ContactKeyLogin
|
||||
if (MultiDB::findAndSetDbByContactKey($request->segment(3))) {
|
||||
|
||||
if($client_contact = ClientContact::where('contact_key', $request->segment(3))->first()){
|
||||
auth()->guard('contact')->login($client_contact, true);
|
||||
Auth::guard('contact')->login($client_contact, true);
|
||||
return redirect()->to('client/dashboard');
|
||||
}
|
||||
|
||||
|
@ -66,7 +66,7 @@ class CompanyExport implements ShouldQueue
|
||||
*
|
||||
* @return CompanyToken|null
|
||||
*/
|
||||
public function handle() : void
|
||||
public function handle()
|
||||
{
|
||||
|
||||
MultiDB::setDb($this->company->db);
|
||||
@ -405,7 +405,9 @@ class CompanyExport implements ShouldQueue
|
||||
|
||||
//write to tmp and email to owner();
|
||||
|
||||
$this->zipAndSend();
|
||||
$this->zipAndSend();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private function transformBasicEntities($model)
|
||||
|
@ -1,7 +1,7 @@
|
||||
@component('email.template.master', ['design' => 'light', 'settings' =>$settings])
|
||||
|
||||
@slot('header')
|
||||
@component('email.components.header', ['p' => '', 'logo' => $url])
|
||||
@component('email.components.header', ['p' => '', 'logo' => $logo])
|
||||
@lang('texts.download')
|
||||
@endcomponent
|
||||
|
||||
@ -12,6 +12,11 @@
|
||||
|
||||
@lang('texts.download_timeframe')
|
||||
|
||||
|
||||
@component('email.components.button', ['url' => $url])
|
||||
@lang('texts.download')
|
||||
@endcomponent
|
||||
|
||||
@slot('signature')
|
||||
InvoiceNinja (contact@invoiceninja.com)
|
||||
@endslot
|
||||
|
@ -44,8 +44,8 @@ class ExportCompanyTest extends TestCase
|
||||
|
||||
public function testCompanyExport()
|
||||
{
|
||||
CompanyExport::dispatchNow($this->company, $this->company->users->first());
|
||||
$res = CompanyExport::dispatchNow($this->company, $this->company->users->first());
|
||||
|
||||
$this->assertTrue(true);
|
||||
$this->assertTrue($res);
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user