diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php index 4e081b33979a..1d7382e01e0a 100644 --- a/app/Http/Controllers/BaseController.php +++ b/app/Http/Controllers/BaseController.php @@ -379,8 +379,6 @@ class BaseController extends Controller 'company.designs'=> function ($query) use ($created_at, $user) { $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) { $query->where('created_at', '>=', $created_at); @@ -388,22 +386,14 @@ class BaseController extends Controller 'company.groups' => function ($query) use ($created_at, $user) { $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) { $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) { $query->where('created_at', '>=', $created_at); - if(!$user->isAdmin()) - $query->where('tax_rates.user_id', $user->id); - }, 'company.activities'=> function ($query) use($user) { @@ -519,8 +509,6 @@ class BaseController extends Controller 'company.payment_terms'=> function ($query) use ($created_at, $user) { $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) { @@ -561,9 +549,6 @@ class BaseController extends Controller 'company.tax_rates' => function ($query) use ($created_at, $user) { $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) { $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) { $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) { $query->where('created_at', '>=', $created_at); diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index 9a489e4d0524..dc0b2a129a71 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -218,8 +218,6 @@ class Import implements ShouldQueue // $this->fixClientBalances(); $check_data = CheckCompanyData::dispatchNow($this->company, md5(time())); - - try{ Mail::to($this->user->email, $this->user->name()) @@ -1642,7 +1640,6 @@ class Import implements ShouldQueue public function exec($method, $url, $data) { - nlog($this->token); $client = new \GuzzleHttp\Client(['headers' => [ diff --git a/app/Mail/MigrationCompleted.php b/app/Mail/MigrationCompleted.php index 9181c1f26838..b7d979f906a4 100644 --- a/app/Mail/MigrationCompleted.php +++ b/app/Mail/MigrationCompleted.php @@ -37,7 +37,8 @@ class MigrationCompleted extends Mailable $data['company'] = $this->company->fresh(); $data['whitelabel'] = $this->company->account->isPaid() ? true : false; $data['check_data'] = $this->check_data; - + $data['logo'] = $this->company->present()->logo(); + $result = $this->from(config('mail.from.address'), config('mail.from.name')) ->view('email.import.completed', $data);