Display bugfixes for #819

snipe · Jul 9, 2015 · 4a50660 · 4a50660
1 parent 84ffc1a
commit 4a50660
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 12 deletions.
diff --git a/app/config/version.php b/app/config/version.php
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v1.2.8-143',
-  'hash_version' => 'v1.2.8-143-g1edce0a',
+  'app_version' => 'v1.2.8-149',
+  'hash_version' => 'v1.2.8-149-g74429d9',
 );
diff --git a/app/lang/en/admin/locations/table.php b/app/lang/en/admin/locations/table.php
@@ -13,4 +13,5 @@
     'zip'			=> 'Postal Code',
     'locations'		=> 'Locations',
     'parent'		=> 'Parent',
+    'currency'  	=> 'Location Currency', // this is deprecated
 );
diff --git a/app/models/Asset.php b/app/models/Asset.php
@@ -62,7 +62,6 @@ public function assetloc()
 
     }
 
-
     /**
     * Get the asset's location based on default RTD location
     **/

diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php
@@ -133,7 +133,7 @@
                     <div class="col-md-2">
                             <div class="input-group">
                                     <span class="input-group-addon">
-                                        @if ($asset->id)
+                                        @if (($asset->id) && ($asset->assetloc))
                                             {{{ $asset->assetloc->currency }}}
                                         @else
                                             {{{ Setting::first()->default_currency }}}

diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php
@@ -90,7 +90,12 @@
 
         @if ($asset->purchase_cost)
             <div class="col-md-12" style="padding-bottom: 5px;"><strong>@lang('admin/hardware/form.cost'):</strong>
-            {{{ $asset->assetloc->currency }}}
+            @if (($asset->id) && ($asset->assetloc))
+                {{{ $asset->assetloc->currency }}}
+            @else
+                {{{ Setting::first()->default_currency }}}
+            @endif
+
             {{{ number_format($asset->purchase_cost,2) }}} </div>
         @endif
 

diff --git a/app/views/backend/locations/edit.blade.php b/app/views/backend/locations/edit.blade.php
@@ -61,7 +61,7 @@
             <!-- Currency -->
             <div class="form-group {{ $errors->has('currency') ? ' has-error' : '' }}">
                 <label for="currency" class="col-md-2 control-label">
-                	@lang('admin/locations/table.address')
+                	@lang('admin/locations/table.currency')
                 </label>
                     <div class="col-md-12">
                         <div class="col-xs-8">

diff --git a/app/views/backend/reports/depreciation.blade.php b/app/views/backend/reports/depreciation.blade.php
@@ -71,12 +71,11 @@
             @endif
             </td>
             <td>
-            @if (isset($asset->assigned_to))
-				@if (($asset->assigned_to > 0) && ($asset->assigneduser->location_id > 0)) {{{ Location::find($asset->assigneduser->location_id)->city }}}
-						,
-						{{{ Location::find($asset->assigneduser->location_id)->state }}}
-				@endif
-            @endif
+                @if ($asset->assetloc)
+                    {{{ $asset->assetloc->name }}}
+                @elseif ($asset->defaultloc)
+                    {{{ $asset->defaultloc->name }}}
+                @endif
             </td>
             <td>{{{ $asset->purchase_date }}}</td>
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,7 +62,6 @@ public function assetloc() @@
         }
         /**
         * Get the asset's location based on default RTD location
         **/
@@ Expand Down @@