diff --git a/Entities/ViewAccount.php b/Entities/ViewAccount.php index 4dfe4b0..65218a5 100644 --- a/Entities/ViewAccount.php +++ b/Entities/ViewAccount.php @@ -38,25 +38,27 @@ class ViewAccount extends Model public function getSearchAccount($cif , $kodecabang, $periode){ // $store = DB::connection('oracle'); - $currentDate = Carbon::now(); - $formattedDate = $currentDate->format('Y'); + $today = Carbon::now(); + $currentYear = $today->format("Y"); + $pastYear = $today->subYear(3)->format('Y'); $data = []; if ($cif != null && $kodecabang == null && $periode == null) { - $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS") - ->where('CUSTOMER_NO',$cif) - ->where('BATCH_DATE','LIKE','%'.$formattedDate.'%'); + $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS") + ->where('CUSTOMER_NO',$cif) + ->where('BATCH_DATE','LIKE','%'.$pastYear.'%'); } elseif ($cif != null && $kodecabang != null && $periode == null) { - $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS") - ->where('CUSTOMER_NO',$cif) - ->where('COMPANY_NAME', 'like', "%" .$kodecabang."%") - ->where('BATCH_DATE','LIKE','%'.$formattedDate.'%'); + dd('tess2'); + $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS") + ->where('CUSTOMER_NO',$cif) + ->where('COMPANY_NAME', 'like', "%" .$kodecabang."%") + ->where('BATCH_DATE','LIKE','%'.$pastYear.'%'); }else { - $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS") - ->where('CUSTOMER_NO',$cif) - ->where('COMPANY_NAME', 'like', "%" .$kodecabang."%") - ->where('BATCH_DATE','LIKE','%'.$periode.'%'); + $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS") + ->where('CUSTOMER_NO',$cif) + ->where('COMPANY_NAME', 'like', "%" .$kodecabang."%") + ->where('BATCH_DATE','LIKE','%'.$periode.'%'); } return $data; diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php index 1099b3f..5d9e6ed 100644 --- a/Http/Controllers/KonfirmasiBankController.php +++ b/Http/Controllers/KonfirmasiBankController.php @@ -41,12 +41,22 @@ public function index(Request $request) { - // $keyword = $request->input('search'); + $data = []; + // Tanggal awal + // Contoh tanggal saat ini + $today = Carbon::now(); - //$data = ViewAccount::take(10)->get(); - //dd($data); + // Menambahkan 1 tahun ke tanggal saat ini + $currentYear = $today->format("Y"); - return view('konfirmasibank::pages.index'); + // Menambahkan 5 tahun ke tanggal saat ini + $futureYear = $today->subYear(3)->format('Y'); + + $data['currentYear'] = $currentYear; + $data['pastYear'] = $futureYear; + // dd($data); + + return view('konfirmasibank::pages.index',compact('data')); } public function getData(Request $request) @@ -62,6 +72,7 @@ $data[$key]['WORKING_BALANCE'] = $account->WORKING_BALANCE; $data[$key]['PRODUCT'] = $account->PRODUCT; $data[$key]['CURRENCY'] = $account->CURRENCY; + $data[$key]['MATURITY_DATE'] = $account->MATURITY_DATE; } return json_encode($data); } @@ -101,10 +112,6 @@ } } - - - - } diff --git a/Resources/views/pages/index.blade.php b/Resources/views/pages/index.blade.php index 448dab1..4642693 100644 --- a/Resources/views/pages/index.blade.php +++ b/Resources/views/pages/index.blade.php @@ -3,6 +3,10 @@ $route = explode('.', Route::currentRouteName()); @endphp + + + +
@@ -11,11 +15,11 @@
-
+
- +
@@ -25,13 +29,13 @@
- +
- +
- +
@@ -89,62 +93,64 @@ $(function() { $('.mycheck').hide(); $('#cif_null').hide(); - - $("#btnSubmit").click( - function(e) { - //cekForm(); - $('.row-none').hide(); - $('.mycheck').show(); - $('.firstrow').remove(); - $('.secondrow').remove(); - $('.loading1').show(); - e.preventDefault(); - var actionUrl = $(".form_customer3").attr('action'); - var cif = $("input[name=cif]").val(); - var kodecabang = $("input[name=kodecabang]").val(); - var periode = $("input[name=periode]").val(); - $("input[name=cus_no]").val(cif) - $("input[name=kode_cabang]").val(kodecabang) - $("input[name=periode]").val(periode) - var no = 1; - - $.ajaxSetup({ - headers: { - 'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content') - } - }); - $.ajax({ - url: "{{ route('getData') }}", - type: 'GET', - dataType: 'json', - success: 'success', - data: { - 'cif': cif, - 'kodecabang': kodecabang, - 'periode': periode - }, - success: function(items) { - $('.loading1').hide(); - $.each(items, function(i, index) { - let dateString = moment(items[i]['MATURITY_DATE']).format("YYYY-MM-DD"); - $('#dataBody').append('' + ( - no++) + - '' + items[i]['ACCOUNT_NUMBER'] + - '' + items[i]['COMPANY_NAME'] + - '' + items[i]['SHORT_TITLE'] + - '' + items[i]['WORKING_BALANCE'] + - '' + items[i]['PRODUCT'] + - '' + items[i]['CURRENCY']+ - ''+ dateString + - '
' - ); - }); - - } - }); + $("#myForm").submit(function (event) { + event.preventDefault(); // Prevent the form from submitting normally + if ($("#periode").val() === "") { + alert("periode harus diisi."); + return; // Stop form submission } - ); + + $('.row-none').hide(); + $('.mycheck').show(); + $('.firstrow').remove(); + $('.secondrow').remove(); + $('.loading1').show(); + var actionUrl = $(".form_customer3").attr('action'); + var cif = $("input[name=cif]").val(); + var kodecabang = $("input[name=kodecabang]").val(); + var periode = $("input[name=periode]").val(); + $("input[name=cus_no]").val(cif) + $("input[name=kode_cabang]").val(kodecabang) + $("input[name=periode]").val(periode) + var no = 1; + + $.ajax({ + url: "{{ route('getData') }}", + type: "GET", + data: $(this).serialize(), + dataType: "json", + success: function (items) { + $('.loading1').hide(); + let dateString =''; + $.each(items, function(i, index) { + if (items[i]['MATURITY_DATE']) { + dateString = moment(items[i]['MATURITY_DATE']).format("YYYY-MM-DD"); + } else { + dateString = '-'; + } + $('#dataBody').append('' + ( + no++) + + '' + items[i]['ACCOUNT_NUMBER'] + + '' + items[i]['COMPANY_NAME'] + + '' + items[i]['SHORT_TITLE'] + + '' + items[i]['WORKING_BALANCE'] + + '' + items[i]['PRODUCT'] + + '' + items[i]['CURRENCY']+ + ''+ dateString + + '
' + ); + }); + + }, + error: function (error) { + console.error("Form submission failed!"); + // Handle the error if needed + } + }); + + }); + var acc_no = []; $('#table4 tbody').on('change', 'tr td.tes input[type=checkbox]', function() { @@ -167,31 +173,9 @@ }); }); - // new tempusDominus.TempusDominus(document.getElementById("kt_td_picker_localization"), { - // localization: { - // locale: "idn", - // startOfTheWeek: 1, - // format: "yyyy-MM-dd" - // } - // }); - }); - // $(document).on('click', '.pagination a', function(event) { - // event.preventDefault(); - // var page = $(this).attr('href').split('page=')[1]; - // fetch_user_data(page); - // }); - - // function fetch_user_data(page) { - // $.ajax({ - // url: "/konpirmasibank/pagination-ajax?page=" + page, - // success: function(data) { - // $('#user_table').html(data); - // } - // }); - // } @endpush