diff --git a/app/Http/Controllers/Login/LoginController.php b/app/Http/Controllers/Login/LoginController.php
index 6940a39..63e2297 100644
--- a/app/Http/Controllers/Login/LoginController.php
+++ b/app/Http/Controllers/Login/LoginController.php
@@ -9,6 +9,7 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Hash;
use App\Models\User;
+use Barryvdh\DomPDF\Facade\Pdf;
use Carbon\Carbon;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
@@ -416,8 +417,12 @@ class LoginController extends Controller
}
public function invoice(){
- return view('invoice.export-invoice', [
- 'transaction' => Transaction::findOrFail('80d9b19b-ba17-4aea-8cad-c3b4661d33bc'),
- ]);
+ // return view('invoice.export-invoice', [
+ // 'transaction' => Transaction::findOrFail('80d9b19b-ba17-4aea-8cad-c3b4661d33bc'),
+ // ]);
+
+ $transaction = Transaction::findOrFail('80d9b19b-ba17-4aea-8cad-c3b4661d33bc');
+ $pdf = Pdf::loadView('invoice.export-invoice',compact('transaction'))->setPaper('A4','portrait');
+ return $pdf->download("invoice-80d9b19b-ba17-4aea-8cad-c3b4661d33b-".uniqid().".pdf");
}
}
diff --git a/app/Http/Controllers/User/PembeliController.php b/app/Http/Controllers/User/PembeliController.php
index e8812f5..f1596e8 100644
--- a/app/Http/Controllers/User/PembeliController.php
+++ b/app/Http/Controllers/User/PembeliController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\User;
use App\Http\Controllers\Controller;
use App\Models\Contact;
+use App\Models\Refund;
use App\Models\Setting;
use App\Models\Transaction;
use App\Models\TransactionDescription;
@@ -362,7 +363,7 @@ class PembeliController extends Controller
return response()->json();
}
- public function cancelTransaction(Request $request)
+ public function cancelPayment(Request $request)
{
$auth = base64_encode(env('MIDTRANS_SERVER_KEY'));
@@ -420,6 +421,82 @@ class PembeliController extends Controller
}
}
+ public function cancelTransaction(Request $request){
+ $transaction = Transaction::where('id', $request->id)->first();
+
+ $params = [
+ 'refund_key' => $request->id . '-ref1',
+ 'amount' => $transaction->total_bayar,
+ 'reason' => $request->complaint,
+ ];
+
+ $auth = base64_encode(env('MIDTRANS_SERVER_KEY'));
+
+ $response = Http::withOptions([
+ 'verify' => false,
+ ])
+ ->withHeaders([
+ 'Content-Type' => 'application/json',
+ 'Authorization' => "Basic $auth",
+ ])
+ ->post('https://api.sandbox.midtrans.com/v2/' . $request->id . '/refund', $params);
+
+ $result = json_decode($response->body(), true);
+ $code = $result['status_code'];
+ $code = '200';
+
+ if ($code == '200') {
+ try {
+ DB::beginTransaction();
+
+ Transaction::where('id', $request->id)->update([
+ 'status_transaksi' => 'failure',
+ 'status_pembayaran' => 'refund',
+ ]);
+
+ Refund::create([
+ 'transaction_id' => $request->id,
+ 'total' => $transaction->total_bayar,
+ 'due_date' => now(),
+ 'status' => 'refund',
+ 'complaint' => $request->complaint,
+ ]);
+
+ TransactionDescription::create([
+ 'transaction_id' => $request->id,
+ 'status' => 'refund',
+ 'background' => 'bg-seller',
+ 'user' => auth()->user()->email,
+ 'judul' => 'fas fa-times',
+ 'deskripsi' => 'Transaksi dibatalkan oleh ' . auth()->user()->nama_depan . '. Alasan : ' . $request->complaint,
+ ]);
+
+ DB::commit();
+
+ return response()->json([
+ 'status' => true,
+ 'message' => 'Transaksi telah dibatalkan.',
+ ]);
+ } catch (Throwable $e) {
+ DB::rollBack();
+
+ Log::error($e->getMessage());
+
+ return response()->json([
+ 'status' => false,
+ 'message' => 'Gagal update status karena kesalahan server.',
+ ]);
+ }
+ } else {
+ Log::error($result['status_message']);
+
+ return response()->json([
+ 'status' => false,
+ 'message' => 'Transaksi gagal',
+ ]);
+ }
+ }
+
public function pendingTransaction(Request $request)
{
$auth = base64_encode(env('MIDTRANS_SERVER_KEY'));
@@ -566,12 +643,12 @@ class PembeliController extends Controller
$result = json_decode($response->body(), true);
- $status = $result['transaction_status'] == null ? '' : $result['transaction_status'];
+ $status = $result['status_code'] == '404' ? '' : $result['transaction_status'];
if ($status == '') {
return response()->json([
'status' => true,
- 'message' => 'On Close',
+ 'message' => 'Halaman pembayaran telah ditutup. Silahkan lakukan pembayaran lagi.',
]);
} else {
try {
@@ -649,6 +726,7 @@ class PembeliController extends Controller
return response()->json([
'status' => false,
'message' => 'Terjadi error di bagian server.',
+ 'data' => $result
]);
}
}
@@ -723,7 +801,15 @@ class PembeliController extends Controller
href="#">Bayar
Batal
+ id="cancelPayment" class="dropdown-item">Batal Pembayaran
+
+ ';
+ }
+
+ if($row->status_transaksi == 'success'){
+ $html_code .= '
+ Batal Transaksi
';
}
diff --git a/app/Http/Controllers/User/PenjualController.php b/app/Http/Controllers/User/PenjualController.php
index ba341f5..9bae354 100644
--- a/app/Http/Controllers/User/PenjualController.php
+++ b/app/Http/Controllers/User/PenjualController.php
@@ -21,29 +21,23 @@ class PenjualController extends Controller
return view('user.transaction.penjual.index');
}
- public function listPenjual(Request $request){
- try{
- $subQuery = Transaction::join('users','transactions.pembeli','=','users.email')
- ->where('transactions.penjual',auth()->user()->email)
- ->select(
- 'transactions.id',
- DB::raw("CONCAT(users.nama_depan,' ',users.nama_belakang) as nama_pembeli"),
- 'transactions.nama_barang',
- 'transactions.total_harga',
- 'transactions.created_at',
- 'transactions.status_transaksi',
- );
+ public function listPenjual(Request $request)
+ {
+ try {
+ $subQuery = Transaction::join('users', 'transactions.pembeli', '=', 'users.email')
+ ->where('transactions.penjual', auth()->user()->email)
+ ->select('transactions.id', DB::raw("CONCAT(users.nama_depan,' ',users.nama_belakang) as nama_pembeli"), 'transactions.nama_barang', 'transactions.total_harga', 'transactions.created_at', 'transactions.status_transaksi');
- if($request->has('search') && !empty($request->search['value'])){
+ if ($request->has('search') && !empty($request->search['value'])) {
$searchPenjual = $request->search['value'];
- if(!is_numeric($searchPenjual)){
- $subQuery->where(function($a) use ($searchPenjual){
- $a->whereRaw("LOWER(CONCAT(users.nama_depan,' ',users.nama_belakang)) LIKE ?",['%'.strtolower($searchPenjual).'%'])
- ->orWhereRaw('LOWER(transactions.nama_barang) LIKE ?',['%'.strtolower($searchPenjual).'%'])
- ->orWhereRaw('LOWER(transactions.status_transaksi) LIKE ?',['%'.strtolower($searchPenjual).'%']);
+ if (!is_numeric($searchPenjual)) {
+ $subQuery->where(function ($a) use ($searchPenjual) {
+ $a->whereRaw("LOWER(CONCAT(users.nama_depan,' ',users.nama_belakang)) LIKE ?", ['%' . strtolower($searchPenjual) . '%'])
+ ->orWhereRaw('LOWER(transactions.nama_barang) LIKE ?', ['%' . strtolower($searchPenjual) . '%'])
+ ->orWhereRaw('LOWER(transactions.status_transaksi) LIKE ?', ['%' . strtolower($searchPenjual) . '%']);
});
- }else{
- $subQuery->where(function($a) use ($searchPenjual){
+ } else {
+ $subQuery->where(function ($a) use ($searchPenjual) {
$a->whereDay('transactions.created_at', '=', $searchPenjual)
->orWhereMonth('transactions.created_at', '=', $searchPenjual)
->orWhereYear('transactions.created_at', '=', $searchPenjual)
@@ -53,17 +47,18 @@ class PenjualController extends Controller
}
$queryPenjual = Transaction::from(DB::raw("({$subQuery->toSql()}) as tmp"))
- ->mergeBindings($subQuery->getQuery()) // Menggabungkan binding parameters
- ->select('*')
- ->get();
+ ->mergeBindings($subQuery->getQuery()) // Menggabungkan binding parameters
+ ->select('*')
+ ->get();
if ($request->ajax()) {
return DataTables::of($queryPenjual)
->addIndexColumn()
->addColumn('action', function ($row) {
$url = route('user-transaction.show', ['id' => $row->id]);
- $invoice = route('invoice.get',['id' => $row->id]);
- $html_code = '
+ $invoice = route('invoice.get', ['id' => $row->id]);
+ $html_code =
+ '
';
@@ -121,8 +134,8 @@ class PenjualController extends Controller
})
->rawColumns(['action'])
->make(true);
- }
- }catch(Throwable $e){
+ }
+ } catch (Throwable $e) {
Log::error($e->getMessage());
return response()->json(['success' => false, 'message' => 'Terjadi Kesalahan pada sisi server']);
@@ -165,44 +178,46 @@ class PenjualController extends Controller
}
}
- public function denyTransaction(Request $request){
-
+ public function denyTransaction(Request $request)
+ {
$transaction = Transaction::where('id', $request->id)->first();
- $refund = Refund::create([
- 'transaction_id' => $request->id,
- 'total' => $transaction->total_bayar,
- 'due_date' => now(),
- 'status' => 'refund',
- 'complaint' => $request->complaint
- ]);
- // $params = [
- // 'refund_key' => $request->id . '-ref1',
- // 'amount' => $refund->total,
- // 'reason' => $refund->complaint,
- // ];
+ $params = [
+ 'refund_key' => $request->id . '-ref1',
+ 'amount' => $transaction->total_bayar,
+ 'reason' => $request->complaint,
+ ];
- // $auth = base64_encode(env('MIDTRANS_SERVER_KEY'));
+ $auth = base64_encode(env('MIDTRANS_SERVER_KEY'));
- // $response = Http::withOptions([
- // 'verify' => false,
- // ])
- // ->withHeaders([
- // 'Content-Type' => 'application/json',
- // 'Authorization' => "Basic $auth",
- // ])
- // ->post('https://api.sandbox.midtrans.com/v2/'.$request->id.'/refund', $params);
+ $response = Http::withOptions([
+ 'verify' => false,
+ ])
+ ->withHeaders([
+ 'Content-Type' => 'application/json',
+ 'Authorization' => "Basic $auth",
+ ])
+ ->post('https://api.sandbox.midtrans.com/v2/' . $request->id . '/refund', $params);
- // $result = json_decode($response->body(), true);
- // $code = $result['status_code'];
+ $result = json_decode($response->body(), true);
+ $code = $result['status_code'];
$code = '200';
- if($code == '200'){
- try{
+ if ($code == '200') {
+ try {
DB::beginTransaction();
Transaction::where('id', $request->id)->update([
+ 'status_transaksi' => 'failure',
+ 'status_pembayaran' => 'refund',
+ ]);
+ Refund::create([
+ 'transaction_id' => $request->id,
+ 'total' => $transaction->total_bayar,
+ 'due_date' => now(),
+ 'status' => 'refund',
+ 'complaint' => $request->complaint,
]);
TransactionDescription::create([
@@ -210,8 +225,8 @@ class PenjualController extends Controller
'status' => 'refund',
'background' => 'bg-seller',
'user' => auth()->user()->email,
- 'judul' => 'fas fa-handshake',
- 'deskripsi' => 'Transaksi ditolak '.auth()->user()->nama_depan.', uang akan dikembalikan ke pembeli. ',
+ 'judul' => 'fas fa-times',
+ 'deskripsi' => 'Transaksi ditolak ' . auth()->user()->nama_depan . ', uang akan dikembalikan ke pembeli. Alasan : ' . $request->complaint,
]);
DB::commit();
@@ -220,7 +235,7 @@ class PenjualController extends Controller
'status' => true,
'message' => 'Transaksi telah ditolak. Uang akan dikirimkan ke pembeli.',
]);
- }catch(Throwable $e){
+ } catch (Throwable $e) {
DB::rollBack();
Log::error($e->getMessage());
@@ -230,8 +245,8 @@ class PenjualController extends Controller
'message' => 'Gagal update status karena kesalahan server.',
]);
}
- }else{
- // Log::error($result['status_message']);
+ } else {
+ Log::error($result['status_message']);
return response()->json([
'status' => false,
@@ -301,7 +316,7 @@ class PenjualController extends Controller
'background' => 'bg-seller',
'user' => auth()->user()->email,
'judul' => 'fas fa-check',
- 'deskripsi' => 'Pesanan telah sampai di tempat pembeli. Keterangan: '.$request->keterangan_bukti,
+ 'deskripsi' => 'Pesanan telah sampai di tempat pembeli. Keterangan: ' . $request->keterangan_bukti,
'bukti_foto' => $bukti_foto,
]);
@@ -325,7 +340,7 @@ class PenjualController extends Controller
return response([
'status' => true,
'message' => 'Sukses kirim data.',
- 'data' => $request
+ 'data' => $request,
]);
}
}
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index 88d1311..e991e8c 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -33,6 +33,7 @@ return new class extends Migration
$table->char('kode_kelurahan',10);
$table->string('no_rek')->nullable();
$table->string('nama_bank')->nullable();
+ $table->string('keterangan')->nullable();
$table->rememberToken();
$table->timestamps();
diff --git a/resources/views/User/transaction/Pembeli/index.blade.php b/resources/views/User/transaction/Pembeli/index.blade.php
index d305cc6..abe4f1a 100644
--- a/resources/views/User/transaction/Pembeli/index.blade.php
+++ b/resources/views/User/transaction/Pembeli/index.blade.php
@@ -339,6 +339,7 @@
listPembeli.ajax.reload();
}
});
+ console.log(response);
},
error: function(fail) {
Swal.fire({
@@ -352,7 +353,7 @@
});
});
- $('#table-pembeli').on('click', '#cancel', function() {
+ $('#table-pembeli').on('click', '#cancelPayment', function() {
const id = $(this).data('id');
const csrfToken = $('meta[name="csrf-token"]').attr('content');
@@ -382,7 +383,7 @@
});
$.ajax({
- url: "{{ route('user-pembeli.cancel') }}",
+ url: "{{ route('user-pembeli.cancel-payment') }}",
type: "PUT",
data: {
id: id
@@ -410,6 +411,89 @@
}
});
});
+
+ $('#table-pembeli').on('click', '#cancelTransaction', function() {
+ const id = $(this).data('id');
+ const csrfToken = $('meta[name="csrf-token"]').attr('content');
+
+ Swal.fire({
+ title: 'Batalkan Transaksi?',
+ text: 'Apakah anda yakin untuk membatalkan transaksi?',
+ icon: 'question',
+ showCancelButton: true,
+ cancelButtonText: 'Tidak.',
+ confirmButtonText: 'Ya, batalkan transaksi.'
+ }).then((result) => {
+ if (result.isConfirmed) {
+ Swal.fire({
+ title: 'Batalkan Transaksi?',
+ text: 'Berikan alasan untuk membatalkan transaksi.',
+ input: 'text',
+ inputPlaceholder: 'Cth: Salah penjual.',
+ showCancelButton: true,
+ cancelButtonText: 'Batal',
+ confirmButtonText: 'Kirim'
+ }).then((a) => {
+ if (a.isConfirmed) {
+ if (a.value) {
+ Swal.fire({
+ html: 'Form Anda sedang diproses!
Mohon tunggu...
',
+ allowEscapeKey: false,
+ allowOutsideClick: false,
+ didOpen: () => {
+ Swal.showLoading();
+ }
+ });
+
+ $.ajaxSetup({
+ headers: {
+ 'X-CSRF-TOKEN': csrfToken
+ }
+ });
+
+ $.ajax({
+ url: "{{ route('user-pembeli.cancel-transaction') }}",
+ type: 'PUT',
+ data: {
+ id: id,
+ complaint: a.value
+ },
+ success: function(response) {
+ Swal.fire({
+ title: response.status ?
+ 'Berhasil' :
+ 'Gagal',
+ text: response.message,
+ icon: response.status ?
+ 'success' : 'error',
+ }).then(function() {
+ Swal.close();
+ if (response.status) {
+ listPembeli.ajax
+ .reload();
+ }
+ });
+ },
+ error: function(error) {
+ Swal.fire({
+ title: 'Gagal',
+ text: 'Pemrosesan transaksi gagal',
+ icon: 'error'
+ });
+ }
+ });
+ } else {
+ Swal.fire({
+ title: 'Gagal',
+ text: 'Masukan alasan untuk membatalkan transaksi',
+ icon: 'error'
+ });
+ }
+ }
+ });
+ }
+ });
+ });
});
diff --git a/resources/views/User/transaction/penjual/index.blade.php b/resources/views/User/transaction/penjual/index.blade.php
index d2e7de3..a90f022 100644
--- a/resources/views/User/transaction/penjual/index.blade.php
+++ b/resources/views/User/transaction/penjual/index.blade.php
@@ -291,63 +291,73 @@
confirmButtonText: 'Ya, tolak transaksi.'
}).then((result) => {
if (result.isConfirmed) {
- const {
- value: complaint
- } = await Swal.fire({
+ Swal.fire({
title: 'Tolak Transaksi?',
inputLabel: 'Berikan alasan untuk menolak transaksi ini',
input: 'text',
- inputPlaceholder: 'Cth: Salah penjual.'
- });
-
- if (complaint) {
- Swal.fire({
- html: 'Form Anda sedang diproses!
Mohon tunggu...
',
- allowEscapeKey: false,
- allowOutsideClick: false,
- didOpen: () => {
- Swal.showLoading();
- }
- });
-
- $.ajaxSetup({
- headers: {
- 'X-CSRF-TOKEN': csrfToken
- }
- });
-
- $.ajax({
- url: "{{ route('user-penjual.deny') }}",
- type: 'PUT',
- data: {
- id: id,
- complaint: complaint
- },
- success: function(response) {
+ inputPlaceholder: 'Cth: Salah penjual.',
+ showCancelButton: true,
+ cancelButtonText: 'Batal.'
+ }).then((a) => {
+ if (a.isConfirmed) {
+ if (a.value) {
Swal.fire({
- title: response.status ? 'Berhasil' :
- 'Gagal',
- text: response.message,
- icon: response.status ? 'success' :
- 'error',
- }).then(function() {
- Swal.close();
- if (response.status) {
- listPenjual.ajax.reload();
+ html: 'Form Anda sedang diproses!
Mohon tunggu...
',
+ allowEscapeKey: false,
+ allowOutsideClick: false,
+ didOpen: () => {
+ Swal.showLoading();
}
});
- },
- error: function(error) {
+
+ $.ajaxSetup({
+ headers: {
+ 'X-CSRF-TOKEN': csrfToken
+ }
+ });
+
+ $.ajax({
+ url: "{{ route('user-penjual.deny') }}",
+ type: 'PUT',
+ data: {
+ id: id,
+ complaint: a.value
+ },
+ success: function(response) {
+ Swal.fire({
+ title: response.status ?
+ 'Berhasil' :
+ 'Gagal',
+ text: response.message,
+ icon: response.status ?
+ 'success' : 'error',
+ }).then(function() {
+ Swal.close();
+ if (response.status) {
+ listPenjual.ajax
+ .reload();
+ }
+ });
+ },
+ error: function(error) {
+ Swal.fire({
+ title: 'Gagal',
+ text: 'Pemrosesan transaksi gagal',
+ icon: 'error'
+ });
+ }
+ });
+ } else {
Swal.fire({
title: 'Gagal',
- text: 'Pemrosesan transaksi gagal',
+ text: 'Masukan alasan untuk menolak transaksi',
icon: 'error'
});
}
- });
- } else {
- Swal.close();
- }
+ }
+ });
+
+
} else {
location.href = "{{ route('user-transaction.show', ':id') }}".replace(':id',
id);
diff --git a/resources/views/email/verification-email.blade.php b/resources/views/email/verification-email.blade.php
index 3053168..fa4aa0e 100644
--- a/resources/views/email/verification-email.blade.php
+++ b/resources/views/email/verification-email.blade.php
@@ -2,45 +2,103 @@
-
-
- Verifikasi Email Pemulihan
+
+
+ Document
+
-
-
-
-
-
-
-
-
-
-
-
Rekber mengirimkan kode verifikasi ke
-
{{ $verificationEmail['email'] }}
-
Gunakan kode ini untuk menyelesaikan syarat pendaftaran akun:
-
-
{{ $verificationEmail['code'] }}
-
-
-
Masa berlaku kode ini akan berakhir dalam 2 menit.
-
-
-
-
-
+
+
+
+
Rekber
+
Verifkasi Email
-
+
+
+
Rekber mengirimkan kode verifikasi
+
{{ $verificationEmail['email'] }}
+
+
+
+
Gunakan kode ini untuk menyelesaikan syarat pendaftaraan akun:
+
+
+
+
{{ $verificationEmail['code'] }}
+
+
+
+
Masa berlaku kode ini akan berakhir dalam 2 menit.
+
+
diff --git a/resources/views/invoice/export-invoice.blade.php b/resources/views/invoice/export-invoice.blade.php
index 8a5978f..c40120a 100644
--- a/resources/views/invoice/export-invoice.blade.php
+++ b/resources/views/invoice/export-invoice.blade.php
@@ -3,328 +3,261 @@
-
-
-
REKBER
-
-
-
-
+
+
Document
-
-
-
-
-
-
-
-
-
-
Invoice
-
Order #{{ $transaction->id }}
-
-
-
-
-
- Pembeli:
- {{ ucwords(strtolower($transaction->data_pembeli->nama_depan . ' ' . $transaction->data_pembeli->nama_belakang)) }}
- {{ ucwords(strtolower($transaction->data_pembeli->alamat)) }}
- {{ ucwords(strtolower($transaction->data_pembeli->getVillageName() . ', ' . $transaction->data_pembeli->getDistrictName())) }}
- {{ ucwords(strtolower($transaction->data_pembeli->getCityName() . ', ' . $transaction->data_pembeli->getProvinceName())) }}
-
-
-
-
- Penjual:
- {{ ucwords(strtolower($transaction->data_penjual->nama_depan . ' ' . $transaction->data_penjual->nama_belakang)) }}
- {{ ucwords(strtolower($transaction->data_penjual->alamat)) }}
- {{ ucwords(strtolower($transaction->data_penjual->getVillageName() . ', ' . $transaction->data_penjual->getDistrictName())) }}
- {{ ucwords(strtolower($transaction->data_penjual->getCityName() . ', ' . $transaction->data_penjual->getProvinceName())) }}
-
-
-
-
-
-
- Payment Method:
- Visa ending **** 4242
- npannisa@gmail.com
-
-
-
-
- Tanggal Transaksi:
- {{ $transaction->created_at->format('d M Y, g:i') }}
-
-
-
-
-
+
+
+
+
+ Invoice
+ |
+ |
+
+
+
+ Pembeli
+ |
+
+ Penjual
+ |
+
+
+ Septea |
+ Takapedia Top Up |
+
+
+
+ Alamat Pembeli
+ |
+
+ Alamat Penjual
+ |
+
+
+ Pondok ponogoro jl.raya bogor no.26 rt 2/2Pondok ponogoro jl.raya bogor no.26
+ rt 2/2 |
+ Pondok ponogoro jl.raya bogor no.26 rt 2/2Pondok ponogoro
+ jl.raya bogor no.26 rt 2/2 |
+
+
+
+ Payment Method
+ |
+ Tanggal Transaksi
+ |
+
+
+ visa ending ***4352 |
+ 11 Nov 2023, 12:06 |
+
+
+
+ email
+ |
+
+
+ ripannisa@gmail.com |
+
+
+
+ Rangkuman Barang
+ |
+ |
+
+
+ Semua barang yang di daftarkan dalam transaksi |
+
+
+
-
-
-
Rangkuman Transaksi
-
Semua barang yang didaftarkan dalam transaksi.
-
-
-
- # |
- Nama Barang |
- Harga |
- Jumlah |
- Total |
-
-
- 1 |
- {{ $transaction->nama_barang }} |
-
- Rp.{{ number_format($transaction->harga_barang, 2, ',', '.') }}
- |
- {{ $transaction->jumlah_barang }} |
-
- Rp.{{ number_format($transaction->total_harga, 2, ',', '.') }}
- |
-
-
-
-
-
-
Metode Pembayaran
-
- @if ($transaction->metode_pembayaran != null)
-
 }})
- @endif
-
-
-
-
-
Subtotal
-
- Rp.{{ number_format($transaction->total_harga, 2, ',', '.') }}
-
-
-
-
Biaya Admin
-
- Rp.{{ number_format($transaction->total_keuntungan, 2, ',', '.') }}
-
-
-
-
-
Total
-
- Rp.{{ number_format($transaction->total_bayar, 2, ',', '.') }}
-
-
-
-
-
-
-
-
-
-
-
+
+
+ # |
+ nama barang |
+ harga |
+ jumlah |
+ total |
+
+
+
+ 1 |
+ Iphone 17 Pro Max |
+ Rp.17.994.592,00 |
+ 2 |
+ Rp.35.989.184,00 |
+
+
+
+
+
+
+ metode pembayaran
+ |
+ |
+
+
+
+ Rp.35.989.184,00
+ |
+
+
+ |
+
+
+
+ Rp.30.000,00
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+
+ Rp.30.000,00
+ |
+
+
+
diff --git a/routes/web.php b/routes/web.php
index b4f3fcf..73bfd60 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -174,13 +174,14 @@ Route::middleware(['auth'])->group(function(){
});
// Pembeli
- Route::controller(PenjualController::class)->group(function(){
+ Route::controller(PembeliController::class)->group(function(){
Route::get('user-pembeli','indexPembeli')->name('user-pembeli.index');
Route::get('user-pembeli/list-pembeli','listPembeli')->name('user-pembeli.list-pembeli');
Route::get('user-pembeli/tambah-transaksi','create')->name('user-pembeli.create');
Route::post('user-pembeli','store')->name('user-pembeli.store');
Route::put('user-pembeli/bayar-transaksi','payTransaction')->name('user-pembeli.pay');
- Route::put('user-pembeli/batal-transaksi','cancelTransaction')->name('user-pembeli.cancel');
+ Route::put('user-pembeli/batal-pembayaran','cancelPayment')->name('user-pembeli.cancel-payment');
+ Route::put('user-pembeli/batal-transaksi','cancelTransaction')->name('user-pembeli.cancel-transaction');
Route::put('user-pembeli/transaksi-pending', 'pendingTransaction')->name('user-pembeli.pending');
Route::put('user-pembeli/transaksi-error','onErrorTransaction')->name('user-pembeli.error');
Route::put('user-pembeli/transaksi-close','onCloseTransaction')->name('user-pembeli.close');
@@ -189,10 +190,10 @@ Route::middleware(['auth'])->group(function(){
});
// Penjual
- Route::controller(PembeliController::class)->group(function(){
+ Route::controller(PenjualController::class)->group(function(){
Route::get('user-penjual','indexPenjual')->name('user-penjual.index');
Route::get('user-penjual/list-penjual','listPenjual')->name('user-penjual.list-penjual');
- Route::get('user-penjual/tolak-transaksi','denyTransaction')->name('user-penjual.deny');
+ Route::put('user-penjual/tolak-transaksi','denyTransaction')->name('user-penjual.deny');
Route::put('user-penjual/terima-transaksi','acceptTransaction')->name('user-penjual.accept');
Route::put('user-penjual/kirim-pesanan','sendingOrder')->name('user-penjual.sending');
Route::post('user-penjual/selesai-kirim-pesanan','sentOrder')->name('user-penjual.sent');