From 44384ca2bd32ffef772b4e431cdfea736ecee117 Mon Sep 17 00:00:00 2001
From: batuhanbas <b1atuhanb1as@gmail.com>
Date: Fri, 7 Feb 2020 15:12:22 +0300
Subject: [PATCH] bill attachment updated

---
 resources/views/partials/media/file.blade.php |  2 +-
 .../views/portal/payments/show.blade.php      | 44 ++++-----
 .../views/purchases/bills/show.blade.php      | 97 ++++++++++---------
 3 files changed, 72 insertions(+), 71 deletions(-)

diff --git a/resources/views/partials/media/file.blade.php b/resources/views/partials/media/file.blade.php
index cf3a0deb5..6e30619f2 100644
--- a/resources/views/partials/media/file.blade.php
+++ b/resources/views/partials/media/file.blade.php
@@ -7,7 +7,7 @@
         <div class="row align-items-center">
             <div class="col-auto">
                 @if ($file->aggregate_type != 'image')
-                    <i class="fas fa-file-image"></i>
+                    <i class="fas fa-file-image font-size-50"></i>
                 @else
                     <a href="#" class="avatar">
                         <img src="{{ url('uploads/' . $file->id) }}" alt="{{ $file->basename }}">
diff --git a/resources/views/portal/payments/show.blade.php b/resources/views/portal/payments/show.blade.php
index 8c8057cf9..75a9ebd8f 100644
--- a/resources/views/portal/payments/show.blade.php
+++ b/resources/views/portal/payments/show.blade.php
@@ -76,23 +76,22 @@
                 <div class="row float-right">
                     <div class="col-md-12">
                         @if (1)
-                            <div class="card mb-0">
-                                <div class="card-body text-center">
-                                    <i class="far fa-file-pdf font-size-50"></i>
-                                </div>
-                                <div class="card-footer">
+                           <div class="card mb-0">
+                                <div class="card-body">
                                     <div class="row align-items-center">
-                                        <div class="col-xs-6 col-sm-6">
+                                        <div class="col-auto">
+                                            <i class="far fa-file-pdf font-size-50"></i>
+                                        </div>
+
+                                        <div class="col-auto">
                                             <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-sm-6">
-                                            <a class="btn btn-icon btn-info float-right" type="button">
+                                            <a class="btn btn-icon btn-info text-white float-right" type="button">
                                                 <span class="btn-inner--icon">
                                                     <i class="fas fa-file-download"></i>
                                                     {{ basename($payment->attachment) }}
@@ -103,27 +102,26 @@
                                 </div>
                             </div>
                         @else
-                            <div class="card mb-0">
-                                <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
-                                </div>
-                                <div class="card-footer">
-                                    <div class="row">
-                                        <div class="col-xs-6 col-md-6">
+                           <div class="card mb-0">
+                                <div class="card-body">
+                                    <div class="row align-items-center">
+                                        <div class="col-auto">
+                                            @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
+                                        </div>
+
+                                        <div class="col-auto">
                                             <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-info float-right" type="button">
+                                            <a class="btn btn-icon btn-info text-white float-right" type="button">
                                                 <span class="btn-inner--icon">
                                                     <i class="fas fa-file-download"></i>
                                                     {{ basename($payment->attachment) }}
diff --git a/resources/views/purchases/bills/show.blade.php b/resources/views/purchases/bills/show.blade.php
index 5b2ae26e0..0cbf87ec6 100644
--- a/resources/views/purchases/bills/show.blade.php
+++ b/resources/views/purchases/bills/show.blade.php
@@ -425,60 +425,63 @@
 
             @stack('box_footer_start')
                 <div class="card-footer">
-                    <div class="float-right">
-                        @stack('button_edit_start')
-                            @if(!$bill->reconciled)
-                                <a href="{{ route('bills.edit', $bill->id) }}" class="btn btn-info header-button-top">
-                                    <i class="fas fa-edit"></i>&nbsp; {{ trans('general.edit') }}
-                                </a>
+                    <div class="row align-items-center">
+                        <div class="col-xs-12 col-sm-6">
+                            @if($bill->attachment)
+                                @php $file = $bill->attachment; @endphp
+                                @include('partials.media.file')
                             @endif
-                        @stack('button_edit_end')
+                        </div>
+                        <div class="col-xs-12 col-sm-6 text-right">
+                            @stack('button_edit_start')
+                                @if(!$bill->reconciled)
+                                    <a href="{{ route('bills.edit', $bill->id) }}" class="btn btn-info header-button-top">
+                                        <i class="fas fa-edit"></i>&nbsp; {{ trans('general.edit') }}
+                                    </a>
+                                @endif
+                            @stack('button_edit_end')
 
