From 697ac984d923b000bf6460ecc7f29d729c0b439c Mon Sep 17 00:00:00 2001
From: Burak Civan <burakcivan22@gmail.com>
Date: Wed, 30 Jun 2021 11:35:27 +0300
Subject: [PATCH] Vendor show template edited

---
 app/Http/Controllers/Purchases/Vendors.php    |   7 +
 resources/lang/en-GB/payments.php             |   1 +
 .../views/purchases/vendors/index.blade.php   |   9 +-
 .../views/purchases/vendors/show.blade.php    | 196 +++++++++++-------
 4 files changed, 138 insertions(+), 75 deletions(-)

diff --git a/app/Http/Controllers/Purchases/Vendors.php b/app/Http/Controllers/Purchases/Vendors.php
index db7ecab05..b423c95fc 100644
--- a/app/Http/Controllers/Purchases/Vendors.php
+++ b/app/Http/Controllers/Purchases/Vendors.php
@@ -329,4 +329,11 @@ class Vendors extends Controller
 
         return redirect()->route('bills.create')->withInput($data);
     }
+
+    public function createPayment(Contact $vendor)
+    {
+        $data['contact'] = $vendor;
+
+        return redirect()->route('payments.create')->withInput($data);
+    }
 }
diff --git a/resources/lang/en-GB/payments.php b/resources/lang/en-GB/payments.php
index cd41d02ae..6d0da5bea 100644
--- a/resources/lang/en-GB/payments.php
+++ b/resources/lang/en-GB/payments.php
@@ -5,5 +5,6 @@ return [
     'payment_made'      => 'Payment Made',
     'paid_to'           => 'Paid To',
     'related_bill'      => 'Releated Bill',
+    'create_payment'    => 'Create Payment',
 
 ];
diff --git a/resources/views/purchases/vendors/index.blade.php b/resources/views/purchases/vendors/index.blade.php
index c9fc09aae..bfd4b75e1 100644
--- a/resources/views/purchases/vendors/index.blade.php
+++ b/resources/views/purchases/vendors/index.blade.php
@@ -77,12 +77,17 @@
                                             <i class="fa fa-ellipsis-h text-muted"></i>
                                         </a>
                                         <div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
-                                            <a class="dropdown-item" href="{{ route('vendors.show', $item->id) }}">{{ trans('general.show') }}</a>
-                                            <a class="dropdown-item" href="{{ route('vendors.edit', $item->id) }}">{{ trans('general.edit') }}</a>
+                                                <a class="dropdown-item" href="{{ route('vendors.show', $item->id) }}">{{ trans('general.show') }}</a>
+                                                
+                                            @can('create-purchases-vendors')
+                                                <a class="dropdown-item" href="{{ route('vendors.edit', $item->id) }}">{{ trans('general.edit') }}</a>
+                                            @endcan
+
                                             @can('create-purchases-vendors')
                                                 <div class="dropdown-divider"></div>
                                                 <a class="dropdown-item" href="{{ route('vendors.duplicate', $item->id) }}">{{ trans('general.duplicate') }}</a>
                                             @endcan
+                                            
                                             @can('delete-purchases-vendors')
                                                 <div class="dropdown-divider"></div>
                                                 {!! Form::deleteLink($item, 'vendors.destroy') !!}
diff --git a/resources/views/purchases/vendors/show.blade.php b/resources/views/purchases/vendors/show.blade.php
index 1224ecf61..3d1b84f9d 100644
--- a/resources/views/purchases/vendors/show.blade.php
+++ b/resources/views/purchases/vendors/show.blade.php
@@ -2,6 +2,61 @@
 
 @section('title', $vendor->name)
 
