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

fixed client portal

Browse Source
This commit is contained in:
denisdulici 2017-10-21 15:29:54 +03:00
parent 5e7d3392ab
commit 9710f81053
9 changed files with 65 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Customers/Payments.php
View File

@ -21,7 +21,7 @@ class Payments extends Controller
*/ */
public function index() public function index()
{ {
$payments = Payment::with('account', 'category')->where('customer_id', '=', Auth::user()->customer->id)->paginate(); $payments = Payment::with(['account', 'category'])->where('customer_id', '=', Auth::user()->customer->id)->paginate();
$payment_methods = Modules::getPaymentMethods(); $payment_methods = Modules::getPaymentMethods();

35
resources/views/customers/dashboard/index.blade.php
View File

@ -18,29 +18,24 @@
</div> </div>
<div class="box-body"> <div class="box-body">
@if ($user->invoices->count()) @if ($user->invoices->count())
<table class="table table-bordered"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th>{{ trans('invoices.invoice_number') }}</th> <th class="col-md-2">{{ trans('invoices.invoice_number') }}</th>
<th>{{ trans_choice('general.customers', 1) }}</th> <th class="col-md-2 text-right">{{ trans('general.amount') }}</th>
<th>{{ trans('invoices.total_price') }}</th> <th class="col-md-3 text-right">{{ trans('invoices.invoice_date') }}</th>
<th>{{ trans_choice('general.statuses', 1) }}</th> <th class="col-md-3 text-right">{{ trans('invoices.due_date') }}</th>
<th>{{ trans('invoices.invoice_date') }}</th> <th class="col-md-2 text-center">{{ trans_choice('general.statuses', 1) }}</th>
<th style="width: 18%;">{{ trans('general.actions') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($user->invoices as $item) @foreach($user->invoices as $item)
<tr> <tr>
<td><a href="{{ url('customer/invoices/' . $item->id . '/edit') }}">{{ $item->invoice_number }}</a></td> <td><a href="{{ url('customers/invoices/' . $item->id) }}">{{ $item->invoice_number }}</a></td>
<td>{{ $item->customer_name }}</td> <td class="text-right">@money($item->amount, $item->currency_code, true)</td>
<td>@money($item->amount, $item->currency_code, true)</td> <td class="text-right">{{ Date::parse($item->invoiced_at)->format($date_format) }}</td>
<td>{{ $item->status->name }}</td> <td class="text-right">{{ Date::parse($item->due_at)->format($date_format) }}</td>
<td>{{ Date::parse($item->invoiced_at)->format($date_format) }}</td> <td class="text-center">{{ $item->status->name }}</td>
<td>
<a href="{{ url('customers/invoices/' . $item->id . '') }}" class="btn btn-info btn-xs"><i class="fa fa-eye" aria-hidden="true"></i> {{ trans('general.show') }}</a>
<a href="{{ url('customers/invoices/' . $item->id . '/edit') }}" class="btn btn-primary btn-xs"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> {{ trans('general.edit') }}</a>
</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
@ -68,26 +63,22 @@
</div> </div>
<div class="box-body"> <div class="box-body">
@if ($user->revenues->count()) @if ($user->revenues->count())
<table class="table table-bordered"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<th>{{ trans('general.date') }}</th> <th>{{ trans('general.date') }}</th>
<th>{{ trans('general.amount') }}</th> <th>{{ trans('general.amount') }}</th>
<th>{{ trans_choice('general.categories', 1) }}</th> <th>{{ trans_choice('general.categories', 1) }}</th>
<th>{{ trans_choice('general.accounts', 1) }}</th> <th>{{ trans_choice('general.accounts', 1) }}</th>
<th style="width: 15%;">{{ trans('general.actions') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($user->revenues as $item) @foreach($user->revenues as $item)
<tr> <tr>
<td><a href="{{ url('customer/payments/' . $item->id . '') }}">{{ Date::parse($item->paid_at)->format($date_format) }}</a></td> <td><a href="{{ url('customers/payments/' . $item->id . '') }}">{{ Date::parse($item->paid_at)->format($date_format) }}</a></td>
<td>@money($item->amount, $item->currency_code, true)</td> <td>@money($item->amount, $item->currency_code, true)</td>
<td>{{ $item->category->name }}</td> <td>{{ $item->category->name }}</td>
<td>{{ $item->account->name }}</td> <td>{{ $item->account->name }}</td>
<td>
<a href="{{ url('customers/payments/' . $item->id . '') }}" class="btn btn-info btn-xs"><i class="fa fa-eye" aria-hidden="true"></i> {{ trans('general.show') }}</a>
</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>

34
resources/views/customers/invoices/index.blade.php
View File

@ -11,16 +11,16 @@
@section('content') @section('content')
<!-- Default box --> <!-- Default box -->
<div class="box box-success"> <div class="box box-success">
<div class="box-header"> <div class="box-header with-border">
{!! Form::open(['url' => 'customers/invoices', 'role' => 'form', 'method' => 'GET']) !!} {!! Form::open(['url' => 'customers/invoices', 'role' => 'form', 'method' => 'GET']) !!}
<div class="pull-left"> <div class="pull-left">
<span class="title-filter">{{ trans('general.search') }}:</span> <span class="title-filter hidden-xs">{{ trans('general.search') }}:</span>
{!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!} {!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!}
{!! Form::select('status', $status, request('status'), ['class' => 'form-control input-filter input-sm']) !!} {!! Form::select('status', $status, request('status'), ['class' => 'form-control input-filter input-sm']) !!}
{!! Form::button('<span class="fa fa-filter"></span> &nbsp;' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!} {!! Form::button('<span class="fa fa-filter"></span> &nbsp;' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
</div> </div>
<div class="pull-right"> <div class="pull-right">
<span class="title-filter">{{ trans('general.show') }}:</span> <span class="title-filter hidden-xs">{{ trans('general.show') }}:</span>
{!! Form::select('limit', $limits, request('limit', setting('general.list_limit', '25')), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} {!! Form::select('limit', $limits, request('limit', setting('general.list_limit', '25')), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!}
</div> </div>
{!! Form::close() !!} {!! Form::close() !!}
@ -28,30 +28,24 @@
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body">
<div class="table table-responsive"> <div class="table table-responsive">
<table class="table table-bordered table-striped table-hover" id="tbl-invoices"> <table class="table table-striped table-hover" id="tbl-invoices">
<thead> <thead>
<tr> <tr>
<th>@sortablelink('invoice_number', trans('invoices.invoice_number'))</th> <th class="col-md-2">@sortablelink('invoice_number', trans('invoices.invoice_number'))</th>
<th>@sortablelink('customer_name', trans_choice('general.customers', 1))</th> <th class="col-md-2 text-right">@sortablelink('amount', trans('general.amount'))</th>
<th>@sortablelink('amount', trans('invoices.total_price'))</th> <th class="col-md-3 text-right">@sortablelink('invoiced_at', trans('invoices.invoice_date'))</th>
<th>@sortablelink('status.name', trans_choice('general.statuses', 1))</th> <th class="col-md-3 text-right">@sortablelink('due_at', trans('invoices.due_date'))</th>
<th>@sortablelink('invoiced_at', trans('invoices.invoice_date'))</th> <th class="col-md-2 text-center">@sortablelink('status.name', trans_choice('general.statuses', 1))</th>
<th>@sortablelink('due_at', trans('invoices.due_date'))</th>
<th style="width: 18%;">{{ trans('general.actions') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($invoices as $item) @foreach($invoices as $item)
<tr> <tr>
<td><a href="{{ url('customers/invoices/' . $item->id . '/edit') }}">{{ $item->invoice_number }}</a></td> <td><a href="{{ url('customers/invoices/' . $item->id) }}">{{ $item->invoice_number }}</a></td>
<td>{{ $item->customer_name }}</td> <td class="text-right">@money($item->amount, $item->currency_code, true)</td>
<td>@money($item->amount, $item->currency_code, true)</td> <td class="text-right">{{ Date::parse($item->invoiced_at)->format($date_format) }}</td>
<td>{{ $item->status->name }}</td> <td class="text-right">{{ Date::parse($item->due_at)->format($date_format) }}</td>
<td>{{ Date::parse($item->invoiced_at)->format($date_format) }}</td> <td class="text-center">{{ $item->status->name }}</td>
<td>{{ Date::parse($item->due_at)->format($date_format) }}</td>
<td>
<a href="{{ url('customers/invoices/' . $item->id . '') }}" class="btn btn-info btn-xs"><i class="fa fa-eye" aria-hidden="true"></i> {{ trans('general.show') }}</a>
</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>

14
resources/views/customers/payments/index.blade.php
View File

@ -11,17 +11,17 @@
@section('content') @section('content')
<!-- Default box --> <!-- Default box -->
<div class="box box-success"> <div class="box box-success">
<div class="box-header"> <div class="box-header with-border">
{!! Form::open(['url' => 'customers/payments', 'role' => 'form', 'method' => 'GET']) !!} {!! Form::open(['url' => 'customers/payments', 'role' => 'form', 'method' => 'GET']) !!}
<div class="pull-left"> <div class="pull-left">
<span class="title-filter">{{ trans('general.search') }}:</span> <span class="title-filter hidden-xs">{{ trans('general.search') }}:</span>
{!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!} {!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!}
{!! Form::select('category_id', $categories, request('category_id'), ['class' => 'form-control input-filter input-sm']) !!} {!! Form::select('category_id', $categories, request('category_id'), ['class' => 'form-control input-filter input-sm']) !!}
{!! Form::select('payment_method', $payment_methods, request('payment_method'), ['class' => 'form-control input-filter input-sm']) !!} {!! Form::select('payment_method', $payment_methods, request('payment_method'), ['class' => 'form-control input-filter input-sm']) !!}
{!! Form::button('<span class="fa fa-filter"></span> &nbsp;' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!} {!! Form::button('<span class="fa fa-filter"></span> &nbsp;' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
</div> </div>
<div class="pull-right"> <div class="pull-right">
<span class="title-filter">{{ trans('general.show') }}:</span> <span class="title-filter hidden-xs">{{ trans('general.show') }}:</span>
{!! Form::select('limit', $limits, request('limit', setting('general.list_limit', '25')), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} {!! Form::select('limit', $limits, request('limit', setting('general.list_limit', '25')), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!}
</div> </div>
{!! Form::close() !!} {!! Form::close() !!}
@ -29,26 +29,22 @@
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body">
<div class="table table-responsive"> <div class="table table-responsive">
<table class="table table-bordered table-striped table-hover" id="tbl-revenues"> <table class="table table-striped table-hover" id="tbl-revenues">
<thead> <thead>
<tr> <tr>
<th>@sortablelink('paid_at', trans('general.date'))</th> <th>@sortablelink('paid_at', trans('general.date'))</th>
<th>@sortablelink('amount', trans('general.amount'))</th> <th>@sortablelink('amount', trans('general.amount'))</th>
<th>@sortablelink('category.name', trans_choice('general.categories', 1))</th> <th>@sortablelink('category.name', trans_choice('general.categories', 1))</th>
<th>@sortablelink('payment_method', trans_choice('general.payment_methods', 1))</th> <th>@sortablelink('payment_method', trans_choice('general.payment_methods', 1))</th>
<th style="width: 15%;">{{ trans('general.actions') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($payments as $item) @foreach($payments as $item)
<tr> <tr>
<td><a href="{{ url('customers/payments/' . $item->id . '') }}">{{ Date::parse($item->paid_at)->format($date_format) }}</a></td> <td><a href="{{ url('customers/payments/' . $item->id) }}">{{ Date::parse($item->paid_at)->format($date_format) }}</a></td>
<td>@money($item->amount, $item->currency_code, true)</td> <td>@money($item->amount, $item->currency_code, true)</td>
<td>{{ $item->category->name }}</td> <td>{{ $item->category->name }}</td>
<td>{{ $payment_methods[$item->payment_method] }}</td> <td>{{ $payment_methods[$item->payment_method] }}</td>
<td>
<a href="{{ url('customers/payments/' . $item->id . '') }}" class="btn btn-info btn-xs"><i class="fa fa-eye" aria-hidden="true"></i> {{ trans('general.show') }}</a>
</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>

8
resources/views/customers/transactions/index.blade.php
View File

@ -5,15 +5,15 @@
@section('content') @section('content')
<!-- Default box --> <!-- Default box -->
<div class="box box-success"> <div class="box box-success">
<div class="box-header"> <div class="box-header with-border">
{!! Form::open(['url' => 'customers/transactions', 'role' => 'form', 'method' => 'GET']) !!} {!! Form::open(['url' => 'customers/transactions', 'role' => 'form', 'method' => 'GET']) !!}
<div class="pull-left"> <div class="pull-left">
<span class="title-filter">{{ trans('general.search') }}:</span> <span class="title-filter hidden-xs">{{ trans('general.search') }}:</span>
{!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!} {!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!}
{!! Form::button('<span class="fa fa-filter"></span> &nbsp;' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!} {!! Form::button('<span class="fa fa-filter"></span> &nbsp;' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
</div> </div>
<div class="pull-right"> <div class="pull-right">
<span class="title-filter">{{ trans('general.show') }}:</span> <span class="title-filter hidden-xs">{{ trans('general.show') }}:</span>
{!! Form::select('limit', $limits, request('limit', setting('general.list_limit', '25')), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!} {!! Form::select('limit', $limits, request('limit', setting('general.list_limit', '25')), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!}
</div> </div>
{!! Form::close() !!} {!! Form::close() !!}
@ -21,7 +21,7 @@
<!-- /.box-header --> <!-- /.box-header -->
<div class="box-body"> <div class="box-body">
<div class="table table-responsive"> <div class="table table-responsive">
<table class="table table-bordered table-striped table-hover" id="tbl-transactions"> <table class="table table-striped table-hover" id="tbl-transactions">
<thead> <thead>
<tr> <tr>
<th>@sortablelink('paid_at', trans('general.date'))</th> <th>@sortablelink('paid_at', trans('general.date'))</th>

2
resources/views/partials/admin/header.blade.php
View File

@ -173,7 +173,9 @@
<i class="fa fa-4 fa-user-o" style="color: #fff; font-size: 7em;"></i> <i class="fa fa-4 fa-user-o" style="color: #fff; font-size: 7em;"></i>
@endif @endif
<p> <p>
@if (!empty($user->name))
{{ $user->name }} {{ $user->name }}
@endif
<small>{{ trans('header.last_login', ['time' => $user->last_logged_in_at]) }}</small> <small>{{ trans('header.last_login', ['time' => $user->last_logged_in_at]) }}</small>
</p> </p>
</li> </li>

24
resources/views/partials/customer/header.blade.php
View File

@ -2,9 +2,9 @@
<!-- Logo --> <!-- Logo -->
<a href="#" class="logo"> <a href="#" class="logo">
<!-- mini logo for sidebar mini 50x50 pixels --> <!-- mini logo for sidebar mini 50x50 pixels -->
<span class="logo-mini"><img src="{{ asset($company->company_logo) }}" class="logo-image-lg" width="25" alt="{{ $company->company_name }}"></span> <span class="logo-mini"><img src="{{ !empty($company->company_logo) ? Storage::url($company->company_logo) : asset('public/img/company.png') }}" class="logo-image-mini" width="25" alt="{{ $company->company_name }}"></span>
<!-- logo for regular state and mobile devices --> <!-- logo for regular state and mobile devices -->
<span class="logo-lg"><img src="{{ asset($company->company_logo) }}" class="logo-image-lg" width="25" alt="{{ $company->company_name }}"> <b>{{ $company->company_name }}</b></span> <span class="logo-lg"><img src="{{ !empty($company->company_logo) ? Storage::url($company->company_logo) : asset('public/img/company.png') }}" width="25" alt="{{ $company->company_name }}"> <b>{{ str_limit($company->company_name, 15) }}</b></span>
</a> </a>
<!-- Header Navbar: style can be found in header.less --> <!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top"> <nav class="navbar navbar-static-top">
@ -53,7 +53,7 @@
<!-- Tasks: style can be found in dropdown.less --> <!-- Tasks: style can be found in dropdown.less -->
<li class="dropdown tasks-menu"> <li class="dropdown tasks-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">
{!! language()->flag() !!} <i class="fa fa-flag-o"></i>
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li class="header">{{ trans('header.change_language') }}</li> <li class="header">{{ trans('header.change_language') }}</li>
@ -66,15 +66,27 @@
<!-- User Account: style can be found in dropdown.less --> <!-- User Account: style can be found in dropdown.less -->
<li class="dropdown user user-menu"> <li class="dropdown user user-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown">
<img src="{{ asset($user->picture) }}" class="user-image" alt="User Image"> @if ($user->picture)
<span class="hidden-xs">{{ $user->name }}</span> <img src="{{ Storage::url($user->picture) }}" class="user-image" alt="User Image">
@else
<i class="fa fa-user-o"></i>
@endif
@if (!empty($user->name))
<span class="hidden-xs">{{ $user->name }}</span>
@endif
</a> </a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<!-- User image --> <!-- User image -->
<li class="user-header"> <li class="user-header">
<img src="{{ asset($user->picture) }}" class="img-circle" alt="User Image"> @if ($user->picture)
<img src="{{ Storage::url($user->picture) }}" class="img-circle" alt="User Image">
@else
<i class="fa fa-4 fa-user-o" style="color: #fff; font-size: 7em;"></i>
@endif
<p> <p>
@if (!empty($user->name))
{{ $user->name }} {{ $user->name }}
@endif
<small>{{ trans('header.last_login', ['time' => $user->last_logged_in_at]) }}</small> <small>{{ trans('header.last_login', ['time' => $user->last_logged_in_at]) }}</small>
</p> </p>
</li> </li>

26
resources/views/partials/customer/menu.blade.php
View File

@ -3,35 +3,15 @@
<section class="sidebar"> <section class="sidebar">
<!-- Sidebar user panel --> <!-- Sidebar user panel -->
<div class="user-panel"> <div class="user-panel">
@if ($customer->picture)
<div class="pull-left image"> <div class="pull-left image">
<img src="{{ asset($customer->picture) }}" class="img-circle" alt="{{ $customer->name }}"> <img src="{{ Storage::url($customer->picture) }}" class="img-circle" alt="{{ $customer->name }}">
</div> </div>
@endif
<div class="pull-left info"> <div class="pull-left info">
<p>{{ $customer->name }}</p> <p>{{ $customer->name }}</p>
@permission('read-companies-companies')
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><span class="caret"></span> &nbsp;{{ trans('general.change') }}</a>
<ul class="dropdown-menu">
@foreach($companies as $com)
<li><a href="{{ url('companies/companies/'. $com->id .'/set') }}">{{ $com->company_name }}</a></li>
@endforeach
@permission('update-companies-companies')
<li role="separator" class="divider"></li>
<li><a href="{{ url('companies/companies') }}">{{ trans('companies.manage') }}</a></li>
@endpermission
</ul>
@endpermission
</div> </div>
</div> </div>
<!-- search form -->
<form action="#" method="get" id="form-search" class="sidebar-form">
<div id="customer-search" class="input-group">
<input type="text" name="main_search" value="<?php //echo $search; ?>" id="input-main-search" class="form-control" placeholder="Search...">
<span class="input-group-btn">
<button type="submit" name="main_search" id="search-btn" class="btn btn-flat"><i class="fa fa-search"></i></button>
</span>
</div>
</form>
<!-- /.search form -->
<!-- sidebar menu: : style can be found in sidebar.less --> <!-- sidebar menu: : style can be found in sidebar.less -->
{!! Menu::get('CustomerMenu') !!} {!! Menu::get('CustomerMenu') !!}
</section> </section>

5
routes/web.php
View File

@ -111,6 +111,11 @@ Route::group(['middleware' => ['auth', 'language', 'adminmenu', 'permission:read
}); });
Route::group(['middleware' => ['auth', 'language', 'customermenu', 'permission:read-customer-panel']], function () { Route::group(['middleware' => ['auth', 'language', 'customermenu', 'permission:read-customer-panel']], function () {
Route::group(['prefix' => 'uploads'], function () {
Route::get('{folder}/{file}', 'Common\Uploads@get');
Route::get('{folder}/{file}/download', 'Common\Uploads@download');
});
Route::group(['prefix' => 'customers'], function () { Route::group(['prefix' => 'customers'], function () {
Route::get('/', 'Customers\Dashboard@index'); Route::get('/', 'Customers\Dashboard@index');