Revisi tampilan yang typo
This commit is contained in:
parent
48dabaef9c
commit
16a9f17c88
@ -19,8 +19,7 @@ class UserRefundController extends Controller
|
||||
return view('user.refund.index', [
|
||||
'refunds' => Refund::join('transactions', 'refunds.transaction_id', '=', 'transactions.id')
|
||||
->where('transactions.pembeli', auth()->user()->email)
|
||||
->select('refunds.*')
|
||||
->get()
|
||||
->select()
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
@ -15,11 +15,14 @@ use App\Models\User;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Support\Facades\Http;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
use Ramsey\Uuid\Uuid;
|
||||
use Midtrans\Config;
|
||||
use Midtrans\Snap;
|
||||
use Midtrans\Transaction as Trans;
|
||||
use Stichoza\GoogleTranslate\GoogleTranslate;
|
||||
use Throwable;
|
||||
|
||||
class UserTransactionController extends Controller
|
||||
{
|
||||
@ -179,30 +182,33 @@ class UserTransactionController extends Controller
|
||||
$snap_token = Snap::getSnapToken($params);
|
||||
$token = $snap_token;
|
||||
$status = 'created';
|
||||
$query = Transaction::create([
|
||||
'id' => $id,
|
||||
'pembeli' => $pembeli,
|
||||
'penjual' => $penjual,
|
||||
'nama_barang' => $nama_barang,
|
||||
'deskripsi_transaksi' => $deskripsi_transaksi,
|
||||
'satuan_barang' => $satuan_barang,
|
||||
'harga_barang' => $harga_barang,
|
||||
'jumlah_barang' => $jumlah_barang,
|
||||
'persentase_keuntungan' => $persentase_keuntungan,
|
||||
'total_keuntungan' => $total_keuntungan,
|
||||
'total_harga' => $total_harga,
|
||||
'total_bayar' => $total_bayar,
|
||||
'token' => $token,
|
||||
'status' => $status,
|
||||
'batas_pembayaran' => $batas_pembayaran,
|
||||
'batas_pengiriman_barang_awal' => $batas_pengiriman_barang_awal,
|
||||
'batas_pengiriman_barang_akhir' => $batas_pengiriman_barang_akhir,
|
||||
]);
|
||||
|
||||
if ($query) {
|
||||
try{
|
||||
DB::beginTransaction();
|
||||
|
||||
$query = Transaction::create([
|
||||
'pembeli' => $pembeli,
|
||||
'penjual' => $penjual,
|
||||
'nama_barang' => $nama_barang,
|
||||
'deskripsi_transaksi' => $deskripsi_transaksi,
|
||||
'satuan_barang' => $satuan_barang,
|
||||
'harga_barang' => $harga_barang,
|
||||
'jumlah_barang' => $jumlah_barang,
|
||||
'persentase_keuntungan' => $persentase_keuntungan,
|
||||
'total_keuntungan' => $total_keuntungan,
|
||||
'total_harga' => $total_harga,
|
||||
'total_bayar' => $total_bayar,
|
||||
'token' => $token,
|
||||
'status' => $status,
|
||||
'batas_pembayaran' => $batas_pembayaran,
|
||||
'batas_pengiriman_barang_awal' => $batas_pengiriman_barang_awal,
|
||||
'batas_pengiriman_barang_akhir' => $batas_pengiriman_barang_akhir,
|
||||
]);
|
||||
|
||||
$contact = Contact::where('pemilik_kontak', $pembeli)
|
||||
->where('relasi_kontak', $penjual)
|
||||
->count();
|
||||
|
||||
if ($contact == 0) {
|
||||
Contact::create([
|
||||
'pemilik_kontak' => $pembeli,
|
||||
@ -211,18 +217,25 @@ class UserTransactionController extends Controller
|
||||
}
|
||||
|
||||
TransactionDescription::create([
|
||||
'transaction_id' => $id,
|
||||
'transaction_id' => $query->id,
|
||||
'status' => $status,
|
||||
'user' => $pembeli,
|
||||
'judul' => 'fa fa-plus',
|
||||
'background' => 'bg-buyer',
|
||||
'deskripsi' => $nama_depan_pembeli . ' telah membuat transaksi baru dengan ' . $nama_penjual,
|
||||
]);
|
||||
|
||||
DB::commit();
|
||||
|
||||
return response()->json([
|
||||
'status' => true,
|
||||
'message' => 'Berhasil menambahkan transaksi. Silahkan lakukan pembayaran.',
|
||||
]);
|
||||
} else {
|
||||
}catch(Throwable $e){
|
||||
DB::rollBack();
|
||||
|
||||
Log::error($e->getMessage());
|
||||
|
||||
return response()->json([
|
||||
'status' => false,
|
||||
'message' => 'Gagal menambahkan transaksi.',
|
||||
|
||||
@ -15,7 +15,6 @@ class Transaction extends Model
|
||||
* @var array<int, string>
|
||||
*/
|
||||
protected $fillable = [
|
||||
'id',
|
||||
'pembeli',
|
||||
'penjual',
|
||||
'nama_barang',
|
||||
|
||||
@ -58,13 +58,13 @@ $("#table-3").dataTable({
|
||||
|
||||
// Refund, Transaction Admin
|
||||
$("#table-4").dataTable({
|
||||
columnDefs: [{ sortable: false, targets: [0, 8] }],
|
||||
columnDefs: [{ sortable: false, targets: [8] }],
|
||||
searchable: true,
|
||||
});
|
||||
|
||||
// Setting Admin
|
||||
$("#table-5").dataTable({
|
||||
columnDefs: [{ sortable: false, targets: [0, 4, 5] }],
|
||||
columnDefs: [{ sortable: false, targets: [4, 5] }],
|
||||
searchable: true,
|
||||
});
|
||||
|
||||
@ -73,3 +73,9 @@ $("#table-6").dataTable({
|
||||
columnDefs: [{ sortable: false, targets: [4] }],
|
||||
searchable: true,
|
||||
});
|
||||
|
||||
//Refund User
|
||||
$("#table-7").dataTable({
|
||||
columnDefs: [{ sortable: false, targets: [5] }],
|
||||
searchable: true,
|
||||
});
|
||||
|
||||
@ -21,6 +21,7 @@
|
||||
</th>
|
||||
<th>ID</th>
|
||||
<th>Pembeli</th>
|
||||
<th>Nama Barang</th>
|
||||
<th>Penjual</th>
|
||||
<th>Total</th>
|
||||
<th>Tanggal Pengajuan</th>
|
||||
@ -36,6 +37,8 @@
|
||||
<td>{{ $refund->id }}</td>
|
||||
<td>{{ $refund->transaction->data_pembeli->nama_depan }}
|
||||
</td>
|
||||
<td>{{ $refund->transaction->nama_barang }}
|
||||
</td>
|
||||
<td>{{ $refund->transaction->data_penjual->nama_depan }}
|
||||
</td>
|
||||
<td>{{ $refund->total }}</td>
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<h1>Kontak</h1>
|
||||
<div class="section-header-breadcrumb">
|
||||
<div class="breadcrumb-item active"><a href="{{ route('user.index') }}">Dashboard</a></div>
|
||||
<div class="breadcrumb-item"><a href="{{ route('user-contact.index') }}">Kontak</a></div>
|
||||
<div class="breadcrumb-item">Kontak</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -17,8 +17,8 @@
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<div class="d-flex justify-content-end">
|
||||
<button class="btn btn-primary btn-lg" data-toggle="modal" data-target="#modalForm">Open
|
||||
Contact Form</button>
|
||||
<button class="btn btn-primary btn-lg" data-toggle="modal"
|
||||
data-target="#modalForm">Tambahkan Kontak Baru</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
@ -53,7 +53,7 @@
|
||||
data-district="{{ $contact->relasiKontak->getDistrictName() }}"
|
||||
data-village="{{ $contact->relasiKontak->getVillageName() }}">Detail</button>
|
||||
<button class="btn btn-danger open-detail-modal" id="deleteContact"
|
||||
data-id="{{ $contact->id }}">Delete</button>
|
||||
data-id="{{ $contact->id }}">Hapus</button>
|
||||
</td>
|
||||
</tr>
|
||||
@endforeach
|
||||
@ -65,7 +65,6 @@
|
||||
</div>
|
||||
</div>
|
||||
@extends('user.contact.modal-detail-contact')
|
||||
{{-- @extends('user.contact.modal-delete-contact') --}}
|
||||
@extends('user.contact.modal-add-contact')
|
||||
</section>
|
||||
</div>
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<h1>Refund</h1>
|
||||
<div class="section-header-breadcrumb">
|
||||
<div class="breadcrumb-item active"><a href="{{ route('user.index') }}">Dashboard</a></div>
|
||||
<div class="breadcrumb-item"><a href="{{ route('user-refund.index') }}">Refund</a></div>
|
||||
<div class="breadcrumb-item">Refund</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -15,34 +15,28 @@
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped" id="table-1">
|
||||
<table class="table table-striped" id="table-7">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-center">
|
||||
#
|
||||
</th>
|
||||
<th>Order Id</th>
|
||||
<th>Customer</th>
|
||||
<th>Seller</th>
|
||||
<th>total</th>
|
||||
<th>Due Date</th>
|
||||
<th>Nama Barang</th>
|
||||
<th>Penjual</th>
|
||||
<th>Total</th>
|
||||
<th>Status</th>
|
||||
<th>upload Bukti</th>
|
||||
<th>Action</th>
|
||||
<th>Aksi</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach ($refunds as $refund)
|
||||
<tr>
|
||||
<td>{{ $loop->iteration }}</td>
|
||||
<td>{{ $refund->id }}</td>
|
||||
<td>{{ $refund->transaction->data_pembeli->nama_depan }}
|
||||
<td>{{ $refund->transaction->nama_barang }}
|
||||
</td>
|
||||
<td>{{ $refund->transaction->data_penjual->nama_depan }}
|
||||
</td>
|
||||
<td>{{ $refund->total }}</td>
|
||||
<td>{{ $refund->created_at }}</td>
|
||||
<td>{{ $refund->due_date }}</td>
|
||||
<td><a href="#" data-toggle="modal"
|
||||
data-target="#modalKeteranganStatus"
|
||||
class="badge {{ $refund->status == 'partial refund' ? 'badge-succes' : ($refund->status == 'pending' ? 'badge-warning' : 'badge-danger') }}">{{ ucwords($refund->status) }}</a>
|
||||
@ -69,6 +63,6 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
</div>
|
||||
@extends('user.refund.modal-detail-refund')
|
||||
@endsection
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<h1>Halaman Pembeli</h1>
|
||||
<div class="section-header-breadcrumb">
|
||||
<div class="breadcrumb-item active"><a href="{{ route('user.index') }}">Dashboard</a></div>
|
||||
<div class="breadcrumb-item"><a href="{{ route('user-pembeli.index') }}">Transaksi Pembeli</a>
|
||||
<div class="breadcrumb-item">Transaksi Pembeli
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
<h1>Halaman Penjual</h1>
|
||||
<div class="section-header-breadcrumb">
|
||||
<div class="breadcrumb-item active"><a href="{{ route('user.index') }}">Dashboard</a></div>
|
||||
<div class="breadcrumb-item"><a href="{{ route('user-penjual.index') }}">Penjual</a></div>
|
||||
<div class="breadcrumb-item">Transaksi Penjual</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user