perbaikan filter data customer

Entities/ViewAccount.php

@@ -38,20 +38,22 @@ class ViewAccount extends Model
 
     public function getSearchAccount($cif , $kodecabang, $periode){
     // $store = DB::connection('oracle');
-    $currentDate = Carbon::now();
+     $today = Carbon::now();
-    $formattedDate = $currentDate->format('Y');
+     $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.'%');
+        ->where('BATCH_DATE','LIKE','%'.$pastYear.'%');
     } elseif ($cif != null && $kodecabang != null && $periode == null) {
+        dd('tess2');
         $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS")
         ->where('CUSTOMER_NO',$cif)
         ->where('COMPANY_NAME', 'like', "%" .$kodecabang."%")
-    ->where('BATCH_DATE','LIKE','%'.$formattedDate.'%');
+        ->where('BATCH_DATE','LIKE','%'.$pastYear.'%');
     }else {
         $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNTS")
         ->where('CUSTOMER_NO',$cif)

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();
+        // Menambahkan 1 tahun ke tanggal saat ini
+        $currentYear = $today->format("Y");
+
+        // 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');
+        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 @@
 
                     }
                  }
-
-
-
-
             }
 
 

Resources/views/pages/index.blade.php

@@ -3,6 +3,10 @@
         $route = explode('.', Route::currentRouteName());
     @endphp
     <!--begin::Card-->
+    <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+
+    <!-- CDN untuk jQuery Validation -->
+    <script src="https://cdn.jsdelivr.net/jquery.validation/1.16.0/jquery.validate.min.js"></script>
     <meta name="csrf-token" content="{{ csrf_token() }}" />
     <div class="card card-xxl-stretch mb-5 mb-xl-8">
         <!--begin::Card body-->
@@ -11,7 +15,7 @@
                 <div class="row" >
                     <div class="col-md-3"></div>
                     <div class="col-md-6" style="border: 1px solid grey;padding: 20px;background-color:#f4f4f4">
-                        <form>
+                        <form id="myForm">
                             <div class="row mb-3">
                                 <label for="colFormLabelSm" class="col-sm-2 col-form-label col-form-label-sm">No CIF</label>
                                 <div class="col-sm-10">
@@ -25,13 +29,13 @@
                                 </div>
                             </div>
                             <div class="row mb-3">
-                                <label for="colFormLabelSm" class="col-sm-2 col-form-label col-form-label-sm">Priode</label>
+                                <label for="colFormLabelSm" class="col-sm-2 col-form-label col-form-label-sm">Periode</label>
                                 <div class="col-sm-10">
-                                    <input type="number" class="form-control form-control-sm" min="2020" max="2023" name="periode" id="periode" placeholder="Periode">
+                                    <input type="text" class="form-control form-control-sm" name="periode" min="{{$data["currentYear"]}}" max="{{$data["pastYear"]}}" id="periode" placeholder="Periode">
                                 </div>
                             </div>
                             <div class="text-end">
-                                <button type="submit" class="btn btn-primary btn-sm ms-auto" id="btnSubmit">Cari</button>
+                                <button type="submit" class="btn btn-primary btn-sm ms-auto">Cari</button>
                             </div>
 
                         </form>
@@ -89,16 +93,18 @@
             $(function() {
                 $('.mycheck').hide();
                 $('#cif_null').hide();
+                $("#myForm").submit(function (event) {
+                    event.preventDefault(); // Prevent the form from submitting normally
+                    if ($("#periode").val() === "") {
+                        alert("periode harus diisi.");
+                        return; // Stop form submission
+                    }
 
-                $("#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();
@@ -108,25 +114,20 @@
                     $("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',
+                        type: "GET",
-                            dataType: 'json',
+                        data: $(this).serialize(),
-                            success: 'success',
+                        dataType: "json",
-                            data: {
-                                'cif': cif,
-                                'kodecabang': kodecabang,
-                                'periode': periode
-                            },
                         success: function (items) {
                             $('.loading1').hide();
+                            let dateString ='';
                             $.each(items, function(i, index) {
-                                    let dateString = moment(items[i]['MATURITY_DATE']).format("YYYY-MM-DD");
+                                if (items[i]['MATURITY_DATE']) {
+                                        dateString = moment(items[i]['MATURITY_DATE']).format("YYYY-MM-DD");
+                                } else {
+                                        dateString = '-';
+                                }
                                 $('#dataBody').append('<tr class="secondrow"><td>' + (
                                         no++) +
                                     '</td><td>' + items[i]['ACCOUNT_NUMBER'] +
@@ -135,16 +136,21 @@
                                     '</td><td>' + items[i]['WORKING_BALANCE'] +
                                     '</td><td>' + items[i]['PRODUCT'] +
                                     '</td><td>' + items[i]['CURRENCY']+
-                                        '</td><td>'+ dateString +
+                                    '</td><td class="text-center">'+ dateString +
                                     '</td><td class="tes"><div style="padding-left:22px" class="form-check form-check-custom form-check-solid me-10"><input class=" form-check-input h-20px w-20px acc_no" type="checkbox" name="account_number" value="' +
                                     items[i]['ACCOUNT_NUMBER'] + '"></div></td></tr>'
                                 );
                             });
 
+                        },
+                        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);
-            //         }
-            //     });
-            // }
         </script>
     @endpush
 </x-default-layout>