fix merge problem, create factory, fix controller problem in SO and WRN, setup a testing database

2026-08-19 12:34:06 +00:00 · 2018-05-31 15:59:59 +08:00
parent f4610f7596 8c8c66572c
commit 12e071d260
17 changed files with 658 additions and 25 deletions
@@ -0,0 +1,167 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\So;
+use App\Soitem;
+
+class SoController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    // get the list of the shipping order 
+    public function index()
+    {
+        return view('welcome');
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    //get the shipping order 
+    public function showso($so_id)
+    {
+        $so_id = So::find($so_id);
+        return response()->json($so_id, 200);
+
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    //post shipping order amd item
+    public function store(Request $request)
+    {   
+
+        //shipping order
+        $so = new So;
+        $so->ff_id = $request->input('ff_id');
+        $so->supplier_company_name = $request->input('supplier_company_name');
+        $so->supplier_contact_person = $request->input('supplier_contact_person');
+        $so->supplier_contact_person_no = $request->input('supplier_contact_person_no');
+        $so->delivery_id = $request->input('delivery_id');
+        $so->warehouse_id = $request->input('warehouse_id');
+        $so->save();
+        
+        //shipping order item
+        $soitems = $request->input("soitem");
+        foreach ($soitems as $soitem)
+         {
+                $new_soitem = new Soitem(array(
+                    'so_id'=>$so->id,
+                    'status'=>$soitem['status'],
+                    'order_id'=>$soitem['order_id'],
+                    'brand_no'=>$soitem['brand_no'],
+                    'model_no'=>$soitem['model_no'],
+                    'item_code'=>$soitem['item_code'],
+                    'quantity_of_item'=>$soitem['quantity_of_item'],
+                    'uom'=>$soitem['uom'],
+                    'quantity_of_carton'=>$soitem['quantity_of_carton'],
+                    'packaging_type'=>$soitem['packaging_type'],
+                    'packaging_height'=>$soitem['packaging_height'],
+                    'packaging_width'=>$soitem['packaging_width'],
+                    'packaging_depth'=>$soitem['packaging_depth'],
+                    'packaging_gross'=>$soitem['packaging_gross'],
+                    'packaging_nett'=>$soitem['packaging_nett'],
+                ));
+
+                $new_soitem->save();
+
+          }
+
+        return response()->json(['so'=>$so], 201);
+        
+    }
+
+    
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    //post the cancel order 
+    public function cancelOrder(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //for shipping order
+        $so = So::find($id);
+        $so->ff_id = $request->input('ff_id');
+        $so->supplier_company_name = $request->input('supplier_company_name');
+        $so->supplier_contact_person = $request->input('supplier_contact_person');
+        $so->supplier_contact_person_no = $request->input('supplier_contact_person_no');
+        $so->delivery_id = $request->input('delivery_id');
+        $so->warehouse_id = $request->input('warehouse_id');
+        $so->save();
+
+        $soitems = $request->input('soitem');       
+        foreach ($soitems as $soitem)
+         {
+                $new_soitem = Soitem::where('so_id', $id)->first();  
+                $new_soitem->status = $soitem['status'];
+                $new_soitem->order_id = $soitem['order_id'];
+                $new_soitem->brand_no = $soitem['brand_no'];
+                $new_soitem->model_no = $soitem['model_no'];
+                $new_soitem->item_code = $soitem['item_code'];
+                $new_soitem->quantity_of_item = $soitem['quantity_of_item'];
+                $new_soitem->uom = $soitem['uom'];
+                $new_soitem->quantity_of_carton = $soitem['quantity_of_carton'];
+                $new_soitem->packaging_type = $soitem['packaging_type'];
+                $new_soitem->packaging_height = $soitem['packaging_height'];
+                $new_soitem->packaging_width = $soitem['packaging_width']; 
+                $new_soitem->packaging_depth = $soitem['packaging_depth'];
+                $new_soitem->packaging_gross = $soitem['packaging_gross']; 
+                $new_soitem->packaging_nett = $soitem['packaging_nett'];
+                $new_soitem->save();
+
+          }
+
+        return response()->json(['so'=>$so],201);
+
+    }
+
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    // delete the shipping order
+    public function delete(So $so_id)
+    {
+        $so_id->delete($so_id);
+        
+        return response()->json($so_id, 204);
+
+    }
+
+     // delete the shipping order item
+    public function deleteitem(Soitem $so_id)
+    {
+        $so_id->delete($so_id);
+        
+        return response()->json($so_id, 204);
+
+    }
+}