From 65bbecd145524ca9e5a23b6f7e7d8dac9fee886e Mon Sep 17 00:00:00 2001
From: slong753 <spencer@spencerlong.com>
Date: Wed, 29 Mar 2023 14:46:31 -0500
Subject: [PATCH] this all works - could use some eyes

---
 .../Assets/BulkAssetsController.php           | 45 ++++++++++++++-----
 resources/views/hardware/bulk.blade.php       |  5 ++-
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php
index 42c0f96d4c..98494fcb76 100644
--- a/app/Http/Controllers/Assets/BulkAssetsController.php
+++ b/app/Http/Controllers/Assets/BulkAssetsController.php
@@ -48,8 +48,7 @@ class BulkAssetsController extends Controller
             return $query->where('fieldset_id', '!=', null);
         })->get();
 
-        $models1 = $asset_custom_field->unique('model_id');  
-        $models = $models1->pluck('model'); 
+        $models = $asset_custom_field->unique('model_id')->pluck('model');  
 
         $custom_fields = new Collection(); 
         foreach ($asset_custom_field as $asset_key => $asset) {
@@ -103,12 +102,19 @@ class BulkAssetsController extends Controller
         }
 
 
+      $custom_field_columns = CustomField::all()->pluck('db_column')->toArray(); 
+        
         if (! $request->filled('ids') || count($request->input('ids')) <= 0) {
             return redirect($bulk_back_url)->with('error', trans('admin/hardware/message.update.no_assets_selected'));
         }
 
         $assets = array_keys($request->input('ids'));
-
+        
+       if ($request->anyFilled($custom_field_columns)) {
+           $custom_fields_present = true;
+         } else {
+           $custom_fields_present = false;
+         }
         if (($request->filled('purchase_date'))
             || ($request->filled('expected_checkin'))
             || ($request->filled('purchase_cost'))
@@ -124,6 +130,7 @@ class BulkAssetsController extends Controller
             || ($request->filled('null_purchase_date'))
             || ($request->filled('null_expected_checkin_date'))
             || ($request->filled('null_next_audit_date'))
+            || ($request->anyFilled($custom_field_columns))
 
         ) {
             foreach ($assets as $assetId) {
@@ -139,6 +146,9 @@ class BulkAssetsController extends Controller
                     ->conditionallyAddItem('supplier_id')
                     ->conditionallyAddItem('warranty_months')
                     ->conditionallyAddItem('next_audit_date');
+                    foreach ($custom_field_columns as $key => $custom_field_column) {
+                        $this->conditionallyAddItem($custom_field_column); 
+                   } 
 
                 if ($request->input('null_purchase_date')=='1') {
                     $this->update_array['purchase_date'] = null;
@@ -187,17 +197,28 @@ class BulkAssetsController extends Controller
                 $logAction->user_id = Auth::id();
                 $logAction->log_meta = json_encode($changed);
                 $logAction->logaction('update');
-
-                DB::table('assets')
-                    ->where('id', $assetId)
-                    ->update($this->update_array);
-            } // endforeach
-
+ 
+                if($custom_fields_present) { 
+                    $asset = Asset::find($assetId); 
+                    $assetCustomFields = $asset->model()->first()->fieldset; 
+                    foreach ($assetCustomFields->fields as $field) { 
+                       if (array_key_exists($field->db_column, $this->update_array)) {
+                            $asset->{$field->db_column} = $this->update_array[$field->db_column]; 
+                            $asset->save();    
+                            continue; 
+                       } else { 
+                            $array = $this->update_array; 
+                            array_except($array, $field->db_column); 
+                            $asset->update($array); 
+                            $asset->save();
+                        }     
+                    } 
+                } else {
+                    Asset::find($assetId)->update($this->update_array);
+                } 
+            } // endforeach ($assets)
             return redirect($bulk_back_url)->with('success', trans('admin/hardware/message.update.success'));
-
-
         }
-
         // no values given, nothing to update
         return redirect($bulk_back_url)->with('warning', trans('admin/hardware/message.update.nothing_updated'));
     }
diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php
index eefa247602..c1283c1e02 100755
--- a/resources/views/hardware/bulk.blade.php
+++ b/resources/views/hardware/bulk.blade.php
@@ -21,6 +21,9 @@
 
     <div class="callout callout-warning">
       <i class="fas fa-exclamation-triangle"></i> {{ trans_choice('admin/hardware/form.bulk_update_warn', count($assets), ['asset_count' => count($assets)]) }}
+        @if (count($models) > 0)
+            made up of {{count($models)}} models
+        @endif 
     </div>
 
     <form class="form-horizontal" method="post" action="{{ route('hardware/bulksave') }}" autocomplete="off" role="form">
@@ -192,7 +195,7 @@
         @endforeach  --}}
 
         @foreach ($models as $model) 
-            <label>
+            <label class="col-md-12 text-center">
                 {{ $model->name }} asset model
             </label>
             @include("models/custom_fields_form",["model" => $model])