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

fixed module installation alias issue

Browse Source
This commit is contained in:
cuneytsenturk 2017-10-11 16:01:23 +03:00
parent 224e625833
commit 40dea7fa99
2 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,7 +144,7 @@ class Item extends Controller
if ($json['success']) { if ($json['success']) {
$request['company_id'] = session('company_id'); $request['company_id'] = session('company_id');
$request['alias'] = 'paypal'; $request['alias'] = $json['data']['alias'];
$module = Module::create($request->all()); $module = Module::create($request->all());

67
app/Traits/Modules.php
View File

@ -20,7 +20,7 @@ trait Modules
return json_decode($response->getBody())->data; return json_decode($response->getBody())->data;
} }
return array(); return [];
} }
public function getModule($alias) public function getModule($alias)
@ -31,7 +31,7 @@ trait Modules
return json_decode($response->getBody())->data; return json_decode($response->getBody())->data;
} }
return array(); return [];
} }
public function getCategories() public function getCategories()
@ -42,7 +42,7 @@ trait Modules
return json_decode($response->getBody())->data; return json_decode($response->getBody())->data;
} }
return array(); return [];
} }
public function getModulesByCategory($alias) public function getModulesByCategory($alias)
@ -53,7 +53,7 @@ trait Modules
return json_decode($response->getBody())->data; return json_decode($response->getBody())->data;
} }
return array(); return [];
} }
public function getPaidModules() public function getPaidModules()
@ -64,7 +64,7 @@ trait Modules
return json_decode($response->getBody())->data; return json_decode($response->getBody())->data;
} }
return array(); return [];
} }
public function getNewModules() public function getNewModules()
@ -75,7 +75,7 @@ trait Modules
return json_decode($response->getBody())->data; return json_decode($response->getBody())->data;
} }
return array(); return [];
} }
public function getFreeModules() public function getFreeModules()
@ -86,7 +86,7 @@ trait Modules
return json_decode($response->getBody())->data; return json_decode($response->getBody())->data;
} }
return array(); return [];
} }
public function getCoreVersion() public function getCoreVersion()
@ -99,7 +99,7 @@ trait Modules
return $response->json(); return $response->json();
} }
return array(); return [];
} }
public function downloadModule($path) public function downloadModule($path)
@ -126,22 +126,22 @@ trait Modules
return false; return false;
} }
$data = array( $data = [
'path' => $path 'path' => $path
); ];
return array( return [
'success' => true, 'success' => true,
'errors' => false, 'errors' => false,
'data' => $data, 'data' => $data,
); ];
} }
return array( return [
'success' => false, 'success' => false,
'errors' => true, 'errors' => true,
'data' => null, 'data' => null,
); ];
} }
public function unzipModule($path) public function unzipModule($path)
@ -204,79 +204,80 @@ trait Modules
// Update database // Update database
Artisan::call('migrate', ['--force' => true]); Artisan::call('migrate', ['--force' => true]);
$data = array( $data = [
'path' => $path 'path' => $path,
); 'alias' => $module->alias
];
return array( return [
'success' => true, 'success' => true,
'installed' => true, 'installed' => true,
'errors' => false, 'errors' => false,
'data' => $data, 'data' => $data,
); ];
} }
public function uninstallModule($alias) public function uninstallModule($alias)
{ {
$module = Module::findByAlias($alias); $module = Module::findByAlias($alias);
$data = array( $data = [
'name' => $module->get('name'), 'name' => $module->get('name'),
'category' => $module->get('category'), 'category' => $module->get('category'),
'version' => $module->get('version'), 'version' => $module->get('version'),
); ];
$module->delete(); $module->delete();
Artisan::call('cache:clear'); Artisan::call('cache:clear');
return array( return [
'success' => true, 'success' => true,
'errors' => false, 'errors' => false,
'data' => $data 'data' => $data
); ];
} }
public function enabledModule($alias) public function enabledModule($alias)
{ {
$module = Module::findByAlias($alias); $module = Module::findByAlias($alias);
$data = array( $data = [
'name' => $module->get('name'), 'name' => $module->get('name'),
'category' => $module->get('category'), 'category' => $module->get('category'),
'version' => $module->get('version'), 'version' => $module->get('version'),
); ];
$module->enable(); $module->enable();
Artisan::call('cache:clear'); Artisan::call('cache:clear');
return array( return [
'success' => true, 'success' => true,
'errors' => false, 'errors' => false,
'data' => $data 'data' => $data
); ];
} }
public function disabledModule($alias) public function disabledModule($alias)
{ {
$module = Module::findByAlias($alias); $module = Module::findByAlias($alias);
$data = array( $data = [
'name' => $module->get('name'), 'name' => $module->get('name'),
'category' => $module->get('category'), 'category' => $module->get('category'),
'version' => $module->get('version'), 'version' => $module->get('version'),
); ];
$module->disable(); $module->disable();
Artisan::call('cache:clear'); Artisan::call('cache:clear');
return array( return [
'success' => true, 'success' => true,
'errors' => false, 'errors' => false,
'data' => $data 'data' => $data
); ];
} }
protected function getRemote($path, $method = 'GET', $data = array()) protected function getRemote($path, $method = 'GET', $data = array())
@ -285,10 +286,10 @@ trait Modules
$client = new Client(['verify' => false, 'base_uri' => $base]); $client = new Client(['verify' => false, 'base_uri' => $base]);
$headers['headers'] = array( $headers['headers'] = [
'Authorization' => 'Bearer ' . setting('general.api_token'), 'Authorization' => 'Bearer ' . setting('general.api_token'),
'Accept' => 'application/json', 'Accept' => 'application/json',
); ];
$data = array_merge($data, $headers); $data = array_merge($data, $headers);