mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/izyim-api.git
synced 2026-08-21 13:34:16 +00:00
solved some user id error, added fk id
This commit is contained in:
@@ -6,6 +6,7 @@ use Illuminate\Http\Request;
|
||||
use App\So;
|
||||
use App\Soitem;
|
||||
use App\company;
|
||||
use Auth;
|
||||
|
||||
class SoController extends Controller
|
||||
{
|
||||
@@ -22,25 +23,18 @@ class SoController extends Controller
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
//post shipping order amd item
|
||||
public function store(Request $request)
|
||||
{
|
||||
|
||||
//TODO
|
||||
// retrieve FK from Contact, Delivery, Warehouse
|
||||
//user()->company()->id,
|
||||
|
||||
//here is what i did to figure out whether the id is belongs to user
|
||||
//$booking = Booking::where('user_id', Auth::user())->where('id', $book_id)->firstOrFail();
|
||||
|
||||
$user = Auth::user();
|
||||
|
||||
$so = new So;
|
||||
$so = So::where('ff_id', $id)->firstOrFail();
|
||||
$so->ff_id = $contact->id; //ff contact list 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 = So::where('delivery_id', $id)->firstOrFail();
|
||||
// $so = So::where('warehouse_id', $id)->firstOrFail();
|
||||
$so = So::where('user_id', Auth::user()->id)->where('com_id', $id)->first();
|
||||
$so->delivery_id = $deliveryinfo->id; //deli-info id
|
||||
$so->warehouse_id = $warehouse_id->id; //warehouse id
|
||||
$so->com_id = $user->company(); //company id
|
||||
$so->save();
|
||||
|
||||
$soitems = $request->input('soitem');
|
||||
@@ -62,8 +56,8 @@ class SoController extends Controller
|
||||
'packaging_gross'=>$soitem['packaging_gross'],
|
||||
'packaging_nett'=>$soitem['packaging_nett'],
|
||||
));
|
||||
$new_soitem->save();
|
||||
|
||||
$new_soitem->save();
|
||||
|
||||
}
|
||||
|
||||
@@ -98,18 +92,20 @@ class SoController extends Controller
|
||||
*/
|
||||
public function update(Request $request, $id)
|
||||
{
|
||||
$so = So::where('user_id', Auth::user()->id)->where('id', $com_id)->findtOrFail();
|
||||
$so = So::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail();
|
||||
|
||||
if (!$so)
|
||||
{
|
||||
return response()->json(['message'=>'shipping order not found'], 404);
|
||||
return response()->json(['message'=>'Access Denied!'], 404);
|
||||
}
|
||||
|
||||
$so->ff_id = $request->input('ff_id');
|
||||
$so->ff_id = $contact->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->delivery_id = $deliveryinfo->id;
|
||||
$so->warehouse_id = $warehouse_id->id;
|
||||
$deliveryinfo->com_id = $user->company();
|
||||
$so->save();
|
||||
|
||||
$soitems = $request->input('soitem');
|
||||
@@ -145,11 +141,18 @@ class SoController extends Controller
|
||||
* @param int $id
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function delete(So $so_id)
|
||||
public function delete(So $id)
|
||||
{
|
||||
$so_id->delete($so_id);
|
||||
$so = So::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail();
|
||||
|
||||
if (!$so)
|
||||
{
|
||||
return response()->json(['message'=>'Access Denied!'], 404);
|
||||
}
|
||||
|
||||
$so->delete($id);
|
||||
|
||||
return response()->json($so_id, 204);
|
||||
return response()->json($so, 204);
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user