-                        @stack('button_print_start')
-                            <a href="{{ route('bills.print', $bill->id) }}" target="_blank" class="btn btn-success header-button-top">
-                                <i class="fa fa-print"></i>&nbsp; {{ trans('general.print') }}
-                            </a>
-                        @stack('button_print_end')
+                            @stack('button_print_start')
+                                <a href="{{ route('bills.print', $bill->id) }}" target="_blank" class="btn btn-success header-button-top">
+                                    <i class="fa fa-print"></i>&nbsp; {{ trans('general.print') }}
+                                </a>
+                            @stack('button_print_end')
 
-                        @stack('button_group_start')
-                            <div class="dropup">
-                                <button type="button" class="btn btn-primary header-button-top" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-chevron-up"></i>&nbsp; {{ trans('general.more_actions') }}</button>
-                                <div class="dropdown-menu" role="menu">
-                                    @stack('button_pay_start')
-                                        @if($bill->status != 'paid')
-                                            @if(empty($bill->paid) || ($bill->paid != $bill->amount))
-                                                <button class="dropdown-item" id="button-payment" @click="onPayment">{{ trans('bills.add_payment') }}</button>
+                            @stack('button_group_start')
+                                <div class="dropup">
+                                    <button type="button" class="btn btn-primary header-button-top" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-chevron-up"></i>&nbsp; {{ trans('general.more_actions') }}</button>
+                                    <div class="dropdown-menu" role="menu">
+                                        @stack('button_pay_start')
+                                            @if($bill->status != 'paid')
+                                                @if(empty($bill->paid) || ($bill->paid != $bill->amount))
+                                                    <button class="dropdown-item" id="button-payment" @click="onPayment">{{ trans('bills.add_payment') }}</button>
+                                                @endif
+                                                @permission('update-purchases-bills')
+                                                    @if($bill->status == 'draft')
+                                                        <a class="dropdown-item" href="{{ route('bills.received', $bill->id) }}">{{ trans('bills.mark_received') }}</a></a>
+                                                    @else
+                                                        <button type="button" class="dropdown-item" disabled="disabled">{{ trans('bills.mark_received') }}</button>
+                                                    @endif
+                                                @endpermission
+                                                <div class="dropdown-divider"></div>
                                             @endif
-                                            @permission('update-purchases-bills')
-                                                @if($bill->status == 'draft')
-                                                    <a class="dropdown-item" href="{{ route('bills.received', $bill->id) }}">{{ trans('bills.mark_received') }}</a></a>
-                                                @else
-                                                    <button type="button" class="dropdown-item" disabled="disabled">{{ trans('bills.mark_received') }}</button>
+                                        @stack('button_pay_end')
+
+                                        @stack('button_pdf_start')
+                                            <a class="dropdown-item" href="{{ route('bills.pdf', $bill->id) }}">{{ trans('bills.download_pdf') }}</a>
+                                        @stack('button_pdf_end')
+
+                                        @stack('button_delete_start')
+                                            @permission('delete-purchases-bills')
+                                                @if(!$bill->reconciled)
+                                                    {!! Form::deleteLink($bill, 'purchases/bills') !!}
                                                 @endif
                                             @endpermission
-                                            <div class="dropdown-divider"></div>
-                                        @endif
-                                    @stack('button_pay_end')
-
-                                    @stack('button_pdf_start')
-                                        <a class="dropdown-item" href="{{ route('bills.pdf', $bill->id) }}">{{ trans('bills.download_pdf') }}</a>
-                                    @stack('button_pdf_end')
-
-                                    @stack('button_delete_start')
-                                        @permission('delete-purchases-bills')
-                                            @if(!$bill->reconciled)
-                                                {!! Form::deleteLink($bill, 'purchases/bills') !!}
-                                            @endif
-                                        @endpermission
-                                    @stack('button_delete_end')
+                                        @stack('button_delete_end')
+                                    </div>
                                 </div>
-                            </div>
-                        @stack('button_group_end')
-
-                        @if($bill->attachment)
-                            @php $file = $bill->attachment; @endphp
-                            @include('partials.media.file')
-                        @endif
+                            @stack('button_group_end')
+                        </div>
                     </div>
                 </div>
             @stack('box_footer_end')