mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/izyim-api.git
synced 2026-09-01 02:44:01 +00:00
fix merge problem, create factory, fix controller problem in SO and WRN, setup a testing database
This commit is contained in:
@@ -46,6 +46,7 @@ class WarehousearrangementController extends Controller
|
||||
$warehouseitems = $request->input("warehouseitem");
|
||||
foreach ($warehouseitems as $warehouseitem)
|
||||
{
|
||||
|
||||
$new_warehouseitem = new Warehouseitem(array(
|
||||
'description'=>$warehouseitem['description'],
|
||||
'nominal_ctn'=>$warehouseitem['nominal_ctn'],
|
||||
@@ -58,8 +59,7 @@ class WarehousearrangementController extends Controller
|
||||
'isDamaged'=>$warehouseitem['isDamaged'],
|
||||
'status'=>$warehouseitem['status'],
|
||||
'image'=>$warehouseitem['image'],
|
||||
'wa_id'=>$warehouseitem['wa_id'],
|
||||
'soitem_id'=>$warehouseitem['soitem_id'],
|
||||
'wa_id'=>$warehousearr->id,
|
||||
));
|
||||
|
||||
$new_warehouseitem->save();
|
||||
@@ -93,8 +93,7 @@ class WarehousearrangementController extends Controller
|
||||
$warehousearr->save();
|
||||
|
||||
//store warehouse receive note item
|
||||
$warehouseitems = $request->input('warehouseitem');
|
||||
|
||||
$warehouseitems = $request->input('warehouseitem');
|
||||
foreach ($warehouseitems as $warehouseitem)
|
||||
{
|
||||
$ex_warehouseitem = Warehouseitem::where('wa_id', $id)->first();
|
||||
@@ -109,11 +108,7 @@ class WarehousearrangementController extends Controller
|
||||
$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->image = $warehouseitem['image'];
|
||||
$ex_warehouseitem->save();
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user