diff --git a/app/Http/Controllers/SettingBeneficiaryController.php b/app/Http/Controllers/SettingBeneficiaryController.php index fdec75f7..5b43d86b 100644 --- a/app/Http/Controllers/SettingBeneficiaryController.php +++ b/app/Http/Controllers/SettingBeneficiaryController.php @@ -2,36 +2,36 @@ namespace App\Http\Controllers; -use App\SettingBeneficiary; +use App\SettingBeneficiaries; use Illuminate\Http\Request; class SettingBeneficiaryController extends Controller { public function index() { - return SettingBeneficiary::all(); + return SettingBeneficiaries::all(); } - public function show(SettingBeneficiary $beneficiary) + public function show(SettingBeneficiaries $beneficiary) { return $beneficiary; } public function store(Request $request) { - $beneficiary = SettingBeneficiary::create($request->all()); + $beneficiary = SettingBeneficiaries::create($request->all()); return response()->json($beneficiary, 201); } - public function update(Request $request, SettingBeneficiary $beneficiary) + public function update(Request $request, SettingBeneficiaries $beneficiary) { $beneficiary->update($request->all()); return response()->json($beneficiary, 200); } - public function delete(SettingBeneficiary $beneficiary) + public function delete(SettingBeneficiaries $beneficiary) { $beneficiary->delete(); diff --git a/app/SettingBeneficiaries.php b/app/SettingBeneficiaries.php new file mode 100644 index 00000000..a37325fd --- /dev/null +++ b/app/SettingBeneficiaries.php @@ -0,0 +1,10 @@ +define(App\SettingBeneficiary::class, function (Faker $faker) { +$factory->define(App\SettingBeneficiaries::class, function (Faker $faker) { return [ // ]; diff --git a/database/migrations/2018_07_11_150423_update_accno_to_id_setting_active_table.php b/database/migrations/2018_07_11_150423_update_accno_to_id_setting_active_table.php new file mode 100644 index 00000000..148134b9 --- /dev/null +++ b/database/migrations/2018_07_11_150423_update_accno_to_id_setting_active_table.php @@ -0,0 +1,51 @@ +dropForeign('setting_active_banks_x1_bank_id_foreign'); + $table->dropForeign('setting_active_banks_x2_bank_id_foreign'); + $table->dropForeign('setting_active_banks_beneficiary_id_foreign'); + $table->dropColumn('x1_bank_id'); + $table->dropColumn('x2_bank_id'); + $table->dropColumn('beneficiary_id'); + }); + + Schema::table('setting_active_banks', function(Blueprint $table) + { + $table->unsignedInteger('x1_bank_id')->unique(); + $table->foreign('x1_bank_id') + ->references('id')->on('setting_malaysia_banks'); + + $table->unsignedInteger('x2_bank_id')->unique(); + $table->foreign('x2_bank_id') + ->references('id')->on('setting_malaysia_banks'); + + $table->unsignedInteger('beneficiary_id')->unique(); + $table->foreign('beneficiary_id') + ->references('id')->on('setting_beneficiaries'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/database/seeds/SettingActiveBankSeeder.php b/database/seeds/SettingActiveBankSeeder.php index feed9792..40560300 100644 --- a/database/seeds/SettingActiveBankSeeder.php +++ b/database/seeds/SettingActiveBankSeeder.php @@ -1,6 +1,8 @@ first(); + $bankx2 = SettingMalaysiaBank::where('acc_no', "=",'malaysiaacc02')->first(); + $chinabank = SettingBeneficiaries::where('acc_no', "=" ,'123456789')->first(); + DB::table('setting_active_banks')->truncate(); DB::table('setting_active_banks')->insert([ - 'x1_bank_id' => 'malaysiaacc01', - 'x2_bank_id' => 'malaysiaacc02', - 'beneficiary_id' => '123456789' + 'x1_bank_id' => $bankx1->id, + 'x2_bank_id' => $bankx2->id, + 'beneficiary_id' => $chinabank->id ]); } } diff --git a/resources/assets/js/pages/booking/uploadUserBankSlip.vue b/resources/assets/js/pages/booking/uploadUserBankSlip.vue index 5071cf96..705131cc 100644 --- a/resources/assets/js/pages/booking/uploadUserBankSlip.vue +++ b/resources/assets/js/pages/booking/uploadUserBankSlip.vue @@ -1,103 +1,103 @@ diff --git a/routes/api.php b/routes/api.php index ef3d2af0..b4f689ee 100644 --- a/routes/api.php +++ b/routes/api.php @@ -46,6 +46,10 @@ Route::group(['middleware' => 'auth:api'], function () { Route::get('user', 'UserController@show'); Route::patch('settings/profile', 'Settings\ProfileController@update'); Route::patch('settings/password', 'Settings\PasswordController@update'); + + // for both user and admin + Route::get('setting-active-bank', 'SettingActiveBankController@index'); + Route::get('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@show'); }); @@ -70,7 +74,6 @@ Route::group(['middleware' => ['role:admin']], function() { Route::get('setting-credit', 'SettingCreditController@index'); Route::put('setting-credit', 'SettingCreditController@update'); - Route::get('setting-active-bank', 'SettingActiveBankController@index'); Route::put('setting-active-bank', 'SettingActiveBankController@update'); Route::get('setting-supplier', 'SettingSupplierController@index'); @@ -86,7 +89,6 @@ Route::group(['middleware' => ['role:admin']], function() { Route::delete('setting-beneficiary/{beneficiary}', 'SettingBeneficiaryController@delete'); Route::get('setting-malaysia-bank', 'SettingMalaysiaBankController@index'); - Route::get('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@show'); Route::post('setting-malaysia-bank', 'SettingMalaysiaBankController@store'); Route::put('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@update'); Route::delete('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@delete'); @@ -108,5 +110,9 @@ Route::group(['middleware' => ['role:admin']], function() { Route::get('booking/{id}/po', 'BookingController@showPurchaseOrder'); Route::post('booking/{id}/upload-invoice', 'BookingController@uploadInvoice'); Route::post('booking/{id}/confirm-invoice', 'BookingController@confirmInvoice'); + + // for both user and admin + // Route::get('setting-active-bank', 'SettingActiveBankController@index'); + // Route::get('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@show'); }); \ No newline at end of file