diff --git a/resources/lang/en/admin/locations/general.php b/resources/lang/en/admin/locations/general.php new file mode 100644 index 000000000..822fd66c8 --- /dev/null +++ b/resources/lang/en/admin/locations/general.php @@ -0,0 +1,9 @@ + 'Assigned to :location Location', + 'asset_management_system' => 'Asset Management System', + 'assigned_to' => 'Assigned To:', + 'manager' => 'Manager', + 'date' => 'Current Date:', +); \ No newline at end of file diff --git a/resources/views/locations/print.blade.php b/resources/views/locations/print.blade.php index b9c664e65..7fc02ea6e 100644 --- a/resources/views/locations/print.blade.php +++ b/resources/views/locations/print.blade.php @@ -156,34 +156,23 @@ - - + - + -
{{ trans('admin/locations/table.signed_by_asset_auditor') }}___________________________
------------------------------------------------------    
{{ trans('admin/locations/table.date') }}____________________
------------------------------    
-
-
-
- + - - + - + -
{{ trans('admin/locations/table.signed_by_finance_auditor') }}____________________
------------------------------------------------------    
{{ trans('admin/locations/table.date') }}____________________
------------------------------    
-
-
-
- + - - + - +
{{ trans('admin/locations/table.signed_by_location_manager') }}_______________________
------------------------------------------------------    
{{ trans('admin/locations/table.date') }}____________________
------------------------------    
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php index 87eaf7c1a..771538df5 100644 --- a/resources/views/locations/view.blade.php +++ b/resources/views/locations/view.blade.php @@ -191,9 +191,20 @@
+
+ {{ trans('admin/locations/table.update') }} +
+
+ {{ trans('admin/locations/table.print_assigned') }} +
+
+ {{ trans('admin/locations/table.print_all_assigned') }} +
+ + @if ($location->image!='')
- {{ $location->name }} + {{ $location->name }}
@endif
@@ -220,21 +231,13 @@ @if (($location->state!='') && ($location->country!='') && (config('services.google.maps_api_key')))
- Map + Map
@endif
-
- {{ trans('admin/locations/table.update') }} -
-
- {{ trans('admin/locations/table.print_assigned') }} -
-
- {{ trans('admin/locations/table.print_all_assigned') }} -
+