Merge branch 'kaunter' into 'new-super'

Kaunter

See merge request online-sistem1/kaunter!172

app/Audit.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Audit extends Model
+{
+    protected $table = 'audit';
+}

app/Http/Controllers/AliranTunaiController.php

@@ -483,7 +483,7 @@ class AliranTunaiController extends Controller
 
         if(strtoupper(Auth::user()->name) === 'LELONG'){
             $penebusanbarcodescanned = floatval($lelongan);
-            $bakisemasa = floatval($lelongan) - floatval($totalserahan);
+            $bakisemasa = floatval($bakiawal) + floatval($lelongan) - floatval($totalserahan);
         }else{
             $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
         }

app/Http/Controllers/CustomersController.php

@@ -12,6 +12,7 @@ use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Auth;
 use Twilio\Rest\Client;
+use App\Komoditi;
 
 use Carbon\Carbon;
 
@@ -52,12 +53,15 @@ class CustomersController extends Controller
         //     $customer_info = $customers_info;
         // }
 
+        $komoditi = Komoditi::first();
+        $min_komoditi = $komoditi['min_komoditi'];
+
         $bakilelong = Http::get(config('api.url') . '/api/bakilelong/cawangan/' . $auth_user['cawangan'] . '/' . Session::get('noic') . '/baki')->json();
         $rugilelong = Http::get(config('api.url') . '/api/bakilelong/cawangan/' . $auth_user['cawangan'] . '/' . Session::get('noic') . '/rugi')->json();
         
         $request->session()->forget('page_reload');
         $request->session()->forget('norujukan');
-        return view('customers.info',compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong'));
+        return view('customers.info',compact('cawangan_info','api_url','customer_info','bakilelong','rugilelong','min_komoditi'));
     }
 
     public function search(Request $request){

app/Http/Controllers/GadaianController.php

@@ -171,7 +171,8 @@ class GadaianController extends Controller
             'upah6' => $keuntungan6bulan,
             'upah12' => $keuntungan12bulan,
             'hargajualan' => $hargajualan,
-            'kuantiti_marhun' => $request->kuantiti_marhun
+            'kuantiti_marhun' => $request->kuantiti_marhun,
+            'transaction' => 'Daftar Gadai'
         ])->json();
 
         $komuditi = Http::put(config('api.url').'/api/komuditi/transaksi',[
@@ -214,7 +215,8 @@ class GadaianController extends Controller
             'upah6' => $keuntungan6bulan,
             'upah12' => $keuntungan12bulan,
             'hargajualan' => $hargajualan,
-            'kuantiti_marhun' => $request->kuantiti_marhun
+            'kuantiti_marhun' => $request->kuantiti_marhun,
+            'transaction' => 'Ubah Gadai'
         ])->json();
         $update_komuditi = Http::put(config('api.url').'/api/komuditi/update',[
             'unit_komuditi' => round($request->pinjaman, 2),

app/Http/Controllers/KhazanahController.php

@@ -953,7 +953,8 @@ class KhazanahController extends Controller
           ]);
 
         $deletepanjar = Http::post(config('api.url') . '/api/DeletePanjar/'. $auth_user['cawangan'],[
-            'recno' => $request->recno    
+            'recno' => $request->recno,
+            'users' => $auth_user['name']
         ])->json();
 
         $updateVault = Http::put( config('api.url').'/api/UpdateVault/DeletePanjar/'.$auth_user['cawangan'],[

app/Http/Controllers/KomuditiController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Http;
+use App\Komoditi;
 use PDF;
 
 class KomuditiController extends Controller
@@ -18,7 +19,9 @@ class KomuditiController extends Controller
         $auth_user = Auth::user();
         $api_url = config('api.url');
         $user_name = $auth_user['name'];
-        return view('operasi.komuditi.index',compact('user_name','api_url'));
+        $komoditi = Komoditi::first();
+        $min_komoditi = $komoditi['min_komoditi'];
+        return view('operasi.komuditi.index',compact('user_name','api_url','min_komoditi'));
     }
 
     public function cetakRekodKomoditi(){
@@ -42,4 +45,14 @@ class KomuditiController extends Controller
 
         return view('print.laporan_transaksi_komoditi',compact('rekod_print','tarikh_rekod'));
     }
+
+    public function komoditiUpdate(Request $request){
+
+        $komoditi = Komoditi::first();
+
+        $komoditi->min_komoditi = $request->komoditi_limit;
+        $komoditi->save();
+
+        return redirect()->route('komuditi');
+    }
 }

