add malaysia bank page and integrate it with backend

app/Http/Controllers/MalaysiaBankController.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use App\MalaysiaBank;
-
-class MalaysiaBankController extends Controller
-{
-    public function index()
-    {
-        return MalaysiaBank::all();
-    }
-
-    public function show(MalaysiaBank $malaysiaBank)
-    {
-        return $malaysiaBank;
-    }
-
-    public function store(Request $request)
-    {
-        $malaysiaBank = MalaysiaBank::create($request->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);
-    }
-}

app/Http/Controllers/SettingMalaysiaBankController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use App\SettingMalaysiaBank;
+
+class SettingMalaysiaBankController extends Controller
+{
+    public function index()
+    {
+        return SettingMalaysiaBank::all();
+    }
+
+    public function show(SettingMalaysiaBank $settingMalaysiaBank)
+    {
+        return $settingMalaysiaBank;
+    }
+
+    public function store(Request $request)
+    {
+        $settingMalaysiaBank = SettingMalaysiaBank::create($request->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);
+    }
+}

app/MalaysiaBank.php

@@ -1,10 +0,0 @@
-<?php
-
-namespace App;
-
-use Illuminate\Database\Eloquent\Model;
-
-class MalaysiaBank extends Model
-{
-    protected $fillable = ['company_name','bank_name','acc_no','bank_address','swift','cnap','bank_branch'];
-}

app/SettingMalaysiaBank.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class SettingMalaysiaBank extends Model
+{
+  	protected $fillable = ['company_name','bank_name','acc_no','bank_address','swift','cnap','bank_branch'];
+}

database/migrations/2018_07_06_035110_add_nullable_setting_malaysia_bank_table.php

