diff --git a/app/Http/Controllers/Admin/AdminRefundController.php b/app/Http/Controllers/Admin/AdminRefundController.php index bf748c98..13e96573 100644 --- a/app/Http/Controllers/Admin/AdminRefundController.php +++ b/app/Http/Controllers/Admin/AdminRefundController.php @@ -26,7 +26,7 @@ class AdminRefundController extends Controller public function show($id) { $refund = Refund::find($id); - $refundDescription = RefundDescription::where($id)->get(); + $refundDescription = RefundDescription::where('refund_id',$id)->get(); return view('admin.refund.detail-refund',[ "refund"=> $refund, 'descriptions' => $refundDescription diff --git a/app/Http/Controllers/Admin/AdminTransactionController.php b/app/Http/Controllers/Admin/AdminTransactionController.php index a596fc4a..ec6439a6 100644 --- a/app/Http/Controllers/Admin/AdminTransactionController.php +++ b/app/Http/Controllers/Admin/AdminTransactionController.php @@ -27,7 +27,7 @@ class AdminTransactionController extends Controller { return view('admin.transaction.detail-transaction', [ 'transaction' => Transaction::findOrFail($id), - 'trackings' => TransactionDescription::where('order_id', $id) + 'trackings' => TransactionDescription::where('transaction_id', $id) ->latest() ->get(), ]); diff --git a/app/Http/Controllers/User/UserRefundController.php b/app/Http/Controllers/User/UserRefundController.php index 9b849f49..757d47df 100644 --- a/app/Http/Controllers/User/UserRefundController.php +++ b/app/Http/Controllers/User/UserRefundController.php @@ -17,7 +17,10 @@ class UserRefundController extends Controller public function index() { return view('user.refund.index', [ - 'refunds' => Refund::where() + 'refunds' => Refund::join('transactions', 'refunds.transaction_id', '=', 'transactions.id') + ->where('transactions.pembeli', auth()->user()->email) + ->select('refunds.*') + ->get() ]); } @@ -45,10 +48,10 @@ class UserRefundController extends Controller $filename = $file->getClientOriginalName(); $mime = $file->getClientMimeType(); if (strpos($mime, 'image') !== false) { - $type = 'Image'; + $type = 'image'; $file->storeAs('public/refund-image/', $filename); } elseif (strpos($mime, 'video') !== false) { - $type = 'Video'; + $type = 'video'; $file->storeAs('public/refund-video/', $filename); } else { $type = 'Other'; diff --git a/app/Http/Controllers/User/UserTransactionController.php b/app/Http/Controllers/User/UserTransactionController.php index 6241f855..82f5ea6c 100644 --- a/app/Http/Controllers/User/UserTransactionController.php +++ b/app/Http/Controllers/User/UserTransactionController.php @@ -62,7 +62,7 @@ class UserTransactionController extends Controller { return view('user.transaction.pembeli.detail-transaction', [ 'transaction' => Transaction::findOrFail($id), - 'trackings' => TransactionDescription::where('order_id', $id) + 'trackings' => TransactionDescription::where('transaction_id', $id) ->latest() ->get(), ]); diff --git a/app/Models/Refund.php b/app/Models/Refund.php index d9a07c8b..b0056dbc 100644 --- a/app/Models/Refund.php +++ b/app/Models/Refund.php @@ -28,7 +28,7 @@ class Refund extends Model //Relasi public function transaction(){ - return $this->belongsTo(Transaction::class, 'id', 'transaction_id'); + return $this->belongsTo(Transaction::class, 'transaction_id', 'id'); } //Relasi } diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index e4eb484b..75d6c9f3 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -3,10 +3,15 @@ namespace Database\Seeders; // use Illuminate\Database\Console\Seeds\WithoutModelEvents; + +use App\Models\Refund; +use App\Models\RefundDescription; use Illuminate\Database\Seeder; use App\Models\User; use Carbon\Carbon; use App\Models\Setting; +use App\Models\Transaction; +use App\Models\TransactionDescription; use Illuminate\Support\Str; use Faker\Factory as FakerFactory; use Faker\Provider\id_ID\Person as Person; @@ -29,7 +34,7 @@ class DatabaseSeeder extends Seeder 'id' => Str::uuid(), 'nama_depan' => $faker->firstName, 'nama_belakang' => $faker->lastName, - 'tanggal_lahir' => $faker->date($format = 'Y-m-d', $max = 'now'), + 'tanggal_lahir' => $faker->date('Y-m-d', 'now'), 'email' => 'admin@example.net', 'email_verified_at' => now(), 'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password @@ -43,7 +48,45 @@ class DatabaseSeeder extends Seeder 'gender' => $faker->randomElement(['Laki-laki', 'Perempuan']), 'kode_kelurahan' => '1101012002', ]); - User::factory(20)->create(); + + $user1 = User::factory()->create([ + 'id' => Str::uuid(), + 'nama_depan' => $faker->firstName, + 'nama_belakang' => $faker->lastName, + 'tanggal_lahir' => $faker->date('Y-m-d', 'now'), + 'email' => $faker->email, + 'email_verified_at' => now(), + 'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password + 'remember_token' => Str::random(10), + 'role' => 'User', + 'nik' => $faker->nik($faker->randomElement(['male', 'female']), $faker->dateTimeBetween('-65 years', '-18 years')), + 'alamat' => $faker->address, + 'nohp' => $faker->phoneNumber(), + 'status' => 'Finished', + 'persentase_kemiripan' => 100, + 'gender' => $faker->randomElement(['Laki-laki', 'Perempuan']), + 'kode_kelurahan' => '1101012002', + ]); + + $user2 = User::factory()->create([ + 'id' => Str::uuid(), + 'nama_depan' => $faker->firstName, + 'nama_belakang' => $faker->lastName, + 'tanggal_lahir' => $faker->date('Y-m-d', 'now'), + 'email' => $faker->email(), + 'email_verified_at' => now(), + 'password' => '$2y$10$92IXUNpkjO0rOQ5byMi.Ye4oKoEa3Ro9llC/.og/at2.uheWG/igi', // password + 'remember_token' => Str::random(10), + 'role' => 'User', + 'nik' => $faker->nik($faker->randomElement(['male', 'female']), $faker->dateTimeBetween('-65 years', '-18 years')), + 'alamat' => $faker->address, + 'nohp' => $faker->phoneNumber(), + 'status' => 'Finished', + 'persentase_kemiripan' => 100, + 'gender' => $faker->randomElement(['Laki-laki', 'Perempuan']), + 'kode_kelurahan' => '1101012002', + ]); + // User::factory(20)->create(); $now = Carbon::now()->tz('Asia/Jakarta'); $bulan = $now->format('n'); @@ -53,7 +96,79 @@ class DatabaseSeeder extends Seeder 'bulan' => $bulan, 'tahun' => $tahun, 'persentase' => 5, - 'status' => 'Active' + 'status' => 'Active', + ]); + + $transaction = Transaction::create([ + 'id' => Str::uuid(), + 'pembeli' => $user1->email, + 'penjual' => $user2->email, + 'nama_barang' => 'hah', + 'deskripsi_transaksi' => null, + 'satuan_barang' => 'barang', + 'harga_barang' => 2000, + 'jumlah_barang' => 2, + 'persentase_keuntungan' => 2, + 'total_keuntungan' => 2, + 'total_harga' => 2, + 'total_bayar' => 2, + 'token' => 'asda', + 'status' => 'pending', + 'batas_pembayaran' => now(), + 'batas_pengiriman_barang_awal' => now(), + 'batas_pengiriman_barang_akhir' => now(), + 'nama_bank_penjual' => 'asd', + 'no_rek_penjual' => '21-', + ]); + + TransactionDescription::create([ + 'transaction_id' => $transaction->id, + 'status' => 'pending', + 'user' => $user1->email, + 'judul' => 'fa fa-plus', + 'background' => 'bg-buyer', + 'deskripsi' => $user1->nama_depan . ' telah membuat transaksi baru dengan ' . $user2->nama_depan, + ]); + + $transactionRefund = Transaction::create([ + 'id' => Str::uuid(), + 'pembeli' => $user1->email, + 'penjual' => $user2->email, + 'nama_barang' => 'hah', + 'deskripsi_transaksi' => null, + 'satuan_barang' => 'barang', + 'harga_barang' => 2000, + 'jumlah_barang' => 2, + 'persentase_keuntungan' => 2, + 'total_keuntungan' => 2, + 'total_harga' => 2, + 'total_bayar' => 2, + 'token' => 'asda', + 'status' => 'refund', + 'batas_pembayaran' => now(), + 'batas_pengiriman_barang_awal' => now(), + 'batas_pengiriman_barang_akhir' => now(), + 'nama_bank_penjual' => 'asd', + 'no_rek_penjual' => '21-', + ]); + + $refund = Refund::create([ + 'transaction_id' => $transactionRefund->id, + 'total' => $transactionRefund->total_harga, + 'due_date' => now(), + 'complaint' => 'ha', + ]); + + RefundDescription::create([ + 'refund_id' => $refund->id, + 'filename' => 'img_1.jpg', + 'type' => 'image' + ]); + + RefundDescription::create([ + 'refund_id' => $refund->id, + 'filename' => 'img_2.jpg', + 'type' => 'image' ]); $this->call([ProvincesSeeder::class, CitiesSeeder::class, DistrictsSeeder::class, VillagesSeeder::class]); diff --git a/public/assets/css/style.css b/public/assets/css/style.css index 818e49b7..a29b547d 100644 --- a/public/assets/css/style.css +++ b/public/assets/css/style.css @@ -1667,7 +1667,8 @@ table tr:hover .table-links { } .badge.badge-warning { - color: #fff; + background-color: #ffb300; + color: #ffffff; } .badge.badge-primary { diff --git a/public/assets/js/page/modules-datatables.js b/public/assets/js/page/modules-datatables.js index 5adc4c9b..44f3e15d 100644 --- a/public/assets/js/page/modules-datatables.js +++ b/public/assets/js/page/modules-datatables.js @@ -56,9 +56,9 @@ $("#table-3").dataTable({ searchable: true, }); -// Refund Admin +// Refund, Transaction Admin $("#table-4").dataTable({ - columnDefs: [{ sortable: false, targets: [8] }], + columnDefs: [{ sortable: false, targets: [0, 8] }], searchable: true, }); @@ -68,8 +68,8 @@ $("#table-5").dataTable({ searchable: true, }); -// Transaction Admin +// Contact User $("#table-6").dataTable({ - columnDefs: [{ sortable: false, targets: [8] }], + columnDefs: [{ sortable: false, targets: [4] }], searchable: true, }); diff --git a/resources/views/Admin/refund/detail-refund.blade.php b/resources/views/Admin/refund/detail-refund.blade.php index 4c686cd9..75d8c9da 100644 --- a/resources/views/Admin/refund/detail-refund.blade.php +++ b/resources/views/Admin/refund/detail-refund.blade.php @@ -14,7 +14,7 @@
-

Image/Video

+

Bukti Foto/Video

@foreach ($descriptions as $description) @if ($description->type == 'image')
Alasan Komplain
-
{{ $refund->complain }}
+
{{ $refund->complaint }}
@if ($refund)
Accept - Decline + Decline
@endif diff --git a/resources/views/Admin/refund/index.blade.php b/resources/views/Admin/refund/index.blade.php index 150cef01..e37bd68a 100644 --- a/resources/views/Admin/refund/index.blade.php +++ b/resources/views/Admin/refund/index.blade.php @@ -3,7 +3,7 @@
-

History Refund

+

Refund

Dashboard
Refund
@@ -33,16 +33,16 @@ @foreach ($refunds as $refund) {{ $loop->iteration }} - {{ $transaction->id }} - {{ $refund->orders->pembeli }} - {{ $refund->orders->penjual }} - {{ $refund->total }} - {{ $refund->created_at }} - {{ $refund->due_date }} - -
- {{ $refund->status }}
+ {{ $refund->id }} + {{ $refund->transaction->data_pembeli->nama_depan }} + + {{ $refund->transaction->data_penjual->nama_depan }} + + {{ $refund->total }} + {{ $refund->created_at }} + {{ $refund->due_date }} + {{ ucwords($refund->status) }}
@@ -64,4 +64,7 @@
- @endsection +
+
+ @extends('admin.transaction.modal-keterangan-status') +@endsection diff --git a/resources/views/Admin/refund/modal-next-detail-refund.blade.php b/resources/views/Admin/refund/modal-next-detail-refund.blade.php index 2efcab8b..d6b3f55d 100644 --- a/resources/views/Admin/refund/modal-next-detail-refund.blade.php +++ b/resources/views/Admin/refund/modal-next-detail-refund.blade.php @@ -23,7 +23,7 @@
- Accept Refund + Accept Refund
diff --git a/resources/views/Admin/setting/index.blade.php b/resources/views/Admin/setting/index.blade.php index 24423e80..4d8bd76b 100644 --- a/resources/views/Admin/setting/index.blade.php +++ b/resources/views/Admin/setting/index.blade.php @@ -164,7 +164,9 @@ - + diff --git a/resources/views/Admin/transaction/detail-transaction.blade.php b/resources/views/Admin/transaction/detail-transaction.blade.php index f5c0c6d4..78c05dcf 100644 --- a/resources/views/Admin/transaction/detail-transaction.blade.php +++ b/resources/views/Admin/transaction/detail-transaction.blade.php @@ -12,19 +12,22 @@
-

- Admin

-

- {{ $transaction->data_pembeli->nama_depan . ' ' . $transaction->data_pembeli->nama_belakang }}

-

- {{ $transaction->data_penjual->nama_depan . ' ' . $transaction->data_penjual->nama_belakang }}

-
-
-

Timeline

-
-
+
+

+ Admin

+

+ {{ $transaction->data_pembeli->nama_depan . ' ' . $transaction->data_pembeli->nama_belakang }} +

+

+ {{ $transaction->data_penjual->nama_depan . ' ' . $transaction->data_penjual->nama_belakang }} +

+
+
+

Timeline

+
+
diff --git a/resources/views/Admin/transaction/index.blade.php b/resources/views/Admin/transaction/index.blade.php index 1f160cd4..a23f778d 100644 --- a/resources/views/Admin/transaction/index.blade.php +++ b/resources/views/Admin/transaction/index.blade.php @@ -13,7 +13,7 @@
-
# + # + Bulan Tahun Persentase (%)
+
- - @foreach ($refundUserss as $key => $HistoryRefundUser) + @foreach ($refunds as $refund) - - - - - - - - + + + + + + + - @endforeach -
@@ -41,8 +41,18 @@ Rp {{ number_format($transaction->total_bayar, 2, ',', '.') }} {{ $transaction->created_at }} {{ $transaction->updated_at }}{{ ucwords($transaction->status) }} + {{ ucwords($transaction->status) }}
@@ -126,8 +136,6 @@ modal.find('.activities').html(activitiesHtml); }); - - }); @endsection diff --git a/resources/views/Admin/transaction/modal-tracking.blade.php b/resources/views/Admin/transaction/modal-tracking.blade.php index c3e16bf6..4647d3cd 100644 --- a/resources/views/Admin/transaction/modal-tracking.blade.php +++ b/resources/views/Admin/transaction/modal-tracking.blade.php @@ -1,5 +1,5 @@ -
- - - - -{{-- @extends('layout.main') -@section('content') - @foreach ($detail_transaction as $detail_transactions) -
-
-
-

Tracking Information

-
-

Tracking Number: {{ $detail_transactions['tracking_number'] }}

-

Order ID: {{ $detail_transactions['orderId'] }}

-

Status: {{ $detail_transactions['status'] }}

-

Estimated: {{ $detail_transactions['estimated'] }}

-
-

Tracking Details

-
    -
  • {{ $detail_transactions['tracking_detail1'] }}
    • -
  • {{ $detail_transactions['tracking_detail2'] }}
    • -
  • {{ $detail_transactions['tracking_detail3'] }}
    • -
-
-
-
- @endforeach -@endsection --}} diff --git a/resources/views/User/contact/index.blade.php b/resources/views/User/contact/index.blade.php index f72dddd3..cdfddd39 100644 --- a/resources/views/User/contact/index.blade.php +++ b/resources/views/User/contact/index.blade.php @@ -23,7 +23,7 @@
- +
@@ -116,7 +116,8 @@ }); $.ajax({ - url: "{{ route('user-contact.delete', ':id') }}".replace(':id', + url: "{{ route('user-contact.destroy', ':id') }}".replace( + ':id', dataId), type: 'DELETE', contentType: false, diff --git a/resources/views/User/refund/detail-refund.blade.php b/resources/views/User/refund/detail-refund.blade.php new file mode 100644 index 00000000..75d8c9da --- /dev/null +++ b/resources/views/User/refund/detail-refund.blade.php @@ -0,0 +1,74 @@ +@extends('layouts.main') +@section('content') +
+
+
+

Detail

+
+
Dashboard
+
Refund
+
Detail
+
+
+
+
+
+
+

Bukti Foto/Video

+ @foreach ($descriptions as $description) + @if ($description->type == 'image') + Return Image + @endif + @if ($description->type == 'videos') +
+
+
+
+
+
+
+ @include('admin.refund.modal-next-detail-refund') +@endsection diff --git a/resources/views/User/refund/history-refund.blade.php b/resources/views/User/refund/history-refund.blade.php deleted file mode 100644 index 90ce7b77..00000000 --- a/resources/views/User/refund/history-refund.blade.php +++ /dev/null @@ -1,58 +0,0 @@ -@extends('layouts.main') -@section('content') -
-
-
-
-
-

Detail Refund

-
-
Dashboard
-
Refund
-
Detail Refund
-
-
-
-
-
#
- - - - - - - - - - - @foreach ($history_refund as $HistoryRefund) - - - - - - - - - - - - @endforeach -
Order IDCustomerSellerTotalDue DateStatusUpload BuktiAction
{{ $HistoryRefund['orderId'] }}{{ $HistoryRefund['customer'] }}{{ $HistoryRefund['seller'] }}{{ $HistoryRefund['total'] }}{{ $HistoryRefund['dueDate'] }}{{ $HistoryRefund['date'] }} -
{{ $HistoryRefund['status'] }}
- 		- Detail - - -
- - -
-
-
-
- - - @endsection diff --git a/resources/views/User/refund/index.blade.php b/resources/views/User/refund/index.blade.php index fa6cbeb5..d7fea799 100644 --- a/resources/views/User/refund/index.blade.php +++ b/resources/views/User/refund/index.blade.php @@ -32,34 +32,36 @@
{{ ++$key }} - {{ $HistoryRefundUser['orderId'] }} - {{ $HistoryRefundUser['Customer'] }} - {{ $HistoryRefundUser['seller'] }} - {{ $HistoryRefundUser['Total'] }}{{ $HistoryRefundUser['dueDate'] }} -
Ditolak
- {{-- {{ $HistoryRefundUser['status'] }} --}} - + 		{{ $loop->iteration }}{{ $refund->id }}{{ $refund->transaction->data_pembeli->nama_depan }} + {{ $refund->transaction->data_penjual->nama_depan }} + {{ $refund->total }}{{ $refund->created_at }}{{ $refund->due_date }}{{ ucwords($refund->status) }} - {{ $HistoryRefundUser['uploadBukti'] }} - +
+ +
+ Detail +
+
@@ -68,5 +70,5 @@ - @extends('user.refund.detail-refund') + @extends('user.refund.modal-detail-refund') @endsection diff --git a/resources/views/User/transaction/Pembeli/detail-transaction.blade.php b/resources/views/User/transaction/Pembeli/detail-transaction.blade.php index f5c0c6d4..78c05dcf 100644 --- a/resources/views/User/transaction/Pembeli/detail-transaction.blade.php +++ b/resources/views/User/transaction/Pembeli/detail-transaction.blade.php @@ -12,19 +12,22 @@
-

- Admin

-

- {{ $transaction->data_pembeli->nama_depan . ' ' . $transaction->data_pembeli->nama_belakang }}

-

- {{ $transaction->data_penjual->nama_depan . ' ' . $transaction->data_penjual->nama_belakang }}

-
-
-

Timeline

-
-
+
+

+ Admin

+

+ {{ $transaction->data_pembeli->nama_depan . ' ' . $transaction->data_pembeli->nama_belakang }} +

+

+ {{ $transaction->data_penjual->nama_depan . ' ' . $transaction->data_penjual->nama_belakang }} +

+
+
+

Timeline

+
+
diff --git a/resources/views/User/transaction/Pembeli/index.blade.php b/resources/views/User/transaction/Pembeli/index.blade.php index cca6d477..4f2f75b6 100644 --- a/resources/views/User/transaction/Pembeli/index.blade.php +++ b/resources/views/User/transaction/Pembeli/index.blade.php @@ -33,10 +33,12 @@ - + - + @@ -52,7 +54,18 @@
No + # + Penjual TotalTanggal PembuatanTanggal Transaksi Tanggal Update Status Aksi{{ $transaction->created_at }} {{ $transaction->updated_at }} {{ ucwords($transaction->status) }} + data-target="#modalKeteranganStatus" + class="badge {{ in_array($transaction->status, ['pending', 'created']) + ? 'badge-light' + : (in_array($transaction->status, ['settlement', 'capture']) + ? 'badge-info' + : (in_array($transaction->status, ['process', 'sending', 'sended']) + ? 'badge-warning' + : (in_array($transaction->status, ['cancel', 'expire', 'failure', 'refund']) + ? 'badge-danger' + : ($transaction->status == 'finished' + ? 'badge-success' + : '')))) }}">{{ ucwords($transaction->status) }}
diff --git a/resources/views/User/transaction/Pembeli/new-transaction.blade.php b/resources/views/User/transaction/Pembeli/new-transaction.blade.php index 981d1c55..9ab8a4e3 100644 --- a/resources/views/User/transaction/Pembeli/new-transaction.blade.php +++ b/resources/views/User/transaction/Pembeli/new-transaction.blade.php @@ -116,7 +116,6 @@
- @extends('user.layout.progress-bar') @extends('user.transaction.pembeli.modal-keterangan-status') diff --git a/resources/views/User/transaction/penjual/modal-tracking.blade.php b/resources/views/User/transaction/penjual/modal-tracking.blade.php index ad3b5981..4647d3cd 100644 --- a/resources/views/User/transaction/penjual/modal-tracking.blade.php +++ b/resources/views/User/transaction/penjual/modal-tracking.blade.php @@ -1,5 +1,5 @@ -