Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev

app/Console/Kernel.php

@@ -23,11 +23,11 @@ class Kernel extends ConsoleKernel
     protected function schedule(Schedule $schedule)
     {
         // Not installed yet
-        if (!env('APP_INSTALLED')) {
+        if (!config('app.installed')) {
             return;
         }
 
-        $schedule_time = env('APP_SCHEDULE_TIME', '09:00');
+        $schedule_time = config('app.schedule_time');
 
         $schedule->command('reminder:invoice')->dailyAt($schedule_time);
         $schedule->command('reminder:bill')->dailyAt($schedule_time);

app/Exceptions/Handler.php

@@ -54,7 +54,7 @@ class Handler extends ExceptionHandler
      */
     public function render($request, Throwable $exception)
     {
-        if (env('APP_DEBUG') === false) {
+        if (config('app.debug') === false) {
             return $this->handleExceptions($request, $exception);
         }
 

app/Http/Controllers/Auth/Login.php

@@ -115,7 +115,7 @@ class Login extends Controller
         auth()->logout();
 
         // Session destroy is required if stored in database
-        if (env('SESSION_DRIVER') == 'database') {
+        if (config('session.driver') == 'database') {
             $request = app('Illuminate\Http\Request');
             $request->session()->getHandler()->destroy($request->session()->getId());
         }

app/Http/Controllers/Install/Database.php

@@ -27,8 +27,10 @@ class Database extends Controller
      */
     public function store(Request $request)
     {
+        $connection = config('database.default','mysql');
+
         $host     = $request['hostname'];
-        $port     = env('DB_PORT', '3306');
+        $port     = config("database.connections.$connection.port", '3306');
         $database = $request['database'];
         $username = $request['username'];
         $password = $request['password'];

app/Http/Controllers/Modules/Item.php

@@ -84,19 +84,19 @@ class Item extends Controller
         // Download
         $steps[] = [
             'text' => trans('modules.installation.download', ['module' => $name]),
-            'url'  => url('apps/download')
+            'url'  => route('apps.download')
         ];
 
         // Unzip
         $steps[] = [
             'text' => trans('modules.installation.unzip', ['module' => $name]),
-            'url'  => url('apps/unzip')
+            'url'  => route('apps.unzip')
         ];
 
         // Download
         $steps[] = [
             'text' => trans('modules.installation.install', ['module' => $name]),
-            'url'  => url('apps/install')
+            'url'  => route('apps.install')
         ];
 
         return response()->json([

app/Http/ViewComposers/Notifications.php

@@ -19,7 +19,7 @@ class Notifications
     public function compose(View $view)
     {
         // No need to add suggestions in console
-        if (app()->runningInConsole() || !env('APP_INSTALLED') || !user()) {
+        if (app()->runningInConsole() || !config('app.installed') || !user()) {
             return;
         }
 

app/Http/ViewComposers/Suggestions.php

@@ -20,7 +20,7 @@ class Suggestions
     public function compose(View $view)
     {
         // No need to add suggestions in console
-        if (app()->runningInConsole() || !env('APP_INSTALLED')) {
+        if (app()->runningInConsole() || !config('app.installed')) {
             return;
         }
 
@@ -31,10 +31,10 @@ class Suggestions
 
             if ($path) {
                 $suggestions = $this->getSuggestions($path);
-    
+
                 if ($suggestions) {
                     $suggestion_modules = $suggestions->modules;
-    
+
                     foreach ($suggestion_modules as $key => $module) {
                         $installed = Module::where('company_id', session('company_id'))->where('alias', $module->alias)->first();
 

app/Listeners/Update/V20/Version207.php

@@ -26,7 +26,7 @@ class Version207 extends Listener
 
         // Update .env file
         Installer::updateEnv([
-            'MAIL_MAILER'       =>  env('MAIL_DRIVER'),
+            'MAIL_MAILER'       =>  env('MAIL_DRIVER', config('mail.default')),
         ]);
     }
 }

app/Providers/App.php

@@ -31,11 +31,11 @@ class App extends Provider
      */
     public function register()
     {
-        if (env('APP_INSTALLED') && env('APP_DEBUG')) {
+        if (config('app.installed') && config('app.debug')) {
             $this->app->register(\Barryvdh\Debugbar\ServiceProvider::class);
         }
 
-        if (env('APP_ENV') !== 'production') {
+        if (config('app.env') !== 'production') {
             $this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class);
         }
     }

app/Traits/DateTime.php

@@ -17,7 +17,7 @@ trait DateTime
         $default = 'd M Y';
 
         // Make sure it's installed
-        if (!env('APP_INSTALLED') && (env('APP_ENV') !== 'testing')) {
+        if (!config('app.installed') && (config('app.env') !== 'testing')) {
             return $default;
         }
 

app/Traits/Modules.php

@@ -293,11 +293,20 @@ trait Modules
 
     public function downloadModule($path)
     {
+        if (empty($path)) {
+            return [
+                'success' => false,
+                'error' => true,
+                'message' => trans('modules.errors.download', ['module' => '']),
+                'data' => null,
+            ];
+        }
+
         if (!$response = static::getResponse('GET', $path)) {
             return [
                 'success' => false,
                 'error' => true,
-                'message' => null,
+                'message' => trans('modules.errors.download', ['module' => '']),
                 'data' => null,
             ];
         }
@@ -321,7 +330,7 @@ trait Modules
             return [
                 'success' => false,
                 'error' => true,
-                'message' => null,
+                'message' => trans('modules.errors.download', ['module' => '']),
                 'data' => null,
             ];
         }
@@ -338,6 +347,15 @@ trait Modules
 
     public function unzipModule($path)
     {
+        if (empty($path)) {
+            return [
+                'success' => false,
+                'error' => true,
+                'message' => trans('modules.errors.unzip', ['module' => '']),
+                'data' => null,
+            ];
+        }
+
         $temp_path = storage_path('app/temp') . '/' . $path;
 
         $file = $temp_path . '/upload.zip';
@@ -349,7 +367,7 @@ trait Modules
             return [
                 'success' => false,
                 'error' => true,
-                'message' => null,
+                'message' => trans('modules.errors.unzip', ['module' => '']),
                 'data' => null,
             ];
         }
@@ -373,9 +391,18 @@ trait Modules
 
     public function installModule($path)
     {
+        if (empty($path)) {
+            return [
+                'success' => false,
+                'error' => true,
+                'message' => trans('modules.errors.finish', ['module' => '']),
+                'data' => null,
+            ];
+        }
+
         $temp_path = storage_path('app/temp') . '/' . $path;
 
-        $modules_path = base_path() . '/modules';
+        $modules_path = config('module.paths.modules');
 
         // Create modules directory
         if (!File::isDirectory($modules_path)) {
@@ -406,11 +433,22 @@ trait Modules
 
         Cache::forget('installed.' . $company_id . '.module');
 
-        Console::run("module:install {$module->alias} {$company_id} {$locale}");
+        $command = "module:install {$module->alias} {$company_id} {$locale}";
+
+        if (true !== $result = Console::run($command)) {
+            $message = !empty($result) ? $result : trans('modules.errors.finish', ['module' => $module->alias]);
+
+            return [
+                'success' => false,
+                'error' => true,
+                'message' => $message,
+                'data' => null,
+            ];
+        }
 
         return [
             'success' => true,
-            'redirect' => url('apps/' . $module->alias),
+            'redirect' => route('apps.app.show', $module->alias),
             'error' => false,
             'message' => null,
             'data' => $data,

app/Utilities/Info.php

@@ -33,7 +33,7 @@ class Info
 
     public static function mysqlVersion()
     {
-        if (env('DB_CONNECTION') === 'mysql') {
+        if (config('database.default') === 'mysql') {
             return DB::selectOne('select version() as mversion')->mversion;
         }
 

app/Utilities/Installer.php

@@ -183,8 +183,8 @@ class Installer
             'database'  => $database,
             'username'  => $username,
             'password'  => $password,
-            'driver'    => env('DB_CONNECTION', 'mysql'),
+            'driver'    => $connection = config('database.default', 'mysql'),
-            'charset'   => env('DB_CHARSET', 'utf8mb4'),
+            'charset'   => config("database.connections.$connection.charset", 'utf8mb4'),
         ]);
 
         try {
@@ -213,7 +213,7 @@ class Installer
             'DB_PREFIX'     =>  $prefix,
         ]);
 
-        $con = env('DB_CONNECTION', 'mysql');
+        $con = config('database.default', 'mysql');
 
         // Change current connection
         $db = Config::get('database.connections.' . $con);

config/app.php

@@ -14,6 +14,10 @@ return [
 
     'name' => env('APP_NAME', 'Akaunting'),
 
+    'installed' => env('APP_INSTALLED', false),
+
+    'schedule_time' => env('APP_SCHEDULE_TIME', '9:00'),
+
     /*
     |--------------------------------------------------------------------------
     | Application Environment

config/module.php

@@ -22,7 +22,7 @@ return [
     */
     'stubs' => [
         'enabled' => true,
-        'path' => base_path() . '/app/Console/Stubs/Modules',
+        'path' => base_path('app/Console/Stubs/Modules'),
         'files' => [
             'listeners/install' => 'Listeners/InstallModule.php',
             'providers/event' => 'Providers/Event.php',
@@ -67,7 +67,7 @@ return [
         | automatically to list of scanned folders.
         |
         */
-        'modules' => base_path('modules'),
+        'modules' => base_path(env('MODULE_PATHS_MODULES', 'modules')),
 
         /*
         |--------------------------------------------------------------------------
@@ -77,7 +77,7 @@ return [
         | Here you may update the modules assets path.
         |
         */
-        'assets' => public_path('modules'),
+        'assets' => public_path(env('MODULE_PATHS_ASSETS', 'modules')),
 
         /*
         |--------------------------------------------------------------------------
@@ -88,7 +88,7 @@ return [
         | the migration files?
         |
         */
-        'migration' => base_path('database/migrations'),
+        'migration' => base_path(env('MODULE_PATHS_MIGRATION', 'database/migrations')),
 
         /*
         |--------------------------------------------------------------------------

resources/views/modules/item/pre_sale.blade.php

@@ -87,10 +87,9 @@
                         @endif
                     @endpermission
 
-                    @if ($module->purchase_faq)
+                    @if (!empty($module->purchase_desc))
-                        <br>
+                        <div class="text-center mt-3">
-                        <div class="text-center">
+                            {!! $module->purchase_desc !!}
-                            <a href="#" @click="onShowFaq" id="button-purchase-faq">{{ trans('modules.tab.faq')}}</a>
                         </div>
                     @endif
                 </div>

resources/views/modules/item/show.blade.php

@@ -191,7 +191,7 @@
 
                     @if (!empty($module->purchase_desc))
                         <div class="text-center mt-3">
-                            {{ $module->purchase_desc }}
+                            {!! $module->purchase_desc !!}
                         </div>
                     @endif
                 </div>

resources/views/partials/admin/head.blade.php

@@ -33,7 +33,7 @@
 
     <script type="text/javascript"><!--
         var url = '{{ url("/") }}';
-        var app_url = '{{ env("APP_URL") }}';
+        var app_url = '{{ config("app.url") }}';
     //--></script>
 
     @stack('js')

resources/views/partials/auth/head.blade.php

@@ -28,7 +28,7 @@
 
     <script type="text/javascript"><!--
         var url = '{{ url("/") }}';
-        var app_url = '{{ env("APP_URL") }}';
+        var app_url = '{{ config("app.url") }}';
     //--></script>
 
     @stack('js')

resources/views/partials/modules/head.blade.php

@@ -31,7 +31,7 @@
     <script type="text/javascript"><!--
         var url = '{{ url("/") }}';
         var app_home = '{{ url("apps/categories") }}';
-        var app_url = '{{ env("APP_URL") }}';
+        var app_url = '{{ config("app.url") }}';
     //--></script>
 
     @stack('js')

resources/views/partials/portal/head.blade.php

@@ -30,7 +30,7 @@
 
     <script type="text/javascript"><!--
         var url = '{{ url("/") }}';
-        var app_url = '{{ env("APP_URL") }}';
+        var app_url = '{{ config("app.url") }}';
     //--></script>
 
     @stack('js')

resources/views/partials/signed/head.blade.php

@@ -30,7 +30,7 @@
 
     <script type="text/javascript"><!--
         var url = '{{ url("/") }}';
-        var app_url = '{{ env("APP_URL") }}';
+        var app_url = '{{ config("app.url") }}';
     //--></script>
 
     @stack('js')

resources/views/partials/wizard/head.blade.php

@@ -30,7 +30,7 @@
 
     <script type="text/javascript"><!--
         var url = '{{ url("/") }}';
-        var app_url = '{{ env("APP_URL") }}';
+        var app_url = '{{ config("app.url") }}';
     //--></script>
 
     @stack('js')