cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

E-Invoice - Receipt Voucher

Browse Source
This commit is contained in:
Dillon Ngo
2025-05-24 22:14:35 +08:00
parent de799dc356
commit b3693aa1e3
21 changed files with 543 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.example
+2
View File
@@ -75,3 +75,5 @@ LARAVEL_VAPOR_ENABLED=false
COMMANDS_V2_ENABLED=false
SENDING_EMAIL_ENABLED=false
SENDING_EMAIL_WELCOME_VOUCHER_ENABLED=false
E_INVOICE_START_DATE="2025-07-01 00:00:00"
app/Classes/General/Helper.php
+22 -1
View File
@@ -4,8 +4,8 @@ namespace App\Classes\General;
use Illuminate\Http\Resources\Json\ResourceCollection;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Str;
use NumberToWords\NumberToWords;
class Helper
{
@@ -66,4 +66,25 @@ class Helper
return json_decode($collection->response()->getContent(), true);
}
/**
* Convert a given number to words based on the specified locale.
*
* @param int|float $number
* @param string $locale The locale to use for conversion (default is 'en').
* @return string
*/
static function convert($number, $locale = 'en')
{
$numberToWords = new NumberToWords();
$numberTransformer = $numberToWords->getNumberTransformer($locale);
$number = number_format((float)$number, 2, '.', '');
[$ringgit, $cents] = explode('.', $number);
$ringgitWords = $numberTransformer->toWords((int)$ringgit);
$centsWords = $numberTransformer->toWords((int)$cents);
return strtoupper('ringgit ' . $ringgitWords . ' and ' . $centsWords . ' cents only');
}
}
app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
+14 -2
View File
@@ -5,6 +5,7 @@ namespace App\Classes\Modules\Billplzs\ControllersLogic;
use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject;
use App\Classes\Modules\Wallets\Services\UpdatesWallet;
use App\Classes\Modules\Transactions\Processors\CreateCashBackTransactionProcessor;
use App\Classes\Modules\Transactions\Processors\CreateReceiptVoucherTransactionProcessor;
use App\Classes\Exceptions\ResourceNotFoundException;
use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
@@ -49,6 +50,9 @@ class CallbackBillplzLogic
/** @var RecalculatesWalletBalance */
private $recalculatesWalletBalance;
/** @var CreateReceiptVoucherTransactionProcessor */
private $createReceiptVoucherTransactionProcessor;
/**
* CallbackBillplzLogic constructor.
* @param GetBillplzBill $getBillplzBill
@@ -56,8 +60,9 @@ class CallbackBillplzLogic
* @param UpdatesTransactionStatus $updatesTransactionStatus
* @param UpdatesWalletBalance $updatesWalletBalance
* @param RecalculatesWalletBalance $recalculatesWalletBalance
* @param CreateReceiptVoucherTransactionProcessor $createReceiptVoucherTransactionProcessor
*/
public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdatesWalletBalance $updatesWalletBalance, CreateCashBackTransactionProcessor $createCashBackTransactionProcessor, RecalculatesWalletBalance $recalculatesWalletBalance)
public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, UpdatesWalletBalance $updatesWalletBalance, CreateCashBackTransactionProcessor $createCashBackTransactionProcessor, RecalculatesWalletBalance $recalculatesWalletBalance, CreateReceiptVoucherTransactionProcessor $createReceiptVoucherTransactionProcessor)
{
$this->getBillplzBill = $getBillplzBill;
$this->fetchesTransaction = $fetchesTransaction;
@@ -65,6 +70,7 @@ class CallbackBillplzLogic
$this->updatesWalletBalance = $updatesWalletBalance;
$this->createCashBackTransactionProcessor = $createCashBackTransactionProcessor;
$this->recalculatesWalletBalance = $recalculatesWalletBalance;
$this->createReceiptVoucherTransactionProcessor = $createReceiptVoucherTransactionProcessor;
}
@@ -105,6 +111,12 @@ class CallbackBillplzLogic
$this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
}
$booking = $transaction->owner instanceof Booking ? $transaction->booking : (count($transaction->owner->owner->bookings()->get())? $transaction->owner->owner->bookings()->orderBy('id', 'DESC')->first(): null);
if($transaction->owner instanceof Booking && $booking && $transaction){
$this->createReceiptVoucherTransactionProcessor->execute($booking, $transaction);
}
// if ($transaction->type == TransactionType::PAYMENT) {
// $cash_back_transaction = $this->createCashBackTransactionProcessor->execute($transaction);
// }
@@ -117,4 +129,4 @@ class CallbackBillplzLogic
return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $marking ?? null, 'transaction' => $transaction, 'status' => $status]);
}
}
}
app/Classes/Modules/Bookings/ControllersLogic/ApprovePaymentVerificationLogic.php
+41 -30
View File
@@ -11,42 +11,15 @@ use App\Classes\Modules\Transactions\Services\FetchesTransaction;
use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
use App\Classes\Modules\Transactions\Processors\CreateCashBackTransactionProcessor;
use App\Classes\Modules\Transactions\Processors\CreateReceiptVoucherTransactionProcessor;
use App\Classes\ValueObjects\Constants\ApprovalStatus;
use App\Models\Booking;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class ApprovePaymentVerificationLogic extends AbstractControllerLogic
{
/**
* ApprovePaymentVerificationLogic constructor.
* @param FetchesTransaction $fetchesTransaction
* @param UpdatesTransactionStatus $updatesTransactionStatus
* @param ApprovesDocument $approvesDocument
* @param RejectsDocument $rejectsDocument
* @param FetchesDocument $fetchesDocument
* @param CreateCashBackTransactionProcessor $createCashBackTransactionProcessor
*/
public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument, CreateCashBackTransactionProcessor $createCashBackTransactionProcessor)
{
$this->fetchesTransaction = $fetchesTransaction;
$this->updatesTransactionStatus = $updatesTransactionStatus;
$this->approvesDocument = $approvesDocument;
$this->rejectsDocument = $rejectsDocument;
$this->createCashBackTransactionProcessor = $createCashBackTransactionProcessor;
}
/**
* @return array
*/
protected function notification():array {
return [
'title' => 'Payment Status',
'message' => 'You have successfully updated the payment status'
];
}
/** @var FetchesTransaction */
private $fetchesTransaction;
@@ -62,6 +35,39 @@ class ApprovePaymentVerificationLogic extends AbstractControllerLogic
/** @var CreateCashBackTransactionProcessor */
private $createCashBackTransactionProcessor;
/** @var CreateReceiptVoucherTransactionProcessor */
private $createReceiptVoucherTransactionProcessor;
/**
* ApprovePaymentVerificationLogic constructor.
* @param FetchesTransaction $fetchesTransaction
* @param UpdatesTransactionStatus $updatesTransactionStatus
* @param ApprovesDocument $approvesDocument
* @param RejectsDocument $rejectsDocument
* @param FetchesDocument $fetchesDocument
* @param CreateCashBackTransactionProcessor $createCashBackTransactionProcessor
* @param CreateReceiptVoucherTransactionProcessor $createReceiptVoucherTransactionProcessor
*/
public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument, CreateCashBackTransactionProcessor $createCashBackTransactionProcessor, CreateReceiptVoucherTransactionProcessor $createReceiptVoucherTransactionProcessor)
{
$this->fetchesTransaction = $fetchesTransaction;
$this->updatesTransactionStatus = $updatesTransactionStatus;
$this->approvesDocument = $approvesDocument;
$this->rejectsDocument = $rejectsDocument;
$this->createCashBackTransactionProcessor = $createCashBackTransactionProcessor;
$this->createReceiptVoucherTransactionProcessor = $createReceiptVoucherTransactionProcessor;
}
/**
* @return array
*/
protected function notification():array {
return [
'title' => 'Payment Status',
'message' => 'You have successfully updated the payment status'
];
}
/**
* @param Request $request
* @return JsonResponse
@@ -77,9 +83,14 @@ class ApprovePaymentVerificationLogic extends AbstractControllerLogic
$this->updatesTransactionStatus->execute($transaction, $status === 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED);
$booking = $transaction->owner instanceof Booking ? $transaction->booking : null;
if($booking && $transaction){
$this->createReceiptVoucherTransactionProcessor->execute($booking, $transaction);
}
// $this->createCashBackTransactionProcessor->execute($transaction);
return $this->response([]);
}
}
}
app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
+8 -1
View File
@@ -25,6 +25,7 @@ use App\Classes\Modules\Vouchers\Processors\Voucherify\BookingToVoucherifyProces
use App\Classes\Modules\Wallets\Services\RecalculatesWalletBalance;
use App\Classes\Modules\Rules\Services\RuleEvaluator;
use App\Classes\Modules\Rules\Standards\Rules\CanPassOrderDurationLimitRule;
use App\Classes\Modules\Transactions\Processors\CreateReceiptVoucherTransactionProcessor;
use App\Classes\ValueObjects\Constants\ApprovalStatus;
use App\Classes\ValueObjects\Constants\PaymentMethodType;
use App\Classes\ValueObjects\Constants\TransactionType;
@@ -89,6 +90,9 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
/** @var RuleEvaluator */
private $ruleEvaluator;
/** @var CreateReceiptVoucherTransactionProcessor */
private $createReceiptVoucherTransactionProcessor;
/**
* CreateBookingPaymentLogic constructor.
* @param FetchesBookingQuotation $fetchBookingQuotation
@@ -104,8 +108,9 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
* @param BookingToVoucherifyProcessor $bookingToVoucherifyProcessor
* @param CalculatesBookingRefundAmount $calculatesBookingRefundAmount
* @param RuleEvaluator $ruleEvaluator
* @param CreateReceiptVoucherTransactionProcessor $createReceiptVoucherTransactionProcessor
*/
public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CalculatesBookingOutstanding $calculatesBookingOutstanding, CreatesBillplzBill $createsBillplzBill, UpdatesWalletBalance $updatesWalletBalance, UpdatesTransactionStatus $updatesTransactionStatus, CreateCashBackTransactionProcessor $createCashBackTransactionProcessor, RecalculatesWalletBalance $recalculatesWalletBalance, BookingToVoucherifyProcessor $bookingToVoucherifyProcessor, CalculatesBookingRefundAmount $calculatesBookingRefundAmount, RuleEvaluator $ruleEvaluator)
public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CalculatesBookingOutstanding $calculatesBookingOutstanding, CreatesBillplzBill $createsBillplzBill, UpdatesWalletBalance $updatesWalletBalance, UpdatesTransactionStatus $updatesTransactionStatus, CreateCashBackTransactionProcessor $createCashBackTransactionProcessor, RecalculatesWalletBalance $recalculatesWalletBalance, BookingToVoucherifyProcessor $bookingToVoucherifyProcessor, CalculatesBookingRefundAmount $calculatesBookingRefundAmount, RuleEvaluator $ruleEvaluator, CreateReceiptVoucherTransactionProcessor $createReceiptVoucherTransactionProcessor)
{
$this->fetchBookingQuotation = $fetchBookingQuotation;
$this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit;
@@ -120,6 +125,7 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
$this->bookingToVoucherifyProcessor = $bookingToVoucherifyProcessor;
$this->calculatesBookingRefundAmount = $calculatesBookingRefundAmount;
$this->ruleEvaluator = $ruleEvaluator;
$this->createReceiptVoucherTransactionProcessor = $createReceiptVoucherTransactionProcessor;
}
/**
@@ -200,6 +206,7 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
if(PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')] == PaymentMethodType::WALLET){
$this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
$this->createReceiptVoucherTransactionProcessor->execute($booking, $transaction);
}
return $this->resourceResponse(new TransactionResource($transaction));
app/Classes/Modules/Bookings/ControllersLogic/RegenerateBookingPaymentRVLogic.php
+81
View File
@@ -0,0 +1,81 @@
<?php
namespace App\Classes\Modules\Bookings\ControllersLogic;
use App\Classes\General\Abstracts\AbstractControllerLogic;
use App\Classes\Modules\Bookings\Services\FetchesBooking;
use App\Classes\Modules\Transactions\Services\FetchesTransaction;
use App\Classes\Modules\Bookings\Standards\Rules\CanFetchBooking;
use App\Classes\Modules\Transactions\Processors\CreateReceiptVoucherTransactionProcessor;
use App\Http\Resources\BookingResource;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class RegenerateBookingPaymentRVLogic extends AbstractControllerLogic
{
/**
* @return array
*/
protected function notification(): array
{
return [
'title' => 'Regenerate Booking Payment Receipt Voucher',
'message' => 'You have successfully regenerate booking payment receipt voucher'
];
}
/** @var CanFetchBooking */
private $canFetchBooking;
/** @var FetchesBooking */
private $fetchesBooking;
/** @var FetchesTransaction */
private $fetchesTransaction;
/** @var CreateReceiptVoucherTransactionProcessor */
private $createReceiptVoucherTransactionProcessor;
/**
* RegenerateBookingPaymentRVLogic constructor.
* @param CanFetchBooking $canFetchBooking
* @param FetchesBooking $fetchesBooking
* @param FetchesTransaction $fetchesTransaction
* @param CreateReceiptVoucherTransactionProcessor $createReceiptVoucherTransactionProcessor
*/
public function __construct(
CanFetchBooking $canFetchBooking,
FetchesBooking $fetchesBooking,
FetchesTransaction $fetchesTransaction,
CreateReceiptVoucherTransactionProcessor $createReceiptVoucherTransactionProcessor
) {
$this->canFetchBooking = $canFetchBooking;
$this->fetchesBooking = $fetchesBooking;
$this->fetchesTransaction = $fetchesTransaction;
$this->createReceiptVoucherTransactionProcessor = $createReceiptVoucherTransactionProcessor;
}
/**
* @param Request $request
* @return JsonResponse
* @throws \App\Classes\Exceptions\AccessForbiddenException
* @throws \App\Classes\Exceptions\MalformedRequestException
* @throws \App\Classes\Exceptions\RequestValidationException
*/
public function logic(Request $request): JsonResponse
{
$this->canFetchBooking->passes();
$booking = $this->fetchesBooking->execute(['id' => $request->route('id')]);
$transaction = $this->fetchesTransaction->execute(['id' => $request->input('paymentId')]);
if($booking && $transaction){
$this->createReceiptVoucherTransactionProcessor->execute($booking, $transaction, true);
}
return $this->resourceResponse(new BookingResource($booking));
}
}
app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php
+17 -5
View File
@@ -10,6 +10,7 @@ use App\Classes\ValueObjects\Constants\DocumentType;
use App\Classes\ValueObjects\Constants\TransactionType;
use App\Models\Booking;
use App\Models\Document;
use Carbon\Carbon;
use Illuminate\Support\Facades\Log;
use Mccarlosen\LaravelMpdf\Facades\LaravelMpdf;
use Webklex\PDFMerger\Facades\PDFMergerFacade as PDFMerger;
@@ -45,9 +46,16 @@ class CreateInvoiceDocumentProcessor
public function execute($transaction, $purchaseOrder, $supplier, $document_type, $voucherRedemption = null)
{
// calculate current Paid Amount
$booking = $transaction->owner_type == Booking::class ? $transaction->owner : null;
$booking = $transaction->owner_type == Booking::class ? $transaction->owner : null;
$currentPaidAmount = null;
$lastPaymentDate = $supplier->segments->whereIn('id', [23])->first() ? \Carbon\Carbon::now() : $purchaseOrder->booking->created_at;
$eInvoiceStartDate = Carbon::parse(env('E_INVOICE_START_DATE', '2025-07-01 00:00:00'));
if ($booking) {
$bookingCreatedDate = Carbon::parse($booking->created_at);
if ($bookingCreatedDate->isAfter($eInvoiceStartDate)) {
$lastPaymentDate = $booking->transactions()->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::APPROVED])->latest()->first()->created_at;
}
$payment = $booking->transactions()->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::APPROVED])->first();
$refundAmount = $payment->transactions()->refunds()->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->sum('amount');
$paymentAmount = $payment->amount;
@@ -56,9 +64,9 @@ class CreateInvoiceDocumentProcessor
$lowercaseDocumentType = strtolower($document_type);
$order_pdf = LaravelMpdf::loadView('pages.pdfs.' . $lowercaseDocumentType, ['transaction' => $transaction, 'po_order_transaction' => $purchaseOrder, 'supplier' => $supplier, 'voucher_redemption' => $voucherRedemption, 'current_paid_amount' => $currentPaidAmount]);
$order_pdf = LaravelMpdf::loadView('pages.pdfs.' . $lowercaseDocumentType, ['transaction' => $transaction, 'po_order_transaction' => $purchaseOrder, 'supplier' => $supplier, 'voucher_redemption' => $voucherRedemption, 'current_paid_amount' => $currentPaidAmount, 'last_payment_date' => $lastPaymentDate ]);
if($purchaseOrder->booking->service_id === 4) {
if($purchaseOrder && $purchaseOrder->booking->service_id === 4) {
$purchaseOrderDocuments = $purchaseOrder->booking->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->get();
@@ -112,8 +120,12 @@ class CreateInvoiceDocumentProcessor
);
/** @var Document $document */
$document = $this->createsDocument->execute($purchaseOrder->booking, $document_object);
if($document_type === DocumentType::RECEIPT_VOUCHER){
$document = $this->createsDocument->execute($transaction, $document_object);
}
else{
$document = $this->createsDocument->execute($purchaseOrder->booking, $document_object);
}
$this->createsFile->execute($document, $document_object);
}
}
app/Classes/Modules/Transactions/Processors/CreateReceiptVoucherTransactionProcessor.php
+113
View File
@@ -0,0 +1,113 @@
<?php
namespace App\Classes\Modules\Transactions\Processors;
use App\Classes\Exceptions\MalformedRequestException;
use App\Classes\Modules\Transactions\Services\CreatesTransaction;
use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
use App\Classes\Modules\Bookings\Services\CalculatesBookingCurrencyAverageRate;
use App\Classes\Modules\Companies\Services\FetchesCompany;
use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
use App\Classes\ValueObjects\Constants\ApprovalStatus;
use App\Classes\ValueObjects\Constants\TransactionType;
use App\Classes\ValueObjects\Constants\DocumentType;
use App\Models\Booking;
use App\Models\Transaction;
use Illuminate\Support\Facades\Log;
class CreateReceiptVoucherTransactionProcessor
{
/** @var CreatesTransaction */
private $createsTransaction;
/** @var GeneratesTransactionBillNumber */
private $generatesTransactionBillNumber;
/** @var CalculatesBookingCurrencyAverageRate */
private $calculatesBookingCurrencyAverageRate;
/** @var FetchesCompany */
private $fetchesCompany;
/** @var CreateInvoiceDocumentProcessor */
private $invoiceDocumentProcessor;
/**
* CreateReceiptVoucherTransactionProcessor constructor.
* @param CreatesTransaction $createsTransaction
* @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
* @param CalculatesBookingCurrencyAverageRate $calculatesBookingCurrencyAverageRate
* @param FetchesCompany $fetchesCompany
* @param CreateInvoiceDocumentProcessor $invoiceDocumentProcessor
*/
public function __construct(CreatesTransaction $createsTransaction, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CalculatesBookingCurrencyAverageRate $calculatesBookingCurrencyAverageRate, FetchesCompany $fetchesCompany, CreateInvoiceDocumentProcessor $invoiceDocumentProcessor)
{
$this->createsTransaction = $createsTransaction;
$this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
$this->calculatesBookingCurrencyAverageRate = $calculatesBookingCurrencyAverageRate;
$this->fetchesCompany = $fetchesCompany;
$this->invoiceDocumentProcessor = $invoiceDocumentProcessor;
}
/**
* @param Booking $booking
* @param Transaction $transaction
* @param bool $isRegenerate
* @return void
* @throws MalformedRequestException
*/
public function execute(Booking $booking, Transaction $transaction, bool $isRegenerate = false)
{
$purchaseOrder = $booking->transactions()
->where('type', TransactionType::PURCHASE_ORDER)
// ->complete()
->first();
if(!$transaction->type === TransactionType::PAYMENT){
return;
}
if(!($transaction->status === ApprovalStatus::APPROVED || $transaction->status === ApprovalStatus::COMPLETED)){
return;
}
Log::info('CreateReceiptVoucherTransactionProcessor booking id: '. $booking->id);
Log::info('CreateReceiptVoucherTransactionProcessor transaction: '. json_encode($transaction));
//If payment receipt voucher already exists, return (unless you want to regenerate)
if($transaction->transactions()->where('type', TransactionType::RECEIPT_VOUCHER)->exists() && !$isRegenerate){
return;
}
$billNumber = $this->generatesTransactionBillNumber->execute('RV-');
$booking_currency_average_rate = $this->calculatesBookingCurrencyAverageRate->execute($booking, TransactionType::PAYMENT);
$transaction_object = new TransactionObject(
$billNumber,
TransactionType::RECEIPT_VOUCHER,
$transaction->issuer,
$transaction->receiver,
$transaction->recipient_bank_account_id,
$transaction->payment_method,
$transaction->amount,
$transaction->original_amount,
$transaction->currency_id,
$transaction->original_currency_id,
$booking_currency_average_rate,
0,
0,
null,
ApprovalStatus::APPROVED
);
$invoice_transaction = $this->createsTransaction->execute($transaction, $transaction_object);
$voucherRedemption = $transaction->voucherRedemption;
$supplier = $this->fetchesCompany->execute(['id' => $transaction->receiver]);
// receipt voucher - Receipt is mandatory for customer who wants e-invoice and those who does not
$this->invoiceDocumentProcessor->execute($invoice_transaction, $purchaseOrder, $supplier, DocumentType::RECEIPT_VOUCHER, $voucherRedemption);
}
}
app/Classes/ValueObjects/Constants/DocumentType.php
+2
View File
@@ -27,4 +27,6 @@ final class DocumentType {
public const BULK_PURCHASE_ORDER = 'BULK_PURCHASE_ORDER';
public const BILL_GROUP_PAYMENT_PROOF = 'BILL_GROUP_PAYMENT_PROOF';
public const RECEIPT_VOUCHER = 'RECEIPT_VOUCHER';
}
app/Classes/ValueObjects/Constants/TransactionType.php
+3 -1
View File
@@ -38,6 +38,8 @@ final class TransactionType {
public const BILL_REFUND = 16;
public const RECEIPT_VOUCHER = 17;
public const ID_TO_NAME = [
self::PAYMENT_ATTEMPT => "PAYMENT_ATTEMPT",
self::PAYMENT => "PAYMENT",
@@ -56,5 +58,5 @@ final class TransactionType {
self::SUPPLIER_PAYMENT => "SUPPLIER_PAYMENT",
self::SUPPLIER_REFUND => "SUPPLIER_REFUND",
];
}
app/Http/Controllers/Bookings/RegenerateBookingPaymentRVController.php
+20
View File
@@ -0,0 +1,20 @@
<?php
namespace App\Http\Controllers\Bookings;
use App\Classes\Modules\Bookings\ControllersLogic\RegenerateBookingPaymentRVLogic;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class RegenerateBookingPaymentRVController
{
/**
* @param Request $request
* @param RegenerateBookingPaymentRVLogic $logic
* @return JsonResponse
*/
public function regenerate(Request $request, RegenerateBookingPaymentRVLogic $logic): JsonResponse {
return $logic->execute($request);
}
}
app/Http/Resources/BookingResource.php
+8 -1
View File
@@ -24,6 +24,12 @@ class BookingResource extends JsonResource
*/
public function toArray($request)
{
$eInvoice = false;
$eInvoiceStartDate = Carbon::parse(env('E_INVOICE_START_DATE', '2025-07-01 00:00:00'));
$bookingCreatedDate = Carbon::parse($this->created_at);
if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $this->company->e_invoice === 1) {
$eInvoice = true;
}
return [
'id' => $this->id,
'company' => new CompanyResource($this->company),
@@ -76,7 +82,8 @@ class BookingResource extends JsonResource
});
});
})->latest()->get())
])
]),
'einvoice' => $eInvoice,
];
}
}
app/Http/Resources/TransactionResource.php
+2
View File
@@ -8,6 +8,7 @@ use App\Classes\ValueObjects\Constants\TransactionType;
use App\Models\Booking;
use Carbon\Carbon;
use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Support\Facades\Log;
class TransactionResource extends JsonResource
{
@@ -56,6 +57,7 @@ class TransactionResource extends JsonResource
'currency_rate' => (double) $this->currency_rate,
'status' => (int) $this->status,
'details' => TransactionDetailResource::collection($this->transactionDetails),
'receipt_voucher' => $this->type === TransactionType::PAYMENT && $this->transactions()->where('type', TransactionType::RECEIPT_VOUCHER)->latest()->first() ? new DocumentResource($this->transactions()->where('type', TransactionType::RECEIPT_VOUCHER)->latest()->first()->documents()->first()) : null,
'documents' => new DocumentResource($this->documents()->first()),
'transaction_bill' => new TransactionResource($this->when((int) $this->type === TransactionType::PAYMENT, $this->transactions()->bills()->first())),
'transaction_refunds' => TransactionResource::collection($this->when((int) $this->type === TransactionType::PAYMENT, $this->transactions()->refunds()->get())),
composer.json
+1
View File
@@ -20,6 +20,7 @@
"fruitcake/laravel-cors": "^1.0",
"guzzlehttp/guzzle": "^7.0.1",
"intervention/image": "^2.5",
"kwn/number-to-words": "^2.11",
"laravel/framework": "^8.0",
"laravel/tinker": "^2.0",
"laravel/vapor-cli": "^1.55",
resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+39 -3
View File
@@ -45,10 +45,23 @@
</div>
</div>
</div>
<div class="col-auto bg-success m-r-5" v-if="item.receipt_voucher">
<document-file-viewer-component class="h-100" :file="item.receipt_voucher.files[0]">
<template slot="button">
<div class="row align-items-center h-100">
<div class="col p-r-0 p-l-0 text-center">
<i class="fa fa-cloud-download text-white"></i>
<p class="fs-7 text-white bold" style="width: 50px;">Receipt</p>
</div>
</div>
</template>
</document-file-viewer-component>
</div>
<div class="col-auto" v-if="item.status !== 3" :class="[{'bg-master-light': item.status === 1 && item.type !== 6}, {'bg-master-lighter': item.status === 2}, {'bg-warning-lighter': item.status === 7}, {'bg-warning-light': item.type === 6}]">
<div class="row align-items-center h-100" v-if="item.status !== 1 || item.payment_method !== 5">
<div class="col">
<div class="col p-r-0 p-l-0 text-center">
<i class="fa" :class="[{'fa-cloud-download': item.status === 1 || item.status === 2}, {'fa-ban': item.status === 4}, {'muted': item.status === 1 || item.status === 2}, {'text-danger': item.status === 4}]"></i>
<p class="fs-7" style="width: 50px;">Payment Slip</p>
</div>
</div>
<div class="row align-items-center h-100" v-if="item.payment_method === 5 && item.status === 1">
@@ -83,7 +96,7 @@
{{item.original_currency.short_code}} {{(Math.round((totalRefunds + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
</div>
</div>
<div class="col-auto p-l-0" v-if="$store.getters.isSuperAdmin">
<div class="col-auto" v-if="$store.getters.isSuperAdmin">
<div class="font-heading fs-8 muted all-caps">Service Type</div>
<div class="font-heading fs-10 bold">
{{item.booking.service.name}} ({{item.booking.service.id}})
@@ -114,12 +127,25 @@
</div>
</div>
</div>
<div class="col-auto bg-success m-r-5" v-if="item.receipt_voucher">
<document-file-viewer-component class="h-100" :file="item.receipt_voucher.files[0]">
<template slot="button">
<div class="row align-items-center h-100">
<div class="col p-r-0 p-l-0 text-center">
<i class="fa fa-cloud-download text-white"></i>
<p class="fs-7 text-white bold" style="width: 50px;">Receipt</p>
</div>
</div>
</template>
</document-file-viewer-component>
</div>
<div class="col-auto bg-success" v-if="item.transaction_bill.status === 2 || item.transaction_bill.status === 3">
<document-file-viewer-component class="h-100" :file="item.transaction_bill.documents.files[0]">
<template slot="button">
<div class="row align-items-center h-100">
<div class="col">
<div class="col p-r-0 p-l-0 text-center">
<i class="fa fa-cloud-download text-white"></i>
<p class="fs-7 text-white bold" style="width: 50px;">Payment Slip</p>
</div>
</div>
</template>
@@ -220,6 +246,7 @@
<div class="row">
<div class="col">
<div class="font-heading all-caps fs-10 m-b-5">Your Payment Proof</div>
<!-- NOT Payment Gateway -->
<div class="row no-margin" v-if="item.payment_method !== 5">
<div v-if="item.documents != null">
<div v-for="file in item.documents.files" v-bind:key="file.id" class="col-auto no-padding m-r-5">
@@ -233,6 +260,7 @@
</div>
</div>
</div>
<!-- Payment Gateway -->
<div class="row no-margin" v-if="item.payment_method === 5 && (item.status === 2 || item.status === 3)">
<a :href="route('billplz.bill', item.payment_reference)" target="_blank">
<div class="icon-thumbnail fs-11 text-white icon-25 bg-primary btn-rounded float-left m-r-5">
@@ -309,6 +337,14 @@
</modal-component>
</div>
</div>
<div class="row m-t-10" v-show="[2, 3].includes(item.status)">
<div class="col" v-if="$store.getters.isAdmin">
<button class="btn btn-xs all-caps b-rad-none bg-master-lighter btn-block no-border requestModal" data-type="regenerateReceiptVoucher">Regenerate Receipt Voucher</button>
<modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="regenerateReceiptVoucher">
<regenerate-receipt-voucher-component :data="data" :section="section" class="text-center"></regenerate-receipt-voucher-component>
</modal-component>
</div>
</div>
<div class="row m-t-10" v-if="data.transaction_refunds.length > 0">
<div class="col">
<button class="btn btn-xs all-caps b-rad-none bg-master-lighter btn-block no-border pointer" @click="clickExpandRefundTransactions">
resources/assets/vue/components/bookings/forms/RegenerateReceiptVoucherComponent.vue
+43
View File
@@ -0,0 +1,43 @@
<template>
<div class="row">
<div class="col bg-white padding-40 b-rad-lg">
<loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
<div class="row justify-content-center" v-show="!isLoading">
<div class="col">
<div class="row m-b-20">
<div class="col">
<h3 class="all-caps">Are you Sure?</h3>
<div class="fs-11">Are you sure you want to regenerate the receipt voucher for this payment?</div>
</div>
</div>
<div class="row">
<div class="col p-r-5">
<div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
</div>
<div class="col p-l-5">
<div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submitForm()">Confirm</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import componentHandler from '../../../general/mixins/componentHandler';
import ModalFormHandler from '../../../general/mixins/modalFormHandler';
export default {
methods: {
submitForm() {
this.parameters = {};
this.parameters.paymentId = this.data.id;
this.submit(this.route('api.booking.receipt.regenerate', this.data.booking.id), 'post', this.section, true, true);
},
successHandler(){
this.closeModal();
this.$store.dispatch('reloadList', {'name': "bookingDetailSection"});
}
},
mixins: [componentHandler, ModalFormHandler]
}
</script>
resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+1 -1
View File
@@ -31,7 +31,7 @@
<div class="row">
<div class="col">
<div class="row justify-content-center no-margin">
<div class="col-md col-6 h-100">
<div class="col-md col-6 h-100" v-if="!booking.einvoice">
<document-file-viewer-component :file="booking.documents.invoice.files[0]" v-if="booking.documents.invoice">
<template slot="button">
<div class="bg-white text-center padding-20 pointer b-grey">
resources/assets/vue/components/general/elements/DocumentFileViewerComponent.vue
+7
View File
@@ -35,6 +35,13 @@
isClicked: false
}
},
watch: {
file: {
handler() {
this.loaded = false;
},
}
},
computed: {
type() {
return this.file.file.mime_type === 'application/pdf' ? 'pdf' : 'image'
resources/views/pages/pdfs/invoice.blade.php
+1 -1
View File
@@ -26,7 +26,7 @@
<div class="title"><strong>Invoice</strong></div>
<div class="number">EI#: {{ $transaction->bill_no }}</div>
<div class="ref">Ref# {{ $po_order_transaction->booking->marking }}</div>
<div class="date">Date: {{ $supplier->segments->whereIn('id', [23])->first() ? \Carbon\Carbon::now() : $po_order_transaction->booking->created_at }}</div>
<div class="date">Date: {{ $last_payment_date }}</div>
<div>&nbsp;</div>
</td>
</tr>
resources/views/pages/pdfs/receipt_voucher.blade.php
+113
View File
@@ -0,0 +1,113 @@
@extends('layouts.base_pdf')
@section('inner_content')
<br>
<htmlpageheader name="page-header">
<br><br>
<div class="separator"><strong><i>{{ $transaction->bill_no }}</i></strong></div>
</htmlpageheader>
<table>
<tr>
<td class="header-logo">
<img src="{{ asset('images/ri_1.png') }}" alt="logo" id="logo" class="logo">
</td>
<td class="header-cief-address">
<span class="company-name"><strong>CIEF WORLDWIDE SDN BHD</strong></span>
<span class="company-reg">(1134596-M)</span><br>
No. 72-3, Jalan Jalil 1,<br>
The Earth Bukit Jalil,<br>
57000 Kuala Lumpur<br>
Tel: 03-8082 1252
</td>
<td class="header-details">
<div class="title"><strong>Receipt Voucher</strong></div>
<div class="number">EI#: {{ $transaction->bill_no }}</div>
<div class="ref">Ref# {{ $po_order_transaction->owner->marking }}</div>
<div class="date">Date: {{ $transaction->created_at }}</div>
<div>&nbsp;</div>
</td>
</tr>
<tr>
<td colspan="3" class="bill-to">
<span class="sub-title">Received From: </span>
</td>
</tr>
<tr>
<td colspan="3" class="address">
<div class="label">{{ $supplier->name }}
@if ($supplier->e_invoice === 1)
(TIN: {{ $supplier->tin }})
@endif
</div>
@php
$billingAddress = $supplier->addresses()->where('billing', '=', true)->first();
@endphp
<div class="address">
{{ $billingAddress->street_one }}
{{ $billingAddress->street_two }},
{{ $billingAddress->district()->first()->name }},
{{ $billingAddress->postcode }}
{{ $billingAddress->state()->first()->name }},
{{ $billingAddress->country()->first()->name }}
</div>
<div>Phone: {{ $supplier->contacts()->first()->phone }}</div>
</td>
</tr>
</table>
@php
$total = round($transaction->amount, 2);
@endphp
<table>
<tr>
<td>
<p><strong>RECEIVE THE SUM OF: <span style="text-decoration: underline;">{{ \App\Classes\General\Helper::convert(round($transaction->amount, 2)) }}</span></strong></p>
</td>
</tr>
</table>
<table width="100%" border="1" cellpadding="5" cellspacing="0" style="border-collapse: collapse; margin-top: 20px; font-size: 12px;">
<thead>
<tr style="background-color: #f0f0f0;">
<th>Payment Method</th>
<th>Transaction ID</th>
<th style="text-align:right;">Payment Amount</th>
</tr>
</thead>
<tbody>
<tr>
<td style="text-transform: uppercase;">{{ ucwords(str_replace('_', ' ', \App\Classes\ValueObjects\Constants\PaymentMethodType::PAYMENT_METHODS_ID[$transaction->payment_method])) }}</td>
<td>{{ $transaction->owner->bill_no ?? '-' }}</td>
<td style="text-align:right;">{{ number_format($total, 2) }}</td>
</tr>
</tbody>
</table>
<p><strong>Paid For</strong></p>
<table width="100%" border="1" cellpadding="5" cellspacing="0" style="border-collapse: collapse; font-size: 12px;">
<thead>
<tr style="background-color: #f0f0f0;">
<th>Description</th>
<th style="text-align:right;">Amount</th>
</tr>
</thead>
<tbody>
<tr>
<td>PAYMENT FOR REF. {{ $po_order_transaction->owner->marking ?? 'N/A' }}</td>
<td style="text-align:right;">{{ number_format($total, 2) }}</td>
</tr>
</tbody>
</table>
<br><br><br><br><br> <br><br>
<p style="text-align: right; font-weight: bold; margin-top: 10px; border-top: 1px solid #000; padding-top: 5px;">
TOTAL: {{ number_format($total, 2) }}
</p>
<p style="text-align:center; font-size: 10px; margin-top: 30px;">AUTO GENERATED BY EXCHANGE PORTAL, NO SIGNATURE REQUIRED</p>
@endsection
routes/booking.php
+5
View File
@@ -1,5 +1,6 @@
<?php
use App\Http\Controllers\Bookings\RegenerateBookingPaymentRVController;
use Illuminate\Support\Facades\Route;
Route::group(['prefix' => 'booking', 'as' => 'booking.', 'namespace' => 'Bookings'], function () {
@@ -40,4 +41,8 @@ Route::group(['prefix' => 'booking', 'as' => 'booking.', 'namespace' => 'Booking
Route::post('{id}/proforma/create', 'CreateProformaInvoiceTransaction@create')->name('proforma.create');
Route::group(['prefix' => '{id}/receipt', 'as' => 'receipt.'], function () {
Route::post('/', [RegenerateBookingPaymentRVController::class, 'regenerate'])->name('regenerate');
});
});