DONE: update logo to original official logo, update letterhead and letterfooter layout

2026-07-07 12:26:28 +08:00
parent 1cc3351ca6
commit fb59917ebf
76 changed files with 547 additions and 402 deletions
@@ -189,6 +189,7 @@ class MembershipApplicationController extends Controller
            $membershipApplication,
            $request->user(),
            $request->validated('board_meeting_reference'),
+            $request->validated('board_meeting_date'),
        );

        $message = $application->board_result === BoardResult::Pass->value
@@ -210,6 +211,7 @@ class MembershipApplicationController extends Controller
            $request->validated('application_ids'),
            $request->user(),
            $request->validated('board_meeting_reference'),
+            $request->validated('board_meeting_date'),
        );

        $succeededCount = count($result['succeeded']);
@@ -270,6 +272,7 @@ class MembershipApplicationController extends Controller
        $application = $this->membershipApplicationService->generateResultLetter(
            $membershipApplication,
            $request->validated('board_meeting_reference'),
+            $request->validated('board_meeting_date'),
        );

        $resultLetter = $application->documents
@@ -301,11 +304,16 @@ class MembershipApplicationController extends Controller
            'board_meeting_reference',
            'Mesyuarat Lembaga',
        );
+        $boardMeetingDate = (string) $request->query(
+            'board_meeting_date',
+            now()->toDateString(),
+        );

        $view = 'membershipapplication::pdf.approved-letter';
        $data = $this->membershipApplicationService->getResultLetterViewData(
            $application,
            $boardMeetingReference,
+            $boardMeetingDate,
        );
        $format = $request->query('format', 'html');
        $filename = 'surat-keputusan-'.$application->application_number.'.pdf';
@@ -20,6 +20,7 @@ class BatchCompleteRequest extends FormRequest
            'application_ids' => 'required|array|min:1|max:100',
            'application_ids.*' => 'required|uuid|distinct|exists:membership_applications,id',
            'board_meeting_reference' => 'required|string|max:255',
+            'board_meeting_date' => 'required|date',
        ];
    }

@@ -36,6 +37,8 @@ class BatchCompleteRequest extends FormRequest
            'application_ids.*.distinct' => 'Permohonan duplikat tidak dibenarkan.',
            'board_meeting_reference.required' => 'Rujukan mesyuarat lembaga diperlukan.',
            'board_meeting_reference.max' => 'Rujukan mesyuarat lembaga tidak boleh melebihi 255 aksara.',
+            'board_meeting_date.required' => 'Tarikh mesyuarat lembaga diperlukan.',
+            'board_meeting_date.date' => 'Tarikh mesyuarat lembaga tidak sah.',
        ];
    }
 }
@@ -18,6 +18,7 @@ class CompleteMembershipApplicationRequest extends FormRequest
    {
        return [
            'board_meeting_reference' => 'required|string|max:255',
+            'board_meeting_date' => 'required|date',
        ];
    }

@@ -29,6 +30,8 @@ class CompleteMembershipApplicationRequest extends FormRequest
        return [
            'board_meeting_reference.required' => 'Rujukan mesyuarat lembaga diperlukan.',
            'board_meeting_reference.max' => 'Rujukan mesyuarat lembaga tidak boleh melebihi 255 aksara.',
+            'board_meeting_date.required' => 'Tarikh mesyuarat lembaga diperlukan.',
+            'board_meeting_date.date' => 'Tarikh mesyuarat lembaga tidak sah.',
        ];
    }
 }
@@ -18,6 +18,7 @@ class GenerateResultLetterRequest extends FormRequest
    {
        return [
            'board_meeting_reference' => 'required|string|max:255',
+            'board_meeting_date' => 'required|date',
        ];
    }

@@ -29,6 +30,8 @@ class GenerateResultLetterRequest extends FormRequest
        return [
            'board_meeting_reference.required' => 'Rujukan mesyuarat lembaga diperlukan.',
            'board_meeting_reference.max' => 'Rujukan mesyuarat lembaga tidak boleh melebihi 255 aksara.',
+            'board_meeting_date.required' => 'Tarikh mesyuarat lembaga diperlukan.',
+            'board_meeting_date.date' => 'Tarikh mesyuarat lembaga tidak sah.',
        ];
    }
 }
@@ -12,49 +12,77 @@
    {{ $applicant->postcode }}
@endsection

+@section('letter-honorific')
+    Tuan/Puan,
+@endsection
+
@section('letter-subject')
    <strong>{{ $letterSubject }}</strong>
@endsection

@section('letter-body')
    <p style="line-height: 1;">
