edit request ip

app/Http/Controllers/Form/BusinessController.php

@@ -343,11 +343,6 @@ class BusinessController extends Controller
     public function viewFormPackageD(Request $request)
     {
         $data = array();
-        if ($request->coverage == 'CYBERJAYA' && $request->subscription == '24') {
-            $ip = $request->ip1;
-        } else {
-            $ip = $request->ip;
-        }
         array_push($data, array(
             'coverage' => $request->coverage,
             'unit' => $request->unit,
@@ -360,7 +355,7 @@ class BusinessController extends Controller
             'company_fax' => $request->company_fax,
             'full_name' => $request->full_name,
             'nric_passport' => $request->nric_passport,
-            'ip' => $ip,
+            'ip' => $request->ip,
             'designation' => $request->designation,
             'contact_primary' => $request->contact_primary,
             'contact_secondary' => $request->contact_secondary,
@@ -448,6 +443,11 @@ class BusinessController extends Controller
 
         $total = number_format((floatval($product->retail_price) * 1.06) + ($otc * 1.06) + $deposit + $ip_tax, 2);
 
+        if ($coverage->city == 'CYBERJAYA' && $request->subscription == '24') {
+            $ip = $request->ip1;
+        } else {
+            $ip = $request->ip;
+        }
         array_push($data, array(
             'coverage' => $request->coverage,
             'unit' => $request->unit,
@@ -467,7 +467,7 @@ class BusinessController extends Controller
             'subscription' => $request->subscription,
             'billing' => $request->billing,
             'voice' => $voice,
-            'ip' => $request->ip,
+            'ip' => $ip,
             'ip_fee' => $ip_fee,
             'ip_tax' => $ip_tax,
             'thedate' => $request->thedate,