From f0da1977fb1c779266ff6408c4d2006b26b0011d Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Sun, 26 Sep 2021 14:32:51 -0700
Subject: [PATCH] Small visual improvements on consumables view

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/consumables/view.blade.php | 111 ++++++++++++---------
 1 file changed, 64 insertions(+), 47 deletions(-)

diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.php
index 3cf71117b..fd1df2499 100644
--- a/resources/views/consumables/view.blade.php
+++ b/resources/views/consumables/view.blade.php
@@ -67,61 +67,78 @@
     </div> <!-- /.box.box-default-->
   </div> <!-- /.col-md-9-->
   <div class="col-md-3">
-    @if ($consumable->image!='')
-      <div class="col-md-12 text-center" style="padding-bottom: 15px;">
-        <a href="{{ Storage::disk('public')->url('consumables/'.e($consumable->image)) }}" data-toggle="lightbox">
-            <img src="{{ Storage::disk('public')->url('consumables/'.e($consumable->image)) }}" class="img-responsive img-thumbnail" alt="{{ $consumable->name }}"></a>
-      </div>
-    @endif
 
-    @if ($consumable->purchase_date)
-      <div class="col-md-12" style="padding-bottom: 5px;">
-        <strong>{{ trans('general.purchase_date') }}: </strong>
-        {{ $consumable->purchase_date }}
-      </div>
-    @endif
 
-    @if ($consumable->purchase_cost)
-      <div class="col-md-12" style="padding-bottom: 5px;">
-        <strong>{{ trans('general.purchase_cost') }}:</strong>
-        {{ $snipeSettings->default_currency }}
-        {{ \App\Helpers\Helper::formatCurrencyOutput($consumable->purchase_cost) }}
-      </div>
-    @endif
+        <div class="box box-default">
+          <div class="box-body">
+            <div class="row">
+              <div class="col-md-12">
 
-    @if ($consumable->item_no)
-      <div class="col-md-12" style="padding-bottom: 5px;">
-        <strong>{{ trans('admin/consumables/general.item_no') }}:</strong>
-        {{ $consumable->item_no }}
-      </div>
-    @endif
+          
+                @if ($consumable->image!='')
+                <div class="col-md-12 text-center" style="padding-bottom: 15px;">
+                  <a href="{{ Storage::disk('public')->url('consumables/'.e($consumable->image)) }}" data-toggle="lightbox">
+                      <img src="{{ Storage::disk('public')->url('consumables/'.e($consumable->image)) }}" class="img-responsive img-thumbnail" alt="{{ $consumable->name }}"></a>
+                </div>
+                @endif
 
-    @if ($consumable->model_number)
-      <div class="col-md-12" style="padding-bottom: 5px;">
-        <strong>{{ trans('general.model_no') }}:</strong>
-        {{ $consumable->model_number }}
-      </div>
-    @endif
+                @if ($consumable->purchase_date)
+                  <div class="col-md-12" style="padding-bottom: 15px;">
+                    <strong>{{ trans('general.purchase_date') }}: </strong>
+                    {{ \App\Helpers\Helper::getFormattedDateObject($consumable->purchase_date, 'date', false) }}
+                  </div>
+                @endif
 
-    @if ($consumable->manufacturer)
-      <div class="col-md-12" style="padding-bottom: 5px;">
-        <strong>{{ trans('general.manufacturer') }}:</strong>
-        {{ $consumable->manufacturer->name }}
-      </div>
-    @endif
+                @if ($consumable->purchase_cost)
+                  <div class="col-md-12" style="padding-bottom: 15px;">
+                    <strong>{{ trans('general.purchase_cost') }}:</strong>
+                    {{ $snipeSettings->default_currency }}
+                    {{ \App\Helpers\Helper::formatCurrencyOutput($consumable->purchase_cost) }}
+                  </div>
+                @endif
 
-    @if ($consumable->order_number)
-      <div class="col-md-12" style="padding-bottom: 5px;">
-        <strong>{{ trans('general.order_number') }}:</strong>
-        {{ $consumable->order_number }}
-      </div>
-    @endif
+                @if ($consumable->item_no)
+                  <div class="col-md-12" style="padding-bottom: 15px;">
+                    <strong>{{ trans('admin/consumables/general.item_no') }}:</strong>
+                    {{ $consumable->item_no }}
+                  </div>
+                @endif
+
+                @if ($consumable->model_number)
+                  <div class="col-md-12" style="padding-bottom: 15px;">
+                    <strong>{{ trans('general.model_no') }}:</strong>
+                    {{ $consumable->model_number }}
+                  </div>
+                @endif
+
+                @if ($consumable->manufacturer)
+                  <div class="col-md-12" style="padding-bottom: 15px;">
+                    <strong>{{ trans('general.manufacturer') }}:</strong>
+                    <a href="{{ route('manufacturers.show', $consumable->manufacturer->id) }}">{{ $consumable->manufacturer->name }}</a>
+                  </div>
+                @endif
+
+                @if ($consumable->order_number)
+                  <div class="col-md-12" style="padding-bottom: 15px;">
+                    <strong>{{ trans('general.order_number') }}:</strong>
+                    {{ $consumable->order_number }}
+                  </div>
+                @endif
+
+                @can('checkout', \App\Models\Accessory::class)
+                <div class="col-md-12 text-center">
+                    <a href="{{ route('checkout/consumable', $consumable->id) }}" style="padding-bottom:5px;" class="btn btn-primary btn-sm" {{ (($consumable->numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }}</a>
+                </div>
+                @endcan
+
+       
+              </div>
+            </div>
+          </div>
+        </div>
 
-    @can('checkout', \App\Models\Accessory::class)
-    <div class="col-md-12">
-        <a href="{{ route('checkout/consumable', $consumable->id) }}" style="padding-bottom:5px;" class="btn btn-primary btn-sm" {{ (($consumable->numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }}</a>
     </div>
-    @endcan
+    
   </div> <!-- /.col-md-3-->
 </div> <!-- /.row-->