-        Dengan segala hormatnya saya merujuk kepada perkara di atas.
+        Dengan segala hormatnya perkara di atas adalah dirujuk.
    </p>
    <p style="line-height: 1;">
-        2. {{ $openingTone }} dimaklumkan bahawa, permohonan tuan untuk menjadi anggota Koperasi
-        Permodalan Kelantan Berhad (KoPKB) telah <strong>{{ $boardResultLabel }}</strong> dalam {{ $boardMeetingReference }}@if ($isPassed && $memberNumber). Nombor keanggotaan tuan adalah <strong>{{ $memberNumber }}</strong>@endif.
+        2.
+        @if ($isPassed)
+            Sukacita dimaklumkan bahawa, permohonan tuan/puan untuk menjadi <strong>Anggota Koperasi Permodalan Kelantan Berhad (KoPKB)</strong> telah dipertimbangkan dan <strong>DILULUSKAN</strong> oleh Lembaga Koperasi dalam {{ $boardMeetingReference }} yang diadakan pada {{ $boardMeetingDate }}.
+        @else
+            Dukacita dimaklumkan bahawa, permohonan tuan/puan untuk menjadi <strong>Anggota Koperasi Permodalan Kelantan Berhad (KoPKB)</strong> telah dipertimbangkan dan <strong>TIDAK DILULUSKAN</strong> oleh Lembaga Koperasi dalam {{ $boardMeetingReference }} yang diadakan pada {{ $boardMeetingDate }}.
+        @endif
    </p>

    @if ($isPassed)
        <p style="line-height: 1;">
-            3. Pihak Koperasi akan membuat potongan gaji melalui majikan tuan sebagaimana ketetapan berikut:-
-            <ul style="line-height: 1;">
-                <li>Saham</li>
-                <ul style="line-height: 1;">
-                    <li>Potongan sebanyak RM {{ $monthlyShareInstallment }} ({{ $shareInstallmentMonths }} bulan)</li>
-                    <li>Potongan sebanyak RM {{ $stockMonthlyContribution }} sehingga Syer Maksima</li>
-                </ul>
-                <li>Yuran</li>
-                <ul style="line-height: 1;">
-                    <li>Potongan sebanyak RM {{ $feeMonthlyContribution }} setiap bulan</li>
-                </ul>
-                <li>Fi Masuk</li>
-                <ul style="line-height: 1;">
-                    <li>Potongan sebanyak RM 10.00 (Pembayaran Pertama)</li>
-                </ul>
-            </ul>
+            3. Maklumat keanggotaan tuan/puan adalah seperti berikut:-
+        </p>
+        <table class="letter-info-table" cellpadding="0" cellspacing="0">
+            <tr>
+                <th>Perkara</th>
+                <th>Maklumat</th>
+            </tr>
+            <tr>
+                <td>Nama Anggota</td>
+                <td>{{ $applicant->name }}</td>
+            </tr>
+            <tr>
+                <td>No. Kad Pengenalan</td>
+                <td>{{ $applicant->ic_number }}</td>
+            </tr>
+            <tr>
+                <td>No. Anggota</td>
+                <td>{{ $memberNumber }}</td>
+            </tr>
+            <tr>
+                <td>Tarikh Kuat Kuasa Keanggotaan</td>
+                <td>{{ $boardMeetingDate }}</td>
+            </tr>
+            <tr>
+                <td>Modal Syer Permulaan</td>
+                <td>RM500.00 (perlu dijelaskan dalam tempoh 6 bulan)</td>
+            </tr>
+            <tr>
+                <td>Fi Masuk</td>
+                <td>RM10.00</td>
+            </tr>
+            <tr>
+                <td>Yuran Tahunan</td>
+                <td>RM30.00 sebulan</td>
+            </tr>
+        </table>
+        <p style="line-height: 1;">
+            4. Sebagai anggota KoPKB, tuan/puan adalah tertakluk kepada Undang-Undang Kecil (UUK), dasar, polisi dan peraturan-peraturan KoPKB yang berkuat kuasa dari semasa ke semasa.
        </p>
        <p style="line-height: 1;">
