Merge pull request #1111 from batuhawk/master

Portal payment page view updated
This commit is contained in:
Batuhan Baş 2020-01-11 17:04:15 +03:00 committed by GitHub
commit ecbf13a3f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 128 additions and 86 deletions

View File

@ -4,7 +4,6 @@ namespace App\Http\Controllers\Portal;
use App\Abstracts\Http\Controller;
use App\Http\Requests\Portal\Profile as Request;
use App\Models\Auth\User;
use App\Traits\Uploads;
class Profile extends Controller

View File

@ -2345,7 +2345,15 @@ option:focus
/*--------General Progress Bar Color Finish--------*/
/*------------------------*/
/*--------List Group Item Active-------*/
.list-group-item.active
{
z-index: 2;
color: #ffffff;
background-color: #3c3f72 !important;
border-color: #3c3f72 !important;
}
/*--------List Group Item Active Finish-------*/
/*--Create Category Button Color--*/

11
public/css/custom.css vendored
View File

@ -188,7 +188,7 @@ button:focus
{
max-width: 1116px !important;
}
/*--------Content Width- Finish-------*/
/*--------Content Width Finish-------*/
/*--------Navbar Notification--------*/
@ -690,6 +690,15 @@ table .align-items-center td span.badge {
/*--------Print Template Finish--------*/
/*--------Font Size 50--------*/
.font-size-50
{
font-size: 50px !important;
}
/*--------Font Size 50 Finish--------*/
/*----------------RESPONSIVE START LINE----------------*/
/*--------Xs Breakpoint--------*/
@media (min-width: 304px) and (max-width: 575.98px)

View File

@ -11,110 +11,136 @@
<div class="card-body">
<div class="row">
<div class="col-md-6">
<div class="card">
<div class="card-header">
<a class="text-sm font-weight-600">{{ trans('general.from') }}:</a> <a class="text-xs long-texts"> {{ setting('company.name') }}</a>
</div>
<div class="card-body d-grid">
<a class="text-sm font-weight-600">{{ trans('general.address') }}:</a>
<a class="text-xs long-texts">{{ setting('company.address') }}</a>
<div class="dropdown-divider"></div>
<a class="text-sm font-weight-600">{{ trans('general.phone') }}:</a>
<a class="text-xs long-texts">{{ setting('company.phone') }}</a>
<div class="dropdown-divider"></div>
<a class="text-sm font-weight-600">{{ trans('general.email') }}:</a>
<a class="text-xs long-texts">{{ setting('company.email') }}</a>
</div>
<div class="card list-group">
<li class="list-group-item list-group-item-action active">
<b>{{ trans('general.from') }}:</b> {{ setting('company.name') }}
</li>
<li class="list-group-item"><b>{{ trans('general.address') }}:</b> {{ setting('company.address') }}</li>
<li class="list-group-item"><b>{{ trans('general.phone') }}:</b> {{ setting('company.phone') }}</li>
<li class="list-group-item"><b>{{ trans('general.email') }}:</b> {{ setting('company.email') }}</li>
</div>
</div>
<div class="col-md-6">
<div class="card">
<div class="card-header">
<a class="text-sm font-weight-600">{{ trans('general.to') }}:</a> <a class="text-xs long-texts"> {{ $payment->contact->name }}</a>
</div>
<div class="card-body d-grid">
<a class="text-sm font-weight-600">{{ trans('general.address') }}:</a>
<a class="text-xs long-texts">{{ $payment->contact->address }}</a>
<div class="dropdown-divider"></div>
<a class="text-sm font-weight-600">{{ trans('general.phone') }}:</a>
<a class="text-xs long-texts">{{ $payment->contact->phone }}</a>
<div class="dropdown-divider"></div>
<a class="text-sm font-weight-600">{{ trans('general.email') }}:</a>
<a class="text-xs long-texts">{{ $payment->contact->email }}</a>
</div>
</div>
<div class="card list-group">
<li class="list-group-item list-group-item-action active">
<b>{{ trans('general.to') }}:</b> {{ $payment->contact->name }}
</li>
<li class="list-group-item"><b>{{ trans('general.address') }}:</b> {{ $payment->contact->address }}</li>
<li class="list-group-item"><b>{{ trans('general.phone') }}:</b> {{ $payment->contact->phone }}</li>
<li class="list-group-item"><b>{{ trans('general.email') }}:</b> {{ $payment->contact->email }}</li>
</div>
</div>
<div class="col-md-6">
@if ($payment->description)
<div class="row">
<div class="col-md-12">
<p class="lead">{{ trans('general.description') }}:</p>
<p class="text-muted">{{ $payment->description }}</p>
</div>
</div>
<p class="form-control-label">{{ trans('general.description') }}</p>
<p class="form-control text-muted long-texts">{{ $payment->description }}</p>
@endif
</div>
<div class="col-md-6">
<div class="card">
<div class="card-header border-bottom-0">
<div class="row align-items-center">
<div class="col-12 text-nowrap">
<h4 class="mb-0">{{ trans_choice('general.payments', 1) }}</h4>
</div>
</div>
</div>
<div class="table-responsive">
<table class="table align-items-center table-flush">
<thead class="thead-light">
<tr>
<th>{{ trans('general.amount') }}</th>
<th>{{ trans_choice('general.payment_methods', 1) }}</th>
<th>{{ trans('general.description') }}</th>
<tr class="row table-head-line">
<th class="col-xs-4 col-md-4 text-left">{{ trans('general.amount') }}</th>
<th class="col-xs-4 col-md-4 text-left">{{ trans_choice('general.payment_methods', 1) }}</th>
<th class="col-xs-4 col-md-4 text-right long-texts">{{ trans('general.description') }}</th>
</tr>
</thead>
<tbody>
<tr>
<td>@money($payment->amount, $payment->currency_code, true)</td>
<td>{{ $payment_methods[$payment->payment_method] }}</td>
<td>{{ $payment->description }}</td>
<tr class="row border-top-1">
<td class="col-xs-4 col-md-4 text-left">@money($payment->amount, $payment->currency_code, true)</td>
<td class="col-xs-4 col-md-4 text-left">{{ $payment_methods[$payment->payment_method] }}</td>
<td class="col-xs-4 col-md-4 text-right long-texts">{{ $payment->description }}</td>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
@if ($payment->attachment)
<div class="card-footer">
<ul class="mailbox-attachments">
<div class="card-footer pb-0">
<div class="row float-right">
<div class="col-md-12">
@if (1)
<li>
<span class="mailbox-attachment-icon"><i class="fa fa-file-pdf-o"></i></span>
<div class="mailbox-attachment-info">
<a href="#" class="mailbox-attachment-name"><i class="fa fa-paperclip"></i> {{ basename($payment->attachment) }}</a>
<span class="mailbox-attachment-size">
<a href="#" class="btn btn-default btn-xs pull-right"><i class="fa fa-cloud-download"></i></a>
</span>
<div class="card w-50">
<div class="card-body text-center">
<i class="far fa-file-pdf font-size-50"></i>
</div>
<div class="card-footer">
<div class="row align-items-center">
<div class="col-xs-6 col-md-6">
<a class="btn btn-icon btn-white" type="button">
<span class="btn-inner--icon">
<i class="fas fa-paperclip"></i>
{{ basename($payment->attachment) }}
</span>
</a>
</div>
<div class="col-xs-6 col-md-6">
<a class="btn btn-icon btn-white float-right" type="button">
<span class="btn-inner--icon">
<i class="fas fa-file-download"></i>
{{ basename($payment->attachment) }}
</span>
</a>
</div>
</div>
</div>
</div>
</li>
@else
<li>
<span class="mailbox-attachment-icon has-img"><img src="{{ asset($payment->attachment) }}" alt="Attachment"></span>
<div class="mailbox-attachment-info">
<a href="#" class="mailbox-attachment-name"><i class="fa fa-camera"></i> {{ basename($payment->attachment) }}</a>
<span class="mailbox-attachment-size">
<a href="#" class="btn btn-default btn-xs pull-right"><i class="fa fa-cloud-download"></i></a>
</span>
</div>
</li>
<div class="card w-50">
<div class="card-body text-center">
@if($payment->attachment)
<img src="public/img/invoice_templates/classic.png" alt="Attachment">
@else
<i class="far fa-file-image font-size-50"></i>
@endif
</ul>
</div>
<div class="card-footer">
<div class="row">
<div class="col-xs-6 col-md-6">
<a class="btn btn-icon btn-white" type="button">
<span class="btn-inner--icon">
<i class="fas fa-camera"></i>
{{ basename($payment->attachment) }}
</span>
</a>
</div>
<div class="col-xs-6 col-md-6">
<a class="btn btn-icon btn-white float-right" type="button">
<span class="btn-inner--icon">
<i class="fas fa-file-download"></i>
{{ basename($payment->attachment) }}
</span>
</a>
</div>
</div>
</div>
</div>
@endif
</div>
</div>
</div>
@endif
</div>
@endsection
@push('scripts_start')
<script src="{{ asset('public/js/customers/payments.js?v=' . version('short')) }}"></script>
<script src="{{ asset('public/js/portal/payments.js?v=' . version('short')) }}"></script>
@endpush