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

Merge pull request #1175 from batuhawk/master

Browse Source 
Sales and purchases styles updated
This commit is contained in:
Batuhan Baş 2020-01-23 17:33:48 +03:00 committed by GitHub
commit 6ee574492b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 87 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
resources/views/purchases/bills/show.blade.php
View File

@ -5,18 +5,28 @@
@section('content') @section('content')
@stack('recurring_message_start') @stack('recurring_message_start')
@if (($recurring = $bill->recurring) && ($next = $recurring->next())) @if (($recurring = $bill->recurring) && ($next = $recurring->next()))
<div class="callout callout-info"> <div class="row mb-3">
@stack('recurring_message_head_start') <div class="col-sm-12">
<h4>{{ trans('recurring.recurring') }}</h4> <div class="media">
@stack('recurring_message_head_end') <div class="media-body">
<div class="media-comment-text">
<div class="d-flex">
@stack('recurring_message_head_start')
<h5 class="mt-0">{{ trans('recurring.recurring') }}</h5>
@stack('recurring_message_head_end')
</div>
@stack('recurring_message_body_start') @stack('recurring_message_body_start')
<p>{{ trans('recurring.message', [ <p class="text-sm lh-160 mb-0">{{ trans('recurring.message', [
'type' => mb_strtolower(trans_choice('general.bills', 1)), 'type' => mb_strtolower(trans_choice('general.bills', 1)),
'date' => $next->format($date_format) 'date' => $next->format($date_format)
]) }} ]) }}
</p> </p>
@stack('recurring_message_body_end') @stack('recurring_message_body_end')
</div>
</div>
</div>
</div>
</div> </div>
@endif @endif
@stack('recurring_message_end') @stack('recurring_message_end')
@ -25,7 +35,7 @@
@if ($bill->status == 'draft') @if ($bill->status == 'draft')
<div class="row"> <div class="row">
<div class="col-sm-12 col-md-12 col-lg-12 col-xl-12"> <div class="col-sm-12 col-md-12 col-lg-12 col-xl-12">
<div class="alert alert-warning fade show" role="alert"> <div class="alert alert-danger fade show" role="alert">
@stack('status_message_body_start') @stack('status_message_body_start')
<span class="alert-text"> <span class="alert-text">
<strong>{!! trans('bills.messages.draft') !!}</strong> <strong>{!! trans('bills.messages.draft') !!}</strong>
@ -45,7 +55,7 @@
<div class="timeline timeline-one-side" data-timeline-content="axis" data-timeline-axis-style="dashed"> <div class="timeline timeline-one-side" data-timeline-content="axis" data-timeline-axis-style="dashed">
@stack('timeline_body_create_bill_start') @stack('timeline_body_create_bill_start')
<div class="timeline-block"> <div class="timeline-block">
<span class="timeline-step badge-info"> <span class="timeline-step badge-primary">
<i class="fas fa-plus"></i> <i class="fas fa-plus"></i>
</span> </span>
<div class="timeline-content"> <div class="timeline-content">
@ -61,7 +71,7 @@
<div class="mt-3"> <div class="mt-3">
@stack('timeline_body_create_bill_body_button_edit_start') @stack('timeline_body_create_bill_body_button_edit_start')
<a href="{{ url('purchases/bills/' . $bill->id . '/edit') }}" class="btn btn-info btn-sm btn-alone"> <a href="{{ url('purchases/bills/' . $bill->id . '/edit') }}" class="btn btn-primary btn-sm btn-alone">
{{ trans('general.edit') }} {{ trans('general.edit') }}
</a> </a>
@stack('timeline_body_create_bill_body_button_edit_end') @stack('timeline_body_create_bill_body_button_edit_end')
@ -73,7 +83,7 @@
@stack('timeline_body_receive_bill_start') @stack('timeline_body_receive_bill_start')
<div class="timeline-block"> <div class="timeline-block">
<span class="timeline-step badge-warning"> <span class="timeline-step badge-danger">
<i class="far fa-envelope"></i> <i class="far fa-envelope"></i>
</span> </span>
<div class="timeline-content"> <div class="timeline-content">
@ -91,7 +101,7 @@
<div class="mt-3"> <div class="mt-3">
@stack('timeline_body_receive_bill_body_button_sent_start') @stack('timeline_body_receive_bill_body_button_sent_start')
@permission('update-purchases-bills') @permission('update-purchases-bills')
<a href="{{ url('purchases/bills/' . $bill->id . '/received') }}" class="btn btn-warning btn-sm btn-alone">{{ trans('bills.mark_received') }}</a> <a href="{{ url('purchases/bills/' . $bill->id . '/received') }}" class="btn btn-danger btn-sm btn-alone">{{ trans('bills.mark_received') }}</a>
@endpermission @endpermission
@stack('timeline_body_receive_bill_body_button_sent_end') @stack('timeline_body_receive_bill_body_button_sent_end')
</div> </div>
@ -490,16 +500,16 @@
<thead class="thead-light"> <thead class="thead-light">
<tr class="row table-head-line"> <tr class="row table-head-line">
<th class="col-xs-4 col-sm-2">{{ trans('general.date') }}</th> <th class="col-xs-4 col-sm-2">{{ trans('general.date') }}</th>
<th class="col-xs-4 col-sm-4 text-center">{{ trans_choice('general.statuses', 1) }}</th> <th class="col-xs-4 col-sm-3 text-left">{{ trans_choice('general.statuses', 1) }}</th>
<th class="col-xs-4 col-sm-6 text-left long-texts">{{ trans('general.description') }}</th> <th class="col-xs-4 col-sm-7 text-left long-texts">{{ trans('general.description') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($bill->histories as $history) @foreach($bill->histories as $history)
<tr class="row align-items-center"> <tr class="row align-items-center">
<td class="col-xs-4 col-sm-2">@date($history->created_at)</td> <td class="col-xs-4 col-sm-2">@date($history->created_at)</td>
<td class="col-xs-4 col-sm-4 text-center">{{ trans('bills.statuses.' . $history->status) }}</td> <td class="col-xs-4 col-sm-3 text-left">{{ trans('bills.statuses.' . $history->status) }}</td>
<td class="col-xs-4 col-sm-6 text-left long-texts">{{ $history->description }}</td> <td class="col-xs-4 col-sm-7 text-left long-texts">{{ $history->description }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>

20
resources/views/purchases/payments/edit.blade.php
View File

@ -4,14 +4,20 @@
@section('content') @section('content')
@if (($recurring = $payment->recurring) && ($next = $recurring->next())) @if (($recurring = $payment->recurring) && ($next = $recurring->next()))
<div class="callout callout-info"> <div class="media mb-3">
<h4>{{ trans('recurring.recurring') }}</h4> <div class="media-body">
<div class="media-comment-text">
<div class="d-flex">
<h5 class="mt-0">{{ trans('recurring.recurring') }}</h5>
</div>
<p>{{ trans('recurring.message', [ <p class="text-sm lh-160 mb-0">{{ trans('recurring.message', [
'type' => mb_strtolower(trans_choice('general.payments', 1)), 'type' => mb_strtolower(trans_choice('general.payments', 1)),
'date' => $next->format($date_format) 'date' => $next->format($date_format)
]) }} ]) }}
</p> </p>
</div>
</div>
</div> </div>
@endif @endif

52
resources/views/sales/invoices/show.blade.php
View File

@ -5,18 +5,28 @@
@section('content') @section('content')
@stack('recurring_message_start') @stack('recurring_message_start')
@if (($recurring = $invoice->recurring) && ($next = $recurring->next())) @if (($recurring = $invoice->recurring) && ($next = $recurring->next()))
<div class="callout callout-info"> <div class="row mb-3">
@stack('recurring_message_head_start') <div class="col-sm-12">
<h4>{{ trans('recurring.recurring') }}</h4> <div class="media">
@stack('recurring_message_head_end') <div class="media-body">
<div class="media-comment-text">
<div class="d-flex">
@stack('recurring_message_head_start')
<h5 class="mt-0">{{ trans('recurring.recurring') }}</h5>
@stack('recurring_message_head_end')
</div>
@stack('recurring_message_body_start') @stack('recurring_message_body_start')
<p>{{ trans('recurring.message', [ <p class="text-sm lh-160 mb-0">{{ trans('recurring.message', [
'type' => mb_strtolower(trans_choice('general.invoices', 1)), 'type' => mb_strtolower(trans_choice('general.invoices', 1)),
'date' => $next->format($date_format) 'date' => $next->format($date_format)
]) }} ]) }}
</p> </p>
@stack('recurring_message_body_end') @stack('recurring_message_body_end')
</div>
</div>
</div>
</div>
</div> </div>
@endif @endif
@stack('recurring_message_end') @stack('recurring_message_end')
@ -25,7 +35,7 @@
@if ($invoice->status == 'draft') @if ($invoice->status == 'draft')
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
<div class="alert alert-warning fade show" role="alert"> <div class="alert alert-danger fade show" role="alert">
@stack('status_message_body_start') @stack('status_message_body_start')
<span class="alert-text"> <span class="alert-text">
<strong>{!! trans('invoices.messages.draft') !!}</strong> <strong>{!! trans('invoices.messages.draft') !!}</strong>
@ -45,7 +55,7 @@
<div class="timeline timeline-one-side" data-timeline-content="axis" data-timeline-axis-style="dashed"> <div class="timeline timeline-one-side" data-timeline-content="axis" data-timeline-axis-style="dashed">
@stack('timeline_body_create_invoice_start') @stack('timeline_body_create_invoice_start')
<div class="timeline-block"> <div class="timeline-block">
<span class="timeline-step badge-info"> <span class="timeline-step badge-primary">
<i class="fas fa-plus"></i> <i class="fas fa-plus"></i>
</span> </span>
<div class="timeline-content"> <div class="timeline-content">
@ -61,7 +71,7 @@
<div class="mt-3"> <div class="mt-3">
@stack('timeline_body_create_invoice_body_button_edit_start') @stack('timeline_body_create_invoice_body_button_edit_start')
<a href="{{ url('sales/invoices/' . $invoice->id . '/edit') }}" class="btn btn-info btn-sm btn-alone"> <a href="{{ url('sales/invoices/' . $invoice->id . '/edit') }}" class="btn btn-primary btn-sm btn-alone">
{{ trans('general.edit') }} {{ trans('general.edit') }}
</a> </a>
@stack('timeline_body_create_invoice_body_button_edit_end') @stack('timeline_body_create_invoice_body_button_edit_end')
@ -73,7 +83,7 @@
@stack('timeline_body_send_invoice_start') @stack('timeline_body_send_invoice_start')
<div class="timeline-block"> <div class="timeline-block">
<span class="timeline-step badge-warning"> <span class="timeline-step badge-danger">
<i class="far fa-envelope"></i> <i class="far fa-envelope"></i>
</span> </span>
<div class="timeline-content"> <div class="timeline-content">
@ -103,7 +113,7 @@
@stack('timeline_body_send_invoice_body_button_email_start') @stack('timeline_body_send_invoice_body_button_email_start')
@if($invoice->contact_email) @if($invoice->contact_email)
<a href="{{ url('sales/invoices/' . $invoice->id . '/email') }}" class="btn btn-warning btn-sm header-button-bottom">{{ trans('invoices.send_mail') }}</a> <a href="{{ url('sales/invoices/' . $invoice->id . '/email') }}" class="btn btn-danger btn-sm header-button-bottom">{{ trans('invoices.send_mail') }}</a>
@else @else
<button type="button" class="btn btn-white btn-sm header-button-bottom green-tooltip" disabled="disabled" data-toggle="tooltip" data-placement="right" title="{{ trans('invoices.messages.email_required') }}"> <button type="button" class="btn btn-white btn-sm header-button-bottom green-tooltip" disabled="disabled" data-toggle="tooltip" data-placement="right" title="{{ trans('invoices.messages.email_required') }}">
<span class="text-disabled">{{ trans('invoices.send_mail') }}</span> <span class="text-disabled">{{ trans('invoices.send_mail') }}</span>
@ -335,7 +345,7 @@
<tbody> <tbody>
<tr class="row"> <tr class="row">
@stack('name_th_start') @stack('name_th_start')
<th class="col-xs-4 col-sm-3 pl-5">{{ trans_choice($text_override['items'], 2) }}</th> <th class="col-xs-4 col-sm-3 pl-5 long-texts">{{ trans_choice($text_override['items'], 2) }}</th>
@stack('name_th_end') @stack('name_th_end')
@stack('quantity_th_start') @stack('quantity_th_start')
@ -536,16 +546,16 @@
<thead class="thead-light"> <thead class="thead-light">
<tr class="row table-head-line"> <tr class="row table-head-line">
<th class="col-xs-4 col-sm-2">{{ trans('general.date') }}</th> <th class="col-xs-4 col-sm-2">{{ trans('general.date') }}</th>
<th class="col-xs-4 col-sm-4 text-center">{{ trans_choice('general.statuses', 1) }}</th> <th class="col-xs-4 col-sm-3 text-left">{{ trans_choice('general.statuses', 1) }}</th>
<th class="col-xs-4 col-sm-6 text-left long-texts">{{ trans('general.description') }}</th> <th class="col-xs-4 col-sm-7 text-left long-texts">{{ trans('general.description') }}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach($invoice->histories as $history) @foreach($invoice->histories as $history)
<tr class="row align-items-center"> <tr class="row align-items-center">
<td class="col-xs-4 col-sm-2">@date($history->created_at)</td> <td class="col-xs-4 col-sm-2">@date($history->created_at)</td>
<td class="col-xs-4 col-sm-4 text-center">{{ trans('invoices.statuses.' . $history->status) }}</td> <td class="col-xs-4 col-sm-3 text-left">{{ trans('invoices.statuses.' . $history->status) }}</td>
<td class="col-xs-4 col-sm-6 text-left long-texts">{{ $history->description }}</td> <td class="col-xs-4 col-sm-7 text-left long-texts">{{ $history->description }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>

20
resources/views/sales/revenues/edit.blade.php
View File

@ -4,14 +4,20 @@
@section('content') @section('content')
@if (($recurring = $revenue->recurring) && ($next = $recurring->next())) @if (($recurring = $revenue->recurring) && ($next = $recurring->next()))
<div class="callout callout-info"> <div class="media mb-3">
<h4>{{ trans('recurring.recurring') }}</h4> <div class="media-body">
<div class="media-comment-text">
<div class="d-flex">
<h5 class="mt-0">{{ trans('recurring.recurring') }}</h5>
</div>
<p>{{ trans('recurring.message', [ <p class="text-sm lh-160 mb-0">{{ trans('recurring.message', [
'type' => mb_strtolower(trans_choice('general.revenues', 1)), 'type' => mb_strtolower(trans_choice('general.revenues', 1)),
'date' => $next->format($date_format) 'date' => $next->format($date_format)
]) }} ]) }}
</p> </p>
</div>
</div>
</div> </div>
@endif @endif