diff --git a/app/Http/Controllers/RateController.php b/app/Http/Controllers/RateController.php index 67f3bddb..acd0f46e 100644 --- a/app/Http/Controllers/RateController.php +++ b/app/Http/Controllers/RateController.php @@ -12,11 +12,6 @@ class RateController extends Controller return Rate::all(); } - public function show(Rate $rate) - { - return $rate; - } - public function store(Request $request) { $rate = Rate::create($request->all()); @@ -37,4 +32,11 @@ class RateController extends Controller return response()->json(null, 204); } + + public function show() + { + $rate = DB::table('rates')->latest()->first(); + + return response()->json($rate, 200); + } } \ No newline at end of file diff --git a/routes/api.php b/routes/api.php index 7c02d29d..d3edcb5f 100644 --- a/routes/api.php +++ b/routes/api.php @@ -69,8 +69,9 @@ Route::group(['middleware' => ['role:admin']], function() { Route::put('update-rate/{rate}', 'RateController@update'); Route::delete('update-rate/{rate}', 'RateController@delete'); Route::get('update-rate', 'RateController@index'); - Route::get('update-rate/{rate}', 'RateController@show'); - + + //show current rate + Route::get('rate', 'RateController@show'); Route::get('setting-credit', 'SettingCreditController@index'); Route::get('setting-credit/{credit}', 'SettingCreditController@show'); @@ -106,7 +107,7 @@ Route::group(['middleware' => ['role:admin']], function() { Route::patch('/booking/{id}/update-china-bankslip','ChinaBankSlipController@update'); Route::get('/booking/{id}/po', 'BookingController@showPurchaseOrder'); Route::post('booking/{id}/upload-invoice', 'BookingController@uploadInvoice'); - Route::post('booking/{id}/confirm-invoice', 'BookingController@confirmInvoice'); + Route::post('booking/{id}/confirm-invoice', 'BookingController@confirmInvoice'); }); diff --git a/tests/Feature/RateTest.php b/tests/Feature/RateTest.php index bd2a73ce..8cc829de 100644 --- a/tests/Feature/RateTest.php +++ b/tests/Feature/RateTest.php @@ -43,8 +43,8 @@ class RateTest extends TestCase 'x2_ba' => '1.2' ]) ->assertStatus(201); - } - + } + public function testUpdate(){ $response = $this->actingAs($this->user) @@ -57,5 +57,12 @@ class RateTest extends TestCase 'x2_ba' => '1.2' ]) ->assertStatus(200); + } + + public function testShowRate(){ + $response = $this->json('GET', '/api/rate'); + $response + ->assertStatus(200); } + }