KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'faiqahzaman'

Browse Source
This commit is contained in:
Azfar Arsyad
2022-03-01 12:56:43 +08:00
parent 5a44139242 a4799d8c60
commit 287bc7d0f4
10 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
-2
View File
@@ -296,8 +296,6 @@ class LelongController extends Controller
$lelongbid->baki =$simulasibid->baki;
$lelongbid->berat =$simulasibid->berat;
$lelongbid->marhun =$simulasibid->marhun;
$lelongbid->gst_hj =$simulasibid->gst_hj;
$lelongbid->gst_cl =$simulasibid->gst_cl;
$lelongbid->percent =$simulasibid->percent;
$lelongbid->status_jual =$simulasibid->status_jual;
$lelongbid->status_payment =$simulasibid->status_payment;
app/Http/Controllers/SimulasiController.php
+7 -11
View File
@@ -123,19 +123,17 @@ class SimulasiController extends Controller
$simulasibid->hargajual = 0.00;
$simulasibid->jbg = $data->jbg;
$simulasibid->kadarupah = $data->kadarupah;
$simulasibid->upahsimpan = $data->upahsimpan;
$simulasibid->upahsimpan = $data->upahSim;
$simulasibid->ansuran = $data->ansuran;
$simulasibid->nilaimarhun = $data->nilaimarhun;
$simulasibid->pinjaman = $data->pinjaman;
$simulasibid->bakiupah = $data->bakiupah;
$simulasibid->cajlain = $data->cajlain;
$simulasibid->cajlelong = 0.00;
$simulasibid->baki = $data->baki;
$simulasibid->baki = 0.00;
$simulasibid->berat = $data->berat;
$simulasibid->marhun = $data->marhun;
$simulasibid->gst_hj = $data->gst_hj;
$simulasibid->gst_cl = $data->gst_cl;
$simulasibid->percent = $data->percent;
$simulasibid->percent = $data->percentpinj;
$simulasibid->status_jual = 0;
$simulasibid->status_payment = 0;
$simulasibid->mora_upah = 0;
@@ -143,7 +141,7 @@ class SimulasiController extends Controller
$sumhargaasas = 0;
$berat = 0;
$gadaimarhun = GadaiMarhun::where('gadai_id','=',$data->id)->get();
$gadaimarhun = GadaiMarhun::where('norujukan','=',$data->norujukan)->get();
foreach($gadaimarhun as $marhun)
{
$simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get();
@@ -209,7 +207,7 @@ class SimulasiController extends Controller
$simulasibid->hargajual = 0.00;
$simulasibid->jbg = $data->jbg;
$simulasibid->kadarupah = $data->kadarupah;
$simulasibid->upahsimpan = $data->upahsimpan;
$simulasibid->upahsimpan = $data->upahSim;
$simulasibid->ansuran = $data->ansuran;
$simulasibid->nilaimarhun = $data->nilaimarhun;
$simulasibid->pinjaman = $data->pinjaman;
@@ -219,9 +217,7 @@ class SimulasiController extends Controller
$simulasibid->baki = $data->baki;
$simulasibid->berat = $data->berat;
$simulasibid->marhun = $data->marhun;
$simulasibid->gst_hj = $data->gst_hj;
$simulasibid->gst_cl = $data->gst_cl;
$simulasibid->percent = $data->percent;
$simulasibid->percent = $data->percentpinj;
$simulasibid->status_jual = 0;
$simulasibid->status_payment = 0;
$simulasibid->mora_upah = 0;
@@ -229,7 +225,7 @@ class SimulasiController extends Controller
$sumhargaasas = 0;
$berat = 0;
$gadaimarhun = GadaiMarhun::where('gadai_id','=',$data->id)->get();
$gadaimarhun = GadaiMarhun::where('norujukan','=',$data->norujukan)->get();
foreach($gadaimarhun as $marhun)
{
$simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get();
app/Models/Gadai.php
-2
View File
@@ -25,8 +25,6 @@ class Gadai extends Model
'baki',
'berat',
'marhun',
'gst_hj',
'gst_cl',
'percent',
'mora_upah',
't_gadai',
app/Models/GadaiMarhun.php
+1 -1
View File
@@ -12,7 +12,7 @@ class GadaiMarhun extends Model
protected $table = 'gadaimarhun';
protected $fillable = [
'gadai_id',
'norujukan',
'bil',
'marhun',
'nota',
app/Models/LelongBid.php
-2
View File
@@ -31,8 +31,6 @@ class LelongBid extends Model
'baki',
'berat',
'marhun',
'gst_hj',
'gst_cl',
'percent',
'status_jual',
'status_payment',
app/Models/SimulasiBid.php
-2
View File
@@ -31,8 +31,6 @@ class SimulasiBid extends Model
'baki',
'berat',
'marhun',
'gst_hj',
'gst_cl',
'percent',
'status_jual',
'status_payment',
database/migrations/2021_12_14_041545_create_simulasis_table.php
-2
View File
@@ -69,8 +69,6 @@ class CreateSimulasisTable extends Migration
$table->decimal('baki', $precision = 9, $scale = 2);
$table->decimal('berat', $precision = 7, $scale = 2);
$table->string('marhun');
$table->decimal('gst_hj', $precision = 7, $scale = 2);
$table->decimal('gst_cl', $precision = 7, $scale = 2);
$table->decimal('percent', $precision = 7, $scale = 2);
$table->integer('status_jual');
$table->integer('status_payment');
database/migrations/2021_12_14_041557_create_lelongs_table.php
-2
View File
@@ -72,8 +72,6 @@ class CreateLelongsTable extends Migration
$table->decimal('baki', $precision = 9, $scale = 2);
$table->decimal('berat', $precision = 7, $scale = 2);
$table->string('marhun');
$table->decimal('gst_hj', $precision = 7, $scale = 2);
$table->decimal('gst_cl', $precision = 7, $scale = 2);
$table->decimal('percent', $precision = 7, $scale = 2);
$table->string('status_jual');
$table->string('status_payment');
resources/views/pembayaran/kaunterpembayaran.blade.php
+3
View File
@@ -46,8 +46,11 @@
@endforeach
</tbody>
</table>
<div class="modal-footer" style="margin-top:2%;">
<a href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="btn btn-primary">Kembali</a>
</div>
</div>
</div>
</div>
<script>
resources/views/pembida/senaraipembida.blade.php
+4 -5
View File
@@ -36,16 +36,15 @@
<td>{{ $user->notelbimbit }}</td>
<td>{{ $user->email }}</td>
<td>
@if ($user->status =='active')
<!-- @if ($user->status =='active')
<button class="btn btn-success btn-sm hovernone-success" disabled>{{$user->status}}</button>
@elseif ($user->status =='banned')
<button class="btn btn-danger btn-sm hovernone-danger" disabled>{{$user->status}}</button>
@endif
@endif -->
Menunggu Pengesahan Operasi
</td>
<td class="text-center">
<a href="{{ route('pembida.show',$user->id) }}"><i class="fas fa-check"></i></a>
{{-- <a class="confirmdel" href="{{ route('pengguna.delete',$user->id) }}"><i class="far fa-trash-alt"></i></a> --}}
<a href="{{ route('pembida.show',$user->id) }}"><i class="fas fa-edit"></i></a>
</td>
</tr>
@endforeach