From 3b3292f631b0f6afbc465335140ddd226d09297a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denis=20Duli=C3=A7i?= <denisdulici@gmail.com>
Date: Wed, 19 May 2021 09:12:01 +0300
Subject: [PATCH] keep module files under their own folder

---
 app/Http/Controllers/Common/Import.php        | 30 +++++++++++++++----
 .../views/common/import/create.blade.php      | 24 +++------------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/app/Http/Controllers/Common/Import.php b/app/Http/Controllers/Common/Import.php
index a5f1f51cc..859b0c327 100644
--- a/app/Http/Controllers/Common/Import.php
+++ b/app/Http/Controllers/Common/Import.php
@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Common;
 
 use App\Abstracts\Http\Controller;
-use Illuminate\Http\Request;
+use Akaunting\Module\Module;
 
 class Import extends Controller
 {
@@ -12,18 +12,38 @@ class Import extends Controller
      *
      * @param  $group
      * @param  $type
+     * @param  $route
+     *
      * @return Response
      */
     public function create($group, $type, $route = null)
     {
         $path = company_id() . '/' . $group . '/' . $type;
 
-        if (module($group) instanceof \Akaunting\Module\Module) {
-            $namespace = $group . '::';
+        if (module($group) instanceof Module) {
+            $title_type = trans_choice($group . '::general.' . str_replace('-', '_', $type), 2);
+            $sample_file = url('modules/' . $group . '/Resources/assets/' . $type . '.xlsx');
         } else {
-            $namespace = '';
+            $title_type = trans_choice('general.' . str_replace('-', '_', $type), 2);
+            $sample_file = url('public/files/import/' . $type . '.xlsx');
         }
 
-        return view('common.import.create', compact('group', 'type', 'path', 'route', 'namespace'));
+        $form_params = [
+            'id' => 'import',
+            '@submit.prevent' => 'onSubmit',
+            '@keydown' => 'form.errors.clear($event.target.name)',
+            'files' => true,
+            'role' => 'form',
+            'class' => 'form-loading-button',
+            'novalidate' => true,
+        ];
+
+        if (!empty($route)) {
+            $form_params['route'] = $route;
+        } else {
+            $form_params['url'] = $path . '/import';
+        }
+
+        return view('common.import.create', compact('group', 'type', 'path', 'route', 'form_params', 'title_type', 'sample_file'));
     }
 }
diff --git a/resources/views/common/import/create.blade.php b/resources/views/common/import/create.blade.php
index 1f9c03a21..c1b75a2a4 100644
--- a/resources/views/common/import/create.blade.php
+++ b/resources/views/common/import/create.blade.php
@@ -1,33 +1,16 @@
 @extends('layouts.admin')
 
-@section('title', trans('import.title', ['type' => trans_choice($namespace . 'general.' . str_replace('-', '_', $type), 2)]))
+@section('title', trans('import.title', ['type' => $title_type]))
 
 @section('content')
     <div class="card">
-        @php
-        $form_open = [
-            'id' => 'import',
-            '@submit.prevent' => 'onSubmit',
-            '@keydown' => 'form.errors.clear($event.target.name)',
-            'files' => true,
-            'role' => 'form',
-            'class' => 'form-loading-button',
-            'novalidate' => true
-        ];
-
-        if (!empty($route)) {
-            $form_open['route'] = $route;
-        } else {
-            $form_open['url'] = $path . '/import';
-        }
-        @endphp
-        {!! Form::open($form_open) !!}
+        {!! Form::open($form_params) !!}
 
             <div class="card-body">
                 <div class="row">
                     <div class="col-md-12">
                         <div class="alert alert-info alert-important">
-                            {!! trans('import.message', ['link' => url('public/files/import/' . $type . '.xlsx')]) !!}
+                            {!! trans('import.message', ['link' => $sample_file]) !!}
                         </div>
                     </div>
 
@@ -54,6 +37,7 @@
                     </div>
                 </div>
             </div>
+
         {!! Form::close() !!}
     </div>
 @endsection