From 371006887b88df954ae6bbe4150e685e9c58041c Mon Sep 17 00:00:00 2001
From: Zain Fauzan Rofie Azizi <zanepojan94@gmail.com>
Date: Mon, 28 May 2018 16:40:47 +0800
Subject: [PATCH] completed PUT request

---
 .../WarehousearrangementController.php        | 67 +++++++------------
 app/Warehouseitem.php                         |  2 +-
 2 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/app/Http/Controllers/WarehousearrangementController.php b/app/Http/Controllers/WarehousearrangementController.php
index 179b377..3635c95 100644
--- a/app/Http/Controllers/WarehousearrangementController.php
+++ b/app/Http/Controllers/WarehousearrangementController.php
@@ -9,6 +9,7 @@ use App\Warehouseitem;
 use App\Decision;
 use App\Decisionitem;
 use Validator;
+use DB;
 
 class WarehousearrangementController extends Controller
 {
@@ -78,13 +79,10 @@ class WarehousearrangementController extends Controller
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, $wa_id)
+    public function update(Request $request, $id)
     {   
-        
-        $warehousearr = Warehousearr::find($wa_id);
-
-       //store warehouse receive note
-        $warehousearr = new Warehousearr;
+        //store warehouse receive note 
+        $warehousearr = Warehousearr::find($id);
         $warehousearr->so_id = $request->input('so_id');
         $warehousearr->receive_on = $request->input('receive_on');
         $warehousearr->transport_company_name = $request->input('transport_company_name');
@@ -95,27 +93,30 @@ class WarehousearrangementController extends Controller
         $warehousearr->image = $request->input('image');
         $warehousearr->save();
 
-         //store warehouse receive note item
-        $warehouseitems = $request->input("warehouseitem");
+        //store warehouse receive note item
+        $warehouseitems = $request->input('warehouseitem');
+        
         foreach ($warehouseitems as $warehouseitem)
          {
-                $new_warehouseitem = new Warehouseitem(array(
-                    'description'=>$warehouseitem['description'],
-                    'nominal_ctn'=>$warehouseitem['nominal_ctn'],
-                    'actual_ctn'=>$warehouseitem['actual_ctn'],
-                    'nominal_measurement'=>$warehouseitem['nominal_measurement'],
-                    'actual_measurement'=>$warehouseitem['actual_measurement'],
-                    'nominal_weight'=>$warehouseitem['nominal_weight'],
-                    'actual_weight'=>$warehouseitem['actual_weight'],
-                    'balance'=>$warehouseitem['balance'],
-                    'isDamaged'=>$warehouseitem['isDamaged'],
-                    'status'=>$warehouseitem['status'],
-                    'image'=>$warehouseitem['image'],
-                    'wa_id'=>$warehouseitem['wa_id'],
-                    'soitem_id'=>$warehouseitem['soitem_id'],
-                ));
-
-        $new_warehouseitem->save();
+                $ex_warehouseitem = Warehouseitem::where('wa_id', $id)->first(); 
+                //return $ex_warehouseitem;
+                 
+                $ex_warehouseitem->description = $warehouseitem['description'];
+                $ex_warehouseitem->nominal_ctn = $warehouseitem['nominal_ctn'];
+                $ex_warehouseitem->actual_ctn = $warehouseitem['actual_ctn'];
+                $ex_warehouseitem->nominal_measurement = $warehouseitem['nominal_measurement'];
+                $ex_warehouseitem->nominal_weight = $warehouseitem['nominal_weight'];
+                $ex_warehouseitem->actual_weight = $warehouseitem['actual_weight'];
+                $ex_warehouseitem->balance = $warehouseitem['balance'];
+                $ex_warehouseitem->isDamaged = $warehouseitem['isDamaged'];
+                $ex_warehouseitem->status = $warehouseitem['status'];
+                $ex_warehouseitem->actual_measurement = $warehouseitem['actual_measurement'];
+                $ex_warehouseitem->image = $warehouseitem['image'];
+                
+                // $ex_warehouseitem->wa_id = $warehouseitem['wa_id'];
+                // $ex_warehouseitem->soitem_id = $warehouseitem['soitem_id'];
+                
+                $ex_warehouseitem->save();
 
           }
 
@@ -123,7 +124,6 @@ class WarehousearrangementController extends Controller
         
     }
 
-
     public function warehousearrpic(Request $request, $id)
     {
         $warehousearr = Warehousearr::find($id);
@@ -258,19 +258,4 @@ class WarehousearrangementController extends Controller
         //
     }
 
-    /**
-     * Remove the specified resource from storage.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function delete(warehousearr $wa_id)
-    {
-        
-        $wa_id->delete($wa_id);
-
-        return response()->json($wa_id, 204);
-    }
-
-
 }
diff --git a/app/Warehouseitem.php b/app/Warehouseitem.php
index 75102d6..e06d858 100644
--- a/app/Warehouseitem.php
+++ b/app/Warehouseitem.php
@@ -30,7 +30,7 @@ class Warehouseitem extends Model
 
     public function soitem()
     {
-        return $this->hasOne('App\Warehousearr');
+        return $this->hasOne('App\Soitem');
     }
 
 }