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

fix discussion

Browse Source
This commit is contained in:
Nazri
2018-05-30 12:24:30 +08:00
parent 4210cdc19d
commit 11ccbd6a91
7 changed files with 61 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/BookingController.php
+24 -80
View File
@@ -12,32 +12,7 @@ use Auth;
class BookingController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
//public function index()
//{
// return response()->json(['success' => true, 'message'=> "You have successfully logged out."]);
//}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
//public function create()
//{
// return response()->json(['success' => true, 'message'=> "Success"]);
//}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
$rates = Rate::all()->last();
@@ -74,7 +49,7 @@ class BookingController extends Controller
}
//Calculation part
// $bookings = Booking::all();
//$bookings = Booking::all();
$amount = $request->input("amount");
if ($amount >= 10000 && ($term == 'x2_cash' || $term = 'x2_cheque' || $term = 'x2_ba')) {
$svcharge = 0;
@@ -130,7 +105,7 @@ class BookingController extends Controller
}
public function uploadbankslip(Request $request)
public function uploadbankslip(Request $request, $id)
{
// Handle File Upload
if($request->hasFile('bankslip_url')){
@@ -145,75 +120,53 @@ class BookingController extends Controller
// Upload Image
$path = $request->file('bankslip_url')->storeAs('public/userbankslip', $fileNameToStore);
} else {
$fileNameToStore = 'hello.jpg';
return response()->json(['message'=>'No file detected'],200);
}
$id = Booking::find($id);
$id->book_id = $request->input('book_id');
$id->cust_marking = $request->input('cust_marking');
$id->is_approve = $request->input('is_approve');
$id->bank_slip_type = $request->input('bank_slip_type');
// Create Post
$post = new UserBankSlip;
$post->bank_slip_type = $request->input('bank_slip_type');
$post->transfer_amount = $request->input('transfer_amount');
$post->book_id = $request->input('book_id');
$post->cust_marking = $request->input('cust_marking');
$post->is_approve = $request->input('is_approve');
$post->bankslip_url = $fileNameToStore;
$post->save();;
}
public function uploadPurchaseOrder(Request $request)
public function uploadPurchaseOrder(Request $request, $id)
{
// Handle File Upload
if($request->hasFile('image_location')){
if($request->hasFile('image_url')){
// Get filename with the extension
$filenameWithExt = $request->file('image_location')->getClientOriginalName();
$filenameWithExt = $request->file('image_url')->getClientOriginalName();
// Get just filename
$filename = pathinfo($filenameWithExt, PATHINFO_FILENAME);
// Get just ext
$extension = $request->file('image_location')->getClientOriginalExtension();
$extension = $request->file('image_url')->getClientOriginalExtension();
// Filename to store
$fileNameToStore= $filename.'_'.time().'.'.$extension;
// Upload Image
$path = $request->file('image_location')->storeAs('public/userPurchaseOrder', $fileNameToStore);
$path = $request->file('image_url')->storeAs('public/userPurchaseOrder', $fileNameToStore);
} else {
$fileNameToStore = 'hello.jpg';
return response()->json(['message'=>'No file detected'],200);
}
$id = Booking::find($id);
$id->book_id = $request->input('book_id');
// Create Post
$post = new PurchaseOrder;
$post->amount = $request->input('amount');
$post->book_id = $request->input('book_id');
$post->image_location = $fileNameToStore;
$post->image_url = $fileNameToStore;
$post->save();;
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
//public function show($id)
//{
// $booking = Booking::find($id);
// return view('booking.index');
//}
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
//public function edit($id)
//{
//
//}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $book_id)
{
$book_id = Booking::find($book_id);
@@ -231,17 +184,8 @@ class BookingController extends Controller
$book_id->save();
return response()->json(['book_id'=>$book_id],200);
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function delete(Booking $book_id)
{
$book_id->delete($book_id);
app/PurchaseOrder.php
+1 -1
View File
@@ -6,5 +6,5 @@ use Illuminate\Database\Eloquent\Model;
class PurchaseOrder extends Model
{
protected $fillable = ['image_location','amount','book_id'];
protected $fillable = ['image_url','amount','book_id'];
}
app/UserBankSlip.php
+1 -1
View File
@@ -6,5 +6,5 @@ use Illuminate\Database\Eloquent\Model;
class UserBankSlip extends Model
{
protected $fillable = ['bank_slip_type','bankslip_url','transfer_amount','book_id','cust_marking', 'is_approve'];
protected $fillable = ['bank_slip_type','bankslip_url','transfer_amount','book_id','cust_marking'];
}
database/migrations/2018_05_28_085925_create_purchase_orders_table.php
+1 -1
View File
@@ -15,7 +15,7 @@ class CreatePurchaseOrdersTable extends Migration
{
Schema::create('purchase_orders', function (Blueprint $table) {
$table->increments('id');
$table->string('image_location');
$table->string('image_url');
$table->double('amount');
$table->integer('book_id')->unsigned();
$table->foreign('book_id')->references('id')->on('bookings');
database/migrations/2018_05_30_030248_update_upload_booking_bankslip.php
+31
View File
@@ -0,0 +1,31 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class UpdateUploadBookingBankslip extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('user_bank_slips', function (Blueprint $table) {
$table->boolean('is_approve')->default('false');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('user_bank_slips', function (Blueprint $table) {
//
});
}
}
routes/api.php
+2 -2
View File
@@ -81,5 +81,5 @@ Route::delete('setting-supplier/{supplier}', 'SettingSupplierController@delete')
Route::post('upload-china-bankslip', 'ChinaBankSlipController@store');
Route::post('upload-bs', 'BookingController@uploadbankslip');
Route::post('upload-po', 'BookingController@uploadPurchaseOrder');
Route::post('booking/{id}/upload-user-bankslip', 'BookingController@uploadbankslip');
Route::post('booking/{id}/upload-po', 'BookingController@uploadPurchaseOrder');
tests/Unit/BookingTest.php
+1 -1
View File
@@ -40,7 +40,7 @@ class BookingTest extends TestCase
'term' => 'x2_cash',
'amount' => '14000'
]);
$response->assertStatus(500);
$response->assertStatus(200);
}
public function testImageUpload()