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

# Conflicts:
#	resources/views/banking/reconciliations/create.blade.php

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/admin/navbar.blade.php

@@ -2,6 +2,8 @@
 <nav class="navbar navbar-top navbar-expand navbar-dark border-bottom">
     <div class="container-fluid">
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
+            @stack('navbar_search')
+
             @permission('read-common-search')
                 <form class="navbar-search navbar-search-light form-inline mb-0" id="navbar-search-main" autocomplete="off">
                     <div id="global-search" class="form-group mb-0 mr-sm-3">
@@ -47,6 +49,8 @@
                     </div>
                 </li>
 
+                @stack('navbar_create')
+
                 <li class="nav-item d-sm-none">
                     <a class="nav-link" href="#" data-action="search-show" data-target="#navbar-search-main">
                         <i class="fa fa-search"></i>
@@ -60,6 +64,8 @@
                         </a>
                         <div class="dropdown-menu dropdown-menu-lg dropdown-menu-dark dropdown-menu-right">
                             <div class="row shortcuts px-4">
+                                @stack('navbar_create_invoice')
+
                                 @permission('create-sales-invoices')
                                     <a href="{{ route('invoices.create') }}" class="col-4 shortcut-item">
                                         <span class="shortcut-media avatar rounded-circle bg-gradient-info">
@@ -69,6 +75,8 @@
                                     </a>
                                 @endpermission
 
+                                @stack('navbar_create_revenue')
+
                                 @permission('create-sales-revenues')
                                     <a href="{{ route('revenues.create') }}" class="col-4 shortcut-item">
                                         <span class="shortcut-media avatar rounded-circle bg-gradient-info">
@@ -78,6 +86,8 @@
                                     </a>
                                 @endpermission
 
+                                @stack('navbar_create_customer')
+
                                 @permission('create-sales-customers')
                                     <a href="{{ route('customers.create') }}" class="col-4 shortcut-item">
                                         <span class="shortcut-media avatar rounded-circle bg-gradient-info">
@@ -87,6 +97,8 @@
                                     </a>
                                 @endpermission
 
+                                @stack('navbar_create_bill')
+
                                 @permission('create-purchases-bills')
                                     <a href="{{ route('bills.create') }}" class="col-4 shortcut-item">
                                         <span class="shortcut-media avatar rounded-circle bg-gradient-danger">
@@ -96,6 +108,8 @@
                                     </a>
                                 @endpermission
 
+                                @stack('navbar_create_payment')
+
                                 @permission('create-purchases-payments')
                                     <a href="{{ route('payments.create') }}" class="col-4 shortcut-item">
                                         <span class="shortcut-media avatar rounded-circle bg-gradient-danger">
@@ -105,6 +119,8 @@
                                     </a>
                                 @endpermission
 
+                                @stack('navbar_create_vendor_start')
+
                                 @permission('create-purchases-vendors')
                                     <a href="{{ route('vendors.create') }}" class="col-4 shortcut-item">
                                         <span class="shortcut-media avatar rounded-circle bg-gradient-danger">
@@ -113,10 +129,14 @@
                                         <small class="text-danger">{{ trans_choice('general.vendors', 1) }}</small>
                                     </a>
                                 @endpermission
+
+                                @stack('navbar_create_vendor_end')
                             </div>
                         </div>
                     </li>
-                @endif
+                @endpermission
+
+                @stack('navbar_notifications')
 
                 <li class="nav-item dropdown">
                     <a class="nav-link" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -175,6 +195,8 @@
                     </div>
                 </li>
 
+                @stack('navbar_updates')
+
                 @permission('read-install-updates')
                     <li class="nav-item">
                         <a class="nav-link" href="{{ route('updates.index') }}" title="{{ $updates }} Updates Available" role="button" aria-haspopup="true" aria-expanded="false">
@@ -188,18 +210,28 @@
                     </li>
                 @endpermission
 
