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

keep module files under their own folder

Browse Source
This commit is contained in:
Denis Duliçi
2021-05-19 09:12:01 +03:00
parent 9f1cf98906
commit 3b3292f631
2 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/Http/Controllers/Common/Import.php
View File

@ -3,7 +3,7 @@
namespace App\Http\Controllers\Common; namespace App\Http\Controllers\Common;
use App\Abstracts\Http\Controller; use App\Abstracts\Http\Controller;
use Illuminate\Http\Request; use Akaunting\Module\Module;
class Import extends Controller class Import extends Controller
{ {
@ -12,18 +12,38 @@ class Import extends Controller
* *
* @param $group * @param $group
* @param $type * @param $type
* @param $route
*
* @return Response * @return Response
*/ */
public function create($group, $type, $route = null) public function create($group, $type, $route = null)
{ {
$path = company_id() . '/' . $group . '/' . $type; $path = company_id() . '/' . $group . '/' . $type;
if (module($group) instanceof \Akaunting\Module\Module) { if (module($group) instanceof Module) {
$namespace = $group . '::'; $title_type = trans_choice($group . '::general.' . str_replace('-', '_', $type), 2);
$sample_file = url('modules/' . $group . '/Resources/assets/' . $type . '.xlsx');
} else { } 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'));
} }
} }

24
resources/views/common/import/create.blade.php
View File

@ -1,33 +1,16 @@
@extends('layouts.admin') @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') @section('content')
<div class="card"> <div class="card">
@php {!! Form::open($form_params) !!}
$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) !!}
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="alert alert-info alert-important"> <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>
</div> </div>
@ -54,6 +37,7 @@
</div> </div>
</div> </div>
</div> </div>
{!! Form::close() !!} {!! Form::close() !!}
</div> </div>
@endsection @endsection