+@section('new_button')
+    <div class="dropup header-drop-top">
+        <button type="button" class="btn btn-white btn-sm" data-toggle="dropdown" aria-expanded="false">
+            <i class="fa fa-chevron-down"></i>&nbsp; {{ trans('general.more_actions') }}
+        </button>
+
+        <div class="dropdown-menu" role="menu">
+            @stack('button_dropdown_start')
+
+            @stack('duplicate_button_start')
+            @can('create-purchases-bills')
+                <a class="dropdown-item" href="{{ route('vendors.duplicate', $vendor->id) }}">
+                    {{ trans('general.duplicate') }}
+                </a>
+            @endcan
+            @stack('duplicate_button_end')
+
+            <div class="dropdown-divider"></div>
+
+            @stack('invoice_button_start')
+            @can('create-purchases-bills')
+                <a class="dropdown-item" href="{{ route('vendors.create-bill', $vendor->id) }}">
+                    {{ trans('bills.create_bill') }}
+                </a>
+            @endcan
+            @stack('invoice_button_end')
+
+            @stack('revenue_button_start')
+            @can('create-purchases-payments')
+                <a class="dropdown-item" href="{{ route('vendors.create-payment', $vendor->id) }}">
+                    {{ trans('payments.create_payment') }}
+                </a>
+            @endcan
+            @stack('revenue_button_end')
+
+            <div class="dropdown-divider"></div>
+
+            @stack('delete_button_start')
+            @can('delete-purchases-vendors')
+                {!! Form::deleteLink($vendor, 'vendors.destroy') !!}
+            @endcan
+            @stack('delete_button_end')
+
+            @stack('button_dropdown_end')
+        </div>
+    </div>
+    @stack('edit_button_start')
+    @can('update-purchases-vendors')
+        <a href="{{ route('vendors.edit', $vendor->id) }}" class="btn btn-white btn-sm">
+            {{ trans('general.edit') }}
+        </a>
+    @endcan
+    @stack('edit_button_end')
+@endsection
+
 @section('content')
     <div class="row">
         <div class="col-xl-3">
@@ -68,12 +123,7 @@
             </ul>
 
             @stack('vendor_edit_button_start')
-            <a href="{{ route('vendors.edit', $vendor->id) }}" class="btn btn-info btn-block"><b>{{ trans('general.edit') }}</b></a>
             @stack('vendor_edit_button_end')
-
-            @stack('vendor_create_bill_button_start')
-            <a href="{{ route('vendors.create-bill', $vendor->id) }}" class="btn btn-white btn-block"><b>{{ trans('bills.create_bill') }}</b></a>
-            @stack('vendor_create_bill_button_end')
         </div>
 
         <div class="col-xl-9">
@@ -131,86 +181,86 @@
                 <div class="col-md-12">
                     <div class="nav-wrapper">
                         <ul class="nav nav-pills nav-fill flex-column flex-md-row" id="tabs-icons-text" role="tablist">
-                            @stack('vendor_transactions_tab_start')
+                        @stack('vendor_bills_tab_start')
                             <li class="nav-item">
-                                <a class="nav-link mb-sm-3 mb-md-0 active" id="transactions-tab" data-toggle="tab" href="#transactions-content" role="tab" aria-controls="transactions-content" aria-selected="true">{{ trans_choice('general.transactions', 2) }}</a>
-                            </li>
-                            @stack('vendor_transactions_tab_end')
-
-                            @stack('vendor_bills_tab_start')
-                            <li class="nav-item">
-                                <a class="nav-link mb-sm-3 mb-md-0" id="bills-tab" data-toggle="tab" href="#bills-content" role="tab" aria-controls="bills-content" aria-selected="false">{{ trans_choice('general.bills', 2) }}</a>
+                                <a class="nav-link mb-sm-3 mb-md-0 active" id="bills-tab" data-toggle="tab" href="#bills-content" role="tab" aria-controls="bills-content" aria-selected="false">{{ trans_choice('general.bills', 2) }}</a>
                             </li>
                             @stack('vendor_bills_tab_end')
+
+                        @stack('vendor_transactions_tab_start')
+                            <li class="nav-item">
+                                <a class="nav-link mb-sm-3 mb-md-0" id="transactions-tab" data-toggle="tab" href="#transactions-content" role="tab" aria-controls="transactions-content" aria-selected="true">{{ trans_choice('general.transactions', 2) }}</a>
+                            </li>
+                        @stack('vendor_transactions_tab_end')
                         </ul>
                     </div>
                     <div class="card">
                         <div class="tab-content" id="myTabContent">