+                @stack('navbar_help_start')
+
                 <li class="nav-item d-none d-md-block">
                     <a class="nav-link" href="{{ url(trans('header.support_link')) }}" target="_blank" title="{{ trans('general.help') }}" role="button" aria-haspopup="true" aria-expanded="false">
                         <i class="far fa-life-ring"></i>
                     </a>
                 </li>
+
+                @stack('navbar_help_end')
             </ul>
 
+            @stack('navbar_profile')
+
             <ul class="navbar-nav align-items-center ml-auto ml-md-0">
                 <li class="nav-item dropdown">
                     <a class="nav-link pr-0" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
                         <div class="media align-items-center">
-                            <img src="{{ asset('public/img/user.svg') }}" height="36" width="36" alt="User"/>
+                            @if ($user->picture)
+                                <img src="{{ Storage::url($user->picture->id) }}" class="rounded-circle image-style user-img" alt="{{ $user->name }}"/>
+                            @else
+                                <img src="{{ asset('public/img/user.svg') }}" class="user-img" alt="{{ $user->name }}"/>
+                            @endif
                             <div class="media-body ml-2 d-none d-lg-block">
                                 <span class="mb-0 text-sm  font-weight-bold">
                                     @if (!empty($user->name))
@@ -209,40 +241,66 @@
                             </div>
                         </div>
                     </a>
+
                     <div class="dropdown-menu dropdown-menu-right">
+                        @stack('navbar_profile_welcome')
+
                         <div class="dropdown-header noti-title">
                             <h6 class="text-overflow m-0">{{ trans('general.welcome') }}</h6>
                         </div>
+
+                        @stack('navbar_profile_edit')
+
                         @permission('update-auth-users')
                             <a href="{{ route('users.edit', $user->id) }}" class="dropdown-item">
                                 <i class="fas fa-user"></i>
                                 <span>{{ trans('auth.profile') }}</span>
                             </a>
                         @endpermission
-                        @permission('read-auth-users')
+
+                        @permission(['read-auth-users', 'read-auth-roles', 'read-auth-permissions'])
                             <div class="dropdown-divider"></div>
-                            <a href="{{ route('users.index') }}" class="dropdown-item">
-                                <i class="fas fa-users"></i>
-                                <span>{{ trans_choice('general.users', 2) }}</span>
-                            </a>
-                        @endpermission
-                        @permission('read-auth-roles')
-                            <a href="{{ route('roles.index') }}" class="dropdown-item">
-                                <i class="fas fa-list"></i>
-                                <span>{{ trans_choice('general.roles', 2) }}</span>
-                            </a>
-                        @endpermission
-                        @permission('read-auth-permissions')
-                            <a href="{{ route('permissions.index') }}" class="dropdown-item">
-                                <i class="fas fa-key"></i>
-                                <span>{{ trans_choice('general.permissions', 2) }}</span>
-                            </a>
+
+                            @stack('navbar_profile_users')
+
+                            @permission('read-auth-users')
+                                <a href="{{ route('users.index') }}" class="dropdown-item">
+                                    <i class="fas fa-users"></i>
+                                    <span>{{ trans_choice('general.users', 2) }}</span>
+                                </a>
+                            @endpermission
+
+                            @stack('navbar_profile_roles')
+
+                            @permission('read-auth-roles')
+                                <a href="{{ route('roles.index') }}" class="dropdown-item">
+                                    <i class="fas fa-list"></i>
+                                    <span>{{ trans_choice('general.roles', 2) }}</span>
+                                </a>
+                            @endpermission
+
+                            @stack('navbar_profile_permissions_start')
+
+                            @permission('read-auth-permissions')
+                                <a href="{{ route('permissions.index') }}" class="dropdown-item">
+                                    <i class="fas fa-key"></i>
+                                    <span>{{ trans_choice('general.permissions', 2) }}</span>
+                                </a>
+                            @endpermission
+
+                            @stack('navbar_profile_permissions_end')
                         @endpermission
+
                         <div class="dropdown-divider"></div>
