Merge remote-tracking branch 'origin/develop'

Author: snipe

app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php

@@ -49,13 +49,6 @@ public function write($pdf, $record) {
             );
             $currentX += $barcodeSize + self::BARCODE_MARGIN;
             $usableWidth -= $barcodeSize + self::BARCODE_MARGIN;
-        } else {
-            static::writeText(
-                $pdf, $record->get('tag'),
-                $pa->x1, $pa->y2 - self::TAG_SIZE,
-                'freesans', 'b', self::TAG_SIZE, 'R',
-                $usableWidth, self::TAG_SIZE, true, 0
-            );
         }
 
         if ($record->has('title')) {

app/Models/Labels/Tapes/Dymo/LabelWriter_30252.php

@@ -50,13 +50,6 @@ public function write($pdf, $record) {
             );
             $currentX += $barcodeSize + self::BARCODE_MARGIN;
             $usableWidth -= $barcodeSize + self::BARCODE_MARGIN;
-        } else {
-            static::writeText(
-                $pdf, $record->get('tag'),
-                $pa->x1, $pa->y2 - self::TAG_SIZE,
-                'freemono', 'b', self::TAG_SIZE, 'R',
-                $usableWidth, self::TAG_SIZE, true, 0
-            );
         }
 
         if ($record->has('title')) {

resources/views/account/view-assets.blade.php

@@ -380,13 +380,8 @@
             <div class="table table-responsive">
               @if ($user->id)
                 <div class="box-header with-border">
-                  <div class="box-heading">
-                    <h2 class="box-title"> {{ trans('admin/users/general.assets_user', array('name' => $user->first_name)) }}</h2>
-                  </div>
                 </div><!-- /.box-header -->
               @endif
-
-              <div class="box-body">
                 <!-- checked out assets table -->
                 <div class="table-responsive">
 
@@ -421,10 +416,15 @@ class="table table-striped snipe-table"
                       <th class="col-md-2" data-switchable="true" data-visible="true">
                         {{ trans('admin/hardware/table.asset_tag') }}
                       </th>
-                      <th class="col-md-2" data-switchable="true" data-visible="false">{{ trans('general.name') }}</th>
+                      <th class="col-md-2" data-switchable="true" data-visible="false">
+                        {{ trans('general.name') }}
+                      </th>
                       <th class="col-md-2" data-switchable="true" data-visible="true">
                         {{ trans('admin/hardware/table.asset_model') }}
                       </th>
+                      <th class="col-md-2" data-switchable="true" data-visible="false">
+                        {{ trans('general.model_no') }}
+                      </th>
                       <th class="col-md-3" data-switchable="true" data-visible="true">
                         {{ trans('admin/hardware/table.serial') }}
                       </th>
@@ -482,9 +482,10 @@ class="table table-striped snipe-table"
                           {{ $asset->name }}
                         </td>
                         <td>
-                          @if ($asset->physical=='1')
                             {{ $asset->model->name }}
-                          @endif
+                        </td>
+                        <td>
+                          {{ $asset->model->model_number }}
                         </td>
                         <td>
                           {{ $asset->serial }}
@@ -528,7 +529,6 @@ class="table table-striped snipe-table"
                   </table>
                 </div>
                 </div> <!-- .table-responsive-->
-            </div>
           </div><!-- /asset -->
           <div class="tab-pane" id="licenses">