forms

app/Http/Controllers/Hauling/Hauling.php

@@ -30,8 +30,8 @@ class Hauling extends Controller
      */
     public function displayFormResults(Request $request) {
         $this->validate($request, [
-            'name1' => 'required',
-            'name2' => 'required',
+            'pickup' => 'required',
+            'destination' => 'required',
             'collateral' => 'required',
             'size' => 'required',
         ]);
@@ -40,14 +40,18 @@ class Hauling extends Controller
         $collateral = $request->collateral;
         $time = '1 week';
         $duration = '3 days';
+        $pickup = $request->pickup;
+        $destination = $request->destination;
 
         $hHelper = new HaulingHelper;
 
-        $jumps = $hHelper->JumpsBetweenSystems($request->name1, $request->name2);
+        $jumps = $hHelper->JumpsBetweenSystems($pickup, $destination);
 
-        if($size > 0 && $size <= 57500) {
+        if($size > 0 && $size <= 8000) {
+            $cost = $jumps* 600000;
+        } else if($size > 8000 && $size <= 57500) {
             $cost = $jumps * 750000;
-        } else if($size > 57500 && $size < 800000) {
+        } else if($size > 57500 && $size <= 800000) {
             $cost = $jumps * 1000000;
         } else {
             $cost = -1;
@@ -58,7 +62,9 @@ class Hauling extends Controller
                                                ->with('collateral', $collateral)
                                                ->with('size', $size)
                                                ->with('time', $time)
-                                               ->with('duration', $duration);
+                                               ->with('duration', $duration)
+                                               ->with('pickup', $pickup)
+                                               ->with('destination', $destination);
     }
 
     /**