+
+                        @stack('navbar_profile_logout_start')
+
                         <a href="{{ route('logout') }}" class="dropdown-item">
                             <i class="fas fa-power-off"></i>
                             <span>{{ trans('auth.logout') }}</span>
                         </a>
+
+                        @stack('navbar_profile_logout_end')
                     </div>
                 </li>
             </ul>

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/documents/item/print.blade.php

@@ -0,0 +1,22 @@
+<tr>
+    @stack('name_td_start')
+        <td class="item">
+            {{ $item->name }}
+            @if (!empty($item->item->description))
+                <br><small>{!! \Illuminate\Support\Str::limit($item->item->description, 500) !!}</small>
+            @endif
+        </td>
+    @stack('name_td_end')
+
+    @stack('quantity_td_start')
+        <td class="quantity">{{ $item->quantity }}</td>
+    @stack('quantity_td_end')
+
+    @stack('price_td_start')
+        <td class="price">@money($item->price, $document->currency_code, true)</td>
+    @stack('price_td_end')
+
+    @stack('total_td_start')
+        <td class="total">@money($item->total, $document->currency_code, true)</td>
+    @stack('total_td_end')
+</tr>

resources/views/partials/documents/item/show.blade.php

@@ -0,0 +1,28 @@
+<tr class="d-flex flex-nowrap">
+    @stack('name_td_start')
+        <td class="col-xs-4 col-sm-5 pl-5">
+            {{ $item->name }}
+            @if (!empty($item->item->description))
+                <br><small class="text-pre-nowrap">{!! \Illuminate\Support\Str::limit($item->item->description, 500) !!}<small>
+            @endif
+        </td>
+    @stack('name_td_end')
+
+    @stack('quantity_td_start')
+        <td class="col-xs-4 col-sm-1 text-center">{{ $item->quantity }}</td>
+    @stack('quantity_td_end')
+
+    @stack('price_td_start')
+        <td class="col-sm-3 text-right d-none d-sm-block">@money($item->price, $document->currency_code, true)</td>
+    @stack('price_td_end')
+
+    @if (in_array(setting('localisation.discount_location', 'total'), ['item', 'both']))
+        @stack('discount_td_start')
+            <td class="col-sm-1 text-center d-none d-sm-block">{{ $item->discount }}</td>
+        @stack('discount_td_end')
+    @endif
+
+    @stack('total_td_start')
+        <td class="col-xs-4 col-sm-3 text-right pr-5">@money($item->total, $document->currency_code, true)</td>
+    @stack('total_td_end')
+</tr>

resources/views/partials/form/date_group.blade.php

@@ -9,6 +9,8 @@
         :form-classes="[{'has-error': form.errors.get('{{ $name }}') }]"
         @endif
 
+        :group_class="'{{ $group_class }}'"
+
         icon="fa fa-{{ $icon }}"
         title="{{ $text }}"
         placeholder="{{ trans('general.form.select.field', ['field' => $text]) }}"
@@ -47,6 +49,10 @@
         @interface="form.{{ $name }} = $event"
         @endif
 
+        @if (isset($attributes['required']))
+        :required="{{ ($attributes['required']) ? 'true' : 'false' }}"
+        @endif
+
         @if (isset($attributes['readonly']))
         :readonly="{{ $attributes['readonly'] }}"
         @endif

resources/views/partials/form/money_group.blade.php

@@ -54,11 +54,11 @@
         @endif
 
         @if (!empty($attributes['v-model']))
-        @interface="{{ $attributes['v-model'] . ' = $event' }}"
+        @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
         @elseif (!empty($attributes['data-field']))
-        @interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
+        @interface="form.errors.clear("{{ 'form.' . $attributes['data-field'] }}"); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
         @else
-        @interface="form.{{ $name }} = $event"
+        @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event"
         @endif
 
         @if (isset($attributes['v-error-message']))

resources/views/partials/form/select_group.blade.php

@@ -24,9 +24,9 @@
         @endif
 
         @if (!empty($attributes['v-model']))
