From 15cf079e2d6bcc5a28e231aaf36ebd734388c0b1 Mon Sep 17 00:00:00 2001 From: "LAPTOP-DGCU80CH\\user1" Date: Thu, 24 Dec 2020 10:56:32 +0800 Subject: [PATCH] latest --- app/Http/Controllers/CustomersController.php | 28 +++++- ...20_10_06_043308_create_customers_table.php | 43 -------- ...2020_10_07_020106_create_gadaian_table.php | 31 ------ .../2020_10_07_055737_create_marhun_table.php | 43 -------- ...20_10_08_020155_create_penebusan_table.php | 31 ------ ..._10_11_001453_add_roles_to_users_table.php | 32 ------ .../2020_10_11_001857_create_roles_table.php | 34 ------- ...0_10_11_002956_create_harga_emas_table.php | 35 ------- ...020_10_11_034739_create_cawangan_table.php | 39 -------- ..._11_043627_add_cawangan_to_users_table.php | 32 ------ ...11_043727_add_info_user_to_users_table.php | 34 ------- .../2020_10_13_002746_create_bangsa_table.php | 31 ------ .../2020_10_13_003310_create_bank_table.php | 33 ------- .../2020_10_13_042256_create_media_table.php | 38 ------- ...020_12_16_085548_create_sessions_table.php | 35 +++++++ database/seeds/BangsaSeeder.php | 16 --- database/seeds/BankSeeder.php | 16 --- database/seeds/CawanganSeeder.php | 16 --- database/seeds/HargaEmasSeeder.php | 59 ----------- database/seeds/PoskodSeeder.php | 98 ------------------- database/seeds/RolesSeeder.php | 37 ------- database/seeds/StateSeeder.php | 81 --------------- resources/views/customers/index.blade.php | 14 +-- .../views/homepage/penilai/home.blade.php | 5 +- .../views/print/laporan_gadaian.blade.php | 5 +- .../views/print/laporan_penebusan.blade.php | 5 +- 26 files changed, 75 insertions(+), 796 deletions(-) delete mode 100644 database/migrations/2020_10_06_043308_create_customers_table.php delete mode 100644 database/migrations/2020_10_07_020106_create_gadaian_table.php delete mode 100644 database/migrations/2020_10_07_055737_create_marhun_table.php delete mode 100644 database/migrations/2020_10_08_020155_create_penebusan_table.php delete mode 100644 database/migrations/2020_10_11_001453_add_roles_to_users_table.php delete mode 100644 database/migrations/2020_10_11_001857_create_roles_table.php delete mode 100644 database/migrations/2020_10_11_002956_create_harga_emas_table.php delete mode 100644 database/migrations/2020_10_11_034739_create_cawangan_table.php delete mode 100644 database/migrations/2020_10_11_043627_add_cawangan_to_users_table.php delete mode 100644 database/migrations/2020_10_11_043727_add_info_user_to_users_table.php delete mode 100644 database/migrations/2020_10_13_002746_create_bangsa_table.php delete mode 100644 database/migrations/2020_10_13_003310_create_bank_table.php delete mode 100644 database/migrations/2020_10_13_042256_create_media_table.php create mode 100644 database/migrations/2020_12_16_085548_create_sessions_table.php delete mode 100644 database/seeds/BangsaSeeder.php delete mode 100644 database/seeds/BankSeeder.php delete mode 100644 database/seeds/CawanganSeeder.php delete mode 100644 database/seeds/HargaEmasSeeder.php delete mode 100644 database/seeds/PoskodSeeder.php delete mode 100644 database/seeds/RolesSeeder.php delete mode 100644 database/seeds/StateSeeder.php diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php index 0b58fa7..25890ec 100644 --- a/app/Http/Controllers/CustomersController.php +++ b/app/Http/Controllers/CustomersController.php @@ -96,11 +96,33 @@ class CustomersController extends Controller */ public function store(Request $request) { - $customer = $this->customerService->createNewCustomer($request); + dd($request); + if($request->warganegara){ + $warganegara = 'Y'; + }else{ + $warganegara = 'N'; + } + if($request->bumiputera){ + $bumiputera = 'Y'; + }else{ + $bumiputera = 'N'; + } + if($request->jantina == 'Lelaki'){ + $jantina = 'L'; + }elseif($request->jantina == 'Perampuan'){ + $jantina = 'P'; + } + $split_date = explode('/',$request->tarikh_lahir); + $tarikh_lahir = $split_date[2].'-'.$split_date[1].'-'.$split_date[0]; + $auth_user = Auth::user(); + $latest_customer = Http::get(config('api.url') . '/api/customers/latest/' . $auth_user['cawangan'])->json(); - $customer_info = Customer::where('noic','=',$request['noic'])->first(); + $nosiri_latest = $latest_customer['nosiri']+1; + $count = sprintf("%08d", $nosiri_latest); + + $no_pelanggan = $request->bangsa . substr($request->noic,6,2).'-'.$count; + // dd($tarikh_lahir); - // dd($customer_info); Session::put('customer_info',$customer_info); return redirect()->route('customer_info')->with( ['customer_info' => $customer_info] ); } diff --git a/database/migrations/2020_10_06_043308_create_customers_table.php b/database/migrations/2020_10_06_043308_create_customers_table.php deleted file mode 100644 index 8067ca9..0000000 --- a/database/migrations/2020_10_06_043308_create_customers_table.php +++ /dev/null @@ -1,43 +0,0 @@ -id(); - $table->string('name'); - $table->string('noic')->unique(); - $table->string('alamat'); - $table->string('main_phone'); - $table->string('alternate_phone')->nullable(); - $table->string('alamat_menyurat'); - $table->integer('poskod'); - $table->string('daerah'); - $table->string('negeri'); - $table->integer('umur'); - $table->string('warganegara'); - $table->string('bangsa'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('customers'); - } -} diff --git a/database/migrations/2020_10_07_020106_create_gadaian_table.php b/database/migrations/2020_10_07_020106_create_gadaian_table.php deleted file mode 100644 index bd74753..0000000 --- a/database/migrations/2020_10_07_020106_create_gadaian_table.php +++ /dev/null @@ -1,31 +0,0 @@ -id(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('gadaian'); - } -} diff --git a/database/migrations/2020_10_07_055737_create_marhun_table.php b/database/migrations/2020_10_07_055737_create_marhun_table.php deleted file mode 100644 index 3ad1f54..0000000 --- a/database/migrations/2020_10_07_055737_create_marhun_table.php +++ /dev/null @@ -1,43 +0,0 @@ -id(); - $table->String('no_rujukan'); - $table->String('marhun'); - $table->String('note'); - $table->boolean('rosak'); - $table->boolean('putus'); - $table->boolean('patah'); - $table->boolean('permata'); - $table->boolean('sebelah'); - $table->String('karat'); - $table->String('berat'); - $table->float('harga'); - $table->float('nilai_marhun'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('marhun'); - } -} diff --git a/database/migrations/2020_10_08_020155_create_penebusan_table.php b/database/migrations/2020_10_08_020155_create_penebusan_table.php deleted file mode 100644 index a9a707a..0000000 --- a/database/migrations/2020_10_08_020155_create_penebusan_table.php +++ /dev/null @@ -1,31 +0,0 @@ -id(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('penebusan'); - } -} diff --git a/database/migrations/2020_10_11_001453_add_roles_to_users_table.php b/database/migrations/2020_10_11_001453_add_roles_to_users_table.php deleted file mode 100644 index e726e19..0000000 --- a/database/migrations/2020_10_11_001453_add_roles_to_users_table.php +++ /dev/null @@ -1,32 +0,0 @@ -String('roles'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('users', function (Blueprint $table) { - $table->dropColumn('roles'); - }); - } -} diff --git a/database/migrations/2020_10_11_001857_create_roles_table.php b/database/migrations/2020_10_11_001857_create_roles_table.php deleted file mode 100644 index 9682086..0000000 --- a/database/migrations/2020_10_11_001857_create_roles_table.php +++ /dev/null @@ -1,34 +0,0 @@ -id(); - $table->String('role_name'); - $table->String('role_code'); - $table->String('description'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('roles'); - } -} diff --git a/database/migrations/2020_10_11_002956_create_harga_emas_table.php b/database/migrations/2020_10_11_002956_create_harga_emas_table.php deleted file mode 100644 index a0ca9d2..0000000 --- a/database/migrations/2020_10_11_002956_create_harga_emas_table.php +++ /dev/null @@ -1,35 +0,0 @@ -id(); - $table->String('mutu_emas'); - $table->String('karat'); - $table->float('kaunter'); - $table->float('harga_gram'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('harga_emas'); - } -} diff --git a/database/migrations/2020_10_11_034739_create_cawangan_table.php b/database/migrations/2020_10_11_034739_create_cawangan_table.php deleted file mode 100644 index f9e1376..0000000 --- a/database/migrations/2020_10_11_034739_create_cawangan_table.php +++ /dev/null @@ -1,39 +0,0 @@ -id(); - $table->String('nama'); - $table->String('code'); - $table->String('alamat'); - $table->String('poskod'); - $table->String('daerah'); - $table->String('negeri'); - $table->String('no_telefon'); - $table->String('no_fax'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('cawangan'); - } -} diff --git a/database/migrations/2020_10_11_043627_add_cawangan_to_users_table.php b/database/migrations/2020_10_11_043627_add_cawangan_to_users_table.php deleted file mode 100644 index 58f257d..0000000 --- a/database/migrations/2020_10_11_043627_add_cawangan_to_users_table.php +++ /dev/null @@ -1,32 +0,0 @@ -String('cawangan'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('users', function (Blueprint $table) { - $table->dropColumn('cawangan'); - }); - } -} diff --git a/database/migrations/2020_10_11_043727_add_info_user_to_users_table.php b/database/migrations/2020_10_11_043727_add_info_user_to_users_table.php deleted file mode 100644 index 1ef29a2..0000000 --- a/database/migrations/2020_10_11_043727_add_info_user_to_users_table.php +++ /dev/null @@ -1,34 +0,0 @@ -String('no_kp'); - $table->String('no_telefon'); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('users', function (Blueprint $table) { - $table->dropColumn('no_kp'); - $table->dropColumn('no_telefon'); - }); - } -} diff --git a/database/migrations/2020_10_13_002746_create_bangsa_table.php b/database/migrations/2020_10_13_002746_create_bangsa_table.php deleted file mode 100644 index 8ffd62f..0000000 --- a/database/migrations/2020_10_13_002746_create_bangsa_table.php +++ /dev/null @@ -1,31 +0,0 @@ -id(); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('bangsa'); - } -} diff --git a/database/migrations/2020_10_13_003310_create_bank_table.php b/database/migrations/2020_10_13_003310_create_bank_table.php deleted file mode 100644 index 0ac684f..0000000 --- a/database/migrations/2020_10_13_003310_create_bank_table.php +++ /dev/null @@ -1,33 +0,0 @@ -id(); - $table->String('bank_name'); - $table->String('bank_code'); - $table->timestamps(); - }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::dropIfExists('bank'); - } -} diff --git a/database/migrations/2020_10_13_042256_create_media_table.php b/database/migrations/2020_10_13_042256_create_media_table.php deleted file mode 100644 index 139ec80..0000000 --- a/database/migrations/2020_10_13_042256_create_media_table.php +++ /dev/null @@ -1,38 +0,0 @@ -bigIncrements('id'); - $table->morphs('model'); - $table->string('collection_name'); - $table->string('name'); - $table->string('file_name'); - $table->string('mime_type')->nullable(); - $table->string('disk'); - $table->unsignedBigInteger('size'); - $table->json('manipulations'); - $table->json('custom_properties'); - $table->json('responsive_images'); - $table->unsignedInteger('order_column')->nullable(); - $table->nullableTimestamps(); - }); - } - - /** - * Reverse the migrations. - */ - public function down() - { - Schema::dropIfExists('media'); - } -} diff --git a/database/migrations/2020_12_16_085548_create_sessions_table.php b/database/migrations/2020_12_16_085548_create_sessions_table.php new file mode 100644 index 0000000..0bd028c --- /dev/null +++ b/database/migrations/2020_12_16_085548_create_sessions_table.php @@ -0,0 +1,35 @@ +string('id')->unique(); + $table->foreignId('user_id')->nullable(); + $table->string('ip_address', 45)->nullable(); + $table->text('user_agent')->nullable(); + $table->text('payload'); + $table->integer('last_activity'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('sessions'); + } +} diff --git a/database/seeds/BangsaSeeder.php b/database/seeds/BangsaSeeder.php deleted file mode 100644 index b1f4473..0000000 --- a/database/seeds/BangsaSeeder.php +++ /dev/null @@ -1,16 +0,0 @@ -insert([ - [ - 'mutu_emas' => '999', - 'karat' => '24K', - 'kaunter' => 183.68, - 'harga_gram' => 262.40 - ], - [ - 'mutu_emas' => '950', - 'karat' => '23K', - 'kaunter' => 174.50, - 'harga_gram' => 249.28 - ], - [ - 'mutu_emas' => '916', - 'karat' => '22K', - 'kaunter' => 168.25, - 'harga_gram' => 240.36 - ], - [ - 'mutu_emas' => '900', - 'karat' => '21K', - 'kaunter' => 165.31, - 'harga_gram' => 236.16 - ], - [ - 'mutu_emas' => '835', - 'karat' => '20K', - 'kaunter' => 153.57, - 'harga_gram' => 219.10 - ], - [ - 'mutu_emas' => '750', - 'karat' => '18K', - 'kaunter' => 137.76, - 'harga_gram' => 196.80 - ], - [ - 'mutu_emas' => '585', - 'karat' => '14K', - 'kaunter' => 137.76, - 'harga_gram' => 153.50 - ] - ]); - } -} diff --git a/database/seeds/PoskodSeeder.php b/database/seeds/PoskodSeeder.php deleted file mode 100644 index d8ed5ba..0000000 --- a/database/seeds/PoskodSeeder.php +++ /dev/null @@ -1,98 +0,0 @@ -insert([ - [ - 'poskod'=>'01000', - 'bandar'=>'Kangar', - 'negeri'=>'PLS' - ], - [ - 'poskod'=>'01007', - 'bandar'=>'Kangar', - 'negeri'=>'PLS' - ], - [ - 'poskod'=>'01009', - 'bandar'=>'Kangar', - 'negeri'=>'PLS' - ], - [ - 'poskod'=>'01500', - 'bandar'=>'Kangar', - 'negeri'=>'PLS' - ], - [ - 'poskod'=>'01502', - 'bandar'=>'Kangar', - 'negeri'=>'PLS' - ], - [ - 'poskod'=>'01503', - 'bandar'=>'Kangar', - 'negeri'=>'PLS' - ], - [ - 'poskod'=>'01504', - 'bandar'=>'Kangar', - 'negeri'=>'PLS' - ], - [ - 'poskod'=>'01505', - 'bandar'=>'Kangar', - 'negeri'=>'PLS' - ], - [ - 'poskod'=>'01506', - 'bandar'=>'Kangar', - 'negeri'=>'PLS' - ], - [ - 'poskod'=>'01508', - 'bandar'=>'Kangar', - 'negeri'=>'PLS' - ], - [ - 'poskod'=>'01512', - 'bandar'=>'Kangar', - 'negeri'=>'PLS' - ], - [ - 'poskod'=>'01514', - 'bandar'=>'Kangar', - 'negeri'=>'PLS' - ], - [ - 'poskod'=>'01516', - 'bandar'=>'Kangar', - 'negeri'=>'PLS' - ], - [ - 'poskod'=>'01517', - 'bandar'=>'Kangar', - 'negeri'=>'PLS' - ], - [ - 'poskod'=>'01518', - 'bandar'=>'Kangar', - 'negeri'=>'PLS' - ], - [ - 'poskod'=>'01524', - 'bandar'=>'Kangar', - 'negeri'=>'PLS' - ] - - ]); - } -} diff --git a/database/seeds/RolesSeeder.php b/database/seeds/RolesSeeder.php deleted file mode 100644 index 09aba8e..0000000 --- a/database/seeds/RolesSeeder.php +++ /dev/null @@ -1,37 +0,0 @@ -insert([ - [ - 'role_name' => 'Penolong Pengurus Cawangan', - 'role_code' => 'PPC', - 'description' => 'Penolong Pengurus Cawangan', - ], - [ - 'role_name' => 'Khazanah', - 'role_code' => 'Khazanah', - 'description' => 'Khazanah', - ], - [ - 'role_name' => 'Juruwang', - 'role_code' => 'TT', - 'description' => 'Juruwang', - ], - [ - 'role_name' => 'Penilai', - 'role_code' => 'PP', - 'description' => 'Penilai', - ] - ]); - } -} diff --git a/database/seeds/StateSeeder.php b/database/seeds/StateSeeder.php deleted file mode 100644 index 16d575f..0000000 --- a/database/seeds/StateSeeder.php +++ /dev/null @@ -1,81 +0,0 @@ -insert([ - [ - 'nama_negeri' => 'Kelantan', - 'code_negeri' => 'KEL' - ], - [ - 'nama_negeri' => 'Johor', - 'code_negeri' => 'JHR' - ], - [ - 'nama_negeri' => 'Kedah', - 'code_negeri' => 'KDH' - ], - [ - 'nama_negeri' => 'Kuala Lumpur', - 'code_negeri' => 'KUL' - ], - [ - 'nama_negeri' => 'Labuan', - 'code_negeri' => 'LBN' - ], - [ - 'nama_negeri' => 'Melaka', - 'code_negeri' => 'MLK' - ], - [ - 'nama_negeri' => 'Negeri Sembilan', - 'code_negeri' => 'NSN' - ], - [ - 'nama_negeri' => 'Pahang', - 'code_negeri' => 'PHG' - ], - [ - 'nama_negeri' => 'Penang', - 'code_negeri' => 'PNG' - ], - [ - 'nama_negeri' => 'Perak', - 'code_negeri' => 'PRK' - ], - [ - 'nama_negeri' => 'Perlis', - 'code_negeri' => 'PLS' - ], - [ - 'nama_negeri' => 'Putrajaya', - 'code_negeri' => 'PJY' - ], - [ - 'nama_negeri' => 'Sabah', - 'code_negeri' => 'SBH' - ], - [ - 'nama_negeri' => 'Sarawak', - 'code_negeri' => 'SRW' - ], - [ - 'nama_negeri' => 'Selangor', - 'code_negeri' => 'SGR' - ], - [ - 'nama_negeri' => 'Terengganu', - 'code_negeri' => 'TRG' - ] - ]); - } -} diff --git a/resources/views/customers/index.blade.php b/resources/views/customers/index.blade.php index bc6c530..2626779 100644 --- a/resources/views/customers/index.blade.php +++ b/resources/views/customers/index.blade.php @@ -51,7 +51,7 @@
Nama
-
No Kad Pengenalan
+
No KP
Tarikh Lahir
@@ -125,17 +125,17 @@
Bank
diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php index 8500a4e..df17ea2 100644 --- a/resources/views/homepage/penilai/home.blade.php +++ b/resources/views/homepage/penilai/home.blade.php @@ -36,7 +36,8 @@
- + + Pembelian Komuditi
@@ -293,6 +294,8 @@ var kodcaw = button.data('kodcaw'); var hargajualan = button.data('hargajualan'); + $('#pembelian_komuditi').attr('href','http://bsas-arrahn.test/pembelian/komuditi?norujukan='+norujukan); + $('#norujukan_modal').val(norujukan); cetakSAG(kodcaw,norujukan); $('#tablemarhun').empty(); diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php index 6a63a86..1044c40 100644 --- a/resources/views/print/laporan_gadaian.blade.php +++ b/resources/views/print/laporan_gadaian.blade.php @@ -93,7 +93,7 @@ #details td, #details th { padding: 8px; - font-size:11px; + font-size:8px; } #details tr:nth-child(even){background-color: #ffffff;} @@ -224,8 +224,7 @@ @endif - - {{$item['norujukan']}} + {{$item['norujukan']}} @php $customer_detail = Http::get($api_url . '/api/customers/' . $item['nokp'])->json(); diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php index abc6ce6..75fb2bc 100644 --- a/resources/views/print/laporan_penebusan.blade.php +++ b/resources/views/print/laporan_penebusan.blade.php @@ -93,7 +93,7 @@ #details td, #details th { padding: 8px; - font-size:11px; + font-size:8px; } #details tr:nth-child(even){background-color: #ffffff;} @@ -226,8 +226,7 @@ @endif - - {{$item['norujukan']}} + {{$item['norujukan']}} @php $gadai_detail = Http::get($api_url . '/api/gadai/norujukan/'. $item['norujukan'])->json();