Implemented requested changes

owlchester · Jan 4, 2024 · a2860f0 · a2860f0
1 parent 142a749
commit a2860f0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/Services/BulkService.php b/app/Services/BulkService.php
@@ -294,7 +294,7 @@ public function editing(array $fields, Bulk $bulk): int
             return $this->updateRelations($filledFields, $mirrorOptions);
         }
 
-        $parent = Str::singular($model->getTable()) . '_id';
+        $parent = method_exists($model, 'getParentKeyName') ? $model->getParentKeyName() : null;
 
         // Todo: move model fetch above to actually use with()
         foreach ($this->ids as $id) {
@@ -308,7 +308,7 @@ public function editing(array $fields, Bulk $bulk): int
             }
             $entityFields = $filledFields;
 
-            if(isset($entityFields[$parent]) && $entityFields[$parent] == strval($entity->id)) {
+            if(isset($entityFields[$parent]) && intval($entityFields[$parent]) == $entity->id) {
                 unset($entityFields[$parent]);
             }