Merge remote-tracking branch 'origin/develop'

# Conflicts:
#	config/version.php

Author: snipe

app/Http/Controllers/Account/AcceptanceController.php

@@ -77,7 +77,6 @@ public function store(Request $request, $id) : RedirectResponse
         $acceptance = CheckoutAcceptance::find($id);
         $assigned_user = User::find($acceptance->assigned_to_id);
         $settings = Setting::getSettings();
-        $path_logo = '';
         $sig_filename='';
 
 
@@ -138,6 +137,13 @@ public function store(Request $request, $id) : RedirectResponse
         }
 
 
+        // Convert PDF logo to base64 for TCPDF
+        // This is needed for TCPDF to properly embed the image if it's a png and the cache isn't writable
+        $encoded_logo = null;
+        if ($settings->acceptance_pdf_logo) {
+            $encoded_logo = base64_encode(file_get_contents(public_path() . '/uploads/' . $settings->acceptance_pdf_logo));
+        }
+
         // Get the data array ready for the notifications and PDF generation
         $data = [
             'item_tag' => $item->asset_tag,
@@ -153,8 +159,8 @@ public function store(Request $request, $id) : RedirectResponse
             'assigned_to' => $assigned_user->display_name,
             'site_name' => $settings->site_name,
             'company_name' => $item->company?->name?? $settings->site_name,
-            'signature' => ($sig_filename) ? storage_path() . '/private_uploads/signatures/' . $sig_filename : null,
-            'logo' => ($settings->acceptance_pdf_logo) ? public_path() . '/uploads/' . $settings->acceptance_pdf_logo : null,
+            'signature' => (($sig_filename && array_key_exists('1', $encoded_image))) ? $encoded_image[1] : null,
+            'logo' => ($encoded_logo) ?? null,
             'date_settings' => $settings->date_display_format,
             'admin' => auth()->user()->present()?->fullName,
             'qty' => $acceptance->qty ?? 1,

app/Models/CheckoutAcceptance.php

@@ -184,7 +184,7 @@ public function generateAcceptancePdf($data, $pdf_filename) {
 
         $pdf->AddPage();
         if ($data['logo'] != null) {
-            $pdf->writeHTML('<img src="'.$data['logo'].'">', true, 0, true, 0, '');
+            $pdf->writeHTML('<img src="@'.$data['logo'].'">', true, 0, true, 0, '');
         } else {
             $pdf->writeHTML('<h3>'.$data['site_name'].'</h3><br /><br />', true, 0, true, 0, 'C');
         }
@@ -230,7 +230,7 @@ public function generateAcceptancePdf($data, $pdf_filename) {
         $pdf->Ln();
 
         if ($data['signature'] != null) {
-            $pdf->writeHTML('<img src="'.$data['signature'].'">', true, 0, true, 0, '');
+            $pdf->writeHTML('<img src="@'.$data['signature'].'">', true, 0, true, 0, '');
             $pdf->writeHTML('<hr>', true, 0, true, 0, '');
             $pdf->writeHTML(e($data['assigned_to']), true, 0, true, 0, 'C');
             $pdf->Ln();

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v8.3.2',
-  'full_app_version' => 'v8.3.2 - build 19905-g028b4e7b7',
-  'build_version' => '19905',
+  'app_version' => 'v8.3.3',
+  'full_app_version' => 'v8.3.3 - build 20061-g884d2a955',
+  'build_version' => '20061',
   'prerelease_version' => '',
-  'hash_version' => 'g028b4e7b7',
-  'full_hash' => 'v8.3.2-319-g028b4e7b7',
+  'hash_version' => 'g884d2a955',
+  'full_hash' => 'v8.3.3-154-g884d2a955',
   'branch' => 'master',
 );

resources/lang/aa-ER/admin/custom_fields/general.php

@@ -5,7 +5,7 @@
     'manage'                    => 'crwdns6501:0crwdne6501:0',
     'field'		                => 'crwdns1487:0crwdne1487:0',
     'about_fieldsets_title'		=> 'crwdns1488:0crwdne1488:0',
-    'about_fieldsets_text'		=> 'crwdns13508:0crwdne13508:0',
+    'about_fieldsets_text'		=> 'crwdns13746:0crwdne13746:0',
     'custom_format'             => 'crwdns6505:0crwdne6505:0',
     'encrypt_field'      	        => 'crwdns1792:0crwdne1792:0',
     'encrypt_field_help'      => 'crwdns1683:0crwdne1683:0',

resources/lang/aa-ER/admin/depreciations/general.php

@@ -2,7 +2,7 @@
 
 return [
     'about_asset_depreciations'  			=> 'crwdns819:0crwdne819:0',
-    'about_depreciations'  					=> 'crwdns820:0crwdne820:0',
+    'about_depreciations'  					=> 'crwdns13748:0crwdne13748:0',
     'asset_depreciations'  					=> 'crwdns821:0crwdne821:0',
     'create'  					            => 'crwdns1799:0crwdne1799:0',
     'depreciation_name'  					=> 'crwdns823:0crwdne823:0',

resources/lang/aa-ER/admin/hardware/form.php

@@ -44,6 +44,8 @@
     'redirect_to_checked_out_to'   => 'crwdns12226:0crwdne12226:0',
     'select_statustype'	=> 'crwdns1167:0crwdne1167:0',
     'serial'			=> 'crwdns716:0crwdne716:0',
+    'serial_required'	=> 'crwdns13774:0crwdne13774:0',
+    'serial_required_post_model_update'	=> 'crwdns13776:0crwdne13776:0',
     'status'			=> 'crwdns717:0crwdne717:0',
     'tag'				=> 'crwdns719:0crwdne719:0',
     'update'			=> 'crwdns720:0crwdne720:0',

resources/lang/aa-ER/admin/hardware/general.php

@@ -22,6 +22,8 @@
     'requested'				    => 'crwdns1697:0crwdne1697:0',
     'not_requestable'           => 'crwdns6555:0crwdne6555:0',
     'requestable_status_warning' => 'crwdns11681:0crwdne11681:0',
+    'require_serial'       => 'crwdns13770:0crwdne13770:0',
+    'require_serial_help'       => 'crwdns13772:0crwdne13772:0',
     'restore'  					=> 'crwdns1178:0crwdne1178:0',
     'pending'  					=> 'crwdns1170:0crwdne1170:0',
     'undeployable'  			=> 'crwdns1171:0crwdne1171:0',

resources/lang/aa-ER/admin/licenses/message.php

@@ -46,11 +46,12 @@
         'not_enough_seats' => 'crwdns11902:0crwdne11902:0',
         'mismatch' => 'crwdns12574:0crwdne12574:0',
         'unavailable' => 'crwdns12576:0crwdne12576:0',
+        'license_is_inactive' => 'crwdns13798:0crwdne13798:0',
     ),
 
     'checkin' => array(
         'error'   => 'crwdns948:0crwdne948:0',
-        'not_reassignable' => 'crwdns12802:0crwdne12802:0',
+        'not_reassignable' => 'crwdns13778:0crwdne13778:0',
         'success' => 'crwdns949:0crwdne949:0'
     ),
 

resources/lang/aa-ER/admin/locations/message.php

@@ -3,12 +3,13 @@
 return array(
 
     'does_not_exist' => 'crwdns650:0crwdne650:0',
-    'assoc_users'    => 'crwdns13150:0crwdne13150:0',
+    'assoc_users'    => 'crwdns13788:0crwdne13788:0',
     'assoc_assets'	 => 'crwdns1404:0crwdne1404:0',
     'assoc_child_loc'	 => 'crwdns1405:0crwdne1405:0',
     'assigned_assets' => 'crwdns11179:0crwdne11179:0',
     'current_location' => 'crwdns11181:0crwdne11181:0',
     'open_map' => 'crwdns12696:0crwdne12696:0',
+    'deleted_warning' => 'crwdns13790:0crwdne13790:0',
 
 
     'create' => array(

resources/lang/aa-ER/admin/locations/table.php

@@ -12,7 +12,8 @@
     'create'                    => 'crwdns644:0crwdne644:0',
     'update'                    => 'crwdns645:0crwdne645:0',
     'print_assigned'            => 'crwdns6062:0crwdne6062:0',
-    'print_all_assigned'        => 'crwdns6064:0crwdne6064:0',
+    'print_inventory'           => 'crwdns13792:0crwdne13792:0',
+    'print_all_assigned'        => 'crwdns13794:0crwdne13794:0',
     'name'                      => 'crwdns646:0crwdne646:0',
     'address'                   => 'crwdns647:0crwdne647:0',
     'address2'                   => 'crwdns11880:0crwdne11880:0',