fix(salary):memperbaiki oenggajian ketika pertama kali gaji itu hasilnya pasti 0

app/Http/Controllers/Admin/Dashboard/AnalyticController.php

@@ -142,7 +142,7 @@ public function filter(Request $request): JsonResponse
                 Carbon::parse($startDate)->startOfDay(),
                 Carbon::parse($endDate)->endOfDay(),
             ])
-            ->sum('amount');
+            ->sum('total');
 
         $totalShaving = Transaction::query()
             ->barbershop()

app/Http/Controllers/Admin/Finance/PayrollController.php

@@ -163,11 +163,6 @@ public function getSalaryEmployee(string $employeeId): JsonResponse
                 if ($employee->role_id === 4 && $latestPayroll->created_at->isToday()) {
                     $query->where('is_paid', '0');
                 }
-            }, function ($query) {
-                $query->whereBetween('created_at', [
-                    now()->subMonth()->startOfMonth(),
-                    now()->subMonth()->endOfMonth(),
-                ]);
             })
             ->sum('total');
         $debt = Debt::where('user_id', $employeeId)->where('is_paid', '0')->sum('amount');

app/Http/Controllers/Admin/Manage/TransactionController.php

@@ -13,24 +13,61 @@
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Storage;
+use Yajra\DataTables\Facades\DataTables;
 
 class TransactionController extends Controller
 {
     use DeleteAttachment, UploadAttachment;
 
-    public function index(): View
+    public function index(Request $request): View|JsonResponse
     {
-        return view('pages.admin.manage.transaction.index', [
-            'pageTitle' => 'Transaksi',
-            'transactions' => Transaction::with(['user', 'user.biography', 'cashier', 'cashier.biography', 'customer', 'service', 'barbershop'])
+        if ($request->ajax()) {
+            $transactions = Transaction::with(['user', 'user.biography', 'cashier', 'cashier.biography', 'customer', 'service', 'barbershop'])
                 ->barbershop()
                 ->when(auth()->user()->role_id === 5, function ($query) {
                     return $query->where('user_id', auth()->id());
+                });
+
+            return DataTables::eloquent($transactions)
+                ->addIndexColumn()
+                ->editColumn('created_at', function ($item) {
+                    return formatDateIndo($item->created_at);
                 })
-                ->latest()
-                ->get(),
+                ->editColumn('payment_method', function ($item) {
+                    switch ($item->payment_method) {
+                        case '1':
+                            return '<span class="badge badge-primary">Tunai</span>';
+                        case '2':
+                            return '<span class="badge badge-info">Qris</span>';
+                        case '2':
+                            return '<span class="badge badge-success">Lainnya</span>';
+
+                        default:
+                            return '<span class="badge badge-danger">Tidak Diketahui</span>';
+                    }
+                })
+                ->addColumn('image', function ($item) {
+                    if ($item->attachment && $item->attachment->formatted_attachment) {
+                        $imageUrl = Storage::url("transactions/{$item->attachment->formatted_attachment}");
+
+                        return '<a href="'.$imageUrl.'" ><img src="'.$imageUrl.'" alt="Check-in Image" height="77" width="77"></a>';
+                    }
+
+                    return '-';
+                })
+                ->addColumn('actions', function ($item) {
+                    return view('partials.admin._actions', ['item' => $item]);
+                })
+                ->rawColumns(['payment_method', 'image', 'actions'])
+                ->make();
+        }
+
+        return view('pages.admin.manage.transaction.index', [
+            'pageTitle' => 'Transaksi',
         ]);
     }
 

app/Http/Requests/Auth/LoginRequest.php

@@ -20,7 +20,7 @@ public function rules(): array
         return [
             'login' => 'required|string|max:255',
             'password' => 'required|string|min:8|max:60',
-            // 'g-recaptcha-response' => 'recaptcha',
+            'g-recaptcha-response' => 'recaptcha',
         ];
     }
 

app/Models/Transaction.php

@@ -30,7 +30,7 @@ class Transaction extends Model
 
     public function scopeBarbershop(Builder $query): Builder
     {
-        return $query->where('barbershop_id', Auth::user()->barbershop_id);
+        return $query->where('transactions.barbershop_id', Auth::user()->barbershop_id);
     }
 
     public function scopeToday(Builder $query): Builder

app/Models/User.php

@@ -41,7 +41,8 @@ public function scopeBarbershop(Builder $query): Builder
 
     public function scopeBarber(Builder $query): Builder
     {
-        return $query->where('role_id', 5);
+        return $query->where('role_id', 5)
+            ->where('is_active', '1');
     }
 
     public function role(): BelongsTo

public/assets/admin/js/chart/top-service.js

@@ -1,4 +1,3 @@
-
 let topServiceCtx = document.getElementById('topServiceChart').getContext('2d');
 
 let topServiceLabels = topService.map(topService => topService.name);
@@ -8,7 +7,7 @@ let topServiceBackgroundColors = topServiceData.map(() => getRandomColor());
 let topServiceBorderColors = topServiceBackgroundColors.map(color => color.replace('0.2', '1'));
 
 let topServiceChart = new Chart(topServiceCtx, {
-    type: 'polarArea',
+    type: 'bar',
     data: {
         labels: topServiceLabels,
         datasets: [{
@@ -25,6 +24,14 @@ let topServiceChart = new Chart(topServiceCtx, {
             legend: {
                 position: 'top',
             },
+        },
+        scales: {
+            x: {
+                beginAtZero: true
+            },
+            y: {
+                beginAtZero: true
+            }
         }
     },
 });

public/assets/admin/js/datatable/custom-table/transaction.js

@@ -0,0 +1,27 @@
+window.columns = [
+    {
+        data: 'DT_RowIndex',
+        orderable: false,
+        searchable: false
+    },
+    {
+        data: 'cashier.biography.full_name',
+    },
+    {
+        data: 'user.biography.full_name',
+    },
+    { data: 'customer.name' },
+    { data: 'service.name' },
+    { data: 'price' },
+    { data: 'discount' },
+    { data: 'total' },
+    { data: 'payment_method' },
+    {
+        data: 'image',
+        orderable: false,
+        searchable: false
+
+    },
+    { data: 'created_at' },
+    { data: 'actions' },
+];

resources/views/pages/admin/dashboard/analytic.blade.php

@@ -8,7 +8,7 @@
             <div class="input-group">
                 <div class="flatpicker-calender">
                     <input name="start_date" class="form-control human-friendly" id="start_date" type="date"
-                        value="{{ $startDate ?? '2024-01-01' }}">
+                        value="{{ $startDate ?? '2024-12-01' }}">
                 </div>
                 <span class="input-group-text">To</span>
                 <div class="flatpicker-calender">
@@ -278,7 +278,7 @@ class="feather feather-user-minus font-success">
     <script src="{{ asset('assets/admin/js/random-color.js?ver=1.0.0') }}"></script>
     <script src="{{ asset('assets/admin/js/chart/finance.js?ver=1.0.0') }}"></script>
     <script src="{{ asset('assets/admin/js/chart/payment-method.js?ver=1.0.0') }}"></script>
-    <script src="{{ asset('assets/admin/js/chart/top-service.js?ver=1.0.0') }}"></script>
+    <script src="{{ asset('assets/admin/js/chart/top-service.js?ver=1.1.0') }}"></script>
     <script src="{{ asset('assets/admin/js/chart/income-by-barber.js?ver=1.0.1') }}"></script>
     <script src="{{ asset('assets/admin/js/chart/transaction-by-barber.js?ver=1.0.0') }}"></script>
     <script src="{{ asset('assets/admin/js/filter.js?ver=1.0.1') }}"></script>

resources/views/pages/admin/finance/payroll/create.blade.php

@@ -32,9 +32,9 @@
                         @enderror
                     </div>
                     <div class="col-lg-6 position-relative">
-                        <label class="form-label" for="amount">Jumlah</label>
+                        <label class="form-label" for="amount">Gaji Pokok</label>
                         <input name="amount" class="form-control rupiah-format @error('amount') is-invalid @enderror"
-                            id="amount" type="text" placeholder="Masukan Jumlah" value="{{ old('amount') }}"
+                            id="amount" type="text" placeholder="Masukan Gaji Pokok" value="{{ old('amount') }}"
                             inputmode="numeric" readonly>
                         @error('amount')
                             <div class="invalid-feedback">
@@ -54,10 +54,10 @@
                         @enderror
                     </div>
                     <div class="col-lg-6 position-relative">
-                        <label class="form-label" for="cut">Potongan</label>
+                        <label class="form-label" for="cut">Kasbon & Potongan</label>
                         <input name="cut" class="form-control rupiah-format @error('cut') is-invalid @enderror"
-                            id="cut" type="text" placeholder="Masukan Potongan" value="{{ old('cut') }}"
-                            inputmode="numeric">
+                            id="cut" type="text" placeholder="Masukan Kasbon & Potongan"
+                            value="{{ old('cut') }}" inputmode="numeric">
                         @error('cut')
                             <div class="invalid-feedback">
                                 {{ $message }}

resources/views/pages/admin/finance/payroll/edit.blade.php

@@ -28,9 +28,9 @@
                         @enderror
                     </div>
                     <div class="col-lg-6 position-relative">
-                        <label class="form-label" for="amount">Jumlah</label>
+                        <label class="form-label" for="amount">Gaji Pokok</label>
                         <input name="amount" class="form-control rupiah-format @error('amount') is-invalid @enderror"
-                            id="amount" type="text" placeholder="Masukan Jumlah"
+                            id="amount" type="text" placeholder="Masukan Gaji Pokok"
                             value="{{ old('amount', formatToRupiah($payroll->amount)) }}" inputmode="numeric" readonly>
                         @error('amount')
                             <div class="invalid-feedback">
@@ -50,9 +50,9 @@
                         @enderror
                     </div>
                     <div class="col-lg-6 position-relative">
-                        <label class="form-label" for="cut">Potongan</label>
+                        <label class="form-label" for="cut">Kasbon & Potongan</label>
                         <input name="cut" class="form-control rupiah-format @error('cut') is-invalid @enderror"
-                            id="cut" type="text" placeholder="Masukan Potongan"
+                            id="cut" type="text" placeholder="Masukan Kasbon & Potongan"
                             value="{{ old('cut', formatToRupiah($payroll->cut)) }}" inputmode="numeric">
                         @error('cut')
                             <div class="invalid-feedback">

resources/views/pages/admin/manage/transaction/index.blade.php

@@ -30,88 +30,10 @@
                                         <th>Metode Pembayaran</th>
                                         <th>Gambar</th>
                                         <th>Tanggal</th>
-                                        @if (in_array(auth()->user()->role_id, [1, 3, 4]))
-                                            <th>Aksi</th>
-                                        @endif
+                                        <th>Aksi</th>
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    @foreach ($transactions as $transaction)
-                                        <tr>
-                                            <td>{{ $loop->iteration }}</td>
-                                            <td>{{ $transaction->cashier->biography->full_name ?? '-deleted-' }}</td>
-                                            <td>{{ $transaction->user->biography->full_name ?? '-deleted-' }}</td>
-                                            <td>{{ $transaction->customer->name }}</td>
-                                            <td>{{ $transaction->service->name }}</td>
-                                            <td>{{ formatToRupiah($transaction->price) }}</td>
-                                            <td>{{ formatToRupiah($transaction->discount) }}</td>
-                                            <td>{{ formatToRupiah($transaction->total) }}</td>
-                                            <td>
-                                                @if ($transaction->payment_method === '1')
-                                                    <span class="badge badge-primary">Tunai</span>
-                                                @elseif($transaction->payment_method === '2')
-                                                    <span class="badge badge-info">Qris</span>
-                                                @elseif($transaction->payment_method === '3')
-                                                    <span class="badge badge-success">Lainnya</span>
-                                                @else
-                                                    <span class="badge badge-danger">Tidak Diketahui</span>
-                                                @endif
-                                            </td>
-                                            <td>
-                                                @if ($transaction->attachment && $transaction->attachment->formatted_attachment)
-                                                    <a
-                                                        href="{{ Storage::url("transactions/{$transaction->attachment->formatted_attachment}") }}">
-                                                        <img src="{{ Storage::url("transactions/{$transaction->attachment->formatted_attachment}") }}"
-                                                            alt="{{ $transaction->name }}" width="77" height="77">
-                                                    </a>
-                                                @else
-                                                    <a href="{{ asset('assets/images/no-imge.png') }}">
-                                                        <img src="{{ asset('assets/images/no-imge.png') }}"
-                                                            alt="Default Image" style="width: 77px; height: 77px">
-                                                    </a>
-                                                @endif
-                                            </td>
-                                            <td>{{ formatDateIndo($transaction->created_at) }}</td>
-                                            @if (in_array(auth()->user()->role_id, [1, 3, 4]))
-                                                <td>
-                                                    <ul class="action">
-                                                        <li class="show">
-                                                            <a href="javascript:void(0)" data-bs-toggle="modal"
-                                                                data-bs-target="#createModal"
-                                                                data-modal-title="Print Transaksi"
-                                                                data-url="{{ route('manage.transaction.print', encryptId($transaction->id)) }}"
-                                                                data-method="post" data-bs-toggle="tooltip"
-                                                                data-bs-placement="left" data-bs-title="Print">
-                                                                <i data-feather="printer"></i>
-                                                            </a>
-                                                        </li>
-                                                        <li class="edit">
-                                                            <a href="{{ route('manage.transaction.edit', encryptId($transaction->id)) }}"
-                                                                data-bs-toggle="tooltip" data-bs-placement="left"
-                                                                data-bs-title="Edit">
-                                                                <i data-feather="edit"></i>
-                                                            </a>
-                                                        </li>
-                                                        @if (auth()->user()->role_id === 1)
-                                                            <li class="delete">
-                                                                <form
-                                                                    action="{{ route('manage.transaction.delete', encryptId($transaction->id)) }}"
-                                                                    method="post">
-                                                                    @csrf
-                                                                    @method('delete')
-                                                                    <a href="javascript:void(0)" class="delete-data"
-                                                                        data-bs-toggle="tooltip" data-bs-placement="left"
-                                                                        data-bs-title="Hapus">
-                                                                        <i data-feather="trash-2"></i>
-                                                                    </a>
-                                                                </form>
-                                                            </li>
-                                                        @endif
-                                                    </ul>
-                                                </td>
-                                            @endif
-                                        </tr>
-                                    @endforeach
                                 </tbody>
                             </table>
                         </div>
@@ -200,9 +122,14 @@
         let userRole = {!! auth()->user()->role_id !!};
     </script>
     <script src="{{ asset('assets/admin/js/datatable/jquery.dataTables.min.js?ver=1.0.0') }}"></script>
-    <script src="{{ asset('assets/admin/js/datatable/custom-table/transaction.js?ver=1.1.0') }}"></script>
-    <script src="{{ asset('assets/admin/js/datatable/server-side.js?ver=1.0.0') }}"></script>
+    <script src="{{ asset('assets/admin/js/datatable/custom-table/transaction.js?ver=1.0.0') }}"></script>
+    <script src="{{ asset('assets/admin/js/datatable/server-side.js?ver=1.0.1') }}"></script>
     <script src="{{ asset('assets/js/interactions/confirmation.js?ver=1.0.0') }}"></script>
     <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
     <script src="{{ asset('assets/admin/js/custom/transaction.js?ver=1.0.0') }}"></script>
+    <script>
+        $('#datatable').on('draw.dt', function() {
+            feather.replace();
+        });
+    </script>
 @endsection

resources/views/pages/admin/manage/transaction/print.blade.php

@@ -213,13 +213,13 @@
                 window.print();
             };
 
-            document.getElementsByTagName("body")[0].onafterprint = function() {
-                myFunction()
-            };
+            // document.getElementsByTagName("body")[0].onafterprint = function() {
+            //     myFunction()
+            // };
 
-            function myFunction() {
-                window.location.href = "{{ $url }}";
-            }
+            // function myFunction() {
+            //     window.location.href = "{{ $url }}";
+            // }
         </script>
     </body>
 

resources/views/partials/admin/_actions.blade.php

@@ -0,0 +1,32 @@
+@if (in_array(auth()->user()->role_id, [1, 3, 4]))
+    <td>
+        <ul class="action">
+            <li class="show">
+                <a href="javascript:void(0)" data-bs-toggle="modal" data-bs-target="#createModal"
+                    data-modal-title="Print Transaksi"
+                    data-url="{{ route('manage.transaction.print', encryptId($item->id)) }}" data-method="post"
+                    data-bs-toggle="tooltip" data-bs-placement="left" data-bs-title="Print">
+                    <i data-feather="printer"></i>
+                </a>
+            </li>
+            <li class="edit">
+                <a href="{{ route('manage.transaction.edit', encryptId($item->id)) }}" data-bs-toggle="tooltip"
+                    data-bs-placement="left" data-bs-title="Edit">
+                    <i data-feather="edit"></i>
+                </a>
+            </li>
+            @if (auth()->user()->role_id === 1)
+                <li class="delete">
+                    <form action="{{ route('manage.transaction.delete', encryptId($item->id)) }}" method="post">
+                        @csrf
+                        @method('delete')
+                        <a href="javascript:void(0)" class="delete-data" data-bs-toggle="tooltip"
+                            data-bs-placement="left" data-bs-title="Hapus">
+                            <i data-feather="trash-2"></i>
+                        </a>
+                    </form>
+                </li>
+            @endif
+        </ul>
+    </td>
+@endif