From d2ed6f9df97385e36127c853891db196366eb355 Mon Sep 17 00:00:00 2001
From: KhatamNugraha <nuganugraha2019@gmail.com>
Date: Thu, 21 Mar 2024 15:02:29 +0700
Subject: [PATCH] FIX formate currency

---
 Entities/Account.php                          |  5 +-
 Http/Controllers/KonfirmasiBankController.php | 10 ++--
 Resources/views/pages/index.blade.php         |  8 ++--
 .../views/pages/index_fasilitas.blade.php     | 10 ++--
 Resources/views/pages/index_signer.blade.php  | 47 ++++++++++++++++---
 5 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/Entities/Account.php b/Entities/Account.php
index 004a336..cd820a4 100644
--- a/Entities/Account.php
+++ b/Entities/Account.php
@@ -81,8 +81,9 @@ class Account extends Model
          //   ->where('INACTIV_MARKER', NULL)
             ->where('AC.BATCH_DATE',$startDate)
             ->whereIn('AC.ACCOUNT_NUMBER', $arrAccount)
-            ->whereIn(DB::raw("LEFT(CATEGORY, 3)"),['100','600','660','101'])
+            //->whereIn(DB::raw("LEFT(CATEGORY, 3)"),['100','600','660','101'])
             ->groupBy('CUSTOMER_NO','ACCOUNT_NUMBER','SHORT_TITLE','SHORT_NAME','COMPANY_NAME')
+            ->orderBy('SHORT_NAME', 'ASC')
             ->limit(100);
          return $data;
     }
@@ -213,4 +214,4 @@ class Account extends Model
 
 
 
-}
\ No newline at end of file
+}
diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php
index ca6fe82..361ba34 100644
--- a/Http/Controllers/KonfirmasiBankController.php
+++ b/Http/Controllers/KonfirmasiBankController.php
@@ -32,6 +32,9 @@
     use Illuminate\Support\Facades\Validator;
     use Illuminate\Support\Facades\Storage;
     use Modules\Konfirmasibank\Http\Requests\Fasilitas\StoreFasilitasRequest;
+    use Akaunting\Money\Currency;
+    use Akaunting\Money\Money;
+
     class KonfirmasiBankController extends Controller
     {
         public $user;
@@ -402,13 +405,12 @@
             }
 
             $fasilitas          = Fasilitas::where('nomor_cif',$request['cusNo'] )->where('status',1)->get();
+
             foreach ($fasilitas as $key3 => $val3) {
-                    $saldo1 = str_replace(',', '.',$val3->saldo);
-                    $saldo2 = str_replace('.', '',$saldo1);
                     $DataFasilitas[$key3]['jenis_fasilitas']      = $val3->jenis_fasilitas;
                     $DataFasilitas[$key3]['start_date']           = $val3->start_date;
                     $DataFasilitas[$key3]['mata_uang']            = $val3->mata_uang;
-                    $DataFasilitas[$key3]['saldo']                =  number_format($saldo2, 2, ',', '.') ?? '';;
+                    $DataFasilitas[$key3]['saldo']                = number_format(floatval($val3->saldo), 2, ',', '.');
                     $DataFasilitas[$key3]['jangka_waktu']         =  $val3->jangka_waktu;
                     $DataFasilitas[$key3]['fixed_rate']           =  $val3->fixed_rate ?? '';
                     $DataFasilitas[$key3]['due_date']             =  $val3->due_date ?? '';
@@ -647,4 +649,4 @@
    }
 
 
-    }
\ No newline at end of file
+    }
diff --git a/Resources/views/pages/index.blade.php b/Resources/views/pages/index.blade.php
index e4517fe..bf519ae 100644
--- a/Resources/views/pages/index.blade.php
+++ b/Resources/views/pages/index.blade.php
@@ -8,6 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="csrf-token" content="{{ csrf_token() }}" />
 