-            4. Untuk makluman tuan, kelulusan keanggotaan ini adalah bersyarat di mana tuan dikehendaki
-            menjelaskan modal syer minimum sebanyak RM{{ $minimumShareCapital }}.
-            Bayaran tersebut perlu dibuat secara ansuran melalui potongan gaji dalam tempoh enam (6) bulan.
-            Pemenuhan syarat ini adalah bagi melayakkan tuan memperoleh hak, kewajipan dan liabiliti sebagai anggota KoPKB
-            sebagaimana terkandung di dalam Undang-Undang Kecil (UUK), Perkara 59 yang telah didaftarkan pada 11 September 2024.
-            Manakala had maksima modal syer adalah sebanyak RM5,000.00.
+            5. Sebagai anggota, tuan/puan adalah layak menikmati kemudahan, produk dan manfaat yang ditawarkan oleh koperasi dari semasa ke semasa, tertakluk kepada syarat-syarat yang ditetapkan.
+        </p>
+        <p style="line-height: 1;">
+            6. Pihak KoPKB mengucapkan tahniah dan mengalu-alukan penyertaan tuan/puan sebagai anggota. Semoga keanggotaan ini akan memberi manfaat kepada tuan/puan serta menyumbang kepada kemajuan dan kecemerlangan KoPKB.
        </p>
    @else
        <p style="line-height: 1;">
-            3. Oleh yang demikian, permohonan tuan untuk menjadi anggota KoPKB tidak dapat diluluskan pada masa ini.
+            3. Oleh yang demikian, permohonan tuan/puan untuk menjadi anggota KoPKB tidak dapat diluluskan pada masa ini.
        </p>
    @endif
@endsection
@@ -64,14 +92,5 @@
@endsection

@section('letter-signature')
-    <div class="signature-header">Dengan hormatnya,</div>
    <div class="signature-company">KOPERASI PERMODALAN KELANTAN BERHAD</div>
-    <div class="signature-space">
-        @if (! empty($signatureUrl))
-            <img src="{{ $signatureUrl }}" alt="" class="signature-space-img">
-        @endif
-    </div>
-    <div class="signatory-name">MUHAMMAD NAFIS BIN ZAINUDIN</div>
-    <div class="signatory-title">Pengurus Besar</div>
-    <div class="signatory-title">b/p Setiausaha</div>
@endsection
@@ -7,6 +7,7 @@ use App\Services\DocumentService;
 use App\Services\LetterService;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Notification;
@@ -258,6 +259,7 @@ class MembershipApplicationService
        MembershipApplication $application,
        User $processedBy,
        string $boardMeetingReference,