app/Komoditi.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Komoditi extends Model
+{
+    protected $table = 'komoditi_parameter';
+}

resources/views/customers/info.blade.php

@@ -416,7 +416,9 @@
 <script>
     var api_url = "<?php echo $api_url ?>";
     var kodcaw = "{{ $cawangan_info['kodcaw'] }}";
+    var min_komoditi = "{{ $min_komoditi }}";
     $('#daftar_gadai').on('click',function(){
+        $("#daftar_gadai").prop('disabled', true);
         var noic = $('#noic').val();
         var iclama = "{{ $customer_info['kplama'] }}";
         var icbaru = "{{ $customer_info['kpbaru'] }}";
@@ -432,13 +434,15 @@
                         title: 'Unit Komoditi Berbaki Minima',
                         text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komoditi'
                     });
+                    $("#daftar_gadai").prop('disabled', false);
                     event.preventDefault();
                     return false;
                 }else{
-                    if(Number(data['unit_komuditi']) < 50000){
+                    if(Number(data['unit_komuditi']) <= min_komoditi){
+                        $("#daftar_gadai").prop('disabled', false);
                         Swal.fire({
                             icon: 'error',
-                            title: 'Unit Komoditi Berbaki Minumum',
+                            title: 'Unit Komoditi Berbaki Minima',
                             text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komoditi'
                         });
                         event.preventDefault();
@@ -1690,6 +1694,9 @@
                                                         $.ajax({
                                                             method:'post',
                                                             url: api_url + '/api/removeupahlamatoday/' + kodcaw + '/' + id,
+                                                            data:{
+                                                                "teller" : "{{ Auth::user()->name }}"
+                                                            },
                                                             success:function(data){
                                                                
                                                                 if(data == 1)

resources/views/gadaian/edit.blade.php

@@ -450,7 +450,8 @@
             data: {
                 "_token": "{{ csrf_token() }}",
                 "norujukan" : norujuk,
-                "recno" : recnozz[1]
+                "recno" : recnozz[1],
+                "teller": "{{ Auth::user()->name }}"
             },
             success:function(data){
                 location.reload();
@@ -551,7 +552,8 @@
                     'harga' : harga_edit,
                     'n_marhun' : nilai_marhun_edit,
                     'marhun' : marhun_edit,
-                    'nota' : nota
+                    'nota' : nota,
+                    "teller": "{{ Auth::user()->name }}"
                 },
                 success:function(data){
                     getMarhun(norujukedit);
@@ -640,7 +642,8 @@
                                     'karat' : karat,
                                     'berat_emas' :berat_emas,
                                     'harga' : harga,
-                                    'nilai_marhun' : nilai_marhun
+                                    'nilai_marhun' : nilai_marhun,
+                                    'teller' : "{{ Auth::user()->name }}"
                                 },
                                 success:function(data){
                                     $('#nota').val('').trigger("change");
@@ -736,7 +739,8 @@
                                 'karat' : karat,
                                 'berat_emas' :berat_emas,
                                 'harga' : harga,
-                                'nilai_marhun' : nilai_marhun
+                                'nilai_marhun' : nilai_marhun,
+                                'teller' : "{{ Auth::user()->name }}"
                             },
                             success:function(data){
                                 $('#nota').val('').trigger("change");

resources/views/gadaian/index.blade.php

@@ -504,7 +504,8 @@
                                     'karat' : karat,
                                     'berat_emas' :berat_emas,
                                     'harga' : harga,
-                                    'nilai_marhun' : nilai_marhun
+                                    'nilai_marhun' : nilai_marhun,
+                                    'teller' : "{{ Auth::user()->name }}"
                                 },
                                 success:function(data){
                                     $("#tambah_marhun").prop('disabled', false);
@@ -615,7 +616,8 @@
                                 'karat' : karat,
                                 'berat_emas' :berat_emas,
                                 'harga' : harga,
-                                'nilai_marhun' : nilai_marhun
+                                'nilai_marhun' : nilai_marhun,
+                                'teller' : "{{ Auth::user()->name }}"
                             },
                             success:function(data){
                                 $("#tambah_marhun").prop('disabled', false);
@@ -1042,7 +1044,8 @@
             data: {
                 "_token": "{{ csrf_token() }}",
                 "norujukan" : norujuk,
-                "recno" : recnozz[1]
+                "recno" : recnozz[1],
+                "teller": "{{ Auth::user()->name }}"
             },
             success:function(data){
                 location.reload();
@@ -1123,7 +1126,8 @@
                     'harga' : harga_edit,
                     'n_marhun' : nilai_marhun_edit,
                     'marhun' : marhun_edit,
-                    'nota' : nota
+                    'nota' : nota,
+                    "teller": "{{ Auth::user()->name }}"
                 },
                 success:function(data){
                     getMarhun(norujukedit);

resources/views/homepage/khazanah/home.blade.php

@@ -159,7 +159,7 @@
                  <div class="row form-group justify-content-center">   
                  <div class="col-3 mx-1">    
                  <div class="row">    
-                <a href="#" disabled class="btn btn-info btn-lg btn-block mb-3">Dashboard</a>
+                <a href="{{ url('dashboard') }}" disabled class="btn btn-info btn-lg btn-block mb-3">Dashboard</a>
                  </div>
                 <div class="row">
                 <a href="{{ url('kakitangan') }}" class="btn btn-info btn-lg btn-block mb-3">Kakitangan</a>

resources/views/operasi/komuditi/index.blade.php

@@ -19,7 +19,7 @@
                         </div>
                     </div>
                     <div class="row form-group" id="maklumat_komuditi">
-                        <div class="col-md-4">
+                        <div class="col-md-5">
                             <div class="row form-group">
                                 <div class="col-md-4 text-right">No Sijil : </div>
                                 <div class="col-md-8"><span id="nosijil_span"></span></div>
@@ -28,8 +28,12 @@
                                 <div class="col-md-4 text-right">Harga : </div>
                                 <div class="col-md-8"><span id="harga_span"></span></div>
                             </div>
+                            <div class="row form-group">
+                                <div class="col-md-4 text-right">Limit Komoditi : </div>
+                                <div class="col-md-8">{{ 'RM ' . number_format($min_komoditi) }}</div>
+                            </div>
                         </div>
-                        <div class="col-md-8">
+                        <div class="col-md-7">
                             <div class="row form-group">
                                 <div class="col-md-4 text-right">Kod Produk / Diskripsi : </div>
                                 <div class="col-md-8"><span id="produk_span"></span></div>
@@ -48,12 +52,19 @@
                         <div class="col-12 text-center">
                             <p>Tiada Komoditi</p>
                         </div>
+                        <div class="col-md-5">
+                            <div class="row form-group">
+                                <div class="col-md-4 text-right">Limit Komoditi : </div>
+                                <div class="col-md-8">{{ 'RM ' . number_format($min_komoditi) }}</div>
+                            </div>
+                        </div>
                     </div>
                     <div class="row form-group justify-content-center">
                         <input type="hidden" value="{{ $user_name }}" id="user_name" name="user_name">
                         <button class="btn btn-primary mr-2" id="pembelian">Pembelian Komoditi</button>
                         <button class="btn btn-danger mr-2" id="penjualan">Penjualan Komoditi</button>
-                        <a class="btn btn-primary" href="{{ route('rekod.komoditi') }}">Rekod Transaksi Komoditi</a>
+                        <a class="btn btn-primary mr-2" href="{{ route('rekod.komoditi') }}">Rekod Transaksi Komoditi</a>
+                        <button class="btn btn-danger mr-2" id="limit_komoditi">Ubah Limit Komoditi</button>
                     </div>
                 </div>
             </div>
@@ -149,6 +160,36 @@
         </div>
     </div>
 </div>
+<div class="modal fade" id="limit_komoditi_modal" tabindex="-1" data-backdrop="static"  aria-labelledby="ModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+            <form action="{{ route('komoditi.limit') }}" method="post">
+                @csrf
+                <div class="modal-header">
+                    <h5 class="modal-title" id="ModalLabel">Ubah Limit Komoditi</h5>
+                </div>
+                <div class="modal-body">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <div class="row form-group">
+                                <div class="col-md-4">Limit Komoditi</div>
+                                <div class="col-md-8">
+                                    <input type="text" class="form-control" id="komoditi_limit" name="komoditi_limit">
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <div class="form-group row">
+                        <button type="submit" class="btn btn-primary mr-md-2" name="terima_komuditi_limit" id="terima_komuditi_limit">Sahkan</button>
+                        <button type="button" class="btn btn-danger" name="batal_komuditi_limit" id="batal_komuditi_limit" data-dismiss="modal">Batal</button>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
 <div class="modal fade" id="detail_komuditi" tabindex="-1" data-backdrop="static"  aria-labelledby="ModalLabel" aria-hidden="true">
     <div class="modal-dialog modal-dialog-centered">
         <div class="modal-content">
@@ -195,6 +236,10 @@
         $('#pembelian_modal').modal('show');
     });
 
+    $('#limit_komoditi').on('click',function(){
+        $('#limit_komoditi_modal').modal('show');
+    });
+
     $('#penjualan').on('click',function(){
         var nosijil = $('#nosijil_span').text();
         var baki_komoditi = $('#nilai_span').text();

resources/views/penebusan/index.blade.php

@@ -1294,7 +1294,7 @@
                 return false;
             }
 
-            if(separuhla > 70 && separuhla <= 75){
+            if(separuhla > 75 && separuhla < 80){
 
                 const swalWithBootstrapButtons = Swal.mixin({
                     customClass: {
@@ -1306,7 +1306,7 @@
 
                 swalWithBootstrapButtons.fire({
                     title: 'Dapatkan Pengesahan Khazanah',
-                    text: "Tetapan margin melebihi 70% untuk Khazanah!",
+                    text: "Tetapan margin melebihi 75% untuk Khazanah!",
                     icon: 'info',
                     showCancelButton: true,
                     confirmButtonText: 'Hantar',
@@ -1408,7 +1408,7 @@
                 event.preventDefault();
                 return false;  
 
-            }else if((separuhla > 75 && separuhla <= 80) || pinjamanbaru >= 10000){
+            }else if(pinjamanbaru >= 10000){
 
                     const swalWithBootstrapButtons = Swal.mixin({
                     customClass: {
@@ -1419,12 +1419,9 @@
                     });
 
                     let text = '';
-                    if(separuhla > 75 && separuhla <= 80)
+                    if(pinjamanbaru >= 10000)
                     {
-                    text  = 'Tetapan margin melebihi 75% untuk Operasi!';
+                        text  = 'Pembiayaan melebihi RM 10,000!';
-                    }else if(pinjamanbaru >= 10000)
-                    {
-                    text  = 'Pembiayaan melebihi RM 10,000!';
                     }
 
 
@@ -1441,10 +1438,7 @@
 
                         let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = separuhla;
                         let komen = '';
-                        if(separuhla > 75 && separuhla <= 80)
+                        if(pinjamanbaru >= 10000)
-                        {
-                            komen = "[Tebus Separuh] Pembiayaan Melebihi Margin" + pinjaman_pelulus + "%";
-                        }else if(pinjamanbaru >= 10000)
                         {
                             komen = "[Tebus Separuh] Pembiayaan Melebihi RM 10,000";
                         }
@@ -1579,7 +1573,7 @@
                 return false;
             }  
 
-            if(parseFloat($('#basic-hargaemas').text()) > 70 && parseFloat($('#basic-hargaemas').text()) <= 75){
+            if(parseFloat($('#basic-hargaemas').text()) > 75 && parseFloat($('#basic-hargaemas').text()) < 80){
                 const swalWithBootstrapButtons = Swal.mixin({
                     customClass: {
                         confirmButton: 'btn btn-success',
@@ -1590,7 +1584,7 @@
 
                 swalWithBootstrapButtons.fire({
                     title: 'Dapatkan Pengesahan Khazanah',
-                    text: "Tetapan margin melebihi 70% untuk Khazanah!",
+                    text: "Tetapan margin melebihi 75% untuk Khazanah!",
                     icon: 'info',
                     showCancelButton: true,
                     confirmButtonText: 'Hantar',
@@ -1692,7 +1686,7 @@
                 event.preventDefault();
                 return false;  
 
-            }else if((parseFloat($('#basic-hargaemas').text()) > 75 && parseFloat($('#basic-hargaemas').text()) <= 80) || pinjamanbaru >= 10000){
+            }else if( pinjamanbaru >= 10000){
 
                 const swalWithBootstrapButtons = Swal.mixin({
                     customClass: {
@@ -1703,10 +1697,7 @@
                 });
 
                 let text = '';
-                if((parseFloat($('#basic-hargaemas').text()) > 75 && parseFloat($('#basic-hargaemas').text()) <= 80))
+                if(pinjamanbaru >= 10000)
-                {
-                    text  = 'Tetapan margin melebihi 75% untuk Operasi!';
-                }else if(pinjamanbaru >= 10000)
                 {
                     text  = 'Pembiayaan melebihi RM 10,000!';
                 }
@@ -1725,10 +1716,7 @@
                     
                         let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-hargaemas').text();
                         let komen = '';
-                        if((parseFloat($('#basic-hargaemas').text()) > 75 && parseFloat($('#basic-hargaemas').text()) <= 80))
+                        if(pinjamanbaru >= 10000)
-                        {
-                            komen = "[Tambah Pinjaman] Pembiayaan Melebihi Margin " + pinjaman_pelulus + "%";
-                        }else if(pinjamanbaru >= 10000)
                         {
                             komen = "[Tambah Pinjaman] Pembiayaan Melebihi RM 10,000";
                         }
@@ -1852,8 +1840,8 @@
             var pinjaman = "{{ $gadai['pinjaman']}}";
             var ansuran = 0;
             var addpinjaman = 0;
-            var bakipinjaman = $('#perludibayar').val().replace(/[^0-9.-]+/g,"");
+            var bakipinjaman = parseFloat($('#perludibayar').val().replace(/[^0-9.-]+/g,"")).toFixed(2);
-            var bakiupah = $('#jumlahupah').val().replace(/[^0-9.-]+/g,"");
+            var bakiupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,"")).toFixed(2);
             var historygadaian = 0;
             var marhun = "{{ $gadai['marhun'] }}";
             var nowakil = nw;
@@ -1981,7 +1969,7 @@
                                 return false;
                             }
 
-                            if(marginsemasa > 70 && marginsemasa <= 75){
+                            if(marginsemasa > 75 && marginsemasa <= 80){
 
                                 const swalWithBootstrapButtons = Swal.mixin({
                                     customClass: {
@@ -1993,7 +1981,7 @@
 
                                 swalWithBootstrapButtons.fire({
                                     title: 'Dapatkan Pengesahan Khazanah',
-                                    text: "Tetapan margin melebihi 70% untuk Khazanah!",
+                                    text: "Tetapan margin melebihi 75% untuk Khazanah!",
                                     icon: 'info',
                                     showCancelButton: true,
                                     confirmButtonText: 'Hantar',
@@ -2094,7 +2082,7 @@
                                 event.preventDefault();
                                 return false;  
 
-                            }else if((marginsemasa > 75 && marginsemasa <= 80) || pinjaman_baru >= 10000){
+                            }else if(pinjaman_baru >= 10000){
 
                                 const swalWithBootstrapButtons = Swal.mixin({
                                 customClass: {
@@ -2105,10 +2093,7 @@
                                 });
 
                                 let text = '';
-                                if(marginsemasa > 75 && marginsemasa <= 80)
+                                if(pinjaman_baru >= 10000)
-                                {
-                                    text  = 'Tetapan margin melebihi 75% untuk Operasi!';
-                                }else if(pinjaman_baru >= 10000)
                                 {
                                     text  = 'Pembiayaan melebihi RM 10,000!';
                                 }
@@ -2127,10 +2112,7 @@
 
                                         let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = marginsemasa;
                                         let komen = '';
-                                        if(marginsemasa > 75 && marginsemasa <= 80)
+                                        if(pinjamanbaru >= 10000)
-                                        {
-                                            komen = "[Auto Tawarruq] Pembiayaan Melebihi Margin " + pinjaman_pelulus + "%";
-                                        }else if(pinjamanbaru >= 10000)
                                         {
                                             komen = "[Auto Tawarruq] Pembiayaan Melebihi RM 10,000";
                                         }

routes/web.php

@@ -249,6 +249,7 @@ Route::get('kakitangan/tukar_taraf',['as'=>'kakitangan.tukartaraf','uses'=>'Kaki
 Route::post('kakitangan/tukar_taraf/update',['as'=>'kakitangan.tukartaraf.update','uses'=>'KakitanganController@tukartarafUpdate'])->middleware('auth','operasi');
 Route::get('kakitangan/tukar_cawangan',['as'=>'kakitangan.tukarcawangan','uses'=>'KakitanganController@tukarcawangan'])->middleware('auth','operasi');
 Route::post('kakitangan/tukar_cawangan/update',['as'=>'kakitangan.tukarcawangan.update','uses'=>'KakitanganController@tukarcawanganUpdate'])->middleware('auth','operasi');
+Route::post('operasi/komoditi/limit',['as'=>'komoditi.limit','uses'=>'KomuditiController@komoditiUpdate'])->middleware('auth','operasi');
 
 Route::get('/operasi/margin',['as'=>'operasi.margin','uses'=>'OperasiController@margin'])->middleware('auth','operasi');