We'll be back soon!
-Sorry for the inconvenience but we're performing some maintenance at the moment. We'll be back online shortly!
+{{ config('maintenance.title') }}
+ }})
+ {{ config('maintenance.message') }}
— CIEF EXCHANGE
- ", $result->messages())); + } + + return $this->resourceResponse(new RuleResource((object)$result)); + } +} diff --git a/app/Classes/Modules/Rules/ControllersLogic/CheckPurchaseOrderRuleLogic.php b/app/Classes/Modules/Rules/ControllersLogic/CheckPurchaseOrderRuleLogic.php new file mode 100644 index 00000000..b6abaf1a --- /dev/null +++ b/app/Classes/Modules/Rules/ControllersLogic/CheckPurchaseOrderRuleLogic.php @@ -0,0 +1,82 @@ + 'Rule Check Purchase Order', + 'message' => 'You have successfully passed all rules evaluated' + ]; + } + + /** @var RuleEvaluator */ + private $ruleEvaluator; + + /** @var CanPassOrderDurationLimitRule */ + private $canPassOrderDurationLimitRule; + + /** @var CanPassEInvoicePromptedRule */ + private $canPassEInvoicePromptedRule; + + /** @var CanPassPurchaseOrderRule */ + private $canPassPurchaseOrderRule; + + + /** + * CheckPurchaseOrderRuleLogic constructor. + * @param RuleEvaluator $ruleEvaluator + * @param CanPassOrderDurationLimitRule $canPassOrderDurationLimitRule + * @param CanPassEInvoicePromptedRule $canPassEInvoicePromptedRule + * @param CanPassPurchaseOrderRule $canPassPurchaseOrderRule + + */ + public function __construct(RuleEvaluator $ruleEvaluator, CanPassOrderDurationLimitRule $canPassOrderDurationLimitRule, CanPassEInvoicePromptedRule $canPassEInvoicePromptedRule, CanPassPurchaseOrderRule $canPassPurchaseOrderRule) + { + $this->ruleEvaluator = $ruleEvaluator; + $this->canPassOrderDurationLimitRule = $canPassOrderDurationLimitRule; + $this->canPassEInvoicePromptedRule = $canPassEInvoicePromptedRule; + $this->canPassPurchaseOrderRule = $canPassPurchaseOrderRule; + } + + /** + * @param Request $request + * @return JsonResponse + * @throws \App\Classes\Exceptions\AccessForbiddenException + * @throws \App\Classes\Exceptions\MalformedRequestException + * @throws \App\Classes\Exceptions\RequestValidationException + * @throws \App\Classes\Exceptions\CriteriaNotFulfilledException + */ + public function logic(Request $request) : JsonResponse + { + $dto = new CheckPurchaseOrderRuleDTO($request->all()); + + $result = $this->ruleEvaluator->evaluate([ + $this->canPassOrderDurationLimitRule, + $this->canPassEInvoicePromptedRule, + $this->canPassPurchaseOrderRule, + ], $dto); + + if ($result->failed()) { + throw new CriteriaNotFulfilledException("- " . implode("
- ", $result->messages())); + } + + return $this->resourceResponse(new RuleResource((object)$result)); + } +} diff --git a/app/Classes/Modules/Rules/ControllersLogic/CheckTransferRuleLogic.php b/app/Classes/Modules/Rules/ControllersLogic/CheckTransferRuleLogic.php new file mode 100644 index 00000000..a87a00d5 --- /dev/null +++ b/app/Classes/Modules/Rules/ControllersLogic/CheckTransferRuleLogic.php @@ -0,0 +1,66 @@ + 'Rule Check Transfer', + 'message' => 'You have successfully passed all rules evaluated' + ]; + } + + /** @var RuleEvaluator */ + private $ruleEvaluator; + + /** @var CanPassOrderDurationLimitRule */ + private $canPassOrderDurationLimitRule; + + /** + * CheckTransferRuleLogic constructor. + * @param RuleEvaluator $ruleEvaluator + * @param CanPassOrderDurationLimitRule $canPassOrderDurationLimitRule + */ + public function __construct(RuleEvaluator $ruleEvaluator, CanPassOrderDurationLimitRule $canPassOrderDurationLimitRule) + { + $this->ruleEvaluator = $ruleEvaluator; + $this->canPassOrderDurationLimitRule = $canPassOrderDurationLimitRule; + } + + /** + * @param Request $request + * @return JsonResponse + * @throws \App\Classes\Exceptions\AccessForbiddenException + * @throws \App\Classes\Exceptions\MalformedRequestException + * @throws \App\Classes\Exceptions\RequestValidationException + * @throws \App\Classes\Exceptions\CriteriaNotFulfilledException + */ + public function logic(Request $request) : JsonResponse + { + $dto = new CheckTransferRuleDTO($request->all()); + + $result = $this->ruleEvaluator->evaluate([ + $this->canPassOrderDurationLimitRule, + ], $dto); + + if ($result->failed()) { + throw new CriteriaNotFulfilledException("- " . implode("
- ", $result->messages())); + } + + return $this->resourceResponse(new RuleResource((object)$result)); + } +} diff --git a/app/Classes/Modules/Rules/DataTransferObjects/CheckEInvoiceRuleDTO.php b/app/Classes/Modules/Rules/DataTransferObjects/CheckEInvoiceRuleDTO.php new file mode 100644 index 00000000..75726e47 --- /dev/null +++ b/app/Classes/Modules/Rules/DataTransferObjects/CheckEInvoiceRuleDTO.php @@ -0,0 +1,22 @@ +companyId = $data['company_id']; + } + + public function toArray(): array + { + return [ + 'company_id' => $this->companyId, + ]; + } +} diff --git a/app/Classes/Modules/Rules/DataTransferObjects/CheckPurchaseOrderRuleDTO.php b/app/Classes/Modules/Rules/DataTransferObjects/CheckPurchaseOrderRuleDTO.php new file mode 100644 index 00000000..2c5c2ab5 --- /dev/null +++ b/app/Classes/Modules/Rules/DataTransferObjects/CheckPurchaseOrderRuleDTO.php @@ -0,0 +1,25 @@ +bookingId = $data['booking_id']; + $this->companyId = $data['company_id']; + } + + public function toArray(): array + { + return [ + 'booking_id' => $this->bookingId, + 'company_id' => $this->companyId, + ]; + } +} diff --git a/app/Classes/Modules/Rules/DataTransferObjects/CheckTransferRuleDTO.php b/app/Classes/Modules/Rules/DataTransferObjects/CheckTransferRuleDTO.php new file mode 100644 index 00000000..a89ffe0e --- /dev/null +++ b/app/Classes/Modules/Rules/DataTransferObjects/CheckTransferRuleDTO.php @@ -0,0 +1,28 @@ +bookingId = $data['booking_id']; + $this->companyId = $data['company_id']; + $this->paymentReference = $data['payment_reference'] ?? ''; + } + + public function toArray(): array + { + return [ + 'booking_id' => $this->bookingId, + 'company_id' => $this->companyId, + 'payment_reference' => $this->paymentReference, + ]; + } +} diff --git a/app/Classes/Modules/Rules/Services/RuleEvaluator.php b/app/Classes/Modules/Rules/Services/RuleEvaluator.php new file mode 100644 index 00000000..ac248a25 --- /dev/null +++ b/app/Classes/Modules/Rules/Services/RuleEvaluator.php @@ -0,0 +1,44 @@ +passes($object)) { + $success = false; + $messages[] = get_class($rule) . ' failed without exception'; + } + } catch (AccessForbiddenException | RequestValidationException | CriteriaNotFulfilledException $e) { + $success = false; + $messages[] = $e->getMessage(); + } catch (\Exception $e) { + $success = false; + $messages[] = 'Unexpected error in ' . get_class($rule) . ': ' . $e->getMessage(); + } + } + + return new RuleEvaluationResult($success, $messages); + } + +} diff --git a/app/Classes/Modules/Rules/Standards/Rules/CanPassEInvoicePromptedRule.php b/app/Classes/Modules/Rules/Standards/Rules/CanPassEInvoicePromptedRule.php new file mode 100644 index 00000000..5ab57fdf --- /dev/null +++ b/app/Classes/Modules/Rules/Standards/Rules/CanPassEInvoicePromptedRule.php @@ -0,0 +1,56 @@ +fetchesCompany = $fetchesCompany; + } + + /** + * @return bool + */ + protected function authorized($object): bool + { + return true; + + } + + /** + * @return bool + */ + protected function validators($object): bool + { + return true; + + } + + + /** + * @return bool + */ + protected function criteria($object): bool + { + //Check if account requires E-Invoice + $company = $this->fetchesCompany->execute(['id' => $object->companyId]); + if($company->e_invoice === null){ + throw new CriteriaNotFulfilledException("Please refresh page and click 'Make Payment' first to answer question related to E-Invoice."); + } + return true; + } + +} diff --git a/app/Classes/Modules/Rules/Standards/Rules/CanPassEditingPORule.php b/app/Classes/Modules/Rules/Standards/Rules/CanPassEditingPORule.php new file mode 100644 index 00000000..62293b6d --- /dev/null +++ b/app/Classes/Modules/Rules/Standards/Rules/CanPassEditingPORule.php @@ -0,0 +1,67 @@ +fetchesBooking = $fetchesBooking; + $this->fetchesCompany = $fetchesCompany; + } + + /** + * @return bool + */ + protected function authorized($object): bool + { + return true; + + } + + /** + * @return bool + */ + protected function validators($object): bool + { + return true; + + } + + + /** + * @return bool + */ + protected function criteria($object): bool + { + //Check if user is allow to edit purchase order + $booking = $this->fetchesBooking->execute(['id' => $object->bookingId]); + + $paidAmount = floatval((App()->make(CalculatesBookingPayableAmount::class))->execute($booking, $booking->fix_currency_id)) - floatval((App()->make(CalculatesBookingRefundAmount::class))->execute($booking, $booking->fix_currency_id)); + + if($paidAmount > 0){ + throw new CriteriaNotFulfilledException("Purchase order form is no longer allow to be edited."); + } + return true; + } +} diff --git a/app/Classes/Modules/Rules/Standards/Rules/CanPassOrderDurationLimitRule.php b/app/Classes/Modules/Rules/Standards/Rules/CanPassOrderDurationLimitRule.php new file mode 100644 index 00000000..9e07bc23 --- /dev/null +++ b/app/Classes/Modules/Rules/Standards/Rules/CanPassOrderDurationLimitRule.php @@ -0,0 +1,92 @@ +fetchesBooking = $fetchesBooking; + $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit; + $this->calculatesTransactionExpiryDateTime = $calculatesTransactionExpiryDateTime; + $this->deletesBillplzBill = $deletesBillplzBill; + $this->fetchesTransaction = $fetchesTransaction; + } + + /** + * @return bool + */ + protected function authorized($object): bool + { + return true; + + } + + /** + * @return bool + */ + protected function validators($object): bool + { + return true; + + } + + + /** + * @return bool + */ + protected function criteria($object): bool + { + //Check if order is still valid (within duration limit, reused PAYMENT_ATTEMPT_DURATION_LIMIT) + $expiresOn = $this->calculatesTransactionExpiryDateTime->execute($object->bookingId); + $isExpired = Carbon::now()->greaterThan($expiresOn); + if($isExpired){ + + if($object->paymentReference){ + $transaction = $this->fetchesTransaction->execute(['payment_reference' => $object->paymentReference]); + if($transaction->status === ApprovalStatus::PENDING_SUBMISSION && $transaction->payment_method == PaymentMethodType::PAYMENT_GATEWAY){ + $this->deletesBillplzBill->execute($object->paymentReference); + } + } + + throw new CriteriaNotFulfilledException("Transfer has already expired."); + } + return true; + } +} diff --git a/app/Classes/Modules/Rules/Standards/Rules/CanPassPurchaseOrderRule.php b/app/Classes/Modules/Rules/Standards/Rules/CanPassPurchaseOrderRule.php new file mode 100644 index 00000000..db17173f --- /dev/null +++ b/app/Classes/Modules/Rules/Standards/Rules/CanPassPurchaseOrderRule.php @@ -0,0 +1,96 @@ +fetchesBooking = $fetchesBooking; + $this->fetchesCompany = $fetchesCompany; + } + + /** + * @return bool + */ + protected function authorized($object): bool + { + return true; + + } + + /** + * @return bool + */ + protected function validators($object): bool + { + return true; + + } + + + /** + * @return bool + */ + protected function criteria($object): bool + { + //Check if the transfer/booking already has purchase order filled + $booking = $this->fetchesBooking->execute(['id' => $object->bookingId]); + $purchaseOrder = $booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first(); + + $isPOEmptyException = false; + if (!$purchaseOrder || $purchaseOrder->status === ApprovalStatus::PENDING_SUBMISSION) { + $isPOEmptyException = true; + } + + if($isPOEmptyException){ //If PO is indeed empty, there are some scenarios where PO actually can be left empty + $ids = ServiceType::whereIn('name', [ + ServiceTypeNameConstants::PAYMENT_1688, + ServiceTypeNameConstants::VIP_1688, + ])->get()->pluck('id'); + + //It can be left empty when booking is of type 1688: specifcally: 1688 Payment and 1688 VIP + if (in_array($booking->service_id, $ids->all())) { + $isPOEmptyException = false; + } + + //However when the customer falls under the segment '1688 Manual PO Periodic', even if their booking is of type 1688 (1688 Payment and 1688 VIP), + //they still must fill up the PO. Confusing?? IKR + $company = $this->fetchesCompany->execute(['id' => $object->companyId]); + $filteredSegments = $company->segments()->whereIn('name', [SegmentNameConstants::MANUAL_PO_PERIODIC_1688, SegmentNameConstants::MANUAL_PO_1688])->get(); + if(!$isPOEmptyException){ + if (!$filteredSegments->isEmpty()) { + $isPOEmptyException = true; + } + } + } + + if($isPOEmptyException){ + throw new CriteriaNotFulfilledException("Please complete the purchase order form."); + } + return true; + } +} diff --git a/app/Classes/Modules/Rules/Standards/Rules/CanPassTINRule.php b/app/Classes/Modules/Rules/Standards/Rules/CanPassTINRule.php new file mode 100644 index 00000000..3f767912 --- /dev/null +++ b/app/Classes/Modules/Rules/Standards/Rules/CanPassTINRule.php @@ -0,0 +1,55 @@ +fetchesCompany = $fetchesCompany; + } + + /** + * @return bool + */ + protected function authorized($object): bool + { + return true; + } + + /** + * @return bool + */ + protected function validators($object): bool + { + return true; + } + + + /** + * @return bool + */ + protected function criteria($object): bool + { + //Check if TIN already provided if account requires E-Invoice + $company = $this->fetchesCompany->execute(['id' => $object->companyId]); + if($company->e_invoice === 1 && !$company->tin){ + throw new CriteriaNotFulfilledException("Please provide all requested E-Invoice Info."); + } + return true; + } + +} diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreatePurchaseOrderTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreatePurchaseOrderTransactionLogic.php index 9bab107f..d5d97536 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/CreatePurchaseOrderTransactionLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/CreatePurchaseOrderTransactionLogic.php @@ -3,9 +3,11 @@ namespace App\Classes\Modules\Transactions\ControllersLogic; +use App\Classes\Exceptions\CriteriaNotFulfilledException; use App\Classes\General\Abstracts\AbstractControllerLogic; use App\Classes\Modules\Bookings\Services\FetchesBooking; use App\Classes\Modules\Companies\Services\FetchesCompany; +use App\Classes\Modules\Transactions\DataTransferObjects\CreatePurchaseOrderDTO; use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject; use App\Classes\Modules\Transactions\Processors\CreatePurchaseOrderTransactionProcessor; use App\Classes\Modules\Transactions\Services\CreatesTransaction; @@ -15,14 +17,18 @@ use App\Classes\Modules\Transactions\Services\FetchesTransaction; use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber; use App\Classes\Modules\Transactions\Services\UpdatesTransaction; use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus; +use App\Classes\Modules\Rules\Services\RuleEvaluator; +use App\Classes\Modules\Rules\Standards\Rules\CanPassEditingPORule; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\PaymentMethodType; +use App\Classes\ValueObjects\Constants\RoleTypes; use App\Classes\ValueObjects\Constants\TransactionType; use App\Http\Resources\TransactionResource; use App\Models\Booking; use App\Models\Transaction; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; class CreatePurchaseOrderTransactionLogic extends AbstractControllerLogic { @@ -33,7 +39,7 @@ class CreatePurchaseOrderTransactionLogic extends AbstractControllerLogic protected function notification():array { return [ 'title' => 'Update Purchase Order', - 'message' => 'You have successfully updated you booking\'s purchase order' + 'message' => 'You have successfully updated your booking\'s purchase order' ]; } @@ -46,17 +52,27 @@ class CreatePurchaseOrderTransactionLogic extends AbstractControllerLogic /** @var CreatePurchaseOrderTransactionProcessor */ private $createPurchaseOrderTransactionProcessor; + /** @var RuleEvaluator */ + private $ruleEvaluator; + + /** @var CanPassEditingPORule */ + private $canPassEditingPORule; + /** * CreatePurchaseOrderTransactionLogic constructor. * @param FetchesBooking $fetchesBooking * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber * @param CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor + * @param RuleEvaluator $ruleEvaluator + * @param CanPassEditingPORule $canPassEditingPORule */ - public function __construct(FetchesBooking $fetchesBooking, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor) + public function __construct(FetchesBooking $fetchesBooking, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatePurchaseOrderTransactionProcessor $createPurchaseOrderTransactionProcessor, RuleEvaluator $ruleEvaluator, CanPassEditingPORule $canPassEditingPORule) { $this->fetchesBooking = $fetchesBooking; $this->generatesTransactionBillNumber = $generatesTransactionBillNumber; $this->createPurchaseOrderTransactionProcessor = $createPurchaseOrderTransactionProcessor; + $this->ruleEvaluator = $ruleEvaluator; + $this->canPassEditingPORule = $canPassEditingPORule; } /** @@ -64,9 +80,22 @@ class CreatePurchaseOrderTransactionLogic extends AbstractControllerLogic * @param string $id * @return JsonResponse * @throws \App\Classes\Exceptions\MalformedRequestException + * @throws \App\Classes\Exceptions\CriteriaNotFulfilledException */ public function logic(Request $request, $id = '') : JsonResponse { + //This checking is excluded for (1) Admin, (2) Update of booking amount post payment as user + if(!in_array(Auth::user()->type, RoleTypes::ADMIN_ROLES) && !$request->has('is_privilleged_update')){ + $dto = new CreatePurchaseOrderDTO($request->all()); + $result = $this->ruleEvaluator->evaluate([ + $this->canPassEditingPORule + ], $dto); + + if ($result->failed()) { + throw new CriteriaNotFulfilledException("- " . implode("
- ", $result->messages())); + } + } + /** @var Booking $booking */ $booking = $this->fetchesBooking->execute(['id' => $request->route('id') ?? $id]); @@ -87,7 +116,4 @@ class CreatePurchaseOrderTransactionLogic extends AbstractControllerLogic return $this->resourceResponse(new TransactionResource($transaction)); } - - - } diff --git a/app/Classes/Modules/Transactions/ControllersLogic/GenerateCreditNotePdfLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/GenerateCreditNotePdfLogic.php index 4a0af327..4241ac91 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/GenerateCreditNotePdfLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/GenerateCreditNotePdfLogic.php @@ -13,6 +13,10 @@ use App\Classes\ValueObjects\Constants\TransactionType; use App\Classes\General\AWSS3Helper; use Illuminate\Support\Facades\Storage; +/** + * @deprecated This class is deprecated and should not be used. + * Use `GenerateCreditNotePdfV2Logic` instead + */ class GenerateCreditNotePdfLogic { diff --git a/app/Classes/Modules/Transactions/ControllersLogic/GenerateCreditNotePdfV2Logic.php b/app/Classes/Modules/Transactions/ControllersLogic/GenerateCreditNotePdfV2Logic.php new file mode 100644 index 00000000..824d5528 --- /dev/null +++ b/app/Classes/Modules/Transactions/ControllersLogic/GenerateCreditNotePdfV2Logic.php @@ -0,0 +1,115 @@ +fetchesTransaction = $fetchesTransaction; + $this->fetchesCompany = $fetchesCompany; + } + + /** + * @param Request $request + * @return string|\Symfony\Component\HttpFoundation\Response + * @throws \App\Classes\Exceptions\MalformedRequestException + */ + public function execute(Request $request) + { + $pdfTemplateName = 'pages.pdfs.credit_note_v2'; //default since e-invoice implementation + $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]); + + if($transaction->type === TransactionType::REFUND){ + //Retrieve TransactionType::CREDIT_NOTE + $booking = $transaction->owner->booking; + $kvp = $transaction->attributesKVP()->latest()->first(); + if($kvp){ + if($kvp->key === 'App\Models\Transaction'){ + $transaction = $this->fetchesTransaction->execute(['id' => $kvp->value ]); + } + } + } + else{ + //For Old Cases + $booking = $transaction->booking; + $pdfTemplateName = 'pages.pdfs.credit_note'; //default + + //For New Cases with e-invoice: Retrieve the refund transaction for this credit note + $kvp = KeyValuePair::where('key', 'App\Models\Transaction')->where('value', $transaction->id)->first(); + if($kvp){ + $kvpOwner = $kvp->owner; + if($kvpOwner && $kvpOwner instanceof Transaction && $kvpOwner->type === TransactionType::REFUND){ + $booking = $kvpOwner->owner->booking; + } + } + } + + $date = $transaction->created_at; + $supplier = $this->fetchesCompany->execute(['id' => $transaction->receiver]); + $brn = $supplier->documents->where('document_type', DocumentType::SSM_REGISTRATION)->first(); + + $eInvoiceStarted = false; + $eInvoiceStartDate = Carbon::parse(env('E_INVOICE_START_DATE', '2025-07-01 00:00:00')); + $bookingCreatedDate = Carbon::parse($booking->created_at); + + if ($bookingCreatedDate->isAfter($eInvoiceStartDate)) { + $eInvoiceStarted = true; + } + // $eInvoiceStarted = false; //cief todo: 90 - for testing + + if($eInvoiceStarted) + { + if($supplier->e_invoice === 1){ + Log::info('Based on booking created date, E-Credit Note started and company wants e-invoice ' . json_encode($booking)); + $date = $booking->updated_at->copy()->endOfMonth(); + $pdfTemplateName = 'pages.pdfs.e_credit_note'; + } + else{ + Log::info('Based on booking created date, E-Credit Note started and company do not wants e-invoice'); + $pdfTemplateName = 'pages.pdfs.credit_note_v2'; + } + } + else{ + Log::info('Based on booking created date, E-Credit Note not yet started'); + } + + $pdf = LaravelMpdf::loadView($pdfTemplateName, ['transaction' => $transaction, 'booking' => $booking, 'supplier' => $supplier, 'date' => $date, 'brn' => $brn,]); + + $exportFileName = 'CreditNote.pdf'; + $filesystemDriver = Storage::getDefaultDriver(); + if($filesystemDriver === 's3'){ + $pdfContent = $pdf->output(); + return response([ 'src' => AWSS3Helper::S3PDF($exportFileName, $pdfContent) ]); + } + else{ + return $pdf->stream($exportFileName); + } + } +} diff --git a/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php index d2b921d1..a8e6ca69 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php @@ -2,7 +2,6 @@ namespace App\Classes\Modules\Transactions\ControllersLogic; -use App\Classes\Exceptions\MalformedRequestException; use App\Classes\General\Abstracts\AbstractControllerLogic; use App\Classes\Modules\Bookings\ControllersLogic\UpdateBookingAmountLogic; use App\Classes\Modules\Companies\Services\FetchesCompany; @@ -12,12 +11,11 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\Modules\Documents\Services\DeletesDocument; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; - use App\Classes\Modules\Wallets\Processors\CreditWalletProcessor; use App\Classes\Modules\Bookings\Services\CalculatesBookingPayableAmount; use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount; +use App\Classes\ValueObjects\Constants\RemarkRefundReason; use App\Classes\ValueObjects\Constants\TransactionType; -use Illuminate\Support\Facades\Auth; class UpdateRefundTransactionStatusLogic extends AbstractControllerLogic { @@ -86,9 +84,10 @@ class UpdateRefundTransactionStatusLogic extends AbstractControllerLogic */ public function logic(Request $request) : JsonResponse { - if(auth()->user()->type === 3) { - throw new MalformedRequestException('You do not have the permission to refund the order.'); - } + //cief todo: 90 - move this into rules + // if(auth()->user()->type === 3) { + // throw new MalformedRequestException('You do not have the permission to refund the order.'); + // } $refundTransaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]); @@ -100,14 +99,22 @@ class UpdateRefundTransactionStatusLogic extends AbstractControllerLogic $booking = $paymentTransaction->owner; - $reference = $paymentTransaction->amount - $refundTransaction->amount < 0.01 ? 'Fully Refund for Ref. ' . $booking->marking : 'Partially Refund for Ref. ' . $booking->marking; + // $reference = $paymentTransaction->amount - $refundTransaction->amount < 0.01 ? 'Fully Refund for Ref. ' . $booking->marking : 'Partially Refund for Ref. ' . $booking->marking; + if ($paymentTransaction->amount - $refundTransaction->amount < 0.01) { + $reference = 'Return Inward for Ref. ' . $booking->marking; + } else { + $refundRemark = $refundTransaction->remarks && $refundTransaction->remarks->first() ? $refundTransaction->remarks->first()->content : $request->input('refundRemark') ; + $remarkGroup = RemarkRefundReason::REFUND_REASONS[$refundRemark] ?? null; + $reference = $remarkGroup ? $remarkGroup . ' for Ref. ' . $booking->marking : $refundRemark . ' for Ref. ' . $booking->marking; + } $refundAmount = $this->calculatesBookingRefundAmount->calculateRefundAmount($paymentTransaction, $booking->fix_currency_id); $paidAmount = $paymentTransaction->original_amount - $refundAmount; if ($refundTransaction->status == ApprovalStatus::APPROVED) { - $this->creditWalletProcessor->execute($booking->company, $refundTransaction->type, $refundTransaction->amount, $reference); + $this->creditWalletProcessor->execute($booking->company, $refundTransaction->type, $refundTransaction->amount, $reference, $refundTransaction); + $po_transaction = $booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first(); if ($po_transaction) { @@ -129,4 +136,4 @@ class UpdateRefundTransactionStatusLogic extends AbstractControllerLogic return $this->response([]); } -} \ No newline at end of file +} diff --git a/app/Classes/Modules/Transactions/DataTransferObjects/CreatePurchaseOrderDTO.php b/app/Classes/Modules/Transactions/DataTransferObjects/CreatePurchaseOrderDTO.php new file mode 100644 index 00000000..074640ad --- /dev/null +++ b/app/Classes/Modules/Transactions/DataTransferObjects/CreatePurchaseOrderDTO.php @@ -0,0 +1,25 @@ +bookingId = $data['booking_id']; + $this->companyId = $data['company_id']; + } + + public function toArray(): array + { + return [ + 'booking_id' => $this->bookingId, + 'company_id' => $this->companyId, + ]; + } +} diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php index 1db15909..8bb2c797 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceDocumentProcessor.php @@ -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,26 @@ 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; + $brn = $supplier->documents->where('document_type', DocumentType::SSM_REGISTRATION)->first(); + $documentDate = $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)) { + $lastPaymentTransaction = $booking->transactions()->where('type', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::COMPLETED, ApprovalStatus::APPROVED])->latest()->first(); + $documentDate = $lastPaymentTransaction->created_at; + if(Carbon::parse($booking->updated_at)->isAfter($lastPaymentTransaction->created_at)){ + $documentDate = $booking->updated_at; + } + } + + if($document_type === DocumentType::EINVOICE){ + $lastDayOfMonth = $documentDate->copy()->endOfMonth(); + $documentDate = $lastDayOfMonth; + } $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 +74,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, 'document_date' => $documentDate, 'brn' => $brn, 'autocountId' => null]); //cief todo: 90 - autocount id to be updated - 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 +130,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); - } } diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php index 7f105dc8..e8c7ff21 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php @@ -20,6 +20,7 @@ use App\Classes\ValueObjects\Constants\TransactionType; use App\Classes\ValueObjects\Constants\DocumentType; use App\Models\Booking; use App\Models\SegmentConstant; +use Carbon\Carbon; class CreateInvoiceTransactionProcessor { @@ -83,10 +84,12 @@ class CreateInvoiceTransactionProcessor /** * @param Booking $booking + * @param String $invoiceNo + * @param bool $isAllowEInvoice * @return void * @throws MalformedRequestException */ - public function execute(Booking $booking) + public function execute(Booking $booking, String $invoiceNo= "", bool $isAllowEInvoice = false) { if ($booking->status === ApprovalStatus::COMPLETED) { @@ -121,10 +124,26 @@ class CreateInvoiceTransactionProcessor // ->first(); $transaction = $booking->transactions() - ->where('type', TransactionType::PAYMENT) - ->latest()->get()[0]; + ->where('type', TransactionType::PAYMENT) + ->latest()->get()[0]; + $supplier = $this->fetchesCompany->execute(['id' => $transaction->receiver]); - $billNumber = $this->generatesTransactionBillNumber->execute('INV-'); + // Check if eInvoice implementation has started and company opted in for eInvoice + $eInvoice = false; + $eInvoiceStartDate = Carbon::parse(env('E_INVOICE_START_DATE', '2025-07-01 00:00:00')); + $bookingCreatedDate = Carbon::parse($booking->created_at); + if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $supplier->e_invoice === 1) { + $eInvoice = true; + } + // $eInvoice = true; //cief todo: 90 - for testing + + if($invoiceNo){ + $billNumber = $invoiceNo; + } + else{ + $billNUmberPrefix = $eInvoice ? 'EINV-' : 'INV-'; + $billNumber = $this->generatesTransactionBillNumber->execute($billNUmberPrefix); + } $booking_currency_average_rate = $this->calculatesBookingCurrencyAverageRate->execute($booking, TransactionType::PAYMENT); @@ -138,6 +157,7 @@ class CreateInvoiceTransactionProcessor ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]) ->sum('tax'); + $transaction_object = new TransactionObject( $billNumber, TransactionType::INVOICE, @@ -159,16 +179,24 @@ class CreateInvoiceTransactionProcessor $voucherRedemption = $transaction->voucherRedemption; - $supplier = $this->fetchesCompany->execute(['id' => $transaction->receiver]); - // purchase order $this->invoiceDocumentProcessor->execute($invoice_transaction, $purchaseOrder, $supplier, DocumentType::PURCHASE_ORDER, $voucherRedemption); // deliver order $this->invoiceDocumentProcessor->execute($invoice_transaction, $purchaseOrder, $supplier, DocumentType::DELIVER_ORDER, $voucherRedemption); + // e-invoice + if ($eInvoice) + { + if($isAllowEInvoice){ + $this->invoiceDocumentProcessor->execute($invoice_transaction, $purchaseOrder, $supplier, DocumentType::EINVOICE, $voucherRedemption); + } + } // invoice - $this->invoiceDocumentProcessor->execute($invoice_transaction, $purchaseOrder, $supplier, DocumentType::INVOICE, $voucherRedemption); + else + { + $this->invoiceDocumentProcessor->execute($invoice_transaction, $purchaseOrder, $supplier, DocumentType::INVOICE, $voucherRedemption); + } $billNumber = $this->generatesTransactionBillNumber->execute('SPDO-'); diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionWithInvoiceNoProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionWithInvoiceNoProcessor.php index 612033f8..3bb33f28 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionWithInvoiceNoProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionWithInvoiceNoProcessor.php @@ -21,6 +21,10 @@ use App\Classes\ValueObjects\Constants\DocumentType; use App\Models\Booking; use App\Models\SegmentConstant; +/** + * @deprecated This class is deprecated and should not be used. + * Use `CreateInvoiceTransactionProcessor` instead or write a new one based on CreateInvoiceTransactionProcessor + */ class CreateInvoiceTransactionWithInvoiceNoProcessor { @@ -53,7 +57,7 @@ class CreateInvoiceTransactionWithInvoiceNoProcessor /** - * CreateInvoiceTransactionProcessor constructor. + * CreateInvoiceTransactionWithInvoiceNoProcessor constructor. * @param ListsTransactions $listsTransactions * @param CreatesTransaction $createsTransaction * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber diff --git a/app/Classes/Modules/Transactions/Processors/CreateReceiptVoucherTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateReceiptVoucherTransactionProcessor.php new file mode 100644 index 00000000..16b37380 --- /dev/null +++ b/app/Classes/Modules/Transactions/Processors/CreateReceiptVoucherTransactionProcessor.php @@ -0,0 +1,113 @@ +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); + } +} diff --git a/app/Classes/Modules/Transactions/Services/CalculatesTransactionExpiryDateTime.php b/app/Classes/Modules/Transactions/Services/CalculatesTransactionExpiryDateTime.php new file mode 100644 index 00000000..bf4e42d7 --- /dev/null +++ b/app/Classes/Modules/Transactions/Services/CalculatesTransactionExpiryDateTime.php @@ -0,0 +1,91 @@ +fetchesBooking = $fetchesBooking; + $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit; + } + + + /** + * @param int $bookingId + * @return Carbon|null $returnDateTime + */ + public function execute(int $bookingId) + { + $isExpired = false; + $booking = $this->fetchesBooking->execute(['id' => $bookingId]); + $paymentAttemptLimit = $this->fetchesCompanyPaymentAttemptLimit->execute($booking->company); + + $createdAt = Carbon::parse($booking->created_at); + Log::info("1. Booking created at {$createdAt}."); + $bookingExpiresAt = $createdAt->addMinutes($paymentAttemptLimit); + Log::info("1. Booking expires at {$bookingExpiresAt}. (original)"); + $newBookingExpiresAt = null; + $now = Carbon::now(); + + if ($now->greaterThan($bookingExpiresAt)) { + $isExpired = true; + } + + $allPayments = $booking->transactions() + ->payments() + ->get(); + + // if ($isExpired) { + $filteredPayments = $allPayments->filter(function ($payment) use ($bookingExpiresAt) { + return Carbon::parse($payment->created_at)->lessThanOrEqualTo($bookingExpiresAt); + }); + + if ($filteredPayments->isNotEmpty()) { + // Use the earlier payment to recalculate bookingExpiresAt + $earliestPayment = $filteredPayments->sortBy('created_at')->first(); + Log::info("2. Booking earliest payment : {$earliestPayment->id}, {$earliestPayment->created_at}"); + $newBookingExpiresAt = Carbon::parse($earliestPayment->created_at)->addMinutes($paymentAttemptLimit); + Log::info("2. Booking expires at : {$newBookingExpiresAt}. (new)"); + $logDetails = [ + 'booking_id' => $booking->id, + 'initial_created_at' => $booking->created_at, + 'original_expiry' => $bookingExpiresAt->toDateTimeString(), + 'new_expiry' => $newBookingExpiresAt->toDateTimeString(), + 'valid_payments' => [] + ]; + foreach ($filteredPayments as $payment) { + $logDetails['valid_payments'][] = [ + 'payment_id' => $payment->id, + 'created_at' => $payment->created_at, + 'amount' => $payment->amount, + ]; + } + Log::info("2. Booking initially expired, but found valid pending payment(s).", $logDetails); + + $isExpired = Carbon::now()->greaterThan($newBookingExpiresAt); + Log::info("2. Booking expired: {$isExpired}"); + } else { + Log::info("Booking expired and no valid pending payments for booking ID: {$booking->id}"); + } + // } + $returnDateTime = $newBookingExpiresAt ? $newBookingExpiresAt : $bookingExpiresAt; + return $returnDateTime; + } +} diff --git a/app/Classes/Modules/Wallets/Processors/CreditWalletProcessor.php b/app/Classes/Modules/Wallets/Processors/CreditWalletProcessor.php index 65f3b9b6..b0fd0e1c 100644 --- a/app/Classes/Modules/Wallets/Processors/CreditWalletProcessor.php +++ b/app/Classes/Modules/Wallets/Processors/CreditWalletProcessor.php @@ -2,6 +2,7 @@ namespace App\Classes\Modules\Wallets\Processors; +use App\Classes\Modules\Accounts\DataTransferObjects\KeyValuePairObject; use App\Models\Wallet; use App\Models\Company; use App\Classes\ValueObjects\Constants\ApprovalStatus; @@ -14,6 +15,8 @@ use App\Classes\Modules\Transactions\Services\CreatesTransaction; use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject; use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject; use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber; +use App\Classes\Modules\Accounts\Services\CreatesKeyValuePair; +use App\Models\Transaction; class CreditWalletProcessor { @@ -32,6 +35,9 @@ class CreditWalletProcessor /** @var UpdatesWallet */ private $updatesWallet; + /** @var CreatesKeyValuePair */ + private $createsKeyValuePair; + /** * CreateWalletLogic constructor. * @param GeneratesWalletCode $generatesWalletCode @@ -39,13 +45,15 @@ class CreditWalletProcessor * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber * @param CreatesTransaction $createsTransaction * @param UpdatesWallet $updatesWallet + * @param CreatesKeyValuePair $createsKeyValuePair */ public function __construct( GeneratesWalletCode $generatesWalletCode, CreatesWallet $createsWallet, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, - UpdatesWallet $updatesWallet + UpdatesWallet $updatesWallet, + CreatesKeyValuePair $createsKeyValuePair ) { $this->generatesWalletCode = $generatesWalletCode; @@ -53,6 +61,7 @@ class CreditWalletProcessor $this->generatesTransactionBillNumber = $generatesTransactionBillNumber; $this->createsTransaction = $createsTransaction; $this->updatesWallet = $updatesWallet; + $this->createsKeyValuePair = $createsKeyValuePair; } @@ -61,10 +70,11 @@ class CreditWalletProcessor * @param int $transactionType * @param float $amount * @param string $reference + * @param $relatedTransaction * @return \Illuminate\Database\Eloquent\Model * @throws \App\Classes\Exceptions\MalformedRequestException */ - public function execute(Company $company, int $transactionType, float $amount, string $reference) + public function execute(Company $company, int $transactionType, float $amount, string $reference, $relatedTransaction = null) { if (!$company->wallets()->first()) { $object = new WalletObject($company->id, 1, $this->generatesWalletCode->execute()); @@ -75,16 +85,26 @@ class CreditWalletProcessor $wallet = $company->wallets()->first(); $billNumber = $this->generatesTransactionBillNumber->execute($transactionType === 2 ? 'DEBIT-NOTE-' : 'CREDIT-NOTE-'); - + $transaction_object = new TransactionObject($billNumber, $transactionType === 2 ? TransactionType::DEBIT_NOTE : TransactionType::CREDIT_NOTE, 1, $wallet->owner->id, 1, PaymentMethodType::CASH, $amount, $amount, 1, 1, 1, 0, 0, null, ApprovalStatus::APPROVED, [], $reference); $transaction = $this->createsTransaction->execute($wallet, $transaction_object); - + $updateWalletAmount = $transactionType === 2 ? ($wallet->amount - $transaction->amount) : ($wallet->amount + $transaction->amount); $walletObject = new WalletObject($wallet->owner->id, $wallet->currency_id, $wallet->code, $updateWalletAmount); $wallet = $this->updatesWallet->execute($wallet, $walletObject); + if($relatedTransaction && $relatedTransaction instanceof Transaction){ + $kvp = $relatedTransaction->attributesKVP()->where('key', 'App\Models\Transaction')->where('value', $transaction->id)->latest()->first(); + if(!$kvp){ + $keyValuePairObject = new KeyValuePairObject( + "App\Models\Transaction", + $transaction->id + ); + $this->createsKeyValuePair->execute($relatedTransaction, $keyValuePairObject); + } + } return $wallet; } } diff --git a/app/Classes/ValueObjects/Constants/DocumentType.php b/app/Classes/ValueObjects/Constants/DocumentType.php index 42f8222b..b11b6874 100644 --- a/app/Classes/ValueObjects/Constants/DocumentType.php +++ b/app/Classes/ValueObjects/Constants/DocumentType.php @@ -27,4 +27,7 @@ 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'; + public const EINVOICE = 'E_INVOICE'; //cief todo: 90 - why is there no E-CREDITNOTE } diff --git a/app/Classes/ValueObjects/Constants/RemarkRefundReason.php b/app/Classes/ValueObjects/Constants/RemarkRefundReason.php new file mode 100644 index 00000000..d8143b21 --- /dev/null +++ b/app/Classes/ValueObjects/Constants/RemarkRefundReason.php @@ -0,0 +1,16 @@ + 'Return Inward', + 'Goods Damage/ Loss Compensation' => 'Return Inward', + 'Cancel Partial Order' => 'Return Inward', + 'Overpaid due to Supplier amend price' => 'Discount Allowed', + 'Defective Item' => 'Discount Allowed', + 'Cancel Full Order' => 'Return Inward', + 'Others' => '', + ]; +} diff --git a/app/Classes/ValueObjects/Constants/SegmentNameConstants.php b/app/Classes/ValueObjects/Constants/SegmentNameConstants.php new file mode 100644 index 00000000..5b29b3a6 --- /dev/null +++ b/app/Classes/ValueObjects/Constants/SegmentNameConstants.php @@ -0,0 +1,8 @@ + "PAYMENT_ATTEMPT", self::PAYMENT => "PAYMENT", @@ -56,5 +58,5 @@ final class TransactionType { self::SUPPLIER_PAYMENT => "SUPPLIER_PAYMENT", self::SUPPLIER_REFUND => "SUPPLIER_REFUND", ]; - + } diff --git a/app/Classes/ValueObjects/Response/RuleEvaluationResult.php b/app/Classes/ValueObjects/Response/RuleEvaluationResult.php new file mode 100644 index 00000000..264eaf26 --- /dev/null +++ b/app/Classes/ValueObjects/Response/RuleEvaluationResult.php @@ -0,0 +1,30 @@ +success = $success; + $this->messages = $messages; + } + + public function failed(): bool + { + return ! $this->success; + } + + public function passed(): bool + { + return $this->success; + } + + public function messages(): array + { + return $this->messages; + } +} diff --git a/app/Http/Controllers/Addresses/ListStatesController.php b/app/Http/Controllers/Addresses/ListStatesController.php new file mode 100644 index 00000000..a881ad6c --- /dev/null +++ b/app/Http/Controllers/Addresses/ListStatesController.php @@ -0,0 +1,19 @@ +execute($request); + } +} diff --git a/app/Http/Controllers/Bookings/RegenerateBookingEInvoiceController.php b/app/Http/Controllers/Bookings/RegenerateBookingEInvoiceController.php new file mode 100644 index 00000000..0b07d938 --- /dev/null +++ b/app/Http/Controllers/Bookings/RegenerateBookingEInvoiceController.php @@ -0,0 +1,20 @@ +execute($request); + } +} diff --git a/app/Http/Controllers/Bookings/RegenerateBookingPaymentRVController.php b/app/Http/Controllers/Bookings/RegenerateBookingPaymentRVController.php new file mode 100644 index 00000000..29a75c70 --- /dev/null +++ b/app/Http/Controllers/Bookings/RegenerateBookingPaymentRVController.php @@ -0,0 +1,20 @@ +execute($request); + } +} diff --git a/app/Http/Controllers/Bookings/UpdateBookingAmountController.php b/app/Http/Controllers/Bookings/UpdateBookingAmountController.php index d0f6dd6c..394d4039 100644 --- a/app/Http/Controllers/Bookings/UpdateBookingAmountController.php +++ b/app/Http/Controllers/Bookings/UpdateBookingAmountController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers\Bookings; use App\Classes\Modules\Bookings\ControllersLogic\UpdateBookingAmountLogic; +use App\Classes\Modules\Bookings\ControllersLogic\UpdateBookingAmountOnHoldLogic; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -17,4 +18,12 @@ class UpdateBookingAmountController return $logic->execute($request); } -} \ No newline at end of file + /** + * @param Request $request + * @param UpdateBookingAmountOnHoldLogic $logic + * @return JsonResponse + */ + public function updateOnHold(Request $request, UpdateBookingAmountOnHoldLogic $logic): JsonResponse { + return $logic->execute($request); + } +} diff --git a/app/Http/Controllers/Companies/FetchCompanyEInvoiceInfoController.php b/app/Http/Controllers/Companies/FetchCompanyEInvoiceInfoController.php new file mode 100644 index 00000000..d506e24e --- /dev/null +++ b/app/Http/Controllers/Companies/FetchCompanyEInvoiceInfoController.php @@ -0,0 +1,20 @@ +execute($request); + } +} diff --git a/app/Http/Controllers/Companies/UpdateCompanyDetailsController.php b/app/Http/Controllers/Companies/UpdateCompanyDetailsController.php new file mode 100644 index 00000000..e8cbfd1c --- /dev/null +++ b/app/Http/Controllers/Companies/UpdateCompanyDetailsController.php @@ -0,0 +1,21 @@ +execute($request); + } +} diff --git a/app/Http/Controllers/Companies/UpdateCompanyEInvoiceInfoController.php b/app/Http/Controllers/Companies/UpdateCompanyEInvoiceInfoController.php new file mode 100644 index 00000000..9157e9de --- /dev/null +++ b/app/Http/Controllers/Companies/UpdateCompanyEInvoiceInfoController.php @@ -0,0 +1,29 @@ +execute($request); + } + + /** + * @param Request $request + * @param UpdateCompanyEInvoiceRequestLogic $logic + * @return JsonResponse + */ + public function updateRequest(Request $request, UpdateCompanyEInvoiceRequestLogic $logic): JsonResponse { + return $logic->execute($request); + } +} diff --git a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php index c63370a9..f77d8acb 100644 --- a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php +++ b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php @@ -13,15 +13,16 @@ use App\Classes\Modules\Exports\Services\ExportsNullDebtors; use App\Classes\Modules\Exports\Services\ExportsPaymentTransactions; use App\Classes\Modules\Exports\Services\ExportsWalletTransactions; use App\Classes\Modules\Exports\Services\ExportsInvoiceTransactions; +use App\Classes\Modules\Exports\Services\ExportsReceiptTransactions; +use App\Classes\Modules\Exports\Services\ExportsImportedReceiptMappeds; +use App\Classes\Modules\Exports\Services\ExportsWhiteFormTransactions; +use App\Classes\Modules\Exports\Services\ExportsImportedInvoiceMappeds; +use App\Classes\Modules\Exports\Services\ExportsEInvoiceDebtorSummary; use App\Models\User; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Maatwebsite\Excel\Excel; -use App\Classes\Modules\Exports\Services\ExportsImportedInvoiceMappeds; use App\Models\TransactionMappingLog; -use App\Classes\Modules\Exports\Services\ExportsReceiptTransactions; -use App\Classes\Modules\Exports\Services\ExportsImportedReceiptMappeds; -use App\Classes\Modules\Exports\Services\ExportsWhiteFormTransactions; use Illuminate\Support\Facades\Storage; use App\Classes\General\AWSS3Helper; use App\Classes\Modules\Exports\Services\ExportsAllCustomersInfoForLarkSystem; @@ -149,14 +150,22 @@ class ExportCustomersToExcelController } } - public function walletTransactions(Request $request){ + public function walletTransactions(Request $request) + { $exportsTransactions = new ExportsWalletTransactions($request); - $exportFileName = 'wallet-transactions.xls'; + + $type = $request->get('type'); + $exportFileName = match ($type) { + 'payment' => 'wallet-payment-transactions.xls', + 'credit_note' => 'wallet-credit-note-transactions.xls', + 'debit_note' => 'wallet-debit-note-transactions.xls', + default => 'wallet-topup-transactions.xls', + }; + $filesystemDriver = Storage::getDefaultDriver(); - if($filesystemDriver === 's3'){ - return response([ 'src' => AWSS3Helper::S3Exportable($exportFileName, $exportsTransactions) ]); - } - else{ + if ($filesystemDriver === 's3') { + return response(['src' => AWSS3Helper::S3Exportable($exportFileName, $exportsTransactions)]); + } else { $response = $exportsTransactions->download($exportFileName, Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']); ob_end_clean(); return $response; @@ -249,7 +258,7 @@ class ExportCustomersToExcelController if ($password !== 'all_customers_data') { return response()->json(['error' => 'Invalid password'], 403); } - + $exportsAllCustomersInfoForLarkSystem = new ExportsAllCustomersInfoForLarkSystem($request); $exportFileName = 'exchange_all_customers_info_for_lark_system.xls'; @@ -262,5 +271,17 @@ class ExportCustomersToExcelController return $response; } } -} + public function eInvoiceDebtorSummary(ExportsEInvoiceDebtorSummary $exportsEInvoiceDebtorSummary, Request $request){ + $exportFileName = 'EINV_DEBTOR_SUMMARY.xls'; + $filesystemDriver = Storage::getDefaultDriver(); + if($filesystemDriver === 's3'){ + return response([ 'src' => AWSS3Helper::S3Exportable($exportFileName, $exportsEInvoiceDebtorSummary) ]); + } + else{ + $response = $exportsEInvoiceDebtorSummary->download($exportFileName, Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']); + ob_end_clean(); + return $response; + } + } +} diff --git a/app/Http/Controllers/Remarks/ListRefundRemarksController.php b/app/Http/Controllers/Remarks/ListRefundRemarksController.php new file mode 100644 index 00000000..7d4e9db9 --- /dev/null +++ b/app/Http/Controllers/Remarks/ListRefundRemarksController.php @@ -0,0 +1,29 @@ + $category) { + // $returnArray[] = [ + // 'name' => $reason + // ]; + // } + // $row['payload']["data"] = $returnArray; + + $allReasons = RemarkRefundReason::REFUND_REASONS; + $row['payload']['data'] = array_keys($allReasons); + return response()->json($row); + } +} diff --git a/app/Http/Controllers/Rules/CheckRuleController.php b/app/Http/Controllers/Rules/CheckRuleController.php new file mode 100644 index 00000000..59b24cd0 --- /dev/null +++ b/app/Http/Controllers/Rules/CheckRuleController.php @@ -0,0 +1,39 @@ +execute($request); + } + + /** + * @param Request $request + * @param CheckPurchaseOrderRuleLogic $logic + * @return JsonResponse + */ + public function checkPurchaseOrderRule(Request $request, CheckPurchaseOrderRuleLogic $logic): JsonResponse { + return $logic->execute($request); + } + + /** + * @param Request $request + * @param CheckTransferRuleLogic $logic + * @return JsonResponse + */ + public function checkTransferRule(Request $request, CheckTransferRuleLogic $logic): JsonResponse { + return $logic->execute($request); + } +} diff --git a/app/Http/Controllers/Transactions/CreatePurchaseOrderTransactionController.php b/app/Http/Controllers/Transactions/CreatePurchaseOrderTransactionController.php index 67a74537..625f1afe 100644 --- a/app/Http/Controllers/Transactions/CreatePurchaseOrderTransactionController.php +++ b/app/Http/Controllers/Transactions/CreatePurchaseOrderTransactionController.php @@ -6,6 +6,8 @@ namespace App\Http\Controllers\Transactions; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use App\Classes\Modules\Transactions\ControllersLogic\CreatePurchaseOrderTransactionLogic; +use App\Classes\Modules\Bookings\ControllersLogic\UpdateBookingAmountWithPOLogic; + class CreatePurchaseOrderTransactionController @@ -15,7 +17,13 @@ class CreatePurchaseOrderTransactionController * @param CreatePurchaseOrderTransactionLogic $logic * @return JsonResponse */ - public function create(Request $request, CreatePurchaseOrderTransactionLogic $logic) : JsonResponse { - return $logic->execute($request); + public function create(Request $request, CreatePurchaseOrderTransactionLogic $createLogic, UpdateBookingAmountWithPOLogic $updateLogic) : JsonResponse { + // return $logic->execute($request); + $updateResult = $updateLogic->execute($request); + + if ($updateResult instanceof JsonResponse && $updateResult->getStatusCode() !== 200) { + return $updateResult; + } + return $createLogic->execute($request); } } diff --git a/app/Http/Controllers/Transactions/GenerateCreditNotePdfController.php b/app/Http/Controllers/Transactions/GenerateCreditNotePdfController.php index 11d27cdd..f58d419f 100644 --- a/app/Http/Controllers/Transactions/GenerateCreditNotePdfController.php +++ b/app/Http/Controllers/Transactions/GenerateCreditNotePdfController.php @@ -5,11 +5,15 @@ namespace App\Http\Controllers\Transactions; use Illuminate\Http\Request; use App\Classes\Modules\Transactions\ControllersLogic\GenerateCreditNotePdfLogic; -use Illuminate\Http\JsonResponse; +use App\Classes\Modules\Transactions\ControllersLogic\GenerateCreditNotePdfV2Logic; class GenerateCreditNotePdfController { public function download(Request $request, GenerateCreditNotePdfLogic $logic) { return $logic->execute($request); } + + public function downloadV2(Request $request, GenerateCreditNotePdfV2Logic $logic) { + return $logic->execute($request); + } } diff --git a/app/Http/Resources/AddressEInvoiceResource.php b/app/Http/Resources/AddressEInvoiceResource.php new file mode 100644 index 00000000..cbdabe17 --- /dev/null +++ b/app/Http/Resources/AddressEInvoiceResource.php @@ -0,0 +1,28 @@ + $this->id, + 'street_one' => $this->street_one, + 'street_two' => $this->street_two, + 'district' => $this->district, + 'state' => $this->state, + 'post_code' => (int) $this->postcode, + 'country' => $this->country, + 'billing' => (int) $this->billing + ]; + } +} diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php index 83e53249..449c6a59 100644 --- a/app/Http/Resources/BookingResource.php +++ b/app/Http/Resources/BookingResource.php @@ -24,6 +24,17 @@ 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); + $eInvoiceRequestedDate = Carbon::parse($this->company->e_invoice_requested_at); + //cief todo: 90 - for testing + if ($bookingCreatedDate->isAfter($eInvoiceStartDate) && $this->company->e_invoice === 1) { //&& $bookingCreatedDate->diffInMinutes($eInvoiceRequestedDate) <= 480 cief todo: 90 + $eInvoice = true; + } + // if ($this->company->e_invoice === 1) { + // $eInvoice = true; + // } return [ 'id' => $this->id, 'company' => new CompanyResource($this->company), @@ -42,6 +53,7 @@ class BookingResource extends JsonResource 'purchase_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::PURCHASE_ORDER)->first()), 'delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::DELIVER_ORDER)->first()), 'invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::INVOICE)->first()), + 'e_invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::EINVOICE)->latest()->first()), 'supplier_delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->first()), 'proforma_invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::PROFORMA_INVOICE)->whereNotIn('status', [ApprovalStatus::REJECTED, ApprovalStatus::EXPIRED])->orderByDesc('id')->first()), 'ecommerce_purchase_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::ECOMMERCE_PURCHASE_ORDER)->first()), @@ -76,7 +88,8 @@ class BookingResource extends JsonResource }); }); })->latest()->get()) - ]) + ]), + 'einvoice' => $eInvoice, ]; } } diff --git a/app/Http/Resources/CompanyResource.php b/app/Http/Resources/CompanyResource.php index b63d0f8d..da166177 100644 --- a/app/Http/Resources/CompanyResource.php +++ b/app/Http/Resources/CompanyResource.php @@ -37,11 +37,15 @@ class CompanyResource extends JsonResource 'name' => $this->name, 'reference' => $this->reference, 'debtor' => $this->debtor, + 'e_invoice' => $this->e_invoice, + 'tin' => $this->tin, + 'msic_code' => $this->msic_code, 'type' => (int) $this->type, 'business_type' => (int) $this->business_type, 'status' => (int) $this->status, 'contact' => new ContactResource ($this->when($this->has('contacts'), $this->contacts->first())), 'address' => new AddressResource($this->when($this->has('addresses'), $this->addresses->where('billing', true)->first())), + 'address_einvoice' => $this->e_invoice ? new AddressEInvoiceResource($this->when($this->has('addresses'), $this->addresses->where('billing', false)->where('e_invoice', true)->sortByDesc('created_at')->first())) : null, 'employee' => new UserResource(Auth::user()->type === RoleTypes::USER ? $this->employees()->where('email', '=', Auth::user()->email)->first() : $this->employees()->orderBy('id', 'DESC')->first()), 'identification' => new DocumentResource($this->documents->whereIn('document_type', DocumentType::IDENTIFICATION_DOCUMENTS)->sortByDesc('created_at')->first()), 'bookings' => $this->whenLoaded('bookings', $this->bookings()->orderBy('id', 'DESC')->get(), []), diff --git a/app/Http/Resources/EInvoiceInfoResource.php b/app/Http/Resources/EInvoiceInfoResource.php new file mode 100644 index 00000000..d183032c --- /dev/null +++ b/app/Http/Resources/EInvoiceInfoResource.php @@ -0,0 +1,31 @@ + $this->id, + 'street_one' => $this->street_one, + 'street_two' => $this->street_two, + 'district' => $this->district, + 'state' => $this->state, + 'post_code' => (int) $this->postcode, + 'country' => $this->country, + 'billing' => (int) $this->billing, + 'msic_code' => (string) $this->msic_code, + 'tin' => (string) $this->tin, + 'e_invoice' => (int) $this->e_invoice, + ]; + } +} diff --git a/app/Http/Resources/RuleResource.php b/app/Http/Resources/RuleResource.php new file mode 100644 index 00000000..1fb42181 --- /dev/null +++ b/app/Http/Resources/RuleResource.php @@ -0,0 +1,22 @@ + $this->success, + 'messages' => $this->messages, + ]; + } +} diff --git a/app/Http/Resources/StateResource.php b/app/Http/Resources/StateResource.php new file mode 100644 index 00000000..d73c455c --- /dev/null +++ b/app/Http/Resources/StateResource.php @@ -0,0 +1,22 @@ + $this->id, + 'state' => $this->name, + ]; + } +} diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php index 4271f030..46c1f29b 100644 --- a/app/Http/Resources/TransactionResource.php +++ b/app/Http/Resources/TransactionResource.php @@ -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())), diff --git a/app/Http/Resources/V2/BookingV2Resource.php b/app/Http/Resources/V2/BookingV2Resource.php index a41d7e35..e1735081 100644 --- a/app/Http/Resources/V2/BookingV2Resource.php +++ b/app/Http/Resources/V2/BookingV2Resource.php @@ -53,15 +53,19 @@ class BookingV2Resource extends JsonResource 'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'), 'created_at_with_time' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'), $this->mergeWhen($this->relationLoaded('transactions'), [ - 'purchase_order' => new V2\TransactionV2Resource($this->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first()), + 'purchase_order' => new V2\TransactionV2Resource( + $this->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first()), 'payment_attempts' => V2\TransactionV2Resource::collection( $this->transactions() ->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION) ->whereDate('expires_on', '>=', Carbon::now()) ->get() ), - 'expired_payment_attempts' => V2\TransactionV2Resource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString())->get()), - 'payment_history' => V2\TransactionV2Resource::collection($this->transactions()->where(function($query){ + 'expired_payment_attempts' => V2\TransactionV2Resource::collection( + $this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->where('expires_on', '>', Carbon::now()->toTimeString())->get() + ), + 'payment_history' => V2\TransactionV2Resource::collection( + $this->transactions()->where(function($query){ $query->where(function($query){ $query->payments()->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::COMPLETED, ApprovalStatus::REJECTED]); })->orWhere(function($query){ diff --git a/app/Models/Booking.php b/app/Models/Booking.php index 259ca01e..d488c1e4 100644 --- a/app/Models/Booking.php +++ b/app/Models/Booking.php @@ -3,6 +3,7 @@ namespace App\Models; use App\Classes\General\Interfaces\Documentable; +use App\Classes\General\Interfaces\KeyValueInterface; use App\Classes\General\Interfaces\Transactionable; use App\Classes\General\Interfaces\Voucherifiable; use App\Classes\General\Traits\LogData; @@ -26,7 +27,7 @@ use Staudenmeir\EloquentHasManyDeep\HasRelationships; * @property int convertible_currency_id * @property int conversion_currency_id */ -class Booking extends AbstractModel implements Documentable, Transactionable, Voucherifiable +class Booking extends AbstractModel implements Documentable, Transactionable, Voucherifiable, KeyValueInterface { use HasRelationships; use SoftDeletes; @@ -130,4 +131,12 @@ class Booking extends AbstractModel implements Documentable, Transactionable, Vo return $this->morphMany(VoucherEntityMapping::class, 'owner'); } + /** + * @return MorphMany + */ + public function attributesKVP(): MorphMany + { + return $this->morphMany(KeyValuePair::class, 'owner'); + } + } diff --git a/composer.json b/composer.json index 757d16f2..c9975f33 100644 --- a/composer.json +++ b/composer.json @@ -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", diff --git a/config/maintenance.php b/config/maintenance.php new file mode 100644 index 00000000..66376756 --- /dev/null +++ b/config/maintenance.php @@ -0,0 +1,6 @@ + env('MAINTENANCE_MESSAGE_TITLE', "We'll be back soon!"), + 'message' => env('MAINTENANCE_MESSAGE', "Sorry for the inconvenience but we're performing some maintenance at the moment."), +]; diff --git a/config/qr.php b/config/qr.php new file mode 100644 index 00000000..e42be03a --- /dev/null +++ b/config/qr.php @@ -0,0 +1,5 @@ + 'https://api.qrserver.com/v1/create-qr-code/?size=150x150&data=', +]; diff --git a/database/migrations/2025_05_04_150726_add_einvoice_to_addresses_table.php b/database/migrations/2025_05_04_150726_add_einvoice_to_addresses_table.php new file mode 100644 index 00000000..990a9e1c --- /dev/null +++ b/database/migrations/2025_05_04_150726_add_einvoice_to_addresses_table.php @@ -0,0 +1,32 @@ +boolean('e_invoice')->default(false)->after('billing'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('addresses', function (Blueprint $table) { + $table->dropColumn('e_invoice'); + }); + } +} diff --git a/database/migrations/2025_05_04_150735_add_tin_to_companies_table.php b/database/migrations/2025_05_04_150735_add_tin_to_companies_table.php new file mode 100644 index 00000000..ed5f2c58 --- /dev/null +++ b/database/migrations/2025_05_04_150735_add_tin_to_companies_table.php @@ -0,0 +1,38 @@ +string('tin')->nullable()->after('debtor'); + $table->string('msic_code')->nullable()->after('debtor')->comment("5-digit code representing business activity"); + $table->timestamp('e_invoice_requested_at')->nullable()->after('debtor'); + $table->boolean('e_invoice')->nullable()->default(null)->after('debtor'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('companies', function (Blueprint $table) { + $table->dropColumn('tin'); + $table->dropColumn('msic_code'); + $table->dropColumn('e_invoice_requested_at'); + $table->dropColumn('e_invoice'); + }); + } +} diff --git a/resources/assets/vue/components/address/forms/EInvoiceInfoFormComponent.vue b/resources/assets/vue/components/address/forms/EInvoiceInfoFormComponent.vue new file mode 100644 index 00000000..7722e33e --- /dev/null +++ b/resources/assets/vue/components/address/forms/EInvoiceInfoFormComponent.vue @@ -0,0 +1,258 @@ + +
+
+
+
diff --git a/resources/assets/vue/components/bookings/elements/DownloadBillingWithDatesComponent.vue b/resources/assets/vue/components/bookings/elements/DownloadBillingWithDatesComponent.vue
index 867ee932..1c96cb94 100644
--- a/resources/assets/vue/components/bookings/elements/DownloadBillingWithDatesComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/DownloadBillingWithDatesComponent.vue
@@ -19,7 +19,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ Please check carefully, you will not be able to edit this after confirm
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Please check carefully, you will not be able to edit this after confirm
+
+
+
+
+
+
+
+ TIN
+{{parameters.tin}}
+
+
+
+
+
+
+ MSIC Code
+{{parameters.msic_code}}
+
+
+
+
+
+
+ Billing Address
+{{parameters.street_one}} {{parameters.street_two}}, {{districts[parseFloat(parameters.district_id) - 1].city}} {{parameters.post_code}} {{states[parseFloat(parameters.state_id) - 1].state}}, {{districts[parseFloat(parameters.district_id) - 1].country.name}}
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -80,27 +80,44 @@ export default {
}
},
methods: {
- downloadReport(){
- var apiRoute = '';
- if(!this.validate()){ return; }
- switch(this.parameters.reportType) {
- case 'Payments Report':
- apiRoute = route('paymentTransactions.export');
- break;
- case 'Wallets Report':
- apiRoute = route('walletTransactions.export');
- break;
- case 'White Form Report':
- apiRoute = route('whiteFormTransactions.export');
- break;
- }
- let url = apiRoute + '?startDate=' + this.parameters.startDate + '&endDate=' + this.parameters.endDate;
- if(window.LARAVEL_VAPOR_ENABLED){
- this.submit(url, 'get', this.section, false, false);
- }
- else{
- window.open(url, '_blank');
+ options() {
+ return [
+ 'Payments Report',
+ 'White Form Report',
+ 'Wallet Top Up Report',
+ 'Wallet Payment Report',
+ 'Wallet Credit Note Report',
+ 'Wallet Debit Note Report',
+ ];
+ },
+ downloadReport() {
+ if (!this.validate()) return;
+
+ const reportType = this.parameters.reportType;
+ const walletTypes = {
+ 'Wallet Payment Report': 'payment',
+ 'Wallet Credit Note Report': 'credit_note',
+ 'Wallet Debit Note Report': 'debit_note',
+ };
+
+ const routesMap = {
+ 'Payments Report': route('paymentTransactions.export'),
+ 'White Form Report': route('whiteFormTransactions.export'),
+ 'Wallet Top Up Report': route('walletTransactions.export'),
+ 'Wallet Payment Report': route('walletTransactions.export'),
+ 'Wallet Credit Note Report': route('walletTransactions.export'),
+ 'Wallet Debit Note Report': route('walletTransactions.export'),
+ };
+
+ let url = `${routesMap[reportType]}?startDate=${this.parameters.startDate}&endDate=${this.parameters.endDate}`;
+
+ if (walletTypes[reportType]) {
+ url += `&type=${walletTypes[reportType]}`;
}
+
+ window.LARAVEL_VAPOR_ENABLED
+ ? this.submit(url, 'get', this.section, false, false)
+ : window.open(url, '_blank');
},
updateDocumentType(documentType) {
this.parameters.type = documentType;
diff --git a/resources/assets/vue/components/bookings/elements/EInvoiceInfoComponent.vue b/resources/assets/vue/components/bookings/elements/EInvoiceInfoComponent.vue
new file mode 100644
index 00000000..0a168216
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/EInvoiceInfoComponent.vue
@@ -0,0 +1,68 @@
+
+
+
+
+
diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
index f35f8573..53007c6b 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
@@ -6,7 +6,7 @@
+
+
+
+
+
+ E-Invoice Info
+
+
+
+
+
+
+ TIN
+{{ eInvoiceData.tin }}
+
+
+ MSIC Code
+{{ eInvoiceData.msic_code }}
+
+
+ Billing Address
+ + +
+
+ -
+
- Street 1: {{eInvoiceData.street_one}} +
- Street 2: {{eInvoiceData.street_two}} +
- District: {{eInvoiceData.district.name}} +
- Postcode: {{eInvoiceData.post_code}} +
- State: {{eInvoiceData.state.name}} +
- Country: {{eInvoiceData.country.name}} +
-
+
-
Status
{{ item.status === 7 ? 'Refunded' : (item.status === 1 ? 'Pending Verification' : item.status === 4 ? 'Rejected' : 'Payment Approved')}}
@@ -15,13 +15,13 @@
{{ item.status === 1 ? 'Pending Verification' : item.status === 4 ? 'Rejected' : 'Processing Payment'}}
+
-
Payment Amount
{{item.original_currency.short_code}} {{(Math.round((item.original_amount - item.refunded_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+
+ Refunded Amount
{{item.original_currency.short_code}} {{(Math.round((item.refunded_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
@@ -45,10 +45,23 @@
+
+
+
+
+
+
+
+
+
+ Receipt
+
-
-
+
+
Payment Slip
@@ -71,19 +84,19 @@
{{ item.transaction_bill.status === 1 ? 'Processing Payment' : 'Transferred'}}
+
-
Payment Amount
{{item.original_currency.short_code}} {{(Math.round((item.original_amount - item.refunded_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+
-
Refunded Amount
{{item.original_currency.short_code}} {{(Math.round((totalRefunds + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+
+ Service Type
{{item.booking.service.name}} ({{item.booking.service.id}})
@@ -114,12 +127,25 @@
+
+
+
+
+
+
+
+
+
+ Receipt
+
-
+
@@ -220,6 +246,7 @@
+
Payment Slip
+
+
+
+
+
+
+
+
+
-
-
+
+
+
-
+
+
+
@@ -332,38 +381,47 @@
+
+
+
-
+
-
Created At
{{ refund.created_at }}
+
-
Status
{{ refund.status === 1 ? 'Pending Verification' : refund.status === 2 ? 'Approved' : 'Rejected'}}
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
-
-
Amount
{{refund.currency.short_code}} {{(Math.round((refund.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
-
+ Amount
{{refund.original_currency.short_code}} {{(Math.round((refund.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+
+
+ Credit Note
+
+
+
+
+
+
@@ -436,6 +494,7 @@
bank_id: 1
},
section: 'bookingDetailSection',
+ eInvoiceStartDate: window.E_INVOICE_START_DATE || ''
}
},
computed: {
@@ -476,6 +535,14 @@
hasRefundInProgress() {
var refundTransactionsStatus = this.data.transaction_refunds.length > 0 ? this.data.transaction_refunds.map(refund => refund.status) : [];
return refundTransactionsStatus.includes(0) || refundTransactionsStatus.includes(1)
+ },
+ showEditBookingAmount(){
+ return this.data.booking.company.employee.status === 2 && this.data.booking.company.status === 2 && (Math.round((this.data.booking.outstanding_amount + Number.EPSILON) * 100) / 100) > 0;
+ },
+ showDownloadCreditNote() {
+ const today = new Date();
+ const einvoiceStartDate = new Date(this.eInvoiceStartDate);
+ return today > einvoiceStartDate;
}
},
methods: {
@@ -495,6 +562,26 @@
paymentMethodArray[5] = 'Payment Gateway';
return paymentMethodArray[paymentMethod];
},
+ downloadCreditNote(transactionId) {
+ let url = this.route('transaction.credit_note.download.v2', transactionId);
+ if(window.LARAVEL_VAPOR_ENABLED){
+ this.$store.dispatch('crudRequest', {endpoint: url, method: 'get'})
+ .then(response =>
+ {
+ let success = response.ok;
+ response.json().then(response => {
+ if(!success){return;}
+ if (response.src) {
+ window.open(response.src, '_blank');
+ }
+ });
+ }
+ );
+ }
+ else{
+ window.open(url, '_blank');
+ }
+ },
},
mixins: [componentHandler]
}
diff --git a/resources/assets/vue/components/bookings/elements/RequestCreditNoteComponent.vue b/resources/assets/vue/components/bookings/elements/RequestCreditNoteComponent.vue
new file mode 100644
index 00000000..69a58c18
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/RequestCreditNoteComponent.vue
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+
+
+
diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationV2Component.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationV2Component.vue
new file mode 100644
index 00000000..03c327cf
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationV2Component.vue
@@ -0,0 +1,845 @@
+
+
+
+
+
+
+
+ Request Credit Note
+
+
+
+
+
+
+
+ {{ method.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ data.booking.fixed_currency.short_code }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Paid Amount: {{ paidAmount }}
+ Refunded Amount: {{ (Math.round((this.data.refunded_amount + Number.EPSILON) * 100) / 100).toFixed(2) }}
+ Refund Amount Requested: {{ refundAmount }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue b/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue
index 975c4592..3b440ab2 100644
--- a/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/ConfirmQuotationFormComponent.vue
@@ -111,7 +111,11 @@
section: {
type: String,
required: true
- }
+ },
+ companyId: {
+ type: Number,
+ required: true
+ },
},
data(){
return {
@@ -121,14 +125,16 @@
amount: this.amount,
bank_code: this.bank_code,
voucher_code: this.calculation.voucher_code,
- voucher_discount_amount: this.calculation.voucher_discount_amount
+ voucher_discount_amount: this.calculation.voucher_discount_amount,
+ booking_id: this.id,
+ company_id: this.companyId,
}
}
},
methods: {
submitForm(){
this.isLoading = true;
- this.submit(route('api.booking.payment.create', this.id), 'post', this.section, false, false);
+ this.submit(route('api.booking.payment.create', this.id), 'post', this.section, false, true);
},
successHandler(response){
if (response.payload.data.payment_method === 5) {
diff --git a/resources/assets/vue/components/bookings/forms/EditBookingAmountFormV2Component.vue b/resources/assets/vue/components/bookings/forms/EditBookingAmountFormV2Component.vue
new file mode 100644
index 00000000..a7001a99
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/EditBookingAmountFormV2Component.vue
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+ 3
+
+ Make full payment
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{this.data.conversion_currency.short_code}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{this.data.convertible_currency.short_code}}
+
+
+
+
+
+
+
+
+
+
+ {{ !item.purchase_order ? 'Please fill up purchase order to enjoy the cashback' : 'You have entitled to earn cashbback' }}
+
+
+
+
+
+
+
+
+
+
+ {{ isEditRecipientBankDetailsCollapsed ? '< Back' : 'Change recipient bank details' }}
+
+
+
+
+ {{ isEditRecipientBankDetailsCollapsed ? '< Back' : 'Show edited recipient bank details on payment' }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Transfer Total:
+
+
+ {{this.data.fixed_currency.short_code}} {{(Math.round((this.data.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+
+
+
+
+ Paid Total:
+
+
+ {{this.data.fixed_currency.short_code}} {{(Math.round((this.data.paid_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+
+
+
+
+ Floating Amount:
+
+
+ {{this.data.fixed_currency.short_code}} {{(Math.round((this.data.floating_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+
+
+
+
+ OutStanding Total:
+
+
+ {{this.data.fixed_currency.short_code}} {{(Math.round((this.data.outstanding_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+
+
+
+
+
+
+
+
+
+
+
+ I need E-Invoice Now
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{error}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{this.data.fixed_currency.short_code}}
+
+
+ Apply a voucher
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ voucherCodeFailedReason }}
+ Voucher applied
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![logo]()
+
+ Online Banking
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+ Wallet Credit
+(Better Rate)
+
+
+
+ {{$store.getters.isShowing('otherPaymentMethods') ? 'Hide' : 'Show'}} Alternative Methods
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Manual Transfer
+
+
+
+
+
+
+
+
+
+ Cheque
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Personal Account Banks
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+ Maybank2u
+
+
+
+
+
+
+
+ 
+
+
+
+
+ CimbClicks
+
+
+
+
+
+
+
+ Business Account Banks
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Maybank2E
+
+
+
+
+
+
+
+
+
+
+
+
+ BizChannel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The recipient will receive the transfer amount by
{{ this.calculation.receive_date }}
+ {{ this.calculation.receive_date }}
+
+
+
+ Outstanding
+
+
+ {{this.data.fixed_currency.short_code}} {{(Math.round(((this.data.outstanding_amount - parseFloat(amount.replace(',', '')))+ Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+
+
+
+
+ Recipient Gets
+
+
+ {{this.data.convertible_currency.short_code}} {{(Math.round((calculation.foreign_total + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+
+
+
+
+ Rate
+
+
+ {{(Math.round((calculation.rate + Number.EPSILON) * 100000) / 100000).toFixed(5) }}
+
+
+
+
+ You are sending
+
+
+ MYR {{(Math.round((calculation.local_total + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+
+
+
+
+ Transfer Charges
+
+
+ MYR {{(Math.round((calculation.service_charge + Number.EPSILON) * 100) / 100).toFixed(2)}}
+
+
+
+
+ Sub Total
+
+
+ MYR {{(Math.round((calculation.sub_total + Number.EPSILON) * 100) / 100).toFixed(2)}}
+
+
+
+
+ Voucher
+
+
+ - MYR {{(Math.round((calculation.voucher_discount_amount + Number.EPSILON) * 100) / 100).toFixed(2)}}
+
+
+ - MYR 0.00
+
+
+
+
+ Tax {{(Math.round((calculation.tax + Number.EPSILON) * 10) / 10).toFixed(1)}}%
+
+
+ MYR {{(Math.round((calculation.tax_total + Number.EPSILON) * 100) / 100).toFixed(2)}}
+
+
+
+
+ You are paying
+
+
+ MYR {{(Math.round((calculation.total + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+
+
+
+
+
+
+
+
+ You don't have sufficient credit in your wallet to complete this transaction. Please Reload your wallet.
+change the payment method?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/assets/vue/components/bookings/forms/PaymentVerificationFormComponent.vue b/resources/assets/vue/components/bookings/forms/PaymentVerificationFormComponent.vue
index 4e47728a..1e5af3c3 100644
--- a/resources/assets/vue/components/bookings/forms/PaymentVerificationFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/PaymentVerificationFormComponent.vue
@@ -118,15 +118,17 @@
},
methods: {
submitForm(){
-
this.parameters = {
- files: this.files
+ files: this.files,
+ booking_id: this.id,
+ company_id: this.data.booking.company.id,
+ payment_id: this.data.id,
};
- this.submit(this.route('api.booking.payment.verification.create', this.id, this.data.id), 'post', this.section, true, false)
+ this.submit(this.route('api.booking.payment.verification.create', this.id, this.data.id), 'post', this.section, true, true);
}
},
mixins: [ModalFromHandler]
}
-
\ No newline at end of file
+
diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
index de4e496b..1009153b 100644
--- a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
@@ -13,7 +13,7 @@
+
+
+
+
+
+
+
+
+
+ Edit Booking Amount
+To ensure both updates take effect, please update the purchase order details with the equivalent booking amount immediately after this update. If not done in sequence, neither update will be applied.
+
+
+
+
+
+
+
+
+
+
+
+ {{error}}
+
+
+
+
+
+ Cancel
+
+
+ Update
+
-
Any Purchase Orders that aren't submitted within 60 days will be closed for editing.
+Ensure PO details are fill in correctly — NO changes allowed after submission.
Please note that this customer request to manual fill up the PO.
@@ -150,8 +150,15 @@
-
+
+
@@ -188,12 +195,13 @@
@@ -235,7 +243,8 @@
},
created() {
this.products = this.data.purchase_order ? this.data.purchase_order.details : [];
- this.submitted = this.data.purchase_order ? this.data.purchase_order.status === 1 || this.data.purchase_order.status === 2: false;
+ this.submitted = this.data.purchase_order ? true : false;
+ // this.submitted = this.data.purchase_order ? this.data.purchase_order.status === 1 || this.data.purchase_order.status === 2: false;
},
computed: {
productTotal(){
@@ -245,13 +254,29 @@
return this.products.reduce(function(last, product) {
return last + product.total;
}, 0);
+ },
+ allowPOEditing() {
+ //Condition 1
+ const noPaymentsMade = Math.round((this.data.paid_amount + Number.EPSILON) * 100) / 100 === 0;
+ const noPaymentPendingVerifications = this.data.payment_history.every(payment => payment.status !== 1);
+
+ //Condition 2
+ const paymentsMade = Math.round((this.data.paid_amount + Number.EPSILON) * 100) / 100 > 0;
+ const outstandingAmount = Math.round((this.data.outstanding_amount + Number.EPSILON) * 100) / 100 > 0;
+ const allPaymentApproved = this.data.payment_history.every(payment => payment.status === 2);
+
+ //Condition 3
+ const adminBeforeApproval = this.$store.getters.isAdmin && !(this.data.purchase_order.status === 2);
+
+ return (noPaymentsMade && noPaymentPendingVerifications) || (paymentsMade && outstandingAmount && allPaymentApproved) || adminBeforeApproval;
}
},
watch: {
'data': function () {
if (this.data && this.data.purchase_order && this.data.purchase_order.details) {
this.products = this.data.purchase_order.details;
- this.submitted = this.data.purchase_order ? this.data.purchase_order.status === 1 || this.data.purchase_order.status === 2: false;
+ this.submitted = this.data.purchase_order ? true : false;
+ // this.submitted = this.data.purchase_order ? this.data.purchase_order.status === 1 || this.data.purchase_order.status === 2: false;
} else {
this.products = [];
}
@@ -278,10 +303,12 @@
}
},
- submitForm(){
+ handleConfirmed(value) {
this.uploadFiles = false;
this.parameters = {
- products: this.products
+ products: this.products,
+ booking_id: this.data.id,
+ company_id: this.data.company.id,
};
this.submit(route('api.transaction.po.create', this.data.id), 'post', this.section, true, true);
diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderSubmitConfirmationComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderSubmitConfirmationComponent.vue
new file mode 100644
index 00000000..cdc1256b
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderSubmitConfirmationComponent.vue
@@ -0,0 +1,38 @@
+
+
Your Purchase Order {{data.purchase_order.status === 1 ? 'is Being Processed for Verification' : 'has been Approved' }}
-
+
-
+
+
If you would like to still edit your Purchase Order you can do that by clicking on the edit button below, but your purchase order verification request will be reset.
+
+
+
diff --git a/resources/assets/vue/components/bookings/forms/RegenerateEInvoiceComponent.vue b/resources/assets/vue/components/bookings/forms/RegenerateEInvoiceComponent.vue
new file mode 100644
index 00000000..6d6d15f9
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/RegenerateEInvoiceComponent.vue
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
+
+
+
+ Are you Sure?
+Ensure PO details are fill in correctly — NO changes allowed after submission.
+
+
+
+
+ Re-Check Again
+
+
+ Confirm Submit
+
+
+
+
diff --git a/resources/assets/vue/components/bookings/forms/RegenerateReceiptVoucherComponent.vue b/resources/assets/vue/components/bookings/forms/RegenerateReceiptVoucherComponent.vue
new file mode 100644
index 00000000..6445272b
--- /dev/null
+++ b/resources/assets/vue/components/bookings/forms/RegenerateReceiptVoucherComponent.vue
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+ Are you Sure?
+Are you sure you want to regenerate the e-invoice for this payment?
+
+
+
+
+ Cancel
+
+
+ Confirm
+
+
+
+
diff --git a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
index e12074b0..68dffd3a 100644
--- a/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
@@ -31,7 +31,7 @@
+
+
+
+
+
+
+
+
+
+ Are you Sure?
+Are you sure you want to regenerate the receipt voucher for this payment?
+
+
+
+
+ Cancel
+
+
+ Confirm
+
-
@@ -282,9 +310,9 @@
+
@@ -175,6 +190,19 @@
{{booking.company.contact ? booking.company.contact.phone: ''}}
+
@@ -46,6 +46,21 @@
+
+
+
+
+
+
+
+
+
+
+ E-Invoice
+
+
+
-
Regenerate Invoices
+
-
Delete Transfer
+
+
+
+
+
+
+
-
@@ -353,8 +390,8 @@
-
+
+
@@ -462,7 +499,7 @@
-
@@ -495,6 +532,7 @@
attention: false,
bearShowing: false,
oneSixEightEightServiceIds: [4, 10],
+ parameters: {}
}
},
computed: {
@@ -513,7 +551,14 @@
},
companySegmentIds() {
return this.booking.company.segments.map(obj => parseInt(obj.id));
- }
+ },
+ invoiceInfo() {
+ const company = this.booking.company;
+ if (company.e_invoice) {
+ return company.tin ? company.tin : 'INCOMPLETE E-INVOICE INFO';
+ }
+ return 'NOT PROVIDED';
+ },
},
watch: {
pendingQueue(inComplete){
@@ -530,13 +575,24 @@
this.isLoading = true;
this.submit(route('api.booking.show', this.marking), 'get', this.section, false, false)
},
- successHandler(response){
- this.$store.dispatch('completeList', {'name': this.section, 'data': []});
- this.isLoading = false;
- this.booking = response.payload.data;
+ successHandler(response, section, payload){
+ if(section === this.section + 'CheckTransferRule'){
+ window.location.href = route('billplz.bill', payload.payment_reference);
+ }
+ else
+ {
+ this.$store.dispatch('completeList', {'name': this.section, 'data': []});
+ this.isLoading = false;
+ this.booking = response.payload.data;
+ }
},
- errorHandler(){
- window.location.href = this.route('dashboard')
+ errorHandler(response, statusCode, section){
+ if(section === this.section + 'CheckTransferRule' && statusCode === 422){
+ console.log('Transfer expired, please create new transfer');
+ }
+ else{
+ window.location.href = this.route('dashboard');
+ }
},
updateDefaultAddress(){
this.addressEdit = false;
@@ -544,7 +600,29 @@
},
selectedID(id){
this.selected_id = id;
- }
+ },
+ checkTransferRule(item){
+ this.parameters = {
+ booking_id: item.booking.id,
+ company_id: item.booking.company.id,
+ payment_reference: item.payment_reference,
+ };
+ this.submit(route('api.rule.check.transfer'), 'post', this.section + 'CheckTransferRule', false, true);
+ },
}
}
+
diff --git a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
index 1435c448..d406e1ac 100644
--- a/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
+++ b/resources/assets/vue/components/companies/elements/CustomerProfileComponent.vue
@@ -14,7 +14,8 @@
-
+
+
+ @php + $credit_title = 'Credit'; + $bill_no = $credit_title === 'Refund' ? str_replace('CREDIT', 'REFUND', $transaction->bill_no) : $transaction->bill_no; + @endphp +
+
+
+
+
+
+
+
+
+
+
+
+@endsection
diff --git a/resources/views/pages/pdfs/e_credit_note.blade.php b/resources/views/pages/pdfs/e_credit_note.blade.php
new file mode 100644
index 00000000..aa4c67d8
--- /dev/null
+++ b/resources/views/pages/pdfs/e_credit_note.blade.php
@@ -0,0 +1,147 @@
+@extends('layouts.base_pdf')
+@section('inner_content')
+
+
+
+ @php + $credit_title = 'E-Credit'; + $bill_no = $transaction->bill_no; + @endphp +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+@endsection
diff --git a/resources/views/pages/pdfs/e_invoice.blade.php b/resources/views/pages/pdfs/e_invoice.blade.php
new file mode 100644
index 00000000..2a133bb8
--- /dev/null
+++ b/resources/views/pages/pdfs/e_invoice.blade.php
@@ -0,0 +1,115 @@
+@extends('layouts.base_pdf')
+
+@section('inner_content')
+
+
+
+
+
+
+
+
+
+
+ + + @include('pages.pdfs.purchase_order_table') + +
+
+ +
+
+
+
+@endsection
diff --git a/resources/views/pages/pdfs/invoice.blade.php b/resources/views/pages/pdfs/invoice.blade.php
index 2fe00625..9e560b44 100644
--- a/resources/views/pages/pdfs/invoice.blade.php
+++ b/resources/views/pages/pdfs/invoice.blade.php
@@ -26,7 +26,7 @@
diff --git a/resources/views/pages/pdfs/receipt_voucher.blade.php b/resources/views/pages/pdfs/receipt_voucher.blade.php
new file mode 100644
index 00000000..64942f6f
--- /dev/null
+++ b/resources/views/pages/pdfs/receipt_voucher.blade.php
@@ -0,0 +1,113 @@
+@extends('layouts.base_pdf')
+
+@section('inner_content')
+
+
+
+
+
+
+
+
+
+ @php
+ $total = round($transaction->amount, 2);
+ @endphp
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +Exchange - Overseas Money Transfers
diff --git a/routes/api.php b/routes/api.php
index 74de21b6..564f9304 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -72,6 +72,8 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
require __DIR__ . '/job.php';
+ require __DIR__ . '/rule.php';
+
// require __DIR__ . '/rate.php';
// require __DIR__ . '/receipt.php';
});
diff --git a/routes/booking.php b/routes/booking.php
index e8e73856..e305276b 100644
--- a/routes/booking.php
+++ b/routes/booking.php
@@ -1,5 +1,8 @@
'booking', 'as' => 'booking.', 'namespace' => 'Bookings'], function () {
@@ -34,10 +37,17 @@ Route::group(['prefix' => 'booking', 'as' => 'booking.', 'namespace' => 'Booking
Route::delete('{id}/purchase_order/pdf', 'DeletePurchaseOrderPdfController@delete')->name('po.pdf.delete');
Route::put('{id}/updateAmount', 'UpdateBookingAmountController@update')->name('booking_amount.update');
+ Route::put('{id}/updateAmountWithPO', [UpdateBookingAmountController::class, 'updateOnHold'])->name('amount.update');
Route::put('{id}/updateOrderReferences', 'UpdateBookingOrderReferenceController@update')->name('booking_order_reference.update');
Route::post('/merge', 'MergeBookingController@merge')->name('merge');
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');
+ });
+ Route::group(['prefix' => '{id}/einvoice', 'as' => 'einvoice.'], function () {
+ Route::post('/', [RegenerateBookingEInvoiceController::class, 'regenerate'])->name('regenerate');
+ });
});
diff --git a/routes/company.php b/routes/company.php
index d3e9d4ba..d88bd398 100644
--- a/routes/company.php
+++ b/routes/company.php
@@ -1,5 +1,8 @@
'company', 'as' => 'company.', 'namespace' => 'Companies'], function () {
@@ -36,4 +39,8 @@ Route::group(['prefix' => 'company', 'as' => 'company.', 'namespace' => 'Compani
Route::put('/{document_id}/approval/{status}', 'ApproveIdentificationDocumentController@approve')->where('status', 'approve|reject')->name('approval');
});
+ Route::put('/details/update/{id}', [UpdateCompanyDetailsController::class, 'update'])->name('update.details');
+ Route::get('/e-invoice/info/{id}', [FetchCompanyEInvoiceInfoController::class, 'fetch'])->name('einvoice.info');
+ Route::post('/e-invoice/info/update', [UpdateCompanyEInvoiceInfoController::class, 'updateInfo'])->name('einvoice.info.update');
+ Route::post('/e-invoice/request/update', [UpdateCompanyEInvoiceInfoController::class, 'updateRequest'])->name('einvoice.request.update');
});
diff --git a/routes/crud.php b/routes/crud.php
index f01b72f7..b8db3c71 100644
--- a/routes/crud.php
+++ b/routes/crud.php
@@ -1,5 +1,7 @@
'address', 'as' => 'address.', 'namespace' => 'Addresses'], function () {
@@ -7,6 +9,7 @@ Route::group(['prefix' => 'address', 'as' => 'address.', 'namespace' => 'Address
Route::get('/list', 'ListAddressesController@list')->name('list');
Route::get('district/list', 'ListDistrictsController@list')->name('district.list');
+ Route::get('state/list', [ListStatesController::class, 'list'])->name('state.list');
Route::post('/create', 'CreateAddressController@create')->name('create');
diff --git a/routes/remark.php b/routes/remark.php
index 91ae4676..90f781eb 100644
--- a/routes/remark.php
+++ b/routes/remark.php
@@ -1,5 +1,6 @@
'Remarks', 'as' => 'remark.', 'prefix' => 'remark'], function () {
@@ -8,4 +9,6 @@ Route::group(['namespace' => 'Remarks', 'as' => 'remark.', 'prefix' => 'remark']
Route::post('/{id}/create', 'CreateRemarkController@create')->name('create');
Route::put('/update/{id}', 'UpdateRemarkController@update')->name('update');
Route::delete('/delete/{id}', 'DeleteRemarkController@delete')->name('delete');
+
+ Route::get('/list/refund-reasons', [ListRefundRemarksController::class, 'list'])->name('list.refund_reasons');
});
diff --git a/routes/rule.php b/routes/rule.php
new file mode 100644
index 00000000..d5330176
--- /dev/null
+++ b/routes/rule.php
@@ -0,0 +1,12 @@
+as('rule.')
+ ->group(function () {
+ Route::post('/check/eInvoice', [CheckRuleController::class, 'checkEInvoiceRule'])->name('check.einvoice');
+ Route::post('/check/purchase-order', [CheckRuleController::class, 'checkPurchaseOrderRule'])->name('check.purchase.order');
+ Route::post('/check/tranfer', [CheckRuleController::class, 'checkTransferRule'])->name('check.transfer');
+ });
diff --git a/routes/web.php b/routes/web.php
index 5ab78d66..d28151ea 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -32,7 +32,6 @@ use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
use App\Classes\Modules\Bookings\Processors\CreatePurchaseOrderFor1688OrderProcessor;
use App\Classes\Modules\Bookings\Services\CalculatesBookingRefundAmount;
use App\Classes\Modules\Documents\Services\DeletesDocument;
-use App\Classes\Modules\Transactions\Processors\CreateInvoiceTransactionWithInvoiceNoProcessor;
use App\Classes\Modules\Transactions\Services\DeletesTransaction;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
@@ -326,6 +325,7 @@ Route::get('/export/analytic/booking', 'Exports\ExportAnalyticToExcelController@
Route::get('/export/analytic/bills', 'Exports\ExportAnalyticToExcelController@billingData')->name('billingData.export');;
Route::get('/export/customers/leads', 'Exports\ExportCustomersToExcelController@leadsData')->name('leads.export');
route::get('/export/excel/{id}', 'Exports\ExportCustomersToExcelController@exportCurrencyVendorOrder')->name('group.excel');
+Route::get('/export/einv-debtor/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@eInvoiceDebtorSummary')->name('eInvoiceDebtorSummary.export');
Route::get('/export/all-customers-info-for-lark-system', 'Exports\ExportCustomersToExcelController@exportAllCustomersInfoForLarkSystem')->name('exportAllCustomersInfoForLarkSystem.export');
Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsProducts $exportsProducts) {
@@ -785,7 +785,7 @@ Route::get('/invoice/fix', function(){
$existing_invoice_bill_no->forceDelete();
}
- (App()->make(CreateInvoiceTransactionWithInvoiceNoProcessor::class))->execute($booking, $bill_no);
+ (App()->make(CreateInvoiceTransactionProcessor::class))->execute($booking, $bill_no);
dump('regenerated invoice. Booking Marking - ' . $booking->marking . '. Bill_no - ' . $bill_no . '. Old bill_no - ' . $deletedInvoice->bill_no);
LogHelper::channel('regenerateInvoice')->info('regenerated invoice. Booking Marking - ' . $booking->marking . '. Bill_no - ' . $bill_no . '. Old bill_no - ' . $deletedInvoice->bill_no);
} else {
@@ -917,7 +917,7 @@ Route::get('/statements/{account}/transactions', function ($account) {
})->name('statements.account.transactions');
Route::get('/statements/{statement}', [BankStatementController::class, 'show'])->name('statements.show');
Route::get('/statements/mapping/rerun', [BankStatementController::class, 'rerun'])->name('statements.rerun');
-Route::get('/statements/{statement}/download', 'StatementController@download')->name('statements.download');
+// Route::get('/statements/{statement}/download', 'StatementController@download')->name('statements.download');
Route::get('/bank-record', 'Imports\ImportBankRecordController@import');
Route::get('/po/outsource/check', function(){
@@ -1010,7 +1010,8 @@ Route::get('/customer/vouchers/{marking}', function ($marking) {
}
})->name('customer.reward');
-Route::get('transaction/{id}/credit_note/download', 'Transactions\GenerateCreditNotePdfController@download')->name('transaction.credit_note.download');
+Route::get('transaction/{id}/credit_note/download', 'Transactions\GenerateCreditNotePdfController@downloadV2')->name('transaction.credit_note.download');
+Route::get('transaction/{id}/credit_note/download/v2', 'Transactions\GenerateCreditNotePdfController@downloadV2')->name('transaction.credit_note.download.v2');
Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking, $started_at, $ended_at) {
@@ -1081,7 +1082,7 @@ Route::get('/invoice/{marking}/{started_at}/{ended_at}/fix', function($marking,
$booking->transactions()->whereIn('transactions.type', [TransactionType::INVOICE, TransactionType::SUPPLIER_DELIVER])->delete();
$booking->documents()->whereIn('document_type', [DocumentType::INVOICE, DocumentType::PURCHASE_ORDER, DocumentType::DELIVER_ORDER, DocumentType::SUPPLIER_DELIVER_ORDER])->delete();
- (App()->make(CreateInvoiceTransactionWithInvoiceNoProcessor::class))->execute($booking, $firstBillNo);
+ (App()->make(CreateInvoiceTransactionProcessor::class))->execute($booking, $firstBillNo);
dump('regenerated invoice. Booking Marking - ' . $booking->marking . '. Bill_no - ' . $firstBillNo . '. Old bill_no - ' . $currentInvoice->bill_no);
LogHelper::channel('regenerateInvoice')->info('regenerated invoice. Booking Marking - ' . $booking->marking . '. Bill_no - ' . $firstBillNo . '. Old bill_no - ' . $currentInvoice->bill_no);
}
Change Booking Owner
+
{{item.name}}
diff --git a/resources/assets/vue/components/companies/forms/ChangeCustomerCompanyDetailsFormComponent.vue b/resources/assets/vue/components/companies/forms/ChangeCustomerCompanyDetailsFormComponent.vue
new file mode 100644
index 00000000..326274d3
--- /dev/null
+++ b/resources/assets/vue/components/companies/forms/ChangeCustomerCompanyDetailsFormComponent.vue
@@ -0,0 +1,194 @@
+
+
+
+
+
+
diff --git a/resources/assets/vue/components/companies/forms/EInvoiceRequestFormComponent.vue b/resources/assets/vue/components/companies/forms/EInvoiceRequestFormComponent.vue
new file mode 100644
index 00000000..30828ea5
--- /dev/null
+++ b/resources/assets/vue/components/companies/forms/EInvoiceRequestFormComponent.vue
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+ Edit Company Details
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ E-Invoice Info
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Cancel
+
+
+ Confirm
+
+
+
+
+
diff --git a/resources/assets/vue/components/general/elements/DocumentFileViewerComponent.vue b/resources/assets/vue/components/general/elements/DocumentFileViewerComponent.vue
index 70f3280f..da0ce254 100644
--- a/resources/assets/vue/components/general/elements/DocumentFileViewerComponent.vue
+++ b/resources/assets/vue/components/general/elements/DocumentFileViewerComponent.vue
@@ -35,6 +35,13 @@
isClicked: false
}
},
+ watch: {
+ file: {
+ handler() {
+ this.loaded = false;
+ },
+ }
+ },
computed: {
type() {
return this.file.file.mime_type === 'application/pdf' ? 'pdf' : 'image'
diff --git a/resources/assets/vue/components/general/forms/ValidationErrorComponent.vue b/resources/assets/vue/components/general/forms/ValidationErrorComponent.vue
index e1020c2e..37223319 100644
--- a/resources/assets/vue/components/general/forms/ValidationErrorComponent.vue
+++ b/resources/assets/vue/components/general/forms/ValidationErrorComponent.vue
@@ -2,9 +2,14 @@
+
+
+
+
+
+
+
+
+
+ Do you need E-Invoice?
+You won't be able to request one after clicking 'No'.
+
+
+
+
+ No
+
+
+ Yes
+
{{errorMessages[param]}}
+ {{errorMessages[param]}} {{object.max}} characters
{{errorMessages[param]}} {{object.min}} characters
{{errorMessages[param]}} {{object.eq}} field
{{errorMessages[param]}} {{object.max}}
+ {{errorMessages[param]}}
+
+ {{ errorMessages[param] }}
+
@@ -14,16 +19,20 @@
props: {
validator: {
required: true
- }
+ },
},
data(){
return {
errorMessages:{
required: 'this field is required',
email: 'enter a valid email address',
+ maxLength: 'this field must have at most',
minLength: 'this field must have at least',
sameAs: 'this field must match the',
- maxValue: 'this value must not exceeds'
+ maxValue: 'this value must not exceeds',
+ alphaNum: 'this value must be alphanumeric',
+ fiveDigits: 'this value must be exactly 5 digits', //custom
+ // notZero: 'this value cannot be zero',
},
}
},
diff --git a/resources/assets/vue/components/wallets/elements/CustomerWalletTransactionComponent.vue b/resources/assets/vue/components/wallets/elements/CustomerWalletTransactionComponent.vue
index ad5ccb07..c8220b04 100644
--- a/resources/assets/vue/components/wallets/elements/CustomerWalletTransactionComponent.vue
+++ b/resources/assets/vue/components/wallets/elements/CustomerWalletTransactionComponent.vue
@@ -1,7 +1,9 @@
{{data.created_at}}
-
+
{{[5, 9].includes(parseFloat(data.type)) ? formatValue(data.amount) : ''}}
{{[1, 11].includes(parseFloat(data.type)) ? '- ' + (formatValue(data.amount)) : ''}}
{{formatValue(data.running_balance)}}
diff --git a/resources/assets/vue/general/mixins/request.js b/resources/assets/vue/general/mixins/request.js
index 96318920..b4dc85a4 100644
--- a/resources/assets/vue/general/mixins/request.js
+++ b/resources/assets/vue/general/mixins/request.js
@@ -25,7 +25,7 @@ export default {
if (!success) {
this.openModal();
errorNotification ? this.$store.dispatch('createNotification', { title: response.title, message: response.message, type: 'error' }) : null;
- this.errorHandler(response, statusCode); return;
+ this.errorHandler(response, statusCode, section); return;
}
successNotification ? this.$store.dispatch('createNotification', { title: response.title, message: response.message, type: 'success' }) : null;
@@ -34,7 +34,7 @@ export default {
link.href = window.URL.createObjectURL(response);
link.download = fileName.trim();
link.click();
- this.successHandler(response)
+ this.successHandler(response, section)
});
} else {
response.json().then(response => {
@@ -42,11 +42,11 @@ export default {
if (!success) {
this.openModal();
errorNotification ? this.$store.dispatch('createNotification', { title: response.title, message: response.message, type: 'error' }) : null;
- this.errorHandler(response, statusCode); return;
+ this.errorHandler(response, statusCode, section); return;
}
successNotification ? this.$store.dispatch('createNotification', { title: response.title, message: response.message, type: 'success' }) : null;
- this.successHandler(response)
+ this.successHandler(response, section, this.parameters);
});
diff --git a/resources/views/errors/503.blade.php b/resources/views/errors/503.blade.php
index d8fbc8c3..f096db8d 100644
--- a/resources/views/errors/503.blade.php
+++ b/resources/views/errors/503.blade.php
@@ -22,8 +22,9 @@
-
+
diff --git a/resources/views/pages/downloads/index.blade.php b/resources/views/pages/downloads/index.blade.php
index 355aa1a2..0f34dee7 100644
--- a/resources/views/pages/downloads/index.blade.php
+++ b/resources/views/pages/downloads/index.blade.php
@@ -66,6 +66,32 @@
+
+
+
+
+
+
+ Download
+
+
+
+ nullDebtor.xls
+
+ New Debtors Report from settings page
+
+
diff --git a/resources/views/pages/pdfs/credit_note_v2.blade.php b/resources/views/pages/pdfs/credit_note_v2.blade.php
new file mode 100644
index 00000000..5155a3bf
--- /dev/null
+++ b/resources/views/pages/pdfs/credit_note_v2.blade.php
@@ -0,0 +1,118 @@
+@extends('layouts.base_pdf')
+@section('inner_content')
+
+
+
+
+ Download
+
+
+
+ EINV_DEBTOR_SUMMARY.xls
+
+ e-Invoice Debtor Summary Report
++
+ @php + $credit_title = 'Credit'; + $bill_no = $credit_title === 'Refund' ? str_replace('CREDIT', 'REFUND', $transaction->bill_no) : $transaction->bill_no; + @endphp +
{{ $bill_no }}
+
+  }})
+ |
+
+
+
+ CIEF WORLDWIDE SDN BHD
+
+
+ (1134596-M) + No. 72-3, Jalan Jalil 1, + The Earth Bukit Jalil, + 57000 Kuala Lumpur + Tel: 03-8082 1252 + TIN: C23880226040, MSIC: 46909 + SST: W10-2403-32000643 + |
+
+
+
+ {{ $transaction->type == 9 ? $credit_title : 'Debit' }} Note
+
+
+
+ Ref# {{ $booking->marking }}
+ Date: {{ $date }}
+ |
+
| + + {{ $transaction->type == 9 ? 'Credit' : 'Debit' }} To + + | +||
|
+
+ {{ $supplier->name }}
+
+
+ @php
+ $addresses = $supplier->addresses()->where('billing', '=', true)->first();
+ @endphp
+ {{ $addresses->street_one }}
+ {{ $addresses->street_two }} ,
+ {{ $addresses->district()->first()->name }},
+ {{ $addresses->postcode }}
+ {{ $addresses->state()->first()->name }},
+ {{ $addresses->country()->first()->name }}
+
+
+ Phone: {{ $supplier->contacts()->first()->phone }}
+
+ @if ($supplier->e_invoice === 1)
+ Buyer TIN: {{ $supplier->tin }}
+ @endif
+ |
+ ||
+
+
| No | +Description | +Quantity | +Unit Price (RM) | +Total Amount (RM) |
+
|---|---|---|---|---|
| 1 | +{{ ucfirst($transaction->payment_reference) }} | +1 | ++ {{ number_format($transaction->amount, 2) }} + | ++ {{ number_format($transaction->amount, 2) }} + | +
| + | Total | ++ {{ number_format($transaction->amount, 2) }} + | +||
| This is generated by computer. No signature required. | +Page {PAGENO} of {nbpg} | +
+
+ @php + $credit_title = 'E-Credit'; + $bill_no = $transaction->bill_no; + @endphp +
{{ $bill_no }}
+|
+
+ |
+
+
+
+ CIEF WORLDWIDE SDN BHD
+
+
+ (1134596-M) + No. 72-3, Jalan Jalil 1, + The Earth Bukit Jalil, + 57000 Kuala Lumpur + Tel: 03-8082 1252 + TIN: C23880226040, MSIC: 46909 + SST: W10-2403-32000643 + |
+
+
+
+ {{ $transaction->type == 9 ? $credit_title : 'Debit' }} Note
+
+
+
+ Ref# {{ $booking->marking }}
+ Date: {{ $date->toDateString() }}
+ |
+
| + + {{ $transaction->type == 9 ? 'Credit' : 'Debit' }} To + + | +||
|
+
+ {{ $supplier->name }}
+ @if ($brn)
+ (ROC: {{ $brn->reference }})
+ @endif
+
+
+ @php
+ $addresses = $supplier->addresses()->where('e_invoice', '=', true)->latest()->first();
+ @endphp
+ {{ $addresses->street_one }}
+ {{ $addresses->street_two }} ,
+ {{ $addresses->district()->first()->name }},
+ {{ $addresses->postcode }}
+ {{ $addresses->state()->first()->name }},
+ {{ $addresses->country()->first()->name }}
+
+
+ Phone: {{ $supplier->contacts()->first()->phone }}
+
+ @if ($supplier->e_invoice === 1)
+ Buyer TIN: {{ $supplier->tin }}
+ @endif
+ |
+ ||
+
+
| No | +Description | +Quantity | +Unit Price (RM) | +Total Amount (RM) |
+
|---|---|---|---|---|
| 1 | +{{ ucfirst($transaction->payment_reference) }} | +1 | ++ {{ number_format($transaction->amount, 2) }} + | ++ {{ number_format($transaction->amount, 2) }} + | +
| + | Total | ++ {{ number_format($transaction->amount, 2) }} + | +||
| + + | +
+
|
+
| This is generated by computer. No signature required. | +Page {PAGENO} of {nbpg} | +
+
+
{{ $transaction->bill_no }}
+ |
+
+ |
+
+ CIEF WORLDWIDE SDN BHD
+ (1134596-M) + No. 72-3, Jalan Jalil 1, + The Earth Bukit Jalil, + 57000 Kuala Lumpur + Tel: 03-8082 1252 + TIN: C23880226040, MSIC: 46909 + SST: W10-2403-32000643 + |
+
+ E-Invoice
+ EI#: {{ $autocountId ?? 'NONE'}}
+ Ref# {{ $po_order_transaction->booking->marking }}
+ Date: {{ $document_date->toDateString() }}
+ |
+
| + Bill To + | +||
|
+ {{ $supplier->name }}
+ @if ($brn)
+ (ROC: {{ $brn->reference }})
+ @endif
+
+ @php
+ $billingAddress = $supplier->addresses()->where('e_invoice', '=', true)->latest()->first();
+ @endphp
+
+ {{ $billingAddress->street_one }}
+ {{ $billingAddress->street_two }},
+ {{ $billingAddress->district()->first()->name }},
+ {{ $billingAddress->postcode }}
+ {{ $billingAddress->state()->first()->name }},
+ {{ $billingAddress->country()->first()->name }}
+
+ Phone: {{ $supplier->contacts()->first()->phone }}
+ @if ($supplier->e_invoice === 1)
+ Buyer TIN: {{ $supplier->tin }}
+ @endif
+ |
+ ||
+
+ + + @include('pages.pdfs.purchase_order_table') + +
+
+ Note: All items purchased are subject to our Terms & Conditions. Please refer to our official website for more information.
+
+ + +
+
|
+
+
|
+
Invoice
EI#: {{ $transaction->bill_no }}
Ref# {{ $po_order_transaction->booking->marking }}
- Date: {{ $supplier->segments->whereIn('id', [23])->first() ? \Carbon\Carbon::now() : $po_order_transaction->booking->created_at }}
+ Date: {{ $document_date }}
+
+
{{ $transaction->bill_no }}
+ |
+
+ |
+
+ CIEF WORLDWIDE SDN BHD
+ (1134596-M) + No. 72-3, Jalan Jalil 1, + The Earth Bukit Jalil, + 57000 Kuala Lumpur + Tel: 03-8082 1252 + |
+
+ Receipt Voucher
+ EI#: {{ $transaction->bill_no }}
+ Ref# {{ $po_order_transaction->owner->marking }}
+ Date: {{ $transaction->created_at }}
+ |
+
| + Received From: + | +||
|
+ {{ $supplier->name }}
+ @if ($supplier->e_invoice === 1)
+ (TIN: {{ $supplier->tin }})
+ @endif
+
+ @php
+ $billingAddress = $supplier->addresses()->where('billing', '=', true)->first();
+ @endphp
+
+ {{ $billingAddress->street_one }}
+ {{ $billingAddress->street_two }},
+ {{ $billingAddress->district()->first()->name }},
+ {{ $billingAddress->postcode }}
+ {{ $billingAddress->state()->first()->name }},
+ {{ $billingAddress->country()->first()->name }}
+
+ Phone: {{ $supplier->contacts()->first()->phone }}
+ |
+ ||
|
+ RECEIVE THE SUM OF: {{ \App\Classes\General\Helper::convert(round($transaction->amount, 2)) }} + |
+
| Payment Method | +Transaction ID | +Payment Amount | +
|---|---|---|
| {{ ucwords(str_replace('_', ' ', \App\Classes\ValueObjects\Constants\PaymentMethodType::PAYMENT_METHODS_ID[$transaction->payment_method])) }} | +{{ $transaction->owner->bill_no ?? '-' }} | +{{ number_format($total, 2) }} | +
Paid For
+ +| Description | +Amount | +
|---|---|
| PAYMENT FOR REF. {{ $po_order_transaction->owner->marking ?? 'N/A' }} | +{{ number_format($total, 2) }} | +
+ +
+ TOTAL: {{ number_format($total, 2) }} +
+AUTO GENERATED BY EXCHANGE PORTAL, NO SIGNATURE REQUIRED
+ +@endsection diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php index eaeeaec7..54a1783a 100644 --- a/resources/views/partials/header.blade.php +++ b/resources/views/partials/header.blade.php @@ -66,6 +66,9 @@ + diff --git a/resources/views/vendor/head.blade.php b/resources/views/vendor/head.blade.php index 721ff047..6f621539 100644 --- a/resources/views/vendor/head.blade.php +++ b/resources/views/vendor/head.blade.php @@ -5,7 +5,10 @@ 'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); })(window,document,'script','dataLayer','GTM-TQKCPCD'); - +