+
     <style>
         .bd-example-modal-lg .modal-dialog{
             display: table;
@@ -67,7 +68,7 @@
                                 <div class="col-sm-10">
                                     <input type="hidden" id="pastYear" value="{{$data['pastYear']}}">
                                     <input type="hidden" id="currentYear" value="{{$data['currentYear']}}">
-                                    <input type="text" class="form-control form-control-sm datepicker" name="startDate" clear id="startDate" placeholder="DD/MM/YYYY">
+                                    <input type="text" class="form-control form-control-sm datepicker" name="startDate" placeholder="DD/MM/YYYY">
                                 </div>
                                 {{-- <div class="col-sm-1">
                                    <label for="colFormLabelSm" class="col-form-label col-form-label-sm">S/D</label>
@@ -260,7 +261,7 @@
                      <div class="form-group row">
                         <label for="inputName" class="col-sm-4 col-form-label">Tgl Req Surat</label>
                         <div class="col-sm-8">
-                           <input type="text" class="form-control form-control-sm datepicker" name="tgl_req_surat"  placeholder="DD/MM/YYYY" onfocus="this.type='date'" onblur="this.type='text'" required>
+                           <input type="text" class="form-control form-control-sm datepicker" name="tgl_req_surat"  placeholder="DD/MM/YYYY" required>
                         </div>
                      </div>
                       <div class="form-group row">
@@ -328,8 +329,8 @@
                 var pasYear = $('#pastYear').val();
                 var currentYear = $('#currentYear').val();
 
+
                 $('.datepicker').flatpickr({
-                     enableTime: !0,
                      dateFormat: "d-m-Y",
                      minDate: pasYear,
                      maxDate: currentYear
@@ -567,6 +568,7 @@
                 });
             });
 
+
         </script>
     @endpush
 </x-default-layout>
diff --git a/Resources/views/pages/index_fasilitas.blade.php b/Resources/views/pages/index_fasilitas.blade.php
index 812110f..8ffb09f 100644
--- a/Resources/views/pages/index_fasilitas.blade.php
+++ b/Resources/views/pages/index_fasilitas.blade.php
@@ -132,7 +132,7 @@
                      <div class="form-group row">
                         <label for="inputName" class="col-sm-3 col-form-label">Balance</label>
                         <div class="col-sm-9">
-                           <input type="number" class="form-control form-control-sm " name="saldo" placeholder="Balance">
+                           <input type="text" class="form-control form-control-sm " name="saldo" placeholder="Balance">
                         </div>
                      </div>
                      <div class="form-group row">
@@ -265,7 +265,7 @@
                         </div>
                      </div>
                      <div class="form-group row">
-                        <label for="inputName" class="col-sm-3 col-form-label">Saldo</label>
+                        <label for="inputName" class="col-sm-3 col-form-label">Balance</label>
                         <div class="col-sm-9">
                            <input type="text" class="form-control form-control-sm " id="saldo" name="saldo_edit"
                               placeholder="Saldo">
@@ -275,14 +275,14 @@
                         <label for="inputName" class="col-sm-3 col-form-label">Start Date</label>
                         <div class="col-sm-9">
                            <input type="text" class="form-control form-control-sm datepicker" id="startDate" name="start_date_edit"
-                               placeholder="DD/MM/YYYY">>
+                               placeholder="DD/MM/YYYY">
                         </div>
                      </div>
                      <div class="form-group row">
                         <label for="inputName" class="col-sm-3 col-form-label">End Date</label>
                         <div class="col-sm-9">
                            <input type="text" class="form-control form-control-sm datepicker" id="dueDatae" name="due_date_edit"
-                              placeholder="DD/MM/YYYY" onfocus="this.type='date'" onblur="this.type='text'">>
+                              placeholder="DD/MM/YYYY">
                         </div>
                      </div>
                      <div class="form-group row">
@@ -317,9 +317,7 @@
       @push('customscript')
       <script>
       $(document).ready(function() {
-
         $('.datepicker').flatpickr({
-                enableTime: !0,
                 dateFormat: "d-m-Y"
         })
          // Open the modal when the "Open Modal" button is clicked
diff --git a/Resources/views/pages/index_signer.blade.php b/Resources/views/pages/index_signer.blade.php
index 5fff66a..a24db66 100644
--- a/Resources/views/pages/index_signer.blade.php
+++ b/Resources/views/pages/index_signer.blade.php
@@ -55,13 +55,14 @@
                      <div class="form-group row">
                         <label for="inputName" class="col-sm-4 col-form-label">Deputy Director</label>
                         <div class="col-sm-8">
-                           <input type="text" class="form-control form-control-sm " name="deputy_director" placeholder="Nama Deputy Director">
+                           <input type="text" class="form-control form-control-sm " name="deputy_director" placeholder="Nama Deputy Director" style="text-transform:uppercase">
                         </div>
                      </div>
                      <div class="form-group row">
                         <label for="inputName" class="col-sm-4 col-form-label">Executive Officer</label>
                         <div class="col-sm-8">
-                           <input type="text" class="form-control form-control-sm " name="executive_officer" placeholder="Nama Executive Officer">
+                           <input type="text" class="form-control form-control-sm " name="executive_officer" placeholder="Nama Executive Officer" id="executive_officer" style="text-transform:uppercase">
+                           <span id="note" style="color:darkred;display:none" ><small>Nama Tidak Boleh Sama .. !</small></span>
                         </div>
                      </div>
                       <div class="form-group row">
@@ -105,13 +106,14 @@
                         <label for="inputName" class="col-sm-4 col-form-label">Deputy Director</label>
                         <div class="col-sm-8">
                            <input type="hidden" class="form-control form-control-sm " name="id" placeholder="Nama Deputy Director">
-                           <input type="text" class="form-control form-control-sm " name="deputy_director" placeholder="Nama Deputy Director">
+                           <input type="text" class="form-control form-control-sm " name="deputy_director" placeholder="Nama Deputy Director" style="text-transform:uppercase">
                         </div>
                      </div>
                      <div class="form-group row">
                         <label for="inputName" class="col-sm-4 col-form-label">Executive Officer</label>
                         <div class="col-sm-8">
-                           <input type="text" class="form-control form-control-sm " name="executive_officer" placeholder="Nama Executive Officer">
+                           <input type="text" class="form-control form-control-sm " id="executive_officer2" name="executive_officer" placeholder="Nama Executive Officer" style="text-transform:uppercase">
+                           <span id="note2" style="color:darkred;display:none" ><small>Nama Tidak Boleh Sama .. !</small></span>
                         </div>
                      </div>
                       <div class="form-group row">
@@ -146,12 +148,45 @@
                     $("#myModalEditSigner").modal("hide");
                 });
 
+                 $('#executive_officer').on('keyup', function() {
+                        let deputy_eirector = $('input[name="deputy_director"]').val();
+                        let executive_officer = $(this).val();
+                        if (executive_officer == deputy_eirector ) {
+                           // alert('Penandatangan Tidak Boleh Sama');
+                            $('#executive_officer').css('border-color', 'red');
+                            $('#submitSigner').attr('disabled', 'disabled');
+                            $('#note').show();
+                        }else{
+                              $('#executive_officer').css('border-color', '');
+                              $('#submitSigner').attr('disabled', false);
+                              $('#note').hide();
+                        }
+                 });
+
+                 $('#executive_officer2').on('keyup', function() {
+                        let deputy_eirector = $('input[name="deputy_director"]').val().toUpperCase();
+                        let executive_officer = $(this).val();
+                        if (executive_officer == deputy_eirector ) {
+                            $('#executive_officer2').css('border-color', 'red');
+                            $('#submitFormUpdateSigner').attr('disabled', 'disabled');
+                            $('#note2').show();
+                        }else{
+                              $('#executive_officer2').css('border-color', '');
+                              $('#submitFormUpdateSigner').attr('disabled', false);
+                              $('#note2').hide();
+                        }
+                 });
+
                 // Handle form submission when the "Submit" button inside the modal is clicked
                 $("#submitSigner").click(function(e) {
                     // Serialize the form data
                     e.preventDefault();
-                    var formData = $("#formSigner").serialize();
-
+                     var formData = $("#formSigner").serialize();
+                    // var executive_officer =   $('input[name="executive_officer"]').val();
+                    // var deputy_director =   $('input[name="executive_officer"]').val();
+                    // if(executive_officer == deputy_director){
+                    //     alert();
+                    // }
                     // Send an AJAX request to the form submission route
                     $.ajax({
                     type: 'POST',