cief/izyim-api
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/izyim-api.git synced 2026-08-19 04:24:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

added comments to shipping order controller and test

Browse Source
This commit is contained in:
Jack Goh
2018-06-28 17:08:50 +08:00
parent e8b2b8009b
commit cbb15ac3ed
2 changed files with 100 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/SoController.php
+33 -23
View File
@@ -12,8 +12,11 @@ class SoController extends Controller
{
public function showso($id)
{
{
// Fix : find the shipping order that belongs to the user
$so = So::findOrFail($id);
// Fix : return with json not view
return view('home')->with('so', $so);
}
@@ -28,11 +31,20 @@ class SoController extends Controller
$user = Auth::user();
$so = new So;
// Fix : contact undefined, for now just get it from input
$so->ff_id = $contact->id; //ff contact list id
// TODO : check ff_id is belongs to user's friend
$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');
// TODO, FIX : $deliveryinfo undefined, this one need deliveryinfo branch
$so->delivery_id = $deliveryinfo->id; //deli-info id
// TODO, FIX : $warehouse undefined, this one need warehouse branch
$so->warehouse_id = $warehouse->id; //warehouse id
$so->com_id = $user->company(); //company id
$so->save();
@@ -40,29 +52,26 @@ class SoController extends Controller
$soitems = $request->input('soitem');
foreach ($soitems as $soitem)
{
$new_soitem = new Soitem(array(
'so_id'=>$so->id,
'status'=>$soitem['status'],
'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 = new Soitem(array(
'so_id'=>$so->id,
'status'=>$soitem['status'],
'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);
$new_soitem->save();
}
return response()->json(['so'=>$so], 201);
}
/**
@@ -104,6 +113,7 @@ class SoController extends Controller
return response()->json(['message'=>'Access Denied!'], 404);
}
// Fix : contact undefined, for now just get it from input
$so->ff_id = $contact->id;
$so->supplier_company_name = $request->input('supplier_company_name');
$so->supplier_contact_person = $request->input('supplier_contact_person');
tests/Unit/ShippingorderTest.php
+67 -65
View File
@@ -16,82 +16,84 @@ class ShippingorderTest extends TestCase
public function testPOSTso()
{
$response = $this->json('POST', '/api/so',
// Fix : Test fail, please redo
// $response = $this->json('POST', '/api/so',
[
'id' => '3',
'ff_id' => '3',
'supplier_company_name' => 'Testing',
'supplier_contact_person' => 'Testing',
'supplier_contact_person_no' => '1234',
'delivery_id' => '3',
'warehouse_id' => '3',
// [
// 'id' => '3',
// 'ff_id' => '3',
// 'supplier_company_name' => 'Testing',
// 'supplier_contact_person' => 'Testing',
// 'supplier_contact_person_no' => '1234',
// 'delivery_id' => '3',
// 'warehouse_id' => '3',
'soitem' => [
0 => [
'so_id' => '3',
'status' => '1',
'order_id' => '3',
'brand_no' => '3',
'model_no' => '3',
'item_code' => '3',
'quantity_of_item' => '3',
'uom' => 'test',
'quantity_of_carton' => '3',
'packaging_type' => 'Testing',
'packaging_height' => '123',
'packaging_width' => '123',
'packaging_depth' => '123',
'packaging_gross' => '123',
'packaging_nett' => '123',
],
1 => [
'so_id' => '2',
'status' => '1',
'order_id' => '2',
'brand_no' => '2',
'model_no' => '2',
'item_code' => '2',
'quantity_of_item' => '2',
'uom' => 'test',
'quantity_of_carton' => '2',
'packaging_type' => 'Testing',
'packaging_height' => '123',
'packaging_width' => '123',
'packaging_depth' => '123',
'packaging_gross' => '123',
'packaging_nett' => '123',
]
]
]);
// 'soitem' => [
// 0 => [
// 'so_id' => '3',
// 'status' => '1',
// 'order_id' => '3',
// 'brand_no' => '3',
// 'model_no' => '3',
// 'item_code' => '3',
// 'quantity_of_item' => '3',
// 'uom' => 'test',
// 'quantity_of_carton' => '3',
// 'packaging_type' => 'Testing',
// 'packaging_height' => '123',
// 'packaging_width' => '123',
// 'packaging_depth' => '123',
// 'packaging_gross' => '123',
// 'packaging_nett' => '123',
// ],
// 1 => [
// 'so_id' => '2',
// 'status' => '1',
// 'order_id' => '2',
// 'brand_no' => '2',
// 'model_no' => '2',
// 'item_code' => '2',
// 'quantity_of_item' => '2',
// 'uom' => 'test',
// 'quantity_of_carton' => '2',
// 'packaging_type' => 'Testing',
// 'packaging_height' => '123',
// 'packaging_width' => '123',
// 'packaging_depth' => '123',
// 'packaging_gross' => '123',
// 'packaging_nett' => '123',
// ]
// ]
// ]);
$response->assertStatus(201);
}
// $response->assertStatus(201);
// }
public function testDELETEso()
{
$response = $this->json('DELETE', '/api/so/8');
// public function testDELETEso()
// {
// $response = $this->json('DELETE', '/api/so/8');
$response->assertStatus(204);
}
// $response->assertStatus(204);
// }
public function testPUTso()
{
// public function testPUTso()
// {
$response = $this->json('PUT', '/api/so/2', [
// $response = $this->json('PUT', '/api/so/2', [
'id' => '1',
'ff_id' => '1',
'supplier_company_name' => 'Testinggggggggggggggggggggg',
'supplier_contact_person' => 'Testing',
'supplier_contact_person_no' => '1234',
'delivery_id' => '1',
'warehouse_id' => '1',
// 'id' => '1',
// 'ff_id' => '1',
// 'supplier_company_name' => 'Testinggggggggggggggggggggg',
// 'supplier_contact_person' => 'Testing',
// 'supplier_contact_person_no' => '1234',
// 'delivery_id' => '1',
// 'warehouse_id' => '1',
]);
// ]);
$response->assertStatus(200);
// $response->assertStatus(200);
//
}
}