-        @interface="{{ $attributes['v-model'] . ' = $event' }}"
+        @interface="form.errors.clear('{{ $attributes['v-model'] }}'); {{ $attributes['v-model'] . ' = $event' }}"
         @elseif (!empty($attributes['data-field']))
-        @interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
+        @interface="form.errors.clear("{{ 'form.' . $attributes['data-field'] }}"); {{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
         @else
         @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event;"
         @endif

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

@@ -21,7 +21,7 @@
                     </div>
                     <div class="col-xs-12 col-sm-3 text-right">
                         {!! Form::open(['route' => 'apps.search', 'role' => 'form', 'method' => 'GET', 'class' => 'm-0']) !!}
-                            <input name="keyword" value="{{ isset($keyword) ? $keyword : '' }}" type="text" class="form-control form-control-sm d-inline-block w-auto" placeholder="Search Apps">
+                            <input name="keyword" value="{{ isset($keyword) ? $keyword : '' }}" type="text" class="form-control form-control-sm d-inline-block w-auto" placeholder="{{ trans('general.search_placeholder') }}">
                             <span class="glyphicon glyphicon-search form-control-feedback"></span>
                         {!! Form::close() !!}
                     </div>

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

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

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

@@ -8,7 +8,7 @@
                 @php $color = 'bg-green'; @endphp
 
                 @if (!$installed[$module->slug])
-                    @php $color = 'bg-yellow'; @endphp
+                    @php $color = 'bg-warning'; @endphp
                 @endif
                 <span class="mr--3 float-right">
                     <span class="badge {{ $color }} text-white">{{ trans('modules.badge.installed') }}</span>

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

@@ -5,77 +5,38 @@
                 <div class="media-body">
                     <div class="media-comment-text">
                         <div class="d-flex">
-                            <h5 class="mt-0">{{ $review->author }}</h5>
-                            <h5 class="text-right ml-auto">@date($review->created_at)</h5>
+                            <h5 class="mb-0">{{ $review->author }}</h5>
                         </div>
-                        <p class="text-sm lh-160">{!! nl2br($review->text) !!}</p>
-                        <div class="icon-actions">
-                            <a href="#" class="like active">
-                                <span class="text-yellow">
+
+                        <div class="d-flex">
+                            <p class="h6 text-muted mb-0">@date($review->created_at)</p>
+                        </div>
+
+                        <div class="d-flex">
+                            <span class="text-yellow position-absolute top-3 right-3">
+                                @if ($review->rating)
                                     @for($i = 1; $i <= $review->rating; $i++)
                                         <i class="fa fa-star"></i>
                                     @endfor
-                                    @for($i = $review->rating; $i < 5; $i++)
-                                        <i class="fa fa-star-o"></i>
+                                    @if ($review->rating < 5) 
+                                        @for($i = 1; $i <= 5 - $review->rating; $i++)
+                                            <i class="far fa-star"></i>
+                                        @endfor
+                                    @endif
+                                @else
+                                    @for($i = 1; $i <= 5; $i++)
+                                        <i class="far fa-star"></i>
                                     @endfor
-                                </span>
-                            </a>
+                                @endif
+                            </span>
+                        </div>
+
+                        <div class="d-flex">
+                            <p class="mt-2 mb-0 text-sm lh-160">{!! nl2br($review->text) !!}</p>
                         </div>
                     </div>
                 </div>
             </div>
         @endforeach
-
-        @php
-            $review_first_item = count($reviews->data) > 0 ? ($reviews->current_page - 1) * $reviews->per_page + 1 : null;
-            $review_last_item = count($reviews->data) > 0 ? $review_first_item + count($reviews->data) - 1 : null;
-        @endphp
     @endif
