shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

My apps get installed app for current company.

Browse Source
This commit is contained in:
cuneytsenturk 2018-06-08 18:31:15 +03:00
parent adc36b0202
commit c0d03b820e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Modules/My.php
View File

@ -22,7 +22,7 @@ class My extends Controller
$purchased = $this->getMyModules(); $purchased = $this->getMyModules();
$modules = $this->getInstalledModules(); $modules = $this->getInstalledModules();
$installed = Module::all()->pluck('status', 'alias')->toArray(); $installed = Module::where('company_id', '=', session('company_id'))->pluck('status', 'alias')->toArray();
return view('modules.my.index', compact('purchased', 'modules', 'installed')); return view('modules.my.index', compact('purchased', 'modules', 'installed'));
} }

6
app/Traits/Modules.php
View File

@ -8,6 +8,7 @@ use File;
use GuzzleHttp\Client; use GuzzleHttp\Client;
use GuzzleHttp\Exception\RequestException; use GuzzleHttp\Exception\RequestException;
use Module; use Module;
use App\Models\Module\Module as MModule;
use ZipArchive; use ZipArchive;
use Cache; use Cache;
use Date; use Date;
@ -103,8 +104,13 @@ trait Modules
$installed = []; $installed = [];
$modules = Module::all(); $modules = Module::all();
$installed_modules = MModule::where('company_id', '=', session('company_id'))->pluck('status', 'alias')->toArray();
foreach ($modules as $module) { foreach ($modules as $module) {
if (!array_key_exists($module->alias, $installed_modules)) {
continue;
}
$result = $this->getModule($module->alias); $result = $this->getModule($module->alias);
if ($result) { if ($result) {