From 6022a8fccd33b9748ae2375e585ceca4a3e99b07 Mon Sep 17 00:00:00 2001 From: lonetrinity Date: Tue, 25 Sep 2018 15:04:03 +0800 Subject: [PATCH] fix/removeDeleteandAddBankStatus --- .../SettingMalaysiaBankController.php | 6 ++ app/SettingMalaysiaBank.php | 2 +- ...d_nullable_setting_malaysia_bank_table.php | 1 + database/seeds/SettingBeneficiarySeeder.php | 2 +- package.json | 1 + resources/assets/js/app.js | 2 + .../js/pages/settings/admin-bank-setting.vue | 7 +- .../js/pages/settings/admin-malaysia-bank.vue | 64 +++++++++---------- routes/api.php | 1 + 9 files changed, 49 insertions(+), 37 deletions(-) diff --git a/app/Http/Controllers/SettingMalaysiaBankController.php b/app/Http/Controllers/SettingMalaysiaBankController.php index 4bfbbb47..ff87bd0d 100644 --- a/app/Http/Controllers/SettingMalaysiaBankController.php +++ b/app/Http/Controllers/SettingMalaysiaBankController.php @@ -37,4 +37,10 @@ class SettingMalaysiaBankController extends Controller return response()->json(null, 204); } + + public function updateStatus(string $id, SettingMalaysiaBank $malaysiaBank){ + $currentRecord = SettingMalaysiaBank::where('id', $id)->first(); + SettingMalaysiaBank::where('id', $id)->update(['active' => $currentRecord->active === 1 ? 0 : 1]); + return response()->json(SettingMalaysiaBank::all(), 200); + } } diff --git a/app/SettingMalaysiaBank.php b/app/SettingMalaysiaBank.php index ccd71e62..233f49fe 100644 --- a/app/SettingMalaysiaBank.php +++ b/app/SettingMalaysiaBank.php @@ -6,5 +6,5 @@ use Illuminate\Database\Eloquent\Model; class SettingMalaysiaBank extends Model { - protected $fillable = ['company_name','bank_name','acc_no','bank_address','swift','cnap','bank_branch']; + protected $fillable = ['company_name','bank_name','acc_no','bank_address','swift','cnap','bank_branch', 'active']; } 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 index 66de8f4d..51fee71f 100644 --- 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 @@ -21,6 +21,7 @@ class AddNullableSettingMalaysiaBankTable extends Migration $table->string('swift')->nullable()->change(); $table->string('cnap')->nullable()->change(); $table->string('bank_branch')->nullable()->change(); + $table->integer('active')->default(1); }); } diff --git a/database/seeds/SettingBeneficiarySeeder.php b/database/seeds/SettingBeneficiarySeeder.php index a78a899d..5c1ff459 100644 --- a/database/seeds/SettingBeneficiarySeeder.php +++ b/database/seeds/SettingBeneficiarySeeder.php @@ -29,7 +29,7 @@ class SettingBeneficiarySeeder extends Seeder 'bank_address' => 'Jalan cyberjaya', 'swift' => 'AB3333', 'cnap' => 'CADSeed', - 'bank_branch' => 'cyberjaa + 'bank_branch' => 'cyberjaya ' ]); } diff --git a/package.json b/package.json index 5b5e6347..1836605b 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ "vue-axios": "^2.1.1", "vue-button-spinner": "^2.2.0", "vue-i18n": "^7.6.0", + "vue-js-toggle-button": "^1.3.0", "vue-loader": "^14.2.2", "vue-loading-spinner": "^1.0.11", "vue-meta": "^1.4.4", diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 9509ac12..8cb27071 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -6,6 +6,8 @@ import App from '~/components/App' import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' import locale from 'element-ui/lib/locale/lang/en' +import ToggleButton from 'vue-js-toggle-button' +Vue.use(ToggleButton) import '~/plugins' import '~/components' diff --git a/resources/assets/js/pages/settings/admin-bank-setting.vue b/resources/assets/js/pages/settings/admin-bank-setting.vue index e6de00e6..0dc2ea8b 100644 --- a/resources/assets/js/pages/settings/admin-bank-setting.vue +++ b/resources/assets/js/pages/settings/admin-bank-setting.vue @@ -9,7 +9,8 @@ v-for="item in options_CIEF" :key="item.value" :label="item.label" - :value="item.value"> + :value="item.value" + :disabled="item.disabled === 0"> @@ -21,7 +22,8 @@ v-for="item in options_CIEF" :key="item.value" :label="item.label" - :value="item.value"> + :value="item.value" + :disabled="item.disabled === 0"> @@ -76,6 +78,7 @@ export default { return { value : item.id, label : item.company_name + " : " + item.bank_name + " : " + item.acc_no, + disabled : item.active }; }); }) diff --git a/resources/assets/js/pages/settings/admin-malaysia-bank.vue b/resources/assets/js/pages/settings/admin-malaysia-bank.vue index adf91f02..2c75574b 100644 --- a/resources/assets/js/pages/settings/admin-malaysia-bank.vue +++ b/resources/assets/js/pages/settings/admin-malaysia-bank.vue @@ -4,15 +4,19 @@ - - - + + + - +
@@ -134,14 +138,15 @@ swift : '', cnap : '', bank_branch : '', + }, EditDatadialogVisible: false, - DeleteAdddialogVisible: false, AddDatadialogVisible: false, DoneAddDatadialogVisible: false, DoneUpdateDatadialogVisible: false, currentEdit : -1, - } + + } }, mounted(){ this.UpdateTableData(); @@ -175,6 +180,24 @@ this.ClearMalaysiaBankForm(); }); }, + UpdateBankStatus : function(id){ + this.loading_btn = true + axios.put('/api/setting-malaysia-bank/status/'+ id) + .then((response) => { + this.loading_btn = false; + this.tableData = response.data; + }) + .catch((error) => { + this.loading_btn = false + console.log(error); + this.$message({ + showClose: true, + message: 'Update Status fail', + type: 'error', + duration: 10000 + }); + }) + }, UpdateTableData : function(){ this.loading_btn = true axios.get('/api/setting-malaysia-bank', this.malaysiaBankForm) @@ -195,31 +218,6 @@ }); }) }, - DeleteMalaysiaBank : function(malaysiaBank_id){ - this.loading_btn = true; - this.DeleteAdddialogVisible = true; - axios.delete('/api/setting-malaysia-bank/' + malaysiaBank_id) - .then((response) => { - this.UpdateTableData(); - this.$message({ - showClose: true, - message: 'Data Deleted Successfully', - type: 'success', - duration: 5000 - }); - - }) - .catch((error) => { - this.loading_btn = false; - console.log(error); - this.$message({ - showClose: true, - message: 'Delete data fail', - type: 'error', - duration: 10000 - }); - }); - }, EditMalaysiaBank : function(){ this.loading_btn = true; this.EditDatadialogVisible = false; diff --git a/routes/api.php b/routes/api.php index cb0e904d..f598511c 100644 --- a/routes/api.php +++ b/routes/api.php @@ -101,6 +101,7 @@ Route::group(['middleware' => ['role:admin']], function() { Route::post('setting-malaysia-bank', 'SettingMalaysiaBankController@store'); Route::put('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@update'); Route::delete('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@delete'); + Route::put('setting-malaysia-bank/status/{id}', 'SettingMalaysiaBankController@updateStatus'); Route::get('setting-marking', 'MarkingController@index'); Route::post('setting-marking', 'MarkingController@store');