-
-    @if (!empty($review_first_item))
-        @stack('pagination_start')
-
-        <div class="row d-none">
-            <div class="col-md-6">
-                <span class="table-text d-none d-lg-block">
-                    {{ trans('pagination.showing', ['first' => $review_first_item, 'last' => $review_last_item, 'total' => $reviews->total, 'type' => strtolower(trans('modules.tab.reviews'))]) }}
-                </span>
-            </div>
-
-            <div class="col-md-6">
-                <ul class="pagination float-right">
-                    {{-- Previous Page Link --}}
-                    @if ($reviews->current_page <= 1)
-                        <li class="page-item disabled"><span class="page-link">&laquo;</span></li>
-                    @else
-                        <li><a class="page-link" href="{{ url(request()->path()) }}?page={{ $reviews->current_page - 1 }}" rel="prev">&laquo;</a></li>
-                    @endif
-
-                    {{-- Pagination Elements --}}
-                    @for ($page = 1; $page <= $reviews->last_page; $page++)
-                        @if ($page == $reviews->current_page)
-                            <li class="page-item active"><span class="page-link">{{ $page }}</span></li>
-                        @else
-                            <li class="page-item"><a class="page-link" href="{{ url(request()->path()) }}?page={{ $page }}" data-page="{{ $page }}">{{ $page }}</a></li>
-                        @endif
-                    @endfor
-
-                    {{-- Next Page Link --}}
-                    @if ($reviews->current_page != 1)
-                        <li class="page-item"><a class="page-link" href="{{ url(request()->path()) }}?page={{ $reviews->current_page + 1 }}" rel="next">&raquo;</a></li>
-                    @else
-                        <li class="page-item disabled"><span class="page-link">&raquo;</span></li>
-                    @endif
-                </ul>
-            </div>
-        </div>
-
-        @stack('pagination_end')
-    @else
-        <div class="row">
-            <div class="col-md-12">
-                <small>{{ trans('general.no_records') }}</small>
-            </div>
-        </div>
-    @endif
-</div>
+</div>

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

@@ -6,5 +6,8 @@
 
         @stack('content_content_end')
         <notifications></notifications>
+
+        <form id="form-create" method="POST" action="#"/>
+        <component v-bind:is="component"></component>
     </div>
 @stack('content_end')

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/print/head.blade.php

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

resources/views/partials/reports/print.blade.php

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

resources/views/partials/reports/table.blade.php

@@ -9,7 +9,7 @@
             @else
                 <tr>
                     <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>
                 </tr>
             @endif

resources/views/partials/reports/table/footer.blade.php

@@ -1,9 +1,9 @@
+@php $grand_total = array_sum($class->footer_totals[$table]); @endphp
+
 <tfoot>
     <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>
-        @php $grand_total = 0; @endphp
+        <th class="{{ $class->column_name_width }} text-uppercase text-left">{{ trans_choice('general.totals', 1) }}</th>
         @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>
         @endforeach
         <th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th>

resources/views/partials/reports/table/rows.blade.php

@@ -1,9 +1,9 @@
-@php $row_total = 0; @endphp
-<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>
-    @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>
-    @endforeach
-    <td class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($row_total, setting('default.currency'), true)</td>
-</tr>
+@if ($row_total = array_sum($rows))
+    <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>
+        @foreach($rows as $row)
+            <td class="{{ $class->column_value_width }} text-right px-0">@money($row, setting('default.currency'), true)</td>
+        @endforeach
+        <td class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($row_total, setting('default.currency'), true)</td>
+    </tr>
+@endif

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/widgets/standard_header.blade.php

@@ -2,11 +2,11 @@
 <div class="card-header{{ !empty($header_class) ? ' ' . $header_class : '' }}">
     <div class="row align-items-center">
 
-        <div class="col-6 text-nowrap">
-            <h4 class="mb-0">{{ $class->model->name }}</h4>
+        <div class="col-10 text-nowrap">
+            <h4 class="mb-0 long-texts">{{ $class->model->name }}</h4>
         </div>
 
-        <div class="col-6 hidden-sm">
+        <div class="col-2 hidden-sm">
             <span class="float-right">
                 <div class="dropdown">
                     <a class="btn btn-sm items-align-center py-2 mr-0 shadow-none--hover" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">

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')