diff --git a/app/Decision.php b/app/Decision.php index 2823b68..d3d5e67 100644 --- a/app/Decision.php +++ b/app/Decision.php @@ -15,7 +15,7 @@ class Decision extends Model public function warehousearr() { - return $this->hasOne('App\Warehousearr'); + return $this->hasOne('App\WarehouseArr'); } public function decisionitem() diff --git a/app/Http/Controllers/WarehousearrangementController.php b/app/Http/Controllers/WarehousearrangementController.php index 7852e84..03a0da6 100644 --- a/app/Http/Controllers/WarehousearrangementController.php +++ b/app/Http/Controllers/WarehousearrangementController.php @@ -13,7 +13,7 @@ use App\User; use Auth; use Validator; -class warehouseArrangementController extends Controller +class WarehouseArrangementController extends Controller { /** * Display a the warehouse arrangement. diff --git a/app/Warehousearr.php b/app/Warehousearr.php index eca6c47..68e1601 100644 --- a/app/Warehousearr.php +++ b/app/Warehousearr.php @@ -4,7 +4,7 @@ namespace App; use Illuminate\Database\Eloquent\Model; -class Warehousearr extends Model +class WarehouseArr extends Model { protected $fillable = [ 'id', @@ -22,7 +22,7 @@ class Warehousearr extends Model public function warehouseitem() { - return $this->hasMany('App\Warehouseitem'); + return $this->hasMany('App\WarehouseItem'); } public function decision() diff --git a/app/Warehouseitem.php b/app/Warehouseitem.php index e06d858..c33aa32 100644 --- a/app/Warehouseitem.php +++ b/app/Warehouseitem.php @@ -23,9 +23,9 @@ class Warehouseitem extends Model 'soitem_id', ]; - public function warehousearr() + public function warehouserr() { - return $this->belongsTo('App\Warehousearr'); + return $this->belongsTo('App\WarehouseArr'); } public function soitem() diff --git a/routes/api.php b/routes/api.php index fd5782f..31d93b1 100644 --- a/routes/api.php +++ b/routes/api.php @@ -27,13 +27,13 @@ Route::put('/so/{so_id}', 'SoController@update');//update the shipping order /* Warehouse-receive-note */ -Route::get('/warehousearr','warehouseArrangementController@show');//view the wrn -Route::post('/warehousearr','warehouseArrangementController@store');//store the new wrn -Route::post('/warehousearr/warehouse_picture/{wa_id}','warehouseArrangementController@warehousearrpic');//upload warehousepicture picture -Route::post('/warehousearr/warehouse_item_picture/{wa_id}','warehouseArrangementController@warehouseitempic');//upload warehousepicture picture -Route::put('/warehousearr/{wa_id}','warehouseArrangementController@update');//update the wrn -Route::post('/decision','warehouseArrangementController@storedecision');//decision reject and request the wrn -Route::post('/decision/decisionitem','warehouseArrangementController@storedecisionitem');//decision item for reject and request +Route::get('/warehousearr','WarehouseArrangementController@show');//view the wrn +Route::post('/warehousearr','WarehouseArrangementController@store');//store the new wrn +Route::post('/warehousearr/warehouse_picture/{wa_id}','WarehouseArrangementController@warehousearrpic');//upload warehousepicture picture +Route::post('/warehousearr/warehouse_item_picture/{wa_id}','WarehouseArrangementController@warehouseitempic');//upload warehousepicture picture +Route::put('/warehousearr/{wa_id}','WarehouseArrangementController@update');//update the wrn +Route::post('/decision','WarehouseArrangementController@storedecision');//decision reject and request the wrn +Route::post('/decision/decisionitem','WarehouseArrangementController@storedecisionitem');//decision item for reject and request //Route::middleware('auth:api')->get('/user', function (Request $request) {