cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-24 06:54:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/57-second-voucher-first-milestone' into development

Browse Source
This commit is contained in:
Dillon Ngo
2024-04-02 21:09:22 +08:00
parent 7a3e7d2c62 c6208e5b04
commit e25f330d3c
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
+2 -4
View File
@@ -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;
}
app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
+4
View File
@@ -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-');
resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+1
View File
@@ -465,6 +465,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>