Fix some error due to update migration

This commit is contained in:
Too
2018-06-28 16:11:49 +08:00
parent 81a5a46d36
commit 63dce18675
14 changed files with 170 additions and 28 deletions
+11 -4
View File
@@ -126,7 +126,6 @@ class BookingController extends Controller
}
return $bookings;
}
public function show($id)
@@ -294,7 +293,7 @@ class BookingController extends Controller
return response()->json(['book_id'=>$book_id],200);
}
//upload
public function uploadbankslip(Request $request, $id)
{
$booking = Booking::where('user_id',Auth::user()->id)->where('id',$id)->first();
@@ -416,7 +415,7 @@ class BookingController extends Controller
$user_po = new PurchaseOrder;
$user_po->image_path = $upload_path;
$user_po->book_id = $booking->id;
$user_po->booking_id = $booking->id;
$user_po->save();
return response()->json(['message'=>'Success'],200);
@@ -582,7 +581,7 @@ class BookingController extends Controller
return response()->json(['message'=>'Success'],200);
}
//upload
public function uploadInvoice(Request $request, $id)
{
$booking = Booking::where('user_id',Auth::user()->id)->where('id',$id)->first();
@@ -636,4 +635,12 @@ class BookingController extends Controller
return response()->json(['message'=>"Success"],200);
}
public function report(Request $request){
$conv = new \Anam\PhantomMagick\Converter();
$conv->source('http://google.com')
->toPng()
->save('/your/destination//google.png');
$conv->toPng();
}
}
@@ -14,7 +14,7 @@ class ChinaBankSlipController extends Controller
public function store(Request $request, $id)
{
$booking = Booking::where('id',$id)->firstOrFail();
// TODO : put this after check file exist
// validate file format
$validator = Validator::make($request->all(), [
@@ -26,7 +26,6 @@ class ChinaBankSlipController extends Controller
return response()->json(['message'=>'Incorrect format'],200);
}
$validator = Validator::make($request->all(), [
'china_bank_slips' => 'max:3072'
]);
@@ -36,7 +35,6 @@ class ChinaBankSlipController extends Controller
return response()->json(['message'=>'Image too large, upload files up to 3 MB'], 400);
}
if($bankslip_file = $request->file('file')){
$filename = $bankslip_file->getClientOriginalName();
@@ -53,7 +51,7 @@ class ChinaBankSlipController extends Controller
} else {
return response()->json(['message'=>'file not found'],200);
}
$china_bankslip = new ChinaBankSlip;
$china_bankslip->booking_id = $booking->id;
$china_bankslip->china_bank_slip_path = $upload_path;