diff --git a/app/Http/Controllers/SettingMalaysiaBankController.php b/app/Http/Controllers/SettingMalaysiaBankController.php new file mode 100644 index 00000000..4bfbbb47 --- /dev/null +++ b/app/Http/Controllers/SettingMalaysiaBankController.php @@ -0,0 +1,40 @@ +all()); + + return response()->json($malaysiaBank, 201); + } + + public function update(Request $request, SettingMalaysiaBank $malaysiaBank) + { + $malaysiaBank->update($request->all()); + + return response()->json($malaysiaBank, 200); + } + + public function delete(SettingMalaysiaBank $malaysiaBank) + { + $malaysiaBank->delete(); + + return response()->json(null, 204); + } +} diff --git a/app/SettingMalaysiaBank.php b/app/SettingMalaysiaBank.php new file mode 100644 index 00000000..ccd71e62 --- /dev/null +++ b/app/SettingMalaysiaBank.php @@ -0,0 +1,10 @@ +define(Model::class, function (Faker $faker) { + return [ + // + ]; +}); diff --git a/database/migrations/2018_07_05_102323_create_setting_malaysia_bank_table.php b/database/migrations/2018_07_05_102323_create_setting_malaysia_bank_table.php new file mode 100644 index 00000000..f493f548 --- /dev/null +++ b/database/migrations/2018_07_05_102323_create_setting_malaysia_bank_table.php @@ -0,0 +1,38 @@ +increments('id'); + $table->string('company_name'); + $table->string('bank_name'); + $table->string('acc_no'); + $table->string('bank_address'); + $table->string('swift'); + $table->string('cnap'); + $table->string('bank_branch'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('setting_malaysia_banks'); + } +} diff --git a/database/migrations/2018_07_06_035110_add_nullable_setting_malaysia_bank_table.php b/database/migrations/2018_07_06_035110_add_nullable_setting_malaysia_bank_table.php new file mode 100644 index 00000000..66de8f4d --- /dev/null +++ b/database/migrations/2018_07_06_035110_add_nullable_setting_malaysia_bank_table.php @@ -0,0 +1,36 @@ +string('company_name')->nullable()->change(); + $table->string('bank_name')->nullable()->change(); + $table->string('acc_no')->nullable()->change(); + $table->string('bank_address')->nullable()->change(); + $table->string('swift')->nullable()->change(); + $table->string('cnap')->nullable()->change(); + $table->string('bank_branch')->nullable()->change(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index ce682fac..04182825 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -20,5 +20,6 @@ class DatabaseSeeder extends Seeder $this->call(SettingCreditSeeder::class); $this->call(SuppliersTableSeeder::class); $this->call(MarkingSeeder::class); + $this->call(SettingMalaysiaBankSeeder::class); } } diff --git a/database/seeds/SettingMalaysiaBankSeeder.php b/database/seeds/SettingMalaysiaBankSeeder.php new file mode 100644 index 00000000..5fe33b9c --- /dev/null +++ b/database/seeds/SettingMalaysiaBankSeeder.php @@ -0,0 +1,24 @@ +insert([ + 'company_name' => 'CIEF', + 'bank_name' => 'Maybank', + 'acc_no' => '131313131313', + 'bank_address' => 'Jalan putrajaya', + 'swift' => 'ABC123', + 'cnap' => 'CED234', + 'bank_branch' => 'Putra' + ]); + } +} diff --git a/resources/assets/js/pages/settings/admin-malaysia-bank.vue b/resources/assets/js/pages/settings/admin-malaysia-bank.vue new file mode 100644 index 00000000..b94130b6 --- /dev/null +++ b/resources/assets/js/pages/settings/admin-malaysia-bank.vue @@ -0,0 +1,263 @@ + + + + + diff --git a/resources/assets/js/pages/settings/index.vue b/resources/assets/js/pages/settings/index.vue index f615f9fa..a7eb4dcc 100644 --- a/resources/assets/js/pages/settings/index.vue +++ b/resources/assets/js/pages/settings/index.vue @@ -62,6 +62,12 @@ route: 'settings.admin-china-bank', role: 'admin' }, + { + icon: 'flag', + name: this.$t('CIEF Malaysia Bank'), + route: 'settings.admin-malaysia-bank', + role: 'admin' + }, { icon: 'building', name: this.$t('Bank Setting'), diff --git a/resources/assets/js/router/routes.js b/resources/assets/js/router/routes.js index 1bfaf118..7be29f11 100644 --- a/resources/assets/js/router/routes.js +++ b/resources/assets/js/router/routes.js @@ -12,6 +12,7 @@ const SettingsPassword = () => import('~/pages/settings/password').then(m => m.d const SettingsAdminSupplier = () => import('~/pages/settings/admin-supplier').then(m => m.default || m) const SettingsAdminCreditSetting = () => import('~/pages/settings/admin-credit-setting').then(m => m.default || m) const SettingsAdminChinaBank = () => import('~/pages/settings/admin-china-bank').then(m => m.default || m) +const SettingsAdminMalaysiaBank = () => import('~/pages/settings/admin-malaysia-bank').then(m => m.default || m) const SettingsAdminBankSetting = () => import('~/pages/settings/admin-bank-setting').then(m => m.default || m) // Booking @@ -55,6 +56,7 @@ export default [ { path: 'admin-supplier', name: 'settings.admin-supplier', component: SettingsAdminSupplier }, { path: 'admin-credit-setting', name: 'settings.admin-credit-setting', component: SettingsAdminCreditSetting }, { path: 'admin-china-bank', name: 'settings.admin-china-bank', component: SettingsAdminChinaBank }, + { path: 'admin-malaysia-bank', name: 'settings.admin-malaysia-bank', component: SettingsAdminMalaysiaBank }, { path: 'admin-bank-setting', name: 'settings.admin-bank-setting', component: SettingsAdminBankSetting } ] }, diff --git a/routes/api.php b/routes/api.php index 366ef499..90e7be8b 100644 --- a/routes/api.php +++ b/routes/api.php @@ -29,21 +29,21 @@ Route::group(['middleware' => 'auth:api'], function () { Route::post('logout', 'Auth\LoginController@logout'); /*Route for the booking */ - Route::get('/booking/{book_id}', 'BookingController@show'); - Route::put('/booking/{book_id}', 'BookingController@update'); - Route::delete('/booking/{book_id}', 'BookingController@delete'); - Route::post('/booking', 'BookingController@store'); - Route::post('/booking/calculation', 'BookingController@calculation'); - 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'); - Route::post('/booking/{id}/confirm-po', 'BookingController@confirmPurchaseOrder'); - Route::patch('/booking/{id}/bankslip-amount', 'BookingController@updateBankSlipAmount'); + Route::get('booking/{book_id}', 'BookingController@show'); + Route::put('booking/{book_id}', 'BookingController@update'); + Route::delete('booking/{book_id}', 'BookingController@delete'); + Route::post('booking', 'BookingController@store'); + Route::post('booking/calculation', 'BookingController@calculation'); + 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'); + Route::post('booking/{id}/confirm-po', 'BookingController@confirmPurchaseOrder'); + Route::patch('booking/{id}/bankslip-amount', 'BookingController@updateBankSlipAmount'); Route::post('booking/{book_id}/reject-bank-slip','BookingController@rejectBankSlip'); Route::post('booking/{book_id}/approve-bank-slip','BookingController@approveBankSlip'); Route::post('booking/{book_id}/cancel', 'BookingController@cancel'); Route::get('/booking', 'BookingController@index'); - Route::get('/user', 'UserController@show'); + Route::get('user', 'UserController@show'); Route::patch('settings/profile', 'Settings\ProfileController@update'); Route::patch('settings/password', 'Settings\PasswordController@update'); }); @@ -66,8 +66,6 @@ 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('setting-credit', 'SettingCreditController@index'); Route::put('setting-credit', 'SettingCreditController@update'); @@ -84,6 +82,12 @@ Route::group(['middleware' => ['role:admin']], function() { Route::put('setting-beneficiary/{beneficiary}', 'SettingBeneficiaryController@update'); 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'); + Route::get('marking', 'MarkingController@index'); Route::post('marking', 'MarkingController@store'); Route::get('marking/{beneficiary}', 'MarkingController@show'); @@ -94,14 +98,12 @@ Route::group(['middleware' => ['role:admin']], function() { Route::get('supplier-booking/{id}', 'BookingSupplierController@show'); Route::post('supplier-booking', 'BookingSupplierController@store'); Route::put('supplier-booking/{id}', 'BookingSupplierController@update'); - Route::post('/booking/{id}/confirm-supplier', 'BookingController@confirmSupplier'); + Route::post('booking/{id}/confirm-supplier', 'BookingController@confirmSupplier'); - Route::post('/booking/{id}/upload-china-bankslip','ChinaBankSlipController@store'); - Route::patch('/booking/{id}/update-china-bankslip','ChinaBankSlipController@update'); - Route::get('/booking/{id}/po', 'BookingController@showPurchaseOrder'); + Route::post('booking/{id}/upload-china-bankslip','ChinaBankSlipController@store'); + 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'); -}); - - +}); \ No newline at end of file