Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 16:54:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for migration email

Browse Source
This commit is contained in:
David Bomba 2021-06-21 07:09:42 +10:00
parent 8b9b30ff63
commit d43984385a
3 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/BaseController.php
View File

@ -379,8 +379,6 @@ class BaseController extends Controller
'company.designs'=> function ($query) use ($created_at, $user) { 'company.designs'=> function ($query) use ($created_at, $user) {
$query->where('created_at', '>=', $created_at)->with('company'); $query->where('created_at', '>=', $created_at)->with('company');
if(!$user->isAdmin())
$query->where('designs.user_id', $user->id);
}, },
'company.documents'=> function ($query) use ($created_at, $user) { 'company.documents'=> function ($query) use ($created_at, $user) {
$query->where('created_at', '>=', $created_at); $query->where('created_at', '>=', $created_at);
@ -388,22 +386,14 @@ class BaseController extends Controller
'company.groups' => function ($query) use ($created_at, $user) { 'company.groups' => function ($query) use ($created_at, $user) {
$query->where('created_at', '>=', $created_at); $query->where('created_at', '>=', $created_at);
if(!$user->isAdmin())
$query->where('group_settings.user_id', $user->id);
}, },
'company.payment_terms'=> function ($query) use ($created_at, $user) { 'company.payment_terms'=> function ($query) use ($created_at, $user) {
$query->where('created_at', '>=', $created_at); $query->where('created_at', '>=', $created_at);
if(!$user->isAdmin())
$query->where('payment_terms.user_id', $user->id);
}, },
'company.tax_rates' => function ($query) use ($created_at, $user) { 'company.tax_rates' => function ($query) use ($created_at, $user) {
$query->where('created_at', '>=', $created_at); $query->where('created_at', '>=', $created_at);
if(!$user->isAdmin())
$query->where('tax_rates.user_id', $user->id);
}, },
'company.activities'=> function ($query) use($user) { 'company.activities'=> function ($query) use($user) {
@ -519,8 +509,6 @@ class BaseController extends Controller
'company.payment_terms'=> function ($query) use ($created_at, $user) { 'company.payment_terms'=> function ($query) use ($created_at, $user) {
$query->where('created_at', '>=', $created_at); $query->where('created_at', '>=', $created_at);
if(!$user->isAdmin())
$query->where('payment_terms.user_id', $user->id);
}, },
'company.products' => function ($query) use ($created_at, $user) { 'company.products' => function ($query) use ($created_at, $user) {
@ -561,9 +549,6 @@ class BaseController extends Controller
'company.tax_rates' => function ($query) use ($created_at, $user) { 'company.tax_rates' => function ($query) use ($created_at, $user) {
$query->where('created_at', '>=', $created_at); $query->where('created_at', '>=', $created_at);
if(!$user->isAdmin())
$query->where('tax_rates.user_id', $user->id);
}, },
'company.vendors'=> function ($query) use ($created_at, $user) { 'company.vendors'=> function ($query) use ($created_at, $user) {
$query->where('created_at', '>=', $created_at)->with('contacts', 'documents'); $query->where('created_at', '>=', $created_at)->with('contacts', 'documents');
@ -575,9 +560,6 @@ class BaseController extends Controller
'company.expense_categories'=> function ($query) use ($created_at, $user) { 'company.expense_categories'=> function ($query) use ($created_at, $user) {
$query->where('created_at', '>=', $created_at); $query->where('created_at', '>=', $created_at);
if(!$user->isAdmin())
$query->where('expense_categories.user_id', $user->id);
}, },
'company.task_statuses'=> function ($query) use ($created_at, $user) { 'company.task_statuses'=> function ($query) use ($created_at, $user) {
$query->where('created_at', '>=', $created_at); $query->where('created_at', '>=', $created_at);

3
app/Jobs/Util/Import.php
View File

@ -218,8 +218,6 @@ class Import implements ShouldQueue
// $this->fixClientBalances(); // $this->fixClientBalances();
$check_data = CheckCompanyData::dispatchNow($this->company, md5(time())); $check_data = CheckCompanyData::dispatchNow($this->company, md5(time()));
try{ try{
Mail::to($this->user->email, $this->user->name()) Mail::to($this->user->email, $this->user->name())
@ -1642,7 +1640,6 @@ class Import implements ShouldQueue
public function exec($method, $url, $data) public function exec($method, $url, $data)
{ {
nlog($this->token);
$client = new \GuzzleHttp\Client(['headers' => $client = new \GuzzleHttp\Client(['headers' =>
[ [

3
app/Mail/MigrationCompleted.php
View File

@ -37,7 +37,8 @@ class MigrationCompleted extends Mailable
$data['company'] = $this->company->fresh(); $data['company'] = $this->company->fresh();
$data['whitelabel'] = $this->company->account->isPaid() ? true : false; $data['whitelabel'] = $this->company->account->isPaid() ? true : false;
$data['check_data'] = $this->check_data; $data['check_data'] = $this->check_data;
$data['logo'] = $this->company->present()->logo();
$result = $this->from(config('mail.from.address'), config('mail.from.name')) $result = $this->from(config('mail.from.address'), config('mail.from.name'))
->view('email.import.completed', $data); ->view('email.import.completed', $data);