+        string $boardMeetingDate,
    ): MembershipApplication {
        if ($application->status !== ApplicationStatus::PendingNotification) {
            throw ValidationException::withMessages([
@@ -271,14 +273,14 @@ class MembershipApplicationService
            ]);
        }

-        return DB::transaction(function () use ($application, $boardMeetingReference) {
+        return DB::transaction(function () use ($application, $boardMeetingReference, $boardMeetingDate) {
            if ($application->board_result === BoardResult::Pass->value && ! $application->user_id) {
                $user = $this->createMemberFromApplication($application);
                $application->update(['user_id' => $user->id]);
                $application->refresh();
            }

-            $resultLetter = $this->storeResultLetter($application, $boardMeetingReference);
+            $resultLetter = $this->storeResultLetter($application, $boardMeetingReference, $boardMeetingDate);

            $this->sendResultNotification($application, $resultLetter);

@@ -298,8 +300,12 @@ class MembershipApplicationService
     *     failed: list<array{id: string, application_number: string|null, message: string}>
     * }
     */
-    public function completeBatch(array $applicationIds, User $processedBy, string $boardMeetingReference): array
-    {
+    public function completeBatch(
+        array $applicationIds,
+        User $processedBy,
+        string $boardMeetingReference,
+        string $boardMeetingDate,
+    ): array {
        $succeeded = [];
        $failed = [];

@@ -317,7 +323,12 @@ class MembershipApplicationService
            }

            try {
-                $succeeded[] = $this->complete($application, $processedBy, $boardMeetingReference);
+                $succeeded[] = $this->complete(
+                    $application,
+                    $processedBy,
+                    $boardMeetingReference,
+                    $boardMeetingDate,
+                );
            } catch (ValidationException $e) {
                $failed[] = [
                    'id' => $id,
@@ -333,7 +344,11 @@ class MembershipApplicationService
        ];
    }

-    public function generateResultLetter(MembershipApplication $application, string $boardMeetingReference,): MembershipApplication {
+    public function generateResultLetter(
+        MembershipApplication $application,
+        string $boardMeetingReference,
+        string $boardMeetingDate,
+    ): MembershipApplication {
        if ($application->status !== ApplicationStatus::Completed) {
            throw ValidationException::withMessages([
                'status' => ['Surat keputusan hanya boleh dijana untuk permohonan yang telah selesai.'],
@@ -346,8 +361,8 @@ class MembershipApplicationService
            ]);
        }

-        return DB::transaction(function () use ($application, $boardMeetingReference) {
-            $this->storeResultLetter($application, $boardMeetingReference);
+        return DB::transaction(function () use ($application, $boardMeetingReference, $boardMeetingDate) {
+            $this->storeResultLetter($application, $boardMeetingReference, $boardMeetingDate);

            return $this->repository->findByIdWithRelations($application->id);
        });
@@ -356,6 +371,7 @@ class MembershipApplicationService
    protected function storeResultLetter(
        MembershipApplication $application,
        string $boardMeetingReference,
+        string $boardMeetingDate,
    ): Document {
        $lockedApplication = MembershipApplication::query()
            ->whereKey($application->id)
@@ -376,7 +392,7 @@ class MembershipApplicationService
            ]);
        }

-        $viewData = $this->buildResultLetterViewData($application, $boardMeetingReference);
+        $viewData = $this->buildResultLetterViewData($application, $boardMeetingReference, $boardMeetingDate);
        $pdf = $this->letterService->renderPdf('membershipapplication::pdf.approved-letter', $viewData);
        $fileName = 'surat-keputusan-'.$application->application_number.'.pdf';

@@ -394,6 +410,7 @@ class MembershipApplicationService
    public function getResultLetterViewData(
        MembershipApplication $application,
        string $boardMeetingReference,
+        string $boardMeetingDate,
    ): array {
        $application = $this->repository->findByIdWithRelations($application->id);

@@ -403,7 +420,7 @@ class MembershipApplicationService
            ]);
        }

-        return $this->buildResultLetterViewData($application, $boardMeetingReference);
+        return $this->buildResultLetterViewData($application, $boardMeetingReference, $boardMeetingDate);
    }

    /**
@@ -412,32 +429,20 @@ class MembershipApplicationService
    protected function buildResultLetterViewData(
        MembershipApplication $application,
        string $boardMeetingReference,
+        string $boardMeetingDate,
    ): array {
        $applicant = $application->applicant;
        $isPassed = $application->board_result === BoardResult::Pass->value;
-        $stockMonthlyContribution = (float) $applicant->stock_monthly_contribution;
-        $monthlyShareInstallment = number_format(
-            $stockMonthlyContribution < 84 ? 84 : $stockMonthlyContribution,
-            2,
-            '.',
-            '',
-        );

        return [
            'application' => $application,
            'applicant' => $applicant,
            'boardMeetingReference' => $boardMeetingReference,
+            'boardMeetingDate' => Carbon::parse($boardMeetingDate)->translatedFormat('d M Y'),
            'isPassed' => $isPassed,
-            'boardResultLabel' => $isPassed ? 'lulus' : 'gagal',
-            'openingTone' => $isPassed ? 'Sukacita' : 'Dukacita',
            'letterSubject' => $isPassed
-                ? 'KELULUSAN KEANGGOTAAN KOPERASI PERMODALAN KELANTAN BERHAD'
-                : 'KEPUTUSAN PERMOHONAN KEANGGOTAAN KOPERASI PERMODALAN KELANTAN BERHAD',
-            'monthlyShareInstallment' => $monthlyShareInstallment,
-            'stockMonthlyContribution' => number_format($stockMonthlyContribution, 2, '.', ''),
-            'feeMonthlyContribution' => number_format((float) $applicant->fee_monthly_contribution, 2, '.', ''),
-            'shareInstallmentMonths' => MembershipApplication::SHARE_INSTALLMENT_MONTHS,
-            'minimumShareCapital' => number_format(MembershipApplication::MINIMUM_SHARE_CAPITAL, 2, '.', ''),
+                ? 'KELULUSAN PERMOHONAN MENJADI ANGGOTA KOPERASI PERMODALAN KELANTAN BERHAD (KoPKB)'
+                : 'KEPUTUSAN PERMOHONAN MENJADI ANGGOTA KOPERASI PERMODALAN KELANTAN BERHAD (KoPKB)',
            'memberNumber' => $isPassed ? $application->user?->member_number : null,
        ];
    }
@@ -4,5 +4,5 @@ return [
    'name' => 'User',
    'public_profile_token_ttl_days' => (int) env('PUBLIC_PROFILE_TOKEN_TTL_DAYS', 90),
    'frontend_url' => rtrim(env('FRONTEND_URL', env('APP_URL', 'http://localhost')), '/'),
-    'digital_card_logo_path' => env('DIGITAL_CARD_LOGO_PATH', public_path('images/logo/logo.svg')),
+    'digital_card_logo_path' => env('DIGITAL_CARD_LOGO_PATH', public_path('images/logo/logo-original.svg')),
 ];