From 38515c055be37e62bd8de9f6267e218264112544 Mon Sep 17 00:00:00 2001 From: Too Date: Thu, 5 Jul 2018 19:10:17 +0800 Subject: [PATCH 1/4] Add setting malaysia bank table and controller --- .../Controllers/MalaysiaBankController.php | 40 +++++++++++++++++++ app/MalaysiaBank.php | 10 +++++ database/factories/MalaysiaBankFactory.php | 9 +++++ ...323_create_setting_malaysia_bank_table.php | 38 ++++++++++++++++++ database/seeds/DatabaseSeeder.php | 1 + database/seeds/MalaysiaBankSeeder.php | 16 ++++++++ 6 files changed, 114 insertions(+) create mode 100644 app/Http/Controllers/MalaysiaBankController.php create mode 100644 app/MalaysiaBank.php create mode 100644 database/factories/MalaysiaBankFactory.php create mode 100644 database/migrations/2018_07_05_102323_create_setting_malaysia_bank_table.php create mode 100644 database/seeds/MalaysiaBankSeeder.php diff --git a/app/Http/Controllers/MalaysiaBankController.php b/app/Http/Controllers/MalaysiaBankController.php new file mode 100644 index 00000000..81819a57 --- /dev/null +++ b/app/Http/Controllers/MalaysiaBankController.php @@ -0,0 +1,40 @@ +all()); + + return response()->json($malaysiaBank, 201); + } + + public function update(Request $request, MalaysiaBank $malaysiaBank) + { + $malaysiaBank->update($request->all()); + + return response()->json($malaysiaBank, 200); + } + + public function delete(MalaysiaBank $malaysiaBank) + { + $malaysiaBank->delete(); + + return response()->json(null, 204); + } +} diff --git a/app/MalaysiaBank.php b/app/MalaysiaBank.php new file mode 100644 index 00000000..eb0536a0 --- /dev/null +++ b/app/MalaysiaBank.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/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index ce682fac..fb9ed708 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(MalaysiaBankSeeder::class); } } diff --git a/database/seeds/MalaysiaBankSeeder.php b/database/seeds/MalaysiaBankSeeder.php new file mode 100644 index 00000000..29503ae5 --- /dev/null +++ b/database/seeds/MalaysiaBankSeeder.php @@ -0,0 +1,16 @@ + Date: Fri, 6 Jul 2018 13:12:18 +0800 Subject: [PATCH 2/4] add malaysia bank page and integrate it with backend --- .../Controllers/MalaysiaBankController.php | 40 --- .../SettingMalaysiaBankController.php | 40 +++ app/MalaysiaBank.php | 10 - app/SettingMalaysiaBank.php | 10 + ...ory.php => SettingMalaysiaBankFactory.php} | 0 ...d_nullable_setting_malaysia_bank_table.php | 36 +++ ...eder.php => SettingMalaysiaBankSeeder.php} | 2 +- .../js/pages/settings/admin-malaysia-bank.vue | 263 ++++++++++++++++++ resources/assets/js/pages/settings/index.vue | 6 + resources/assets/js/router/routes.js | 2 + routes/api.php | 38 +-- 11 files changed, 379 insertions(+), 68 deletions(-) delete mode 100644 app/Http/Controllers/MalaysiaBankController.php create mode 100644 app/Http/Controllers/SettingMalaysiaBankController.php delete mode 100644 app/MalaysiaBank.php create mode 100644 app/SettingMalaysiaBank.php rename database/factories/{MalaysiaBankFactory.php => SettingMalaysiaBankFactory.php} (100%) create mode 100644 database/migrations/2018_07_06_035110_add_nullable_setting_malaysia_bank_table.php rename database/seeds/{MalaysiaBankSeeder.php => SettingMalaysiaBankSeeder.php} (78%) create mode 100644 resources/assets/js/pages/settings/admin-malaysia-bank.vue diff --git a/app/Http/Controllers/MalaysiaBankController.php b/app/Http/Controllers/MalaysiaBankController.php deleted file mode 100644 index 81819a57..00000000 --- a/app/Http/Controllers/MalaysiaBankController.php +++ /dev/null @@ -1,40 +0,0 @@ -all()); - - return response()->json($malaysiaBank, 201); - } - - public function update(Request $request, MalaysiaBank $malaysiaBank) - { - $malaysiaBank->update($request->all()); - - return response()->json($malaysiaBank, 200); - } - - public function delete(MalaysiaBank $malaysiaBank) - { - $malaysiaBank->delete(); - - return response()->json(null, 204); - } -} diff --git a/app/Http/Controllers/SettingMalaysiaBankController.php b/app/Http/Controllers/SettingMalaysiaBankController.php new file mode 100644 index 00000000..4319f058 --- /dev/null +++ b/app/Http/Controllers/SettingMalaysiaBankController.php @@ -0,0 +1,40 @@ +all()); + + return response()->json($settingMalaysiaBank, 201); + } + + public function update(Request $request, SettingMalaysiaBank $settingMalaysiaBank) + { + $settingMalaysiaBank->update($request->all()); + + return response()->json($settingMalaysiaBank, 200); + } + + public function delete(SettingMalaysiaBank $settingMalaysiaBank) + { + $settingMalaysiaBank->delete(); + + return response()->json(null, 204); + } +} diff --git a/app/MalaysiaBank.php b/app/MalaysiaBank.php deleted file mode 100644 index eb0536a0..00000000 --- a/app/MalaysiaBank.php +++ /dev/null @@ -1,10 +0,0 @@ -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/MalaysiaBankSeeder.php b/database/seeds/SettingMalaysiaBankSeeder.php similarity index 78% rename from database/seeds/MalaysiaBankSeeder.php rename to database/seeds/SettingMalaysiaBankSeeder.php index 29503ae5..142ae8e6 100644 --- a/database/seeds/MalaysiaBankSeeder.php +++ b/database/seeds/SettingMalaysiaBankSeeder.php @@ -2,7 +2,7 @@ use Illuminate\Database\Seeder; -class MalaysiaBankSeeder extends Seeder +class SettingMalaysiaBankSeeder extends Seeder { /** * Run the database seeds. 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..cbabdb05 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,11 @@ 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/{id}', 'SettingMalaysiaBankController@show'); + Route::post('setting-malaysia-bank', 'SettingMalaysiaBankController@store'); + Route::put('setting-malaysia-bank/{id}', 'SettingMalaysiaBankController@update'); + Route::get('marking', 'MarkingController@index'); Route::post('marking', 'MarkingController@store'); Route::get('marking/{beneficiary}', 'MarkingController@show'); @@ -94,14 +97,15 @@ 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'); }); + Route::delete('setting-malaysia-bank/{id}', 'SettingMalaysiaBankController@delete'); \ No newline at end of file From 84fc15adceec302a26246ef963283b6f5c6df647 Mon Sep 17 00:00:00 2001 From: Too Date: Fri, 6 Jul 2018 13:22:44 +0800 Subject: [PATCH 3/4] fix update and delete at settingmalaysiacontroller --- .../SettingMalaysiaBankController.php | 18 +++++++++--------- routes/api.php | 10 ++++------ 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/SettingMalaysiaBankController.php b/app/Http/Controllers/SettingMalaysiaBankController.php index 4319f058..4bfbbb47 100644 --- a/app/Http/Controllers/SettingMalaysiaBankController.php +++ b/app/Http/Controllers/SettingMalaysiaBankController.php @@ -12,28 +12,28 @@ class SettingMalaysiaBankController extends Controller return SettingMalaysiaBank::all(); } - public function show(SettingMalaysiaBank $settingMalaysiaBank) + public function show(SettingMalaysiaBank $malaysiaBank) { - return $settingMalaysiaBank; + return $malaysiaBank; } public function store(Request $request) { - $settingMalaysiaBank = SettingMalaysiaBank::create($request->all()); + $malaysiaBank = SettingMalaysiaBank::create($request->all()); - return response()->json($settingMalaysiaBank, 201); + return response()->json($malaysiaBank, 201); } - public function update(Request $request, SettingMalaysiaBank $settingMalaysiaBank) + public function update(Request $request, SettingMalaysiaBank $malaysiaBank) { - $settingMalaysiaBank->update($request->all()); + $malaysiaBank->update($request->all()); - return response()->json($settingMalaysiaBank, 200); + return response()->json($malaysiaBank, 200); } - public function delete(SettingMalaysiaBank $settingMalaysiaBank) + public function delete(SettingMalaysiaBank $malaysiaBank) { - $settingMalaysiaBank->delete(); + $malaysiaBank->delete(); return response()->json(null, 204); } diff --git a/routes/api.php b/routes/api.php index cbabdb05..90e7be8b 100644 --- a/routes/api.php +++ b/routes/api.php @@ -83,9 +83,10 @@ 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/{id}', 'SettingMalaysiaBankController@show'); + Route::get('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@show'); Route::post('setting-malaysia-bank', 'SettingMalaysiaBankController@store'); - Route::put('setting-malaysia-bank/{id}', 'SettingMalaysiaBankController@update'); + 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'); @@ -105,7 +106,4 @@ Route::group(['middleware' => ['role:admin']], function() { Route::post('booking/{id}/upload-invoice', 'BookingController@uploadInvoice'); Route::post('booking/{id}/confirm-invoice', 'BookingController@confirmInvoice'); -}); - - - Route::delete('setting-malaysia-bank/{id}', 'SettingMalaysiaBankController@delete'); \ No newline at end of file +}); \ No newline at end of file From 3752de23477926ac44823323c1467b4f16cabb3f Mon Sep 17 00:00:00 2001 From: Too Date: Fri, 6 Jul 2018 14:07:07 +0800 Subject: [PATCH 4/4] Add setting malaysia bank seeder --- database/seeds/DatabaseSeeder.php | 2 +- database/seeds/SettingMalaysiaBankSeeder.php | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index fb9ed708..04182825 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -20,6 +20,6 @@ class DatabaseSeeder extends Seeder $this->call(SettingCreditSeeder::class); $this->call(SuppliersTableSeeder::class); $this->call(MarkingSeeder::class); - $this->call(MalaysiaBankSeeder::class); + $this->call(SettingMalaysiaBankSeeder::class); } } diff --git a/database/seeds/SettingMalaysiaBankSeeder.php b/database/seeds/SettingMalaysiaBankSeeder.php index 142ae8e6..5fe33b9c 100644 --- a/database/seeds/SettingMalaysiaBankSeeder.php +++ b/database/seeds/SettingMalaysiaBankSeeder.php @@ -11,6 +11,14 @@ class SettingMalaysiaBankSeeder extends Seeder */ public function run() { - // + DB::table('setting_malaysia_banks')->insert([ + 'company_name' => 'CIEF', + 'bank_name' => 'Maybank', + 'acc_no' => '131313131313', + 'bank_address' => 'Jalan putrajaya', + 'swift' => 'ABC123', + 'cnap' => 'CED234', + 'bank_branch' => 'Putra' + ]); } }