Merge branch 'develop' into bug/sc-24884

app/Http/Requests/ImageUploadRequest.php

@@ -86,12 +86,8 @@ class ImageUploadRequest extends Request
 
         if ($this->offsetGet($form_fieldname) instanceof UploadedFile) {
            $image = $this->offsetGet($form_fieldname);
-           \Log::debug('Image is an instance of UploadedFile');
         } elseif ($this->hasFile($form_fieldname)) {
             $image = $this->file($form_fieldname);
-            \Log::debug('Just use regular upload for '.$form_fieldname);
-        } else {
-            \Log::debug('No image found for form fieldname: '.$form_fieldname);
         }
 
         if (isset($image)) {

app/Http/Requests/StoreAssetRequest.php

@@ -4,6 +4,7 @@ namespace App\Http\Requests;
 
 use App\Models\Asset;
 use App\Models\Company;
+use App\Models\Setting;
 use Carbon\Carbon;
 use Carbon\Exceptions\InvalidFormatException;
 use Illuminate\Support\Facades\Gate;
@@ -45,12 +46,21 @@ class StoreAssetRequest extends ImageUploadRequest
      */
     public function rules(): array
     {
-        $rules = array_merge(
-            (new Asset)->getRules(),
+        $modelRules = (new Asset)->getRules();
+
+        if (Setting::getSettings()->digit_separator === '1.234,56' && is_string($this->input('purchase_cost'))) {
+            // If purchase_cost was submitted as a string with a comma separator
+            // then we need to ignore the normal numeric rules.
+            // Since the original rules still live on the model they will be run
+            // right before saving (and after purchase_cost has been
+            // converted to a float via setPurchaseCostAttribute).
+            $modelRules = $this->removeNumericRulesFromPurchaseCost($modelRules);
+        }
+
+        return array_merge(
+            $modelRules,
             parent::rules(),
         );
-
-        return $rules;
     }
 
     private function parseLastAuditDate(): void
@@ -69,4 +79,20 @@ class StoreAssetRequest extends ImageUploadRequest
             }
         }
     }
+
+    private function removeNumericRulesFromPurchaseCost(array $rules): array
+    {
+        $purchaseCost = $rules['purchase_cost'];
+
+        // If rule is in "|" format then turn it into an array
+        if (is_string($purchaseCost)) {
+            $purchaseCost = explode('|', $purchaseCost);
+        }
+
+        $rules['purchase_cost'] = array_filter($purchaseCost, function ($rule) {
+            return $rule !== 'numeric' && $rule !== 'gte:0';
+        });
+
+        return $rules;
+    }
 }