small fixes
This commit is contained in:
@ -83,7 +83,7 @@ class Updates extends Controller
|
|||||||
public function update($alias, $version)
|
public function update($alias, $version)
|
||||||
{
|
{
|
||||||
if ($alias == 'core') {
|
if ($alias == 'core') {
|
||||||
$name = 'Akaunting v' . $version;
|
$name = 'Akaunting ' . $version;
|
||||||
|
|
||||||
$installed = version('short');
|
$installed = version('short');
|
||||||
} else {
|
} else {
|
||||||
|
@ -3,15 +3,15 @@
|
|||||||
namespace App\Traits;
|
namespace App\Traits;
|
||||||
|
|
||||||
use App\Utilities\Info;
|
use App\Utilities\Info;
|
||||||
|
use App\Models\Module\Module as Model;
|
||||||
use Artisan;
|
use Artisan;
|
||||||
|
use Cache;
|
||||||
|
use Date;
|
||||||
use File;
|
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 Date;
|
|
||||||
|
|
||||||
trait Modules
|
trait Modules
|
||||||
{
|
{
|
||||||
@ -148,7 +148,7 @@ trait Modules
|
|||||||
|
|
||||||
$installed = [];
|
$installed = [];
|
||||||
$modules = Module::all();
|
$modules = Module::all();
|
||||||
$installed_modules = MModule::where('company_id', '=', session('company_id'))->pluck('status', 'alias')->toArray();
|
$installed_modules = Model::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)) {
|
if (!array_key_exists($module->alias, $installed_modules)) {
|
||||||
|
Reference in New Issue
Block a user