diff --git a/app/Http/Controllers/SettingActiveBankController.php b/app/Http/Controllers/SettingActiveBankController.php
new file mode 100644
index 00000000..8fc9ae52
--- /dev/null
+++ b/app/Http/Controllers/SettingActiveBankController.php
@@ -0,0 +1,23 @@
+first();
+ return response()->json($active_bank_setting, 201);
+ }
+
+ public function update(Request $request)
+ {
+ $active_bank_setting = SettingActiveBank::latest()->first();
+ $active_bank_setting->update($request->all());
+
+ return response()->json($active_bank_setting, 200);
+ }
+}
diff --git a/app/SettingActiveBank.php b/app/SettingActiveBank.php
new file mode 100644
index 00000000..35d45bdb
--- /dev/null
+++ b/app/SettingActiveBank.php
@@ -0,0 +1,10 @@
+define(Model::class, function (Faker $faker) {
+ return [
+ //
+ ];
+});
diff --git a/database/migrations/2018_04_25_090057_create_setting_beneficiaries_table.php b/database/migrations/2018_04_25_090057_create_setting_beneficiaries_table.php
index 67a54c32..8ec40c3e 100644
--- a/database/migrations/2018_04_25_090057_create_setting_beneficiaries_table.php
+++ b/database/migrations/2018_04_25_090057_create_setting_beneficiaries_table.php
@@ -17,7 +17,7 @@ class CreateSettingBeneficiariesTable extends Migration
$table->increments('id');
$table->string('company_name');
$table->string('bank_name');
- $table->string('acc_no');
+ $table->string('acc_no')->unique();
$table->string('bank_address');
$table->string('swift');
$table->string('cnap');
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
index f493f548..d70fc691 100644
--- 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
@@ -17,7 +17,7 @@ class CreateSettingMalaysiaBankTable extends Migration
$table->increments('id');
$table->string('company_name');
$table->string('bank_name');
- $table->string('acc_no');
+ $table->string('acc_no')->unique();
$table->string('bank_address');
$table->string('swift');
$table->string('cnap');
diff --git a/database/migrations/2018_07_06_075408_create_setting_active_bank_table.php b/database/migrations/2018_07_06_075408_create_setting_active_bank_table.php
new file mode 100644
index 00000000..10e0947a
--- /dev/null
+++ b/database/migrations/2018_07_06_075408_create_setting_active_bank_table.php
@@ -0,0 +1,43 @@
+increments('id');
+ $table->string('x1_bank_id')->unique();
+ $table->string('x2_bank_id')->unique();
+ $table->string('beneficiary_id')->unique();
+ $table->foreign('x1_bank_id')
+ ->references('acc_no')->on('setting_malaysia_banks')
+ ->onDelete('cascade');
+ $table->foreign('x2_bank_id')
+ ->references('acc_no')->on('setting_malaysia_banks')
+ ->onDelete('cascade');
+ $table->foreign('beneficiary_id')
+ ->references('acc_no')->on('setting_beneficiaries')
+ ->onDelete('cascade');
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('setting_active_banks');
+ }
+}
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 04182825..b2e3cd03 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -21,5 +21,7 @@ class DatabaseSeeder extends Seeder
$this->call(SuppliersTableSeeder::class);
$this->call(MarkingSeeder::class);
$this->call(SettingMalaysiaBankSeeder::class);
+ $this->call(SettingBeneficiaresSeeder::class);
+ $this->call(SettingActiveBankSeeder::class);
}
}
diff --git a/database/seeds/SettingActiveBankSeeder.php b/database/seeds/SettingActiveBankSeeder.php
new file mode 100644
index 00000000..e808aca2
--- /dev/null
+++ b/database/seeds/SettingActiveBankSeeder.php
@@ -0,0 +1,20 @@
+insert([
+ 'x1_bank_id' => 'malaysiaacc01',
+ 'x2_bank_id' => 'malaysiaacc02',
+ 'beneficiary_id' => '123456789'
+ ]);
+ }
+}
diff --git a/database/seeds/SettingBeneficiaresSeeder.php b/database/seeds/SettingBeneficiaresSeeder.php
new file mode 100644
index 00000000..dd4c3963
--- /dev/null
+++ b/database/seeds/SettingBeneficiaresSeeder.php
@@ -0,0 +1,34 @@
+insert([
+ 'company_name' => 'CIEF2',
+ 'bank_name' => 'Mayban222k',
+ 'acc_no' => '5555555',
+ 'bank_address' => 'Jalan putrajaya',
+ 'swift' => 'ABC122223',
+ 'cnap' => 'CED232224',
+ 'bank_branch' => 'Putra'
+ ]);
+ DB::table('setting_beneficiaries')->insert([
+ 'company_name' => 'Bota',
+ 'bank_name' => 'CIMB',
+ 'acc_no' => '123456789',
+ 'bank_address' => 'Jalan cyberjaya',
+ 'swift' => 'AB3333',
+ 'cnap' => 'CADSeed',
+ 'bank_branch' => 'cyberjaa
+ '
+ ]);
+ }
+}
diff --git a/database/seeds/SettingMalaysiaBankSeeder.php b/database/seeds/SettingMalaysiaBankSeeder.php
index 5fe33b9c..fefd588f 100644
--- a/database/seeds/SettingMalaysiaBankSeeder.php
+++ b/database/seeds/SettingMalaysiaBankSeeder.php
@@ -14,11 +14,20 @@ class SettingMalaysiaBankSeeder extends Seeder
DB::table('setting_malaysia_banks')->insert([
'company_name' => 'CIEF',
'bank_name' => 'Maybank',
- 'acc_no' => '131313131313',
+ 'acc_no' => 'malaysiaacc01',
'bank_address' => 'Jalan putrajaya',
'swift' => 'ABC123',
'cnap' => 'CED234',
'bank_branch' => 'Putra'
]);
+ DB::table('setting_malaysia_banks')->insert([
+ 'company_name' => 'CIEF',
+ 'bank_name' => 'Maybank',
+ 'acc_no' => 'malaysiaacc02',
+ 'bank_address' => 'Jalan putrajaya',
+ 'swift' => 'ABC123',
+ 'cnap' => 'CED234',
+ 'bank_branch' => 'Putra'
+ ]);
}
}
diff --git a/resources/assets/js/pages/settings/admin-bank-setting.vue b/resources/assets/js/pages/settings/admin-bank-setting.vue
index 7e1468d6..e8e597d5 100644
--- a/resources/assets/js/pages/settings/admin-bank-setting.vue
+++ b/resources/assets/js/pages/settings/admin-bank-setting.vue
@@ -3,30 +3,157 @@
Bank Setting
- Active CIEF bank account for today :
- X1 :
- Maybank
- Affinbank
- Bank Islam
-
- X2 :
- Maybank
- Affinbank
- Bank Islam
+ Active CIEF bank account for today :
+ X1 :
+
+
+
- Update
-
-
- Active CIEF China Beneficiary Account for Today :
-
- Bank of China
- China Bank
- Bank
+ X2 :
+
+
+
- Update
+
+
+ Active CIEF China Beneficiary Account for Today :
+
+
+
+
+
+
+ Update
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/resources/assets/js/pages/settings/admin-credit-setting.vue b/resources/assets/js/pages/settings/admin-credit-setting.vue
index 57307154..4d2c793e 100644
--- a/resources/assets/js/pages/settings/admin-credit-setting.vue
+++ b/resources/assets/js/pages/settings/admin-credit-setting.vue
@@ -17,7 +17,6 @@
Update
-
@@ -38,7 +37,7 @@
};
},
mounted() {
- this.getCreditSetting()
+ this.getCreditSetting();
},
methods: {
getCreditSetting() {
diff --git a/routes/api.php b/routes/api.php
index 90e7be8b..36cc5155 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -70,6 +70,9 @@ 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::get('setting-supplier', 'SettingSupplierController@index');
Route::get('setting-supplier/{supplier}', 'SettingSupplierController@show');
Route::post('setting-supplier', 'SettingSupplierController@store');
@@ -106,4 +109,6 @@ Route::group(['middleware' => ['role:admin']], function() {
Route::post('booking/{id}/upload-invoice', 'BookingController@uploadInvoice');
Route::post('booking/{id}/confirm-invoice', 'BookingController@confirmInvoice');
-});
\ No newline at end of file
+});
+
+Route::put('setting-active-bank', 'SettingActiveBankController@update');
\ No newline at end of file