@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddNullableSettingMalaysiaBankTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('setting_malaysia_banks', function(Blueprint $table) {
+            $table->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()
+    {
+        //
+    }
+}

database/seeds/SettingMalaysiaBankSeeder.php

@@ -2,7 +2,7 @@
 
 use Illuminate\Database\Seeder;
 
-class MalaysiaBankSeeder extends Seeder
+class SettingMalaysiaBankSeeder extends Seeder
 {
     /**
      * Run the database seeds.

resources/assets/js/pages/settings/admin-malaysia-bank.vue

@@ -0,0 +1,263 @@
+<template>
+<div>
+	<span align="center"><h4>Malaysia Bank Details</h4></span><br>
+		<el-table :data="tableData" border style="width: 100%">
+			<el-table-column prop="company_name" label="Company Name" width="90px"></el-table-column>
+			<el-table-column prop="bank_name" label="Bank Name"></el-table-column>
+			<el-table-column prop="acc_no" label="Bank Account No" width="115px"></el-table-column>
+			<el-table-column prop="bank_address" label="Bank Address" width="111px"></el-table-column>
+			<el-table-column prop="swift" label="SWIFT Code"></el-table-column>
+			<el-table-column prop="cnap" label="CNAP" width="80px"></el-table-column>
+			<el-table-column prop="bank_branch" label="Bank Branch"></el-table-column>
+			<el-table-column label="Action">
+				<template slot-scope="scope">
+					<el-button type="text" size="small" @click="PopOutEditMalaysiaBank(scope.$index)">Edit</el-button>
+					<el-button type="text" size="small" @click="DeleteMalaysiaBank(tableData[scope.$index].id)">Delete</el-button>
+				</template>
+			</el-table-column>
+		</el-table><br>
+		<div align="right">
+			<el-button type="primary" icon="el-icon-plus" @click="PopOutAddMalaysiaBank">Add New Data</el-button>
+		</div>
+		<!-- popup add new data -->
+			<el-dialog title="Add New Data" align="center" :visible.sync="AddDatadialogVisible" width="40%">
+				<el-form label-width="150px">
+					<el-form-item label="Company Name" :class="{'has-error': errors.has('company_name') }">
+						<el-input v-model="malaysiaBankForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('company_name')">{{ errors.first('company_name') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Name" :class="{'has-error': errors.has('bank_name') }">
+						<el-input v-model="malaysiaBankForm.bank_name" v-validate="'required|max:191'" name="bank_name"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_name')">{{ errors.first('bank_name') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Account No" :class="{'has-error': errors.has('acc_no') }">
+						<el-input v-model="malaysiaBankForm.acc_no" v-validate="'required|max:191'" name="acc_no"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('acc_no')">{{ errors.first('acc_no') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Address" :class="{'has-error': errors.has('bank_address') }">
+						<el-input v-model="malaysiaBankForm.bank_address" v-validate="'required|max:191'" name="bank_address"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_address')">{{ errors.first('bank_address') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="SWIFT Code" :class="{'has-error': errors.has('swift') }">
+						<el-input v-model="malaysiaBankForm.swift" v-validate="'required|max:191'" name="swift"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('swift')">{{ errors.first('swift') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="CNAP" :class="{'has-error': errors.has('cnap') }">
+						<el-input v-model="malaysiaBankForm.cnap" v-validate="'required|max:191'" name="cnap" ></el-input>
+						<span class="error-message text-danger" v-if="errors.has('cnap')">{{ errors.first('cnap') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Branch" :class="{'has-error': errors.has('bank_branch') }">
+						<el-input v-model="malaysiaBankForm.bank_branch" v-validate="'required|max:191'" name="bank_branch"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_branch')">{{ errors.first('bank_branch') }}<br/></span>
+					</el-form-item>
+				</el-form>
+				<div align="center">
+					<el-button @click="AddDatadialogVisible = false">Cancel</el-button>
+					<el-button type="primary" @click="CreateMalaysiaBank">OK</el-button>
+				</div>
+				<span slot="footer" class="dialog-footer">
+					* Please key in the data in Chinese
+				</span>
+			</el-dialog>
+			<el-dialog align="center" :visible.sync="DoneAddDatadialogVisible" width="30%">
+				<span>Data Added Successfully</span><br><br>
+				<div align="center">
+						<el-button type="primary" @click="DoneAddDatadialogVisible = false">OK</el-button>
+				</div>
+			</el-dialog>
+		<!-- popup add new data end -->
+		<!-- popup edit data -->
+			<el-dialog title="Edit Data" align="center" :visible.sync="EditDatadialogVisible" width="40%">
+				<el-form label-width="150px">
+					<el-form-item label="Company Name" :class="{'has-error': errors.has('company_name') }">
+						<el-input v-model="malaysiaBankForm.company_name" v-validate="'required|max:191'" name="company_name"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('company_name')">{{ errors.first('company_name') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Name" :class="{'has-error': errors.has('bank_name') }">
+						<el-input v-model="malaysiaBankForm.bank_name" v-validate="'required|max:191'" name="bank_name"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_name')">{{ errors.first('bank_name') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Account No" :class="{'has-error': errors.has('acc_no') }">
+						<el-input v-model="malaysiaBankForm.acc_no" v-validate="'required|max:191'" name="acc_no"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('acc_no')">{{ errors.first('acc_no') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Address" :class="{'has-error': errors.has('bank_address') }">
+						<el-input v-model="malaysiaBankForm.bank_address" v-validate="'required|max:191'" name="bank_address"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_address')">{{ errors.first('bank_address') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="SWIFT Code" :class="{'has-error': errors.has('swift') }">
+						<el-input v-model="malaysiaBankForm.swift" v-validate="'required|max:191'" name="swift"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('swift')">{{ errors.first('swift') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="CNAP" :class="{'has-error': errors.has('cnap') }">
+						<el-input v-model="malaysiaBankForm.cnap" v-validate="'required|max:191'" name="cnap" ></el-input>
+						<span class="error-message text-danger" v-if="errors.has('cnap')">{{ errors.first('cnap') }}<br/></span>
+					</el-form-item>
+					<el-form-item label="Bank Branch" :class="{'has-error': errors.has('bank_branch') }">
+						<el-input v-model="malaysiaBankForm.bank_branch" v-validate="'required|max:191'" name="bank_branch"></el-input>
+						<span class="error-message text-danger" v-if="errors.has('bank_branch')">{{ errors.first('bank_branch') }}<br/></span>
+					</el-form-item>
+				</el-form>
+				<div align="center">
+					<el-button @click="EditDatadialogVisible = false">Cancel</el-button>
+					<el-button type="primary" @click="EditMalaysiaBank">Submit</el-button>
+				</div>
+				<span slot="footer" class="dialog-footer">
+					* Please key in the data in Chinese
+				</span>
+			</el-dialog>
+			<el-dialog align="center" :visible.sync="DoneUpdateDatadialogVisible" width="30%">
+				<span>Data Updated Successfully</span><br><br>
+				<div align="center">
+					<el-button type="primary" @click="DoneUpdateDatadialogVisible = false">OK</el-button>
+				</div>
+			</el-dialog>
+		<!-- popup edit data end -->
+		<!-- popup delete -->
+			<el-dialog align="center" :visible.sync="DeleteAdddialogVisible" width="30%">
+				<span>Data Deleted</span><br><br>
+				<div align="center">
+					<el-button type="primary" @click="DeleteAdddialogVisible = false">OK</el-button>
+				</div>
+			</el-dialog>
+		<!-- popup delete end -->
+</div>
+</template>
+
+<script>
+	var axios = require('axios');
+	var client = axios.create({
+		baseURL: 'http://localhost:8000'
+	});
+
+	export default {
+		data() {
+			return {
+				tableData: [],
+				malaysiaBankForm : {
+					company_name : '',
+					bank_name : '',
+					acc_no : '',
+					bank_address : '',
+					swift : '',
+					cnap : '',
+					bank_branch : '',
+				},
+				EditDatadialogVisible: false,
+				DeleteAdddialogVisible: false,
+				AddDatadialogVisible: false,
+				DoneAddDatadialogVisible: false,
+				DoneUpdateDatadialogVisible: false,
+				currentEdit : -1,
+			}
+		},
+		beforeMount(){
+			this.UpdateTableData();
+		},
+		methods: {
+			CreateMalaysiaBank : function(){
+				this.AddDatadialogVisible = false;
+				client.post('api/setting-malaysia-bank', this.malaysiaBankForm)
+					.then((response) => {
+						this.DoneAddDatadialogVisible = true;
+						this.ClearMalaysiaBankForm();
+						this.UpdateTableData();
+					})
+					.catch((error) => {
+						console.log(error);
+						this.$message({
+							showClose: true,
+							message: 'Create Fail',
+							type: 'error',
+							duration: 10000
+						});
+						this.ClearMalaysiaBankForm();
+					});
+			},
+			UpdateTableData : function(){
+				client.get('api/setting-malaysia-bank', this.malaysiaBankForm)
+					.then((response) => {
+						this.tableData = response.data;
+					})
+					.catch((error) => {
+						console.log(error);
+						this.$message({
+							showClose: true,
+							message: 'Fetch data fail',
+							type: 'error',
+							duration: 10000
+						});
+					})
+			},
+			DeleteMalaysiaBank : function(malaysiaBank_id){
+				console.log('delete'+malaysiaBank_id);
+				this.DeleteAdddialogVisible = true;
+				client.delete('api/setting-malaysia-bank/' + malaysiaBank_id)
+					.then((response) => {
+						this.UpdateTableData();
+					})
+					.catch((error) => {
+						console.log(error);
+						this.$message({
+							showClose: true,
+							message: 'Delete data fail',
+							type: 'error',
+							duration: 10000
+						});
+					});
+			},
+			EditMalaysiaBank : function(){
+				this.EditDatadialogVisible = false;
+				this.DoneUpdateDatadialogVisible = true;
+
+				client.put('api/setting-malaysia-bank/' + this.currentEdit, this.malaysiaBankForm)
+					.then((response) => {
+						this.UpdateTableData();
+					})
+					.catch((error) => {
+						console.log(error);
+						this.$message({
+							showClose: true,
+							message: 'Update Fail',
+							type: 'error',
+							duration: 10000
+						});
+					});
+			},
+			PopOutAddMalaysiaBank : function(){
+				this.AddDatadialogVisible = true;
+				this.ClearMalaysiaBankForm();
+			},
+			PopOutEditMalaysiaBank : function(tableDataRow){
+				this.EditDatadialogVisible = true;
+				this.FillupMalaysiaBankForm(tableDataRow);
+				this.currentEdit = this.tableData[tableDataRow].id;
+			},
+			ClearMalaysiaBankForm : function(){
+				this.malaysiaBankForm.company_name = '';
+				this.malaysiaBankForm.bank_name = '';
+				this.malaysiaBankForm.acc_no = '';
+				this.malaysiaBankForm.bank_address = '';
+				this.malaysiaBankForm.swift = '';
+				this.malaysiaBankForm.cnap = '';
+				this.malaysiaBankForm.bank_branch = '';
+			},
+			FillupMalaysiaBankForm : function(tableDataRow){
+				this.malaysiaBankForm.company_name = this.tableData[tableDataRow].company_name;
+				this.malaysiaBankForm.bank_name = this.tableData[tableDataRow].bank_name;
+				this.malaysiaBankForm.acc_no = this.tableData[tableDataRow].acc_no;
+				this.malaysiaBankForm.bank_address = this.tableData[tableDataRow].bank_address;
+				this.malaysiaBankForm.swift = this.tableData[tableDataRow].swift;
+				this.malaysiaBankForm.cnap = this.tableData[tableDataRow].cnap;
+				this.malaysiaBankForm.bank_branch = this.tableData[tableDataRow].bank_branch;
+			}
+		}
+	}
+</script>
+<style type="text/css">
+	.error-message{
+		position: absolute;
+		left: 0;
+	}
+</style>
+

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'),

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 }
     ] },
 

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');