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

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
Cüneyt Şentürk 2020-06-06 17:44:16 +03:00
commit f003f99d71
16 changed files with 38 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Abstracts/Report.php
View File

@ -47,11 +47,6 @@ abstract class Report
public $loaded = false; public $loaded = false;
public $indents = [
'table_header' => '0px',
'table_rows' => '24px',
];
public $chart = [ public $chart = [
'line' => [ 'line' => [
'width' => '0', 'width' => '0',

12
app/Jobs/Common/CreateContact.php
View File

@ -4,6 +4,7 @@ namespace App\Jobs\Common;
use App\Abstracts\Job; use App\Abstracts\Job;
use App\Models\Auth\User; use App\Models\Auth\User;
use App\Models\Auth\Role;
use App\Models\Common\Contact; use App\Models\Common\Contact;
class CreateContact extends Job class CreateContact extends Job
@ -48,11 +49,14 @@ class CreateContact extends Job
$data = $this->request->all(); $data = $this->request->all();
$data['locale'] = setting('default.locale', 'en-GB'); $data['locale'] = setting('default.locale', 'en-GB');
$user = User::create($data); $customer_role = Role::all()->filter(function ($role) {
$user->roles()->attach(['3']); return $role->hasPermission('read-client-portal');
$user->companies()->attach([session('company_id')]); })->first();
$user = User::create($data);
$user->roles()->attach($customer_role);
$user->companies()->attach(session('company_id'));
// St user id to request
$this->request['user_id'] = $user->id; $this->request['user_id'] = $user->id;
} }
} }

5
app/Reports/ProfitLoss.php
View File

