Merge branch 'too/verifybankslip' into 'master'

Approved user bankslip

See merge request CIEFWorldwideSdnBhd/exchange!17
This commit is contained in:
Jack Goh
2018-06-18 09:47:14 +00:00
4 changed files with 39 additions and 1 deletions
@@ -236,4 +236,22 @@ class BookingController extends Controller
return response()->json(['message'=>'Success'],200);
}
public function approveBankSlip(Request $request, $book_id)
{
if (!$Booking = Booking::where('user_id',Auth::user()->id)->where('id',$book_id)->first())
{
return response()->json(['message'=>'Access denied'], 200);
}
if(!$userBankSlip = UserBankSlip::where('book_id',$Booking->id)->first())
{
return response()->json(['message'=>'Access denied'], 200);
}
$userBankSlip->is_approve = 1;
$userBankSlip->save();
return response()->json(['message'=>'Success'],200);
}
}
+7 -1
View File
@@ -3,7 +3,13 @@
use Faker\Generator as Faker;
$factory->define(App\UserBankSlip::class, function (Faker $faker) {
$book_id = App\Booking::pluck('id')->toArray();
return [
//
'bank_slip_type' => str_random(10),
'bankslip_url' => str_random(10),
'transfer_amount' => $faker->randomDigit,
'cust_marking' => str_random(10),
'book_id' => $faker->randomElement($book_id),
];
});
+1
View File
@@ -81,6 +81,7 @@ Route::delete('setting-supplier/{supplier}', 'SettingSupplierController@delete')
Route::post('upload-china-bankslip', 'ChinaBankSlipController@store');
Route::post('booking/{book_id}/approve-bank-slip','BookingController@approveBankSlip');
Route::post('booking/{book_id}/cancel', 'BookingController@cancel');
Route::post('booking/{id}/upload-user-bankslip', 'BookingController@uploadbankslip');
Route::post('booking/{id}/upload-po', 'BookingController@uploadPurchaseOrder');
+13
View File
@@ -14,11 +14,13 @@ use Auth;
use Artisan;
use App\User;
use App\Booking;
use App\UserBankSlip;
class BookingTest extends TestCase
{
protected $user;
protected $booking;
protected $userBankSlip;
public function setUp()
{
@@ -28,6 +30,10 @@ class BookingTest extends TestCase
$this->booking = factory(Booking::class)->create([
'user_id' => $this->user->id
]);
$this->userBankSlip = factory(UserBankSlip::class)->create([
'book_id' => $this->booking->id
]);
}
public function testPost()
@@ -104,4 +110,11 @@ class BookingTest extends TestCase
->json('POST','/api/booking/' . $this->booking->id . '/cancel', [])
->assertSuccessful();
}
public function testApproveBankSlip()
{
$this->actingAs($this->user)
->json('POST','/api/booking/' . $this->booking->id . '/approve-bank-slip', [])
->assertSuccessful();
}
}