From c6208e5b04e4a627028d0d0e4388fd79bd6713d1 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Tue, 2 Apr 2024 21:09:09 +0800
Subject: [PATCH] Change place to process second voucher eligibilty check

---
 .../Billplzs/ControllersLogic/CallbackBillplzLogic.php      | 6 ++----
 .../Processors/CreateInvoiceTransactionProcessor.php        | 4 ++++
 .../bookings/sections/BookingDetailsSectionComponent.vue    | 1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
index a4b80fc4..a6d48a5e 100644
--- a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
+++ b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
@@ -26,8 +26,7 @@ use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
 use App\Classes\Modules\Wallets\Services\RecalculatesWalletBalance;
-use App\Classes\Jobs\CreateMilestoneRewardByTransactionJob;
-use App\Classes\ValueObjects\Constants\Milestones;
+
 
 class CallbackBillplzLogic
 {
@@ -91,8 +90,7 @@ class CallbackBillplzLogic
         if(!$billPlz) throw new ResourceNotFoundException('Billplz bill not found.');
 
         $transaction = $this->fetchesTransaction->execute(['payment_reference' => $billplzXSignatureObject->getBillPlzId()]);
-        CreateMilestoneRewardByTransactionJob::dispatch($transaction, [Milestones::MILESTONE_1]);
-        
+
         if($billPlz->state === 'paid') {
             $status = ApprovalStatus::APPROVED;
         }
diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
index 7f105dc8..76f7cef7 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
@@ -14,13 +14,16 @@ use App\Classes\Modules\Bookings\Services\CalculatesBookingCurrencyAverageRate;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Bookings\Services\UpdatesBookingStatus;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Jobs\CreateMilestoneRewardByTransactionJob;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\SegmentConstants;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\Milestones;
 use App\Models\Booking;
 use App\Models\SegmentConstant;
 
+
 class CreateInvoiceTransactionProcessor
 {
 
@@ -123,6 +126,7 @@ class CreateInvoiceTransactionProcessor
         $transaction = $booking->transactions()
         ->where('type', TransactionType::PAYMENT)
         ->latest()->get()[0];
+        CreateMilestoneRewardByTransactionJob::dispatch($transaction, [Milestones::MILESTONE_1]);
 
         $billNumber = $this->generatesTransactionBillNumber->execute('INV-');
 
diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
index a2762ce7..a494bfe1 100644
--- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -460,6 +460,7 @@
                     </div>
                 </div>
                 <div class="col col-sm-12 col-md-3">
+                    <vouchers-summary-component></vouchers-summary-component>
                     <wallet-component class="m-b-20" :data="booking.company"></wallet-component>
                     <verification-warning-component :data="booking.company"></verification-warning-component>
                 </div>