@ -16,11 +16,6 @@ class ProfitLoss extends Report
public $icon = 'fa fa-heart'; public $icon = 'fa fa-heart';
public $indents = [
'table_header' => '0px',
'table_rows' => '48px',
];
public function setViews() public function setViews()
{ {
parent::setViews(); parent::setViews();

5
app/Reports/TaxSummary.php
View File

@ -21,11 +21,6 @@ class TaxSummary extends Report
public $icon = 'fa fa-percent'; public $icon = 'fa fa-percent';
public $indents = [
'table_header' => '0px',
'table_rows' => '48px',
];
public function setViews() public function setViews()
{ {
parent::setViews(); parent::setViews();

2
config/debugbar.php
View File

@ -122,7 +122,7 @@ return [
'files' => false, // Show the included files 'files' => false, // Show the included files
'config' => false, // Display config settings 'config' => false, // Display config settings
'cache' => false, // Display cache events 'cache' => false, // Display cache events
'models' => false, // Display models 'models' => true, // Display models
], ],
/* /*

2
resources/views/layouts/print.blade.php
View File

@ -1,5 +1,4 @@
<html lang="{{ app()->getLocale() }}"> <html lang="{{ app()->getLocale() }}">
@include('partials.print.head') @include('partials.print.head')
<body onload="window.print();"> <body onload="window.print();">
@ -9,5 +8,4 @@
@stack('body_end') @stack('body_end')
</body> </body>
</html> </html>

1
resources/views/partials/print/head.blade.php
View File

@ -20,7 +20,6 @@
} }
</style> </style>
@stack('css') @stack('css')
@stack('stylesheet') @stack('stylesheet')

5
resources/views/partials/reports/print.blade.php
View File

@ -1,12 +1,13 @@
@extends('layouts.print') @extends('layouts.print')
@section('content') @section('title', $class->model->name)
@section('content')
<h2>{{ $class->model->name }}</h2> <h2>{{ $class->model->name }}</h2>
{{ setting('company.name') }} {{ setting('company.name') }}
@if(!empty($class->model->settings->chart)) @if (!empty($class->model->settings->chart))
@include($class->views['chart']) @include($class->views['chart'])
@endif @endif

2
resources/views/partials/reports/table.blade.php
View File

@ -9,7 +9,7 @@
@else @else
<tr> <tr>
<td colspan="{{ count($class->dates) + 2 }}"> <td colspan="{{ count($class->dates) + 2 }}">
<h5 class="text-center pl-0">{{ trans('general.no_records') }}</h5> <div class="text-muted pl-0">{{ trans('general.no_records') }}</div>
</td> </td>
</tr> </tr>
@endif @endif

6
resources/views/partials/reports/table/footer.blade.php
View File

@ -1,9 +1,9 @@
@php $grand_total = array_sum($class->footer_totals[$table]); @endphp
<tfoot> <tfoot>
<tr class="row rp-border-top-1 font-size-unset px-3"> <tr class="row rp-border-top-1 font-size-unset px-3">
<th class="{{ $class->column_name_width }} text-uppercase">{{ trans_choice('general.totals', 1) }}</th> <th class="{{ $class->column_name_width }} text-uppercase text-left">{{ trans_choice('general.totals', 1) }}</th>
@php $grand_total = 0; @endphp
@foreach($class->footer_totals[$table] as $total) @foreach($class->footer_totals[$table] as $total)
@php $grand_total += $total; @endphp
<th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th> <th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th> <th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th>

18
resources/views/partials/reports/table/rows.blade.php
View File

@ -1,9 +1,9 @@
@php $row_total = 0; @endphp @if ($row_total = array_sum($rows))
<tr class="row rp-border-top-1 font-size-unset"> <tr class="row rp-border-top-1 font-size-unset">
<td class="{{ $class->column_name_width }} long-texts pr-0">{{ $class->row_names[$table][$id] }}</td> <td class="{{ $class->column_name_width }} long-texts pr-0">{{ $class->row_names[$table][$id] }}</td>
@foreach($rows as $row) @foreach($rows as $row)
@php $row_total += $row; @endphp <td class="{{ $class->column_value_width }} text-right px-0">@money($row, setting('default.currency'), true)</td>
<td class="{{ $class->column_value_width }} text-right px-0">@money($row, setting('default.currency'), true)</td> @endforeach
@endforeach <td class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($row_total, setting('default.currency'), true)</td>
<td class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($row_total, setting('default.currency'), true)</td> </tr>
</tr> @endif

2
resources/views/reports/profit_loss/content/footer.blade.php
View File

@ -2,7 +2,7 @@
<table class="table table-hover align-items-center rp-border-collapse"> <table class="table table-hover align-items-center rp-border-collapse">
<tfoot class="border-top-style"> <tfoot class="border-top-style">
<tr class="row rp-border-top-1 font-size-unset px-3"> <tr class="row rp-border-top-1 font-size-unset px-3">
<th class="{{ $class->column_name_width }} text-uppercase text-nowrap border-top-0">{{ trans('reports.net_profit') }}</th> <th class="{{ $class->column_name_width }} text-uppercase text-left border-top-0">{{ trans('reports.net_profit') }}</th>
@foreach($class->net_profit as $profit) @foreach($class->net_profit as $profit)
<th class="{{ $class->column_value_width }} text-right px-0 border-top-0">@money($profit, setting('default.currency'), true)</th> <th class="{{ $class->column_value_width }} text-right px-0 border-top-0">@money($profit, setting('default.currency'), true)</th>
@endforeach @endforeach

8
resources/views/reports/profit_loss/table/footer.blade.php
View File

@ -1,9 +1,9 @@
@php $grand_total = array_sum($class->footer_totals[$table]); @endphp
<tfoot> <tfoot>
<tr class="row rp-border-top-1 font-size-unset px-3 mb-3"> <tr class="row rp-border-top-1 font-size-unset px-3 mb-3">
<th class="{{ $class->column_name_width }} text-uppercase">{{ trans_choice('general.totals', 1) }}</th> <th class="{{ $class->column_name_width }} text-uppercase text-left">{{ trans_choice('general.totals', 1) }}</th>
@php $grand_total = 0; @endphp @foreach($class->footer_totals[$table] as $total)
@foreach($class->footer_totals[$table] as $date => $total)
@php $grand_total += $total; @endphp
<th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th> <th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th> <th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th>

6
resources/views/reports/tax_summary/content/header.blade.php
View File

@ -1,10 +1,10 @@
<div class="table-responsive"> <div class="table-responsive mt-4">
<table class="table table-hover align-items-center rp-border-collapse"> <table class="table table-hover align-items-center rp-border-collapse">
<thead class="border-top-style"> <thead class="border-top-style">
<tr class="row rp-border-bottom-1 font-size-unset px-3"> <tr class="row rp-border-bottom-1 font-size-unset px-3">
<th class="{{ $class->column_name_width }} text-right border-top-0 rp-border-bottom-1"></th> <th class="{{ $class->column_name_width }} text-right px-0 border-top-0"></th>
@foreach($class->dates as $date) @foreach($class->dates as $date)
<th class="{{ $class->column_value_width }} text-right px-0 border-top-0 rp-border-bottom-1">{{ $date }}</th> <th class="{{ $class->column_value_width }} text-right px-0 border-top-0">{{ $date }}</th>
@endforeach @endforeach
<th class="{{ $class->column_name_width }} text-right pl-0 pr-4 border-top-0 rp-border-bottom-1">{{ trans_choice('general.totals', 1) }}</th> <th class="{{ $class->column_name_width }} text-right pl-0 pr-4 border-top-0 rp-border-bottom-1">{{ trans_choice('general.totals', 1) }}</th>
</tr> </tr>

8
resources/views/reports/tax_summary/table/footer.blade.php
View File

@ -1,9 +1,9 @@
@php $grand_total = array_sum($class->footer_totals[$table]); @endphp
<tfoot> <tfoot>
<tr class="row rp-border-bottom-1 font-size-unset px-3"> <tr class="row rp-border-top-1 font-size-unset px-3 mb-3">
<th class="{{ $class->column_name_width }} text-left">{{ trans('reports.net') }}</th> <th class="{{ $class->column_name_width }} text-uppercase text-left">{{ trans('reports.net') }}</th>
@php $grand_total = 0; @endphp
@foreach($class->footer_totals[$table] as $total) @foreach($class->footer_totals[$table] as $total)
@php $grand_total += $total; @endphp
<th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th> <th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
@endforeach @endforeach
<th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th> <th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th>

2
resources/views/reports/tax_summary/table/header.blade.php
View File

@ -1,4 +1,4 @@
<thead class="border-top-style mt-4"> <thead class="border-top-style">
<tr> <tr>
<th class="rp-float-left" colspan="{{ count($class->dates) + 2 }}"> <th class="rp-float-left" colspan="{{ count($class->dates) + 2 }}">
<h4>{{ $table }}</h4> <h4>{{ $table }}</h4>