diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index a042c98e..acefb60d 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -240,6 +240,7 @@ class LelongController extends Controller $lelong->cajlelong = $simulasi->cajlelong; $lelong->save(); + foreach($simkarat as $simulasikarat) { $lelkarat = new LelKarat; @@ -409,7 +410,7 @@ class LelongController extends Controller { $karat->karat = $karat->karat; $karat->keterangan = $karat->keterangan; - $karat->harga = $request->harga[$index]; + // $karat->harga = $request->harga[$index]; $karat->harga2 = $request->harga2[$index]; $karat->save(); } @@ -731,6 +732,7 @@ class LelongController extends Controller $keuntungan = $upah['bakipjm'] - ($upah['bakihargajualan'] - ($upah['upah12'] - $upah['ansakhir'])-(($upah['tempoh']-$upah['tempohbayar'])*$upah['kadarupah']/100*$upah['bakipjm']) ); $brglelong[$index1]['keuntungan'] = $keuntungan; + } @@ -744,6 +746,9 @@ class LelongController extends Controller $lelong_id = $request->lelongid; + $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->where('lelong.id', $lelong_id) + ->get(); $brglelong = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') ->where('lelongbid.lelong_id', $lelong_id) @@ -755,12 +760,14 @@ class LelongController extends Controller $totnilai_marhun=0; $tot_pinjaman=0; + + foreach($brglelong as $index1=>$upah) { $keuntungan = $upah['bakipjm'] - ($upah['bakihargajualan'] - ($upah['upah12'] - $upah['ansakhir']) - (($upah['tempoh']-$upah['tempohbayar'])*$upah['kadarupah']/100*$upah['bakipjm']) ); $brglelong[$index1]['keuntungan'] = $keuntungan; - + } $totharga_asas = $totharga_asas + ($upah->sum('hargaasas')); @@ -768,20 +775,54 @@ class LelongController extends Controller $totnilai_marhun = $totnilai_marhun + ($upah->sum('nilaimarhun')); $tot_pinjaman = $tot_pinjaman + ($upah->sum('pinjaman')); - - - $pdf = PDF::loadView('pdf.listlelong',compact('brglelong','totharga_asas','totkeuntungan','totnilai_marhun','tot_pinjaman')) - ->setPaper('a4', 'potrait'); + $pdf = PDF::loadView('pdf.listlelong',compact('brglelong','totharga_asas','totkeuntungan','totnilai_marhun','tot_pinjaman','lelong_id','lelongid')) + ->setPaper('a4', 'potrait'); - return $pdf->download('Senarai Lelong.pdf'); - - - + return $pdf->download('Senarai Lelong.pdf'); + } + public function lapbidaan (Request $request){ + + $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->get(); + + return view('lelong.laporanbidaanindex',compact('lelongid')); + } + + + public function senarailapbidaan ($lelong_id){ + + $arraydetails = []; + + $laporanpembida= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') + ->select('lelongbid_id','norujukan','hargaasas') + ->where('lelongbid.lelong_id','=',$lelong_id) + ->groupBy('lelongbid_id') + ->get() + ->toArray(); + + foreach($laporanpembida as $laporan) + { + $details = LelongBidder::where('lelongbid_id',$laporan['lelongbid_id']) + ->orderBy('hargabida','desc') + ->orderBy('masa_bidaan','asc') + ->get() + ->toArray(); + array_push($arraydetails,['laporan' => $laporan,'details' => $details]); + } + + return view('lelong.senarailapbidaan', compact('arraydetails')); + + + + } + + } \ No newline at end of file diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 32085359..e023c621 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -92,7 +92,7 @@ class SimulasiController extends Controller $simkarat->simulasi_id = $simulasi->id; $simkarat->karat = $item->karat; $simkarat->keterangan = $item->keterangan; - $simkarat->harga = ($hargaasas + ($item->dariharga916))/2.72; //gram + $simkarat->harga = ($hargaasas + ($item->dariharga916)); //gram $simkarat->harga2 = $hargaasas + ($item->dariharga916); //rial $simkarat->save(); } @@ -487,7 +487,7 @@ class SimulasiController extends Controller { $karat->karat = $karat->karat; $karat->keterangan = $karat->keterangan; - $karat->harga = $request->harga[$index]; + // $karat->harga = $request->harga[$index]; $karat->harga2 = $request->harga2[$index]; $karat->save(); } diff --git a/composer.json b/composer.json index d4d20a88..96ebe155 100644 --- a/composer.json +++ b/composer.json @@ -19,6 +19,7 @@ "spatie/laravel-permission": "^5.3" }, "require-dev": { + "barryvdh/laravel-debugbar": "^3.6", "facade/ignition": "^2.5", "fakerphp/faker": "^1.9.1", "laravel/sail": "^1.0.1", diff --git a/composer.lock b/composer.lock index 3ec90ca5..c9394a68 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2e5f0f0a7cad0c224615bb48a86d6a1b", + "content-hash": "1f26af21cdf299942137e16bdee7fbea", "packages": [ { "name": "asm89/stack-cors", @@ -7225,6 +7225,91 @@ } ], "packages-dev": [ + { + "name": "barryvdh/laravel-debugbar", + "version": "v3.6.7", + "source": { + "type": "git", + "url": "https://github.com/barryvdh/laravel-debugbar.git", + "reference": "b96f9820aaf1ff9afe945207883149e1c7afb298" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/b96f9820aaf1ff9afe945207883149e1c7afb298", + "reference": "b96f9820aaf1ff9afe945207883149e1c7afb298", + "shasum": "" + }, + "require": { + "illuminate/routing": "^6|^7|^8|^9", + "illuminate/session": "^6|^7|^8|^9", + "illuminate/support": "^6|^7|^8|^9", + "maximebf/debugbar": "^1.17.2", + "php": ">=7.2", + "symfony/debug": "^4.3|^5|^6", + "symfony/finder": "^4.3|^5|^6" + }, + "require-dev": { + "mockery/mockery": "^1.3.3", + "orchestra/testbench-dusk": "^4|^5|^6|^7", + "phpunit/phpunit": "^8.5|^9.0", + "squizlabs/php_codesniffer": "^3.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.6-dev" + }, + "laravel": { + "providers": [ + "Barryvdh\\Debugbar\\ServiceProvider" + ], + "aliases": { + "Debugbar": "Barryvdh\\Debugbar\\Facades\\Debugbar" + } + } + }, + "autoload": { + "files": [ + "src/helpers.php" + ], + "psr-4": { + "Barryvdh\\Debugbar\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "PHP Debugbar integration for Laravel", + "keywords": [ + "debug", + "debugbar", + "laravel", + "profiler", + "webprofiler" + ], + "support": { + "issues": "https://github.com/barryvdh/laravel-debugbar/issues", + "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.6.7" + }, + "funding": [ + { + "url": "https://fruitcake.nl", + "type": "custom" + }, + { + "url": "https://github.com/barryvdh", + "type": "github" + } + ], + "time": "2022-02-09T07:52:32+00:00" + }, { "name": "doctrine/instantiator", "version": "1.4.0", @@ -7794,6 +7879,72 @@ }, "time": "2021-11-05T08:25:44+00:00" }, + { + "name": "maximebf/debugbar", + "version": "v1.18.0", + "source": { + "type": "git", + "url": "https://github.com/maximebf/php-debugbar.git", + "reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6", + "reference": "0d44b75f3b5d6d41ae83b79c7a4bceae7fbc78b6", + "shasum": "" + }, + "require": { + "php": "^7.1|^8", + "psr/log": "^1|^2|^3", + "symfony/var-dumper": "^2.6|^3|^4|^5|^6" + }, + "require-dev": { + "phpunit/phpunit": "^7.5.20 || ^9.4.2", + "twig/twig": "^1.38|^2.7|^3.0" + }, + "suggest": { + "kriswallsmith/assetic": "The best way to manage assets", + "monolog/monolog": "Log using Monolog", + "predis/predis": "Redis storage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.17-dev" + } + }, + "autoload": { + "psr-4": { + "DebugBar\\": "src/DebugBar/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Maxime Bouroumeau-Fuseau", + "email": "maxime.bouroumeau@gmail.com", + "homepage": "http://maximebf.com" + }, + { + "name": "Barry vd. Heuvel", + "email": "barryvdh@gmail.com" + } + ], + "description": "Debug bar in the browser for php application", + "homepage": "https://github.com/maximebf/php-debugbar", + "keywords": [ + "debug", + "debugbar" + ], + "support": { + "issues": "https://github.com/maximebf/php-debugbar/issues", + "source": "https://github.com/maximebf/php-debugbar/tree/v1.18.0" + }, + "time": "2021-12-27T18:49:48+00:00" + }, { "name": "mockery/mockery", "version": "1.4.4", @@ -9734,6 +9885,74 @@ ], "time": "2020-09-28T06:39:44+00:00" }, + { + "name": "symfony/debug", + "version": "v4.4.37", + "source": { + "type": "git", + "url": "https://github.com/symfony/debug.git", + "reference": "5de6c6e7f52b364840e53851c126be4d71e60470" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/debug/zipball/5de6c6e7f52b364840e53851c126be4d71e60470", + "reference": "5de6c6e7f52b364840e53851c126be4d71e60470", + "shasum": "" + }, + "require": { + "php": ">=7.1.3", + "psr/log": "^1|^2|^3" + }, + "conflict": { + "symfony/http-kernel": "<3.4" + }, + "require-dev": { + "symfony/http-kernel": "^3.4|^4.0|^5.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Debug\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools to ease debugging PHP code", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/debug/tree/v4.4.37" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:41:36+00:00" + }, { "name": "theseer/tokenizer", "version": "1.2.1", diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index a768e1e7..d8812d1a 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -86,10 +86,7 @@
  • Senarai Lelong
    • -
  • - Laporan Senarai Lelong -
    • - + @endhasrole @hasrole('operasi') @@ -113,10 +110,7 @@
  • Senarai Lelong Tak Laku
    • -
  • - Laporan Senarai Lelong -
    • - +
  • @@ -142,6 +136,19 @@
    • +
  • + + + +
    • @endhasrole @hasrole('account') {{--
  • diff --git a/resources/views/lelong/laporanbidaanindex.blade.php b/resources/views/lelong/laporanbidaanindex.blade.php new file mode 100644 index 00000000..1d88ddfe --- /dev/null +++ b/resources/views/lelong/laporanbidaanindex.blade.php @@ -0,0 +1,73 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    + + + + + + + + + + + + + + @foreach ($lelongid as $bid) + + + + + + + + @endforeach + + +
    Lelong IDCawanganTarikh LelongAction
    {{ $bid->lelong_id}}{{ $bid->caw_name}}{{ $bid->tarikh_lelong }} + +
    +
    +
    + +
    +
    + + +@endsection diff --git a/resources/views/lelong/laporanlelong.blade.php b/resources/views/lelong/laporanlelong.blade.php index cc9309d9..b92c11dd 100644 --- a/resources/views/lelong/laporanlelong.blade.php +++ b/resources/views/lelong/laporanlelong.blade.php @@ -31,7 +31,6 @@ {{ $bid->caw_name}} {{ $bid->tarikh_lelong }} - {{-- --}} diff --git a/resources/views/lelong/lelongtaklaku.blade.php b/resources/views/lelong/lelongtaklaku.blade.php index d3780795..6b5d4604 100644 --- a/resources/views/lelong/lelongtaklaku.blade.php +++ b/resources/views/lelong/lelongtaklaku.blade.php @@ -10,7 +10,7 @@

    {{ $message }}

    @endif -
    + @@ -110,36 +110,20 @@ "lengthChange": false, "pageLength": 15, dom: 'Bfrtip', - // buttons: [ - // { - // className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw', - // text: '', - // titleAttr: 'Tambah Cawangan', - // action: function ( e, dt, node, config ) { - // // alert( 'Button activated' ); - // // console.log('hye'); - - // $('#myModal').modal("show"); - // $('#myModal').on('shown.bs.modal', function () { - // $('#rolename').trigger('focus') - // }) - // } - // }, - // { - // className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', - // titleAttr: 'Export to CSV', - // text: '', - // action: function ( e, dt, node, config ) { - // $("#exportform").submit(); - // } - // } - // ] + buttons: [ + + { + className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', + titleAttr: 'Export to CSV', + text: '', + action: function ( e, dt, node, config ) { + $("#exportform").submit(); + } + } + ] }); - // $('.addcaw').tooltip(); - // $('.export').tooltip(); - // // $( '.dt-buttons').addClass('btn-group'); - // $( '.addcaw').removeClass('dt-button'); - // $( '.export').removeClass('dt-button'); + $('.export').tooltip(); + $( '.export').removeClass('dt-button'); @endsection diff --git a/resources/views/lelong/senaraibrglelong.blade.php b/resources/views/lelong/senaraibrglelong.blade.php index 1a3482c4..502444d3 100644 --- a/resources/views/lelong/senaraibrglelong.blade.php +++ b/resources/views/lelong/senaraibrglelong.blade.php @@ -32,14 +32,14 @@ @foreach($brglelong as $brg) - - - - - - - - + + + + + + + + @endforeach @@ -78,7 +78,7 @@ buttons: [ - { + { className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', titleAttr: 'Download to PDF', text: '', diff --git a/resources/views/lelong/senarailapbidaan.blade.php b/resources/views/lelong/senarailapbidaan.blade.php new file mode 100644 index 00000000..bb94a9b7 --- /dev/null +++ b/resources/views/lelong/senarailapbidaan.blade.php @@ -0,0 +1,113 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + {{-- --}} + @csrf + + {{-- --}} + +
    {{ $loop->iteration }} {{ $brg['norujukan']}}{{$brg['hargaasas']}}{{ $brg['keuntungan'] }}{{ $brg['jbg']}}{{ $brg['nilaimarhun']}}{{ $brg['pinjaman']}}{{ $brg['marhun']}}{{ $loop->iteration }} {{ $brg['norujukan']}}{{$brg['hargaasas']}}{{ $brg['keuntungan'] }}{{ $brg['jbg']}}{{ $brg['nilaimarhun']}}{{ $brg['pinjaman']}}{{ $brg['marhun']}}
    + + + + + + + + + + + + @foreach ($arraydetails as $laporan) + + + + + + + + + + + + + @endforeach + + + + + {{-- + --}} + + +
    NoNo RujukanHarga AsasNama PembidaHarga BidaMasa Bida
    {{ $loop->iteration }}{{ $laporan['laporan']['norujukan']}}{{ $laporan['laporan']['hargaasas']}} + @foreach($laporan['details'] as $details) + {{ $details['nama_bidder']}}
    + @endforeach +     		+ @foreach($laporan['details'] as $details) + {{ $details['hargabida']}}
    + @endforeach +     		+ @foreach($laporan['details'] as $details) + {{ $details['masa_bidaan']}}
    + @endforeach +
    JUMLAH KESELURUHAN{{ number_format($tot_hargaasas, 2, '.', ',') }}
    +
    + Kembali +
    + + + + + +@endsection diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index 30292945..a8ced8f0 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -172,7 +172,7 @@ Karat Keterangan Harga - Harga + {{-- Harga --}} @@ -181,7 +181,7 @@ {{$karat->karat}} {{$karat->keterangan}} {{$karat->harga2}} - {{$karat->harga}} + {{-- {{$karat->harga}} --}} @endforeach @@ -243,14 +243,14 @@ $("td.input").each(function(index) { // console.log(index) var la = $(this).html(); - if(index%2 ==0 ) //even-0-2-4 - { + // if(index%2 ==0 ) //even-0-2-4 + // { $(this).html(""); - } - else //odd-1-3-5-7 - { - $(this).html(""); - } + // } + // else //odd-1-3-5-7 + // { + // $(this).html(""); + // } }) $("#hideform").show(); @@ -274,35 +274,35 @@ let jeniskarat = $(e).data('jeniskarat'); - let maxcolumn = 2; + // let maxcolumn = 2; let count = 0; let indexarray = 0; $("td.input").each(function(index) { if(hargaasasbaru) { $('#btnsimpan').prop('disabled', false) - if(index%2 == 0) - { - let harga1 = parseInt(hargaasasbaru); - let harga2 = parseInt(jeniskarat[indexarray]['dariharga916']); + // if(index%2 == 0) + // { + let harga1 = parseFloat(hargaasasbaru); + let harga2 = parseFloat(jeniskarat[indexarray]['dariharga916']); let newhargaasas = harga1 + (harga2); count++; $('#harga2'+index).val(newhargaasas.toFixed(2)); - } - else - { - let harga1 = parseInt(hargaasasbaru); - let harga2 = parseInt(jeniskarat[indexarray]['dariharga916']); - let newhargaasas = (harga1 + (harga2))/2.72;; - count++; - $('#harga'+index).val(newhargaasas.toFixed(2)); - } + // } + // else + // { + // let harga1 = parseFloat(hargaasasbaru); + // let harga2 = parseFloat(jeniskarat[indexarray]['dariharga916']); + // let newhargaasas = (harga1 + (harga2))/2.72;; + // count++; + // $('#harga'+index).val(newhargaasas.toFixed(2)); + // } - if(count == maxcolumn) - { - count = 0; + // if(count == maxcolumn) + // { + // count = 0; indexarray++; - } + // } } else { @@ -312,11 +312,11 @@ { $('#harga2'+index).val(dummy.toFixed(2)); } - else - { + // else + // { - $('#harga'+index).val(dummy.toFixed(2)); - } + // $('#harga'+index).val(dummy.toFixed(2)); + // } } }) diff --git a/resources/views/pdf/listlelong.blade.php b/resources/views/pdf/listlelong.blade.php index f5944d48..08af691f 100644 --- a/resources/views/pdf/listlelong.blade.php +++ b/resources/views/pdf/listlelong.blade.php @@ -80,7 +80,19 @@ tr:nth-child(even) { -

    + + +
    + + + @foreach ($lelongid as $tarikh) + + + @endforeach + +
    Lelong ID: {{$lelong_id}}Tarikh Lelong: {{ $tarikh->tarikh_lelong }}
    + +
    diff --git a/resources/views/pdf/marhundetails.blade.php b/resources/views/pdf/marhundetails.blade.php index 2419e9cd..c39ca0c6 100644 --- a/resources/views/pdf/marhundetails.blade.php +++ b/resources/views/pdf/marhundetails.blade.php @@ -85,14 +85,14 @@ tr:nth-child(even) { - + - + - + @@ -128,14 +128,12 @@ tr:nth-child(even) { - + - - {{-- --}} @endforeach @foreach ($arraycaw as $index=>$caw) @@ -147,8 +145,6 @@ tr:nth-child(even) { - - {{-- --}} @endforeach
    NoNo Rujukan No Rujukan Jenis Marhun Karat Berat(gm) Harga(RM)Nilai Marhun(RM)Nilai Marhun(RM) Harga Asas(RM)NotaNota
    Jumlah {{ number_format($marhun['berat'], 2, '.', ',') }} {{ number_format($marhun['nilaimarhun'], 2, '.', ',') }} {{ number_format($marhun['hargaasas'], 2, '.', ',') }} {{ number_format($total_hargaasas, 2, '.', ',') }}
    {{ number_format($total_nmarhun, 2, '.', ',') }} {{ number_format($total_hargaasas, 2, '.', ',') }} {{ number_format($total_hargaasas, 2, '.', ',') }}
    @@ -159,3 +155,19 @@ tr:nth-child(even) { +@foreach ($laporanpembida as $laporan) + + {{ $loop->iteration }} + {{ $laporan['norujukan'] }} + @foreach ($laporan['details'] as $item) + {{ $item['nilaimarhun'] }}
    + @endforeach + @foreach ($laporan['details'] as $item) + {{ $item['nama_bidder'] }}
    + @endforeach + @foreach ($laporan['details'] as $item) + {{ $item['hargabida'] }}
    + @endforeach + @foreach ($laporan['details'] as $item) + {{ $item['masa_bidaan'] }}
    + @endforeach \ No newline at end of file diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php index 22e3f250..2809c818 100644 --- a/resources/views/simulasi/showsimulasi.blade.php +++ b/resources/views/simulasi/showsimulasi.blade.php @@ -168,7 +168,6 @@ Karat Keterangan Harga - Harga @@ -177,7 +176,7 @@ {{$karat->karat}} {{$karat->keterangan}} {{$karat->harga2}} - {{$karat->harga}} + {{-- --}} @endforeach @@ -234,14 +233,14 @@ $("td.input").each(function(index) { // console.log(index) var la = $(this).html(); - if(index%2 ==0 ) //even-0-2-4 - { + // if(index%2 ==0 ) //even-0-2-4 + // { $(this).html(""); - } - else //odd-1-3-5-7 - { - $(this).html(""); - } + // } + // else //odd-1-3-5-7 + // { + // $(this).html(""); + // } }) $("#hideform").show(); @@ -264,49 +263,49 @@ let jeniskarat = $(e).data('jeniskarat'); - let maxcolumn = 2; + // let maxcolumn = 2; let count = 0; let indexarray = 0; $("td.input").each(function(index) { if(hargaasasbaru) { $('#btnsimpan').prop('disabled', false) - if(index%2 == 0) - { - let harga1 = parseInt(hargaasasbaru); - let harga2 = parseInt(jeniskarat[indexarray]['dariharga916']); + // if(index%2 == 0) + // { + let harga1 = parseFloat(hargaasasbaru); + let harga2 = parseFloat(jeniskarat[indexarray]['dariharga916']); let newhargaasas = harga1 + (harga2); count++; $('#harga2'+index).val(newhargaasas.toFixed(2)); - } - else - { - let harga1 = parseInt(hargaasasbaru); - let harga2 = parseInt(jeniskarat[indexarray]['dariharga916']); - let newhargaasas = (harga1 + (harga2))/2.72;; - count++; - $('#harga'+index).val(newhargaasas.toFixed(2)); - } + // } + // else + // { + // let harga1 = parseFloat(hargaasasbaru); + // let harga2 = parseFloat(jeniskarat[indexarray]['dariharga916']); + // let newhargaasas = (harga1 + (harga2));; + // count++; + // $('#harga2'+index).val(newhargaasas.toFixed(2)); + // } - if(count == maxcolumn) - { - count = 0; + // if(count == maxcolumn) + // { + // count = 0; indexarray++; - } + // } } else { $('#btnsimpan').prop('disabled', true) let dummy =0; - if(index%2 == 0) - { + // if(index%2 == 0) + // { $('#harga2'+index).val(dummy.toFixed(2)); - } - else - { + // } + // else + // { - $('#harga'+index).val(dummy.toFixed(2)); - } + // $('#harga'+index).val(dummy.toFixed(2)); + // } } }) diff --git a/routes/web.php b/routes/web.php index 2dfb140b..c2328241 100644 --- a/routes/web.php +++ b/routes/web.php @@ -78,27 +78,25 @@ Route::group(['middleware' => ['permission:sistem'],'prefix'=>'sistem'], functio Route::group(['prefix'=>'lelong'], function () { Route::group(['middleware' => ['permission:pendaftaranbatch']], function () { - Route::get('/create/{id}',['as'=>'lelong.create','uses'=>'LelongController@create']); - Route::get('/senarailelong',['as'=>'lelong.senarailelong','uses'=>'LelongController@index']); - Route::get('/senaraipemenang/{lelong_id}',['as'=>'lelong.senaraipemenang','uses'=>'LelongController@senaraipemenang']); - Route::get('/senaraisagpemenang/{user_id}/{lelong_id}',['as'=>'lelong.senaraisagpemenang','uses'=>'LelongController@senaraisagpemenang']); - Route::get('/senarailelongtaklaku',['as'=>'lelong.senarailelongtaklaku','uses'=>'LelongController@senarailelongtaklaku']); - Route::get('/lelongtaklaku/{lelong_id}',['as'=>'lelong.lelongtaklaku','uses'=>'LelongController@lelongtaklaku']); - Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']); - Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']); - Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']); - Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); - Route::get('/laporansenarailelong',['as'=>'lelong.laporansenarailelong','uses'=>'LelongController@laporansenarailelong']); - Route::get('/senaraibrglelong/{lelong_id}',['as'=>'lelong.senaraibrglelong','uses'=>'LelongController@senaraibrglelong']); - Route::post('/pdfsenarailelong',['as'=>'lelong.pdfsenarailelong','uses'=>'LelongController@pdfsenarailelong']); + Route::get('/create/{id}',['as'=>'lelong.create','uses'=>'LelongController@create']); + Route::get('/senarailelong',['as'=>'lelong.senarailelong','uses'=>'LelongController@index']); + Route::get('/senaraipemenang/{lelong_id}',['as'=>'lelong.senaraipemenang','uses'=>'LelongController@senaraipemenang']); + Route::get('/senaraisagpemenang/{user_id}/{lelong_id}',['as'=>'lelong.senaraisagpemenang','uses'=>'LelongController@senaraisagpemenang']); + Route::get('/senarailelongtaklaku',['as'=>'lelong.senarailelongtaklaku','uses'=>'LelongController@senarailelongtaklaku']); + Route::get('/lelongtaklaku/{lelong_id}',['as'=>'lelong.lelongtaklaku','uses'=>'LelongController@lelongtaklaku']); + Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']); + Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']); + Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']); + Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); + Route::get('/laporansenarailelong',['as'=>'lelong.laporansenarailelong','uses'=>'LelongController@laporansenarailelong']); + Route::get('/senaraibrglelong/{lelong_id}',['as'=>'lelong.senaraibrglelong','uses'=>'LelongController@senaraibrglelong']); + Route::post('/pdfsenarailelong',['as'=>'lelong.pdfsenarailelong','uses'=>'LelongController@pdfsenarailelong']); + Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']); + Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']); + Route::get('/lapbidaan', ['as'=>'lelong.lapbidaan','uses'=>'LelongController@lapbidaan']); + Route::get('/senarailapbidaan/{lelong_id}',['as' =>'lelong.senarailapbidaan','uses'=>'LelongController@senarailapbidaan']); - - - - Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']); - Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']); - }); Route::group(['middleware' => ['permission:pengesahanpembayaranpc']], function () { @@ -205,3 +203,5 @@ Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], f }); + + diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore new file mode 100644 index 00000000..d6b7ef32 --- /dev/null +++ b/storage/debugbar/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore