From 617607ba75e24f6190c3e6e10db56512a15d2031 Mon Sep 17 00:00:00 2001 From: Amir Hamzan <62345746+amirhamzan@users.noreply.github.com> Date: Wed, 19 Jan 2022 16:58:58 +0800 Subject: [PATCH] fix ui *delete arrahn fx --- .../views/includes/analisaportal.blade.php | 17 +- .../includes/bayaran/pembayaransag.blade.php | 141 +++++++++++------ .../bayaran/senaraibayaransag.blade.php | 102 ++---------- resources/views/includes/home.blade.php | 2 +- .../views/includes/main/footerwhite.blade.php | 145 ++++++------------ .../views/includes/rekod/rekodsag.blade.php | 36 +++-- resources/views/layouts/indexthird.blade.php | 2 +- resources/views/modal/marhun.blade.php | 68 ++++---- .../pembayaran/result/berjayaportal.blade.php | 1 + 9 files changed, 222 insertions(+), 292 deletions(-) diff --git a/resources/views/includes/analisaportal.blade.php b/resources/views/includes/analisaportal.blade.php index 0f42060..03b5aec 100644 --- a/resources/views/includes/analisaportal.blade.php +++ b/resources/views/includes/analisaportal.blade.php @@ -169,7 +169,7 @@ pattern-lines
-
+
@@ -180,7 +180,7 @@
- +
@@ -203,21 +203,18 @@ -
+

Harga Emas

- {{--
- See all -
--}}
-
No. SAG
+
@@ -273,14 +270,15 @@ var hargaemastable = $('#harga_emas').DataTable({ "bLengthChange": false, "bFilter": false, - "paging": false, "pagingType": "simple", language: { 'paginate': { 'previous': '', 'next': '' } - } + }, + "scrollX": true, + "pageLength": 5 }); @@ -288,6 +286,7 @@ "bLengthChange": false, "bFilter": false, "pageLength": 5, + "scrollX": true, "pagingType": "simple", language: { 'paginate': { diff --git a/resources/views/includes/bayaran/pembayaransag.blade.php b/resources/views/includes/bayaran/pembayaransag.blade.php index 37c9e1d..0f236fe 100644 --- a/resources/views/includes/bayaran/pembayaransag.blade.php +++ b/resources/views/includes/bayaran/pembayaransag.blade.php @@ -14,13 +14,6 @@ @csrf
-

Home /Pembayaran /

@@ -44,29 +37,11 @@
-
-
-
- -
-
-
+
-
- + -
+
-
Karat
+
@@ -143,7 +118,7 @@ - + @php $counter = 1;$jenisbayaran = 'tawarruq'; @endphp @@ -200,7 +175,8 @@ -
+ + + + +
+ --> + + +
+
+
+
+
+

Ringkasan Pembayaran

+ +
+
+
+ +
+
+
NoB. Pembiayaan Tempoh KeuntunganBayaranBayaran
+ + + + + + + + @php $counter = 1; + @endphp + + @foreach($arraybayar as $index=>$bayar) + @if($bayar['hargajualan'] != '') + + + + + + + + + @php + $counter++; + @endphp + @endif + @endforeach +
NoNo RujukanBayaran
+ {{ $counter }} + + {{ $bayar['norujukan'] }} + + +
+
+
+
+
+ +
+ +
+ RM 0.00 +
+
+
+ +
+ + +
@@ -284,7 +315,9 @@ 'previous': '', 'next': '' } - } + }, + "scrollX": true, + "pageLength": 10 }); var selepastawarruqtable = $('#selepas_tawarruq').DataTable({ @@ -296,8 +329,20 @@ 'previous': '', 'next': '' } - } + }, + "scrollX": true, + "pageLength": 10, + "pagingType": "simple", + "paging": false + }); + // var selepastawarruqtable = $('#ringkasan_bayaran').DataTable({ + // "bLengthChange": false, + // "bFilter": false, + // "bInfo": false, + + // "scrollX": true, + // }); function validateform() { return false; diff --git a/resources/views/includes/bayaran/senaraibayaransag.blade.php b/resources/views/includes/bayaran/senaraibayaransag.blade.php index bb5fd8a..efeb303 100644 --- a/resources/views/includes/bayaran/senaraibayaransag.blade.php +++ b/resources/views/includes/bayaran/senaraibayaransag.blade.php @@ -38,16 +38,11 @@
-
+
  • - - person Ar-Rahn - -
    • -
  • - + dashboard Tawarruq
    • @@ -63,84 +58,11 @@
    -
    + +
    +
    - - - - - - - - - - - - - @foreach($belum_tebus as $index=>$bt) - @if($bt['hargajualan'] == '') - @php - - $koskeuntungan = Http::get(config('api.url') . '/api/upahbukantawarruq/' . $bt['kodcaw'] . '/' . $bt['norujukan'])->json(); - $searchonline = Http::get(config('api.url') . '/portal/searchsagonline/',['norujukan' => $bt['norujukan']])->json(); - - $searchLelong = Http::get(config('api.url').'/api/search/lelong',[ - 'kodcaw' => $bt['kodcaw'], - 'norujukan' => $bt['norujukan'] - ])->json(); - - $tarikh_hari_ini = Carbon\Carbon::now()->toDateString(); - - if($searchLelong){ - $t_lelong = Carbon\Carbon::parse($searchLelong['t_lelong'].' 00:00:00'); - $tarikhini = Carbon\Carbon::parse($tarikh_hari_ini.' 00:00:00'); - $diff=date_diff($tarikhini,$t_lelong); - $diff = (int)$diff->format("%R%a"); - if($diff <= 2){ // 'messageamaran'=>'Rekod Gadaian Dalam Proses Lelong, Sila Hadir ke Cawangan.' - }elseif($searchLelong['t_jual'] != null && $searchLelong['hargajual'] != 0.00){ - // 'messageamaran'=>'Rekod Gadaian Telah Dilelong.' - } - } - @endphp - - - - - - - - - - @endif - @endforeach - -
    #No RujukanPembiayaanTempoh SimpanUpah telah bayarUpah semasa
    - - -
    -
    - @php - $marhun = Http::get(config('api.url') . '/api/marhun/' . $bt['norujukan'] )->json(); - @endphp - {{ $bt['norujukan'] }} -
    -
    -     		- {{ number_format($bt['pinjaman'],2) }} - - {{ number_format($bt['tempoh'],2) }} - - {{ number_format($bt['telahbayar'],2) }} - - {{ number_format($koskeuntungan,2) }} -
    -
    -
    -
    - - -
    - +
    @@ -239,19 +161,25 @@ 'previous': '', 'next': '' } - } + }, + "pageLength": 10, + "scrollX": true + }); var selepastawarruqtable = $('#selepas_tawarruq').DataTable({ "bLengthChange": false, "bFilter": true, - "paging" : false, + "paging" : true, + "pagingType": "simple", language: { 'paginate': { 'previous': '', 'next': '' } - } + }, + "scrollX": true, + "pageLength": 10 }); $("input[type='checkbox'][name='chkboxsag[]']").click(function() { diff --git a/resources/views/includes/home.blade.php b/resources/views/includes/home.blade.php index 2746f9a..645e3af 100644 --- a/resources/views/includes/home.blade.php +++ b/resources/views/includes/home.blade.php @@ -99,7 +99,7 @@
    - Gold? + Gold
    diff --git a/resources/views/includes/main/footerwhite.blade.php b/resources/views/includes/main/footerwhite.blade.php index f027c6e..2fda6fd 100644 --- a/resources/views/includes/main/footerwhite.blade.php +++ b/resources/views/includes/main/footerwhite.blade.php @@ -1,136 +1,85 @@
    #
    @@ -82,14 +81,14 @@
    -
    +
    -->
    Tawarruq
    -
    +
    @@ -142,14 +141,14 @@
    -
    +
    Penyata Terdahulu
    -
    No Rujukan
    +
    @@ -218,7 +217,9 @@ 'previous': '', 'next': '' } - } + }, + "scrollX": true + }); var selepastawarruqtable = $('#selepas_tawarruq').DataTable({ @@ -235,7 +236,10 @@ 'previous': '', 'next': '' } - } + }, + + "scrollX": true + }); var sudahtebustable = $('#saghistory').DataTable({ @@ -248,7 +252,9 @@ 'previous': '', 'next': '' } - } + }, + "scrollX": true + }); diff --git a/resources/views/layouts/indexthird.blade.php b/resources/views/layouts/indexthird.blade.php index 05a362c..869a55c 100644 --- a/resources/views/layouts/indexthird.blade.php +++ b/resources/views/layouts/indexthird.blade.php @@ -7,7 +7,7 @@ @include('includes.main.navigation') -
    +
    @yield('content')
    diff --git a/resources/views/modal/marhun.blade.php b/resources/views/modal/marhun.blade.php index 8195a70..f4f8ecb 100644 --- a/resources/views/modal/marhun.blade.php +++ b/resources/views/modal/marhun.blade.php @@ -2,48 +2,50 @@
    - +
    -

    Senarai Marhun

    - +
    Senarai Marhun
    +
    - +
    -
    No Rujukan
    - - - - - - - - - - - - - - +
    +
    BilJenis MarhunBeratKaratNilai MarhunNota
    dassaddassad
    + + + + + + + + + + + + + + - + - + - + - + - - -
    BilJenis MarhunBeratKaratNilai MarhunNota
    dassaddassaddassaddassaddassaddassaddassaddassaddassaddassad
    -
    + + + +
    +
    - -
    - -
    + +
    + +
    -
    -
    +
    +
\ No newline at end of file diff --git a/resources/views/pembayaran/result/berjayaportal.blade.php b/resources/views/pembayaran/result/berjayaportal.blade.php index 12dcbf2..6c905e6 100644 --- a/resources/views/pembayaran/result/berjayaportal.blade.php +++ b/resources/views/pembayaran/result/berjayaportal.blade.php @@ -2,6 +2,7 @@ @section('content') +Pembayaran Berjaya | Customer Portal