-                            @stack('vendor_transactions_content_start')
-                            <div class="tab-pane fade show active" id="transactions-content" role="tabpanel" aria-labelledby="transactions-tab">
-                                <div class="table-responsive">
-                                    <table class="table table-flush table-hover" id="tbl-transactions">
-                                        <thead class="thead-light">
-                                            <tr class="row table-head-line">
-                                                <th class="col-xs-6 col-sm-2">{{ trans('general.date') }}</th>
-                                                <th class="col-xs-6 col-sm-2 text-right">{{ trans('general.amount') }}</th>
-                                                <th class="col-sm-4 d-none d-sm-block">{{ trans_choice('general.categories', 1) }}</th>
-                                                <th class="col-sm-4 d-none d-sm-block">{{ trans_choice('general.accounts', 1) }}</th>
-                                            </tr>
-                                        </thead>
-                                        <tbody>
-                                            @foreach($transactions as $item)
-                                                <tr class="row align-items-center border-top-1 tr-py">
-                                                    <td class="col-xs-6 col-sm-2">@date($item->paid_at)</td>
-                                                    <td class="col-xs-6 col-sm-2 text-right">@money($item->amount, $item->currency_code, true)</td>
-                                                    <td class="col-sm-4 d-none d-sm-block">{{ $item->category->name }}</td>
-                                                    <td class="col-sm-4 d-none d-sm-block">{{ $item->account->name }}</td>
-                                                </tr>
-                                            @endforeach
-                                        </tbody>
-                                    </table>
-                                </div>
-                                <div class="card-footer py-4 table-action">
-                                    <div class="row">
-                                        @include('partials.admin.pagination', ['items' => $transactions, 'type' => 'transactions'])
-                                    </div>
-                                </div>
-                            </div>
-                            @stack('vendor_transactions_content_end')
-
                             @stack('vendor_bills_content_start')
-                            <div class="tab-pane fade" id="bills-content" role="tabpanel" aria-labelledby="bills-tab">
-                                <div class="table-responsive">
-                                    <table class="table table-flush table-hover" id="tbl-bills">
-                                        <thead class="thead-light">
-                                            <tr class="row table-head-line">
-                                                <th class="col-xs-4 col-sm-1">{{ trans_choice('general.numbers', 1) }}</th>
-                                                <th class="col-xs-4 col-sm-3 text-right">{{ trans('general.amount') }}</th>
-                                                <th class="col-sm-3 d-none d-sm-block text-left">{{ trans('bills.bill_date') }}</th>
-                                                <th class="col-sm-3 d-none d-sm-block text-left">{{ trans('bills.due_date') }}</th>
-                                                <th class="col-xs-4 col-sm-2">{{ trans_choice('general.statuses', 1) }}</th>
-                                            </tr>
-                                        </thead>
-                                        <tbody>
-                                            @foreach($bills as $item)
-                                                <tr class="row align-items-center border-top-1 tr-py">
-                                                    <td class="col-xs-4 col-sm-1"><a href="{{ route('bills.show', $item->id) }}">{{ $item->document_number }}</a></td>
-                                                    <td class="col-xs-4 col-sm-3 text-right">@money($item->amount, $item->currency_code, true)</td>
-                                                    <td class="col-sm-3 d-none d-sm-block text-left">@date($item->issued_at)</td>
-                                                    <td class="col-sm-3 d-none d-sm-block text-left">@date($item->due_at)</td>
-                                                    <td class="col-xs-4 col-sm-2"><span class="badge badge-pill badge-{{ $item->status_label }} my--2">{{ trans('documents.statuses.' . $item->status) }}</span></td>
+                                <div class="tab-pane fade show active" id="bills-content" role="tabpanel" aria-labelledby="transactions-tab">
+                                    <div class="table-responsive">
+                                        <table class="table table-flush table-hover" id="tbl-bills">
+                                            <thead class="thead-light">
+                                                <tr class="row table-head-line">
+                                                    <th class="col-xs-4 col-sm-1">{{ trans_choice('general.numbers', 1) }}</th>
+                                                    <th class="col-xs-4 col-sm-3 text-right">{{ trans('general.amount') }}</th>
+                                                    <th class="col-sm-3 d-none d-sm-block text-left">{{ trans('invoices.invoice_date') }}</th>
+                                                    <th class="col-sm-3 d-none d-sm-block text-left">{{ trans('invoices.due_date') }}</th>
+                                                    <th class="col-xs-4 col-sm-2">{{ trans_choice('general.statuses', 1) }}</th>
                                                 </tr>
-                                            @endforeach
-                                        </tbody>
-                                    </table>
-                                </div>
-                                <div class="card-footer py-4 table-action">
-                                    <div class="row">
-                                        @include('partials.admin.pagination', ['items' => $bills, 'type' => 'bills'])
+                                            </thead>
+                                            <tbody>
+                                                @foreach($bills as $item)
+                                                    <tr class="row align-items-center border-top-1 tr-py">
+                                                        <td class="col-xs-4 col-sm-1"><a href="{{ route('bills.show', $item->id) }}">{{ $item->document_number }}</a></td>
+                                                        <td class="col-xs-4 col-sm-3 text-right">@money($item->amount, $item->currency_code, true)</td>
+                                                        <td class="col-sm-3 d-none d-sm-block text-left">@date($item->issued_at)</td>
+                                                        <td class="col-sm-3 d-none d-sm-block text-left">@date($item->due_at)</td>
+                                                        <td class="col-xs-4 col-sm-2"><span class="badge badge-pill badge-{{ $item->status_label }} my--2">{{ trans('documents.statuses.' . $item->status) }}</span></td>
+                                                    </tr>
+                                                @endforeach
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                    <div class="card-footer py-4 table-action">
+                                        <div class="row">
+                                            @include('partials.admin.pagination', ['items' => $bills, 'type' => 'bills'])
+                                        </div>
                                     </div>
                                 </div>
-                            </div>
                             @stack('vendor_bills_content_end')
+
+                            @stack('vendor_transactions_content_start')
+                                <div class="tab-pane fade" id="transactions-content" role="tabpanel" aria-labelledby="bills-tab">
+                                    <div class="table-responsive">
+                                        <table class="table table-flush table-hover" id="tbl-transactions">
+                                            <thead class="thead-light">
+                                                <tr class="row table-head-line">
+                                                    <th class="col-xs-6 col-sm-2">{{ trans('general.date') }}</th>
+                                                    <th class="col-xs-6 col-sm-2 text-right">{{ trans('general.amount') }}</th>
+                                                    <th class="col-sm-4 d-none d-sm-block">{{ trans_choice('general.categories', 1) }}</th>
+                                                    <th class="col-sm-4 d-none d-sm-block">{{ trans_choice('general.accounts', 1) }}</th>
+                                                </tr>
+                                            </thead>
+                                            <tbody>
+                                                @foreach($transactions as $item)
+                                                    <tr class="row align-items-center border-top-1 tr-py">
+                                                        <td class="col-xs-6 col-sm-2">@date($item->paid_at)</td>
+                                                        <td class="col-xs-6 col-sm-2 text-right">@money($item->amount, $item->currency_code, true)</td>
+                                                        <td class="col-sm-4 d-none d-sm-block">{{ $item->category->name }}</td>
+                                                        <td class="col-sm-4 d-none d-sm-block">{{ $item->account->name }}</td>
+                                                    </tr>
+                                                @endforeach
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                    <div class="card-footer py-4 table-action">
+                                        <div class="row">
+                                            @include('partials.admin.pagination', ['items' => $transactions, 'type' => 'transactions'])
+                                        </div>
+                                    </div>
+                                </div>
+                            @stack('vendor_transactions_content_end')
                         </div>
                     </div>
                 </div>