Added marking to admin home page

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/marking

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

database/factories/SettingActiveBankFactory.php

@@ -0,0 +1,9 @@
+<?php
+
+use Faker\Generator as Faker;
+
+$factory->define(Model::class, function (Faker $faker) {
+    return [
+        //
+    ];
+});

database/factories/UserFactory.php

@@ -21,5 +21,6 @@ $factory->define(App\User::class, function (Faker $faker) {
         'email' => $faker->unique()->safeEmail,
         'password' => $password ?: $password = bcrypt('secret'),
         'remember_token' => str_random(10),
+        'marking' => $faker->name,
     ];
 });

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

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

database/migrations/2018_07_06_075408_create_setting_active_bank_table.php

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

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

database/seeds/SettingActiveBankSeeder.php

@@ -0,0 +1,20 @@
+<?php
+
+use Illuminate\Database\Seeder;
+
+class SettingActiveBankSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        DB::table('setting_active_banks')->insert([
+        	'x1_bank_id' => 'malaysiaacc01',
+        	'x2_bank_id' => 'malaysiaacc02',
+        	'beneficiary_id' => '123456789'
+        ]);
+    }
+}

database/seeds/SettingBeneficiaresSeeder.php

@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Seeder;
+
+class SettingBeneficiaresSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        DB::table('setting_beneficiaries')->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
+            '
+        ]);
+    }
+}

database/seeds/SettingMalaysiaBankSeeder.php

@@ -15,11 +15,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'
+        ]);
     }
 }