Merge branch 'atie' into 'main'

update 0108

See merge request online-sistem1/lelong!9

database/seeders/KaratSeeder.php

@@ -17,19 +17,19 @@ class KaratSeeder extends Seeder
         JenisKarat::create([
             'karat' => '24.0Kgb',
             'keterangan' => '999.00 Gold Bar',
-            'dariharga916' => 35
+            'dariharga916' => 12.86
         ]);
 
         JenisKarat::create([
             'karat' => '24.0K',
             'keterangan' => '999.00',
-            'dariharga916' => 30
+            'dariharga916' => 11.02
         ]);
 
         JenisKarat::create([
             'karat' => '23.0K',
             'keterangan' => '950.00',
-            'dariharga916' => 3
+            'dariharga916' => 1.10
         ]);
 
         JenisKarat::create([
@@ -41,43 +41,43 @@ class KaratSeeder extends Seeder
         JenisKarat::create([
             'karat' => '21.0K',
             'keterangan' => '900.00',
-            'dariharga916' => -25
+            'dariharga916' => -9.20
         ]);
 
         JenisKarat::create([
             'karat' => '20.0K',
             'keterangan' => '835.00',
-            'dariharga916' => -60
+            'dariharga916' => -22.06
         ]);
 
         JenisKarat::create([
             'karat' => '18.0Kp',
             'keterangan' => '750.00 putih',
-            'dariharga916' => -125
+            'dariharga916' => -45.96
         ]);
 
         JenisKarat::create([
             'karat' => '18.0K',
             'keterangan' => '750.00',
-            'dariharga916' => -125
+            'dariharga916' => -45.96
         ]);
 
         JenisKarat::create([
             'karat' => '14.0Kp',
             'keterangan' => '585.00 putih',
-            'dariharga916' => -252
+            'dariharga916' => -92.65
         ]);
 
         JenisKarat::create([
             'karat' => '14.0K',
             'keterangan' => '585.00',
-            'dariharga916' => -252
+            'dariharga916' => -92.65
         ]);
 
         JenisKarat::create([
             'karat' => '9.0K',
             'keterangan' => '375.00',
-            'dariharga916' => -380
+            'dariharga916' => -139.71
         ]);
 
         

database/seeders/RolesSeeder.php

@@ -115,6 +115,7 @@ class RolesSeeder extends Seeder
             'name' => 'notistamatkontrak',
             'description' => 'Notis 30 Hari Sebelum Tamat Kontrak'
         ]);
+        
 
         //account
         Permission::create([
@@ -168,6 +169,7 @@ class RolesSeeder extends Seeder
         $role6->givePermissionTo('pengesahanpembida');
         $role6->givePermissionTo('pengesahan');
         $role6->givePermissionTo('notistamatkontrak');
+        $role6->givePermissionTo('kemaskinihargaasas');
 
         $role7 = Role::create(['name' => 'account']);
         $role7->givePermissionTo('pengesahanbayaran');

resources/views/lelong/senaraimarhun.blade.php

@@ -141,7 +141,7 @@
             // "ordering": false,
             "info": false,
             "lengthChange": false,
-            "pageLength": 25,
+            "pageLength": 100000000,
             dom: 'Bfrtip',
             // buttons: [
             //     // 'copy', 'excel', 'pdf'

resources/views/pdf/marhundetails.blade.php

@@ -154,20 +154,3 @@ tr:nth-child(even) {
                       
                     
 </tbody>
-
-@foreach ($laporanpembida as $laporan)
-<tr>
-    <td>{{ $loop->iteration }} </td>
-    <td>{{ $laporan['norujukan'] }}</td>
-    <td>@foreach ($laporan['details'] as $item)
-      {{ $item['nilaimarhun'] }}<br>
-    @endforeach</td>
-    <td>@foreach ($laporan['details'] as $item)
-      {{ $item['nama_bidder'] }}<br>
-    @endforeach</td>
-    <td>@foreach ($laporan['details'] as $item)
-      {{ $item['hargabida'] }}<br>
-    @endforeach</td>  
-    <td>@foreach ($laporan['details'] as $item)
-      {{ $item['masa_bidaan'] }}<br>
-    @endforeach</td>   

resources/views/simulasi/senaraimarhunlel.blade.php

@@ -141,7 +141,7 @@
             // "ordering": false,
             "info": false,
             "lengthChange": false,
-            "pageLength": 25,
+            "pageLength": 10000000,
             dom: 'Bfrtip',
             // buttons: [
             //     // 'copy', 'excel', 'pdf'

resources/views/simulasi/senaraisimulasi.blade.php

@@ -17,7 +17,7 @@
                         <tr>
                             <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
                             <th>Tarikh Lelong</th>
-                            <th>Harga Emas Asas</th>
+                            <th>Cawangan</th>
                             <th>JBG</th>
                             <th>Caj Lelong</th>
                             <th class="text-center">Action</th>