From fb4d17b46f3da5b416e72fd1016d307b9c99f942 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Sun, 28 Nov 2021 21:10:46 +0800 Subject: [PATCH] rename performa to proforma --- ...CreateProformaInvoiceTransactionLogic.php} | 26 +++++++------------ .../Exports/Services/ExportsTransactions.php | 2 +- ...teProformaInvoiceTransactionProcessor.php} | 14 +++++----- .../ValueObjects/Constants/DocumentType.php | 2 +- .../Constants/TransactionType.php | 2 +- ...p => CreateProformaInvoiceTransaction.php} | 8 +++--- app/Http/Resources/BookingResource.php | 2 +- database/seeds/FakeBookingTransactions.php | 2 +- .../forms/PurchaseOrderFormComponent.vue | 4 +-- ...e.blade.php => proforma_invoice.blade.php} | 2 +- routes/booking.php | 2 +- 11 files changed, 30 insertions(+), 36 deletions(-) rename app/Classes/Modules/Bookings/ControllersLogic/{CreatePerformaInvoiceTransactionLogic.php => CreateProformaInvoiceTransactionLogic.php} (60%) rename app/Classes/Modules/Transactions/Processors/{CreatePerformaInvoiceTransactionProcessor.php => CreateProformaInvoiceTransactionProcessor.php} (96%) rename app/Http/Controllers/Bookings/{CreatePerformaInvoiceTransaction.php => CreateProformaInvoiceTransaction.php} (57%) rename resources/views/pages/pdfs/{performa_invoice.blade.php => proforma_invoice.blade.php} (99%) diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreatePerformaInvoiceTransactionLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateProformaInvoiceTransactionLogic.php similarity index 60% rename from app/Classes/Modules/Bookings/ControllersLogic/CreatePerformaInvoiceTransactionLogic.php rename to app/Classes/Modules/Bookings/ControllersLogic/CreateProformaInvoiceTransactionLogic.php index ab3bf220..98b25504 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/CreatePerformaInvoiceTransactionLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateProformaInvoiceTransactionLogic.php @@ -5,18 +5,12 @@ namespace App\Classes\Modules\Bookings\ControllersLogic; use App\Classes\General\Abstracts\AbstractControllerLogic; use App\Classes\Modules\Bookings\Services\FetchesBooking; use App\Classes\Modules\Bookings\Standards\Rules\CanFetchBooking; -use App\Classes\Modules\Bookings\Services\UpdatesBookingStatus; -use App\Classes\Modules\Transactions\Services\DeletesTransaction; -use App\Classes\Modules\Documents\Services\DeletesDocument; -use App\Classes\Modules\Transactions\Processors\CreatePerformaInvoiceTransactionProcessor; - +use App\Classes\Modules\Transactions\Processors\CreateProformaInvoiceTransactionProcessor; use App\Http\Resources\BookingResource; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; -use App\Classes\ValueObjects\Constants\ApprovalStatus; -use App\Classes\ValueObjects\Constants\TransactionType; -class CreatePerformaInvoiceTransactionLogic extends AbstractControllerLogic +class CreateProformaInvoiceTransactionLogic extends AbstractControllerLogic { /** @@ -24,8 +18,8 @@ class CreatePerformaInvoiceTransactionLogic extends AbstractControllerLogic */ protected function notification():array { return [ - 'title' => 'Create Perfoma Invoice Transaction', - 'message' => 'You have successfully create performa invoice transaction' + 'title' => 'Create Proforma Invoice Transaction', + 'message' => 'You have successfully create proforma invoice transaction' ]; } @@ -35,24 +29,24 @@ class CreatePerformaInvoiceTransactionLogic extends AbstractControllerLogic /** @var FetchesBooking */ private $fetchesBooking; - /** @var CreatePerformaInvoiceTransactionProcessor */ - private $CreatePerformaInvoiceTransactionProcessor; + /** @var CreateProformaInvoiceTransactionProcessor */ + private $CreateProformaInvoiceTransactionProcessor; /** * FetchBookingLogic constructor. * @param CanFetchBooking $canFetchBooking * @param FetchesBooking $fetchesBooking - * @param CreatePerformaInvoiceTransactionProcessor $CreatePerformaInvoiceTransactionProcessor + * @param CreateProformaInvoiceTransactionProcessor $CreateProformaInvoiceTransactionProcessor */ public function __construct( CanFetchBooking $canFetchBooking, FetchesBooking $fetchesBooking, - CreatePerformaInvoiceTransactionProcessor $CreatePerformaInvoiceTransactionProcessor + CreateProformaInvoiceTransactionProcessor $CreateProformaInvoiceTransactionProcessor ) { $this->canFetchBooking = $canFetchBooking; $this->fetchesBooking = $fetchesBooking; - $this->CreatePerformaInvoiceTransactionProcessor = $CreatePerformaInvoiceTransactionProcessor; + $this->CreateProformaInvoiceTransactionProcessor = $CreateProformaInvoiceTransactionProcessor; } @@ -68,7 +62,7 @@ class CreatePerformaInvoiceTransactionLogic extends AbstractControllerLogic $booking = $this->fetchesBooking->execute(['id' => $request->route('id')]); - $this->CreatePerformaInvoiceTransactionProcessor->execute($booking); + $this->CreateProformaInvoiceTransactionProcessor->execute($booking); return $this->resourceResponse(new BookingResource($booking)); } diff --git a/app/Classes/Modules/Exports/Services/ExportsTransactions.php b/app/Classes/Modules/Exports/Services/ExportsTransactions.php index 4fd48239..a49d1f85 100644 --- a/app/Classes/Modules/Exports/Services/ExportsTransactions.php +++ b/app/Classes/Modules/Exports/Services/ExportsTransactions.php @@ -36,7 +36,7 @@ class ExportsTransactions implements FromQuery, WithHeadingRow, WithMapping 1 => 'PAYMENT', 2 => 'INVOICE', 3 => 'BILL', - 4 => 'PERFORMA', + 4 => 'PROFORMA', 5 => 'TOP_UP', 6 => 'REFUND', 7 => 'PURCHASE_ORDER', diff --git a/app/Classes/Modules/Transactions/Processors/CreatePerformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php similarity index 96% rename from app/Classes/Modules/Transactions/Processors/CreatePerformaInvoiceTransactionProcessor.php rename to app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php index 67bbe879..21f9885f 100644 --- a/app/Classes/Modules/Transactions/Processors/CreatePerformaInvoiceTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php @@ -25,7 +25,7 @@ use App\Models\Booking; use App\Models\Document; use Meneses\LaravelMpdf\Facades\LaravelMpdf; -class CreatePerformaInvoiceTransactionProcessor +class CreateProformaInvoiceTransactionProcessor { /** @var CreatesTransaction */ @@ -64,7 +64,7 @@ class CreatePerformaInvoiceTransactionProcessor private $fetchesCompanyPaymentAttemptLimit; /** - * CreatePerformaInvoiceTransactionProcessor constructor. + * CreateProformaInvoiceTransactionProcessor constructor. * @param CreatesTransaction $createsTransaction * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber * @param CalculatesBookingPayableAmount $calculatesBookingPayableAmount @@ -106,7 +106,7 @@ class CreatePerformaInvoiceTransactionProcessor ->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED]) ->first(); - $billNumber = $this->generatesTransactionBillNumber->execute('PERFORMA-'); + $billNumber = $this->generatesTransactionBillNumber->execute('PROFORMA-'); $outstanding = $this->calculatesBookingOutstanding->execute($booking); @@ -137,7 +137,7 @@ class CreatePerformaInvoiceTransactionProcessor $transaction_object = new TransactionObject( $billNumber, - TransactionType::PERFORMA, + TransactionType::PROFORMA, $transaction->issuer, $transaction->receiver, $transaction->recipient_bank_account_id, @@ -157,13 +157,13 @@ class CreatePerformaInvoiceTransactionProcessor $supplier = $this->fetchesCompany->execute(['id' => $transaction->receiver]); - $purchase_order_pdf = LaravelMpdf::loadView('pages.pdfs.performa_invoice', ['invoice_transaction' => $perofrma_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]); + $purchase_order_pdf = LaravelMpdf::loadView('pages.pdfs.proforma_invoice', ['invoice_transaction' => $perofrma_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]); $document_object = new DocumentObject( - DocumentType::PERFORMA_INVOICE, + DocumentType::PROFORMA_INVOICE, [chunk_split('data:application/pdf;base64,'.base64_encode($purchase_order_pdf->output()))], '', ApprovalStatus::COMPLETED, - 'performa_invoices' + 'proforma_invoices' ); /** @var Document $document */ diff --git a/app/Classes/ValueObjects/Constants/DocumentType.php b/app/Classes/ValueObjects/Constants/DocumentType.php index 3c5ed68b..04edf25c 100644 --- a/app/Classes/ValueObjects/Constants/DocumentType.php +++ b/app/Classes/ValueObjects/Constants/DocumentType.php @@ -17,7 +17,7 @@ final class DocumentType { public const WALLET_TOP_UP_PAYMENT_PROOF = 'WALLET_TOP_UP_PAYMENT_PROOF'; public const WALLET_REFUND_PAYMENT_PROOF = 'WALLET_REFUND_PAYMENT_PROOF'; - public const PERFORMA_INVOICE = 'PERFORMA_INVOICE'; + public const PROFORMA_INVOICE = 'PROFORMA_INVOICE'; public const PURCHASE_ORDER = 'PURCHASE_ORDER'; public const DELIVER_ORDER = 'DELIVER_ORDER'; public const INVOICE = 'INVOICE'; diff --git a/app/Classes/ValueObjects/Constants/TransactionType.php b/app/Classes/ValueObjects/Constants/TransactionType.php index 05771c12..698abd76 100644 --- a/app/Classes/ValueObjects/Constants/TransactionType.php +++ b/app/Classes/ValueObjects/Constants/TransactionType.php @@ -12,7 +12,7 @@ final class TransactionType { public const BILL = 3; - public const PERFORMA = 4; + public const PROFORMA = 4; public const TOP_UP = 5; diff --git a/app/Http/Controllers/Bookings/CreatePerformaInvoiceTransaction.php b/app/Http/Controllers/Bookings/CreateProformaInvoiceTransaction.php similarity index 57% rename from app/Http/Controllers/Bookings/CreatePerformaInvoiceTransaction.php rename to app/Http/Controllers/Bookings/CreateProformaInvoiceTransaction.php index 40c6d8db..11b0739c 100644 --- a/app/Http/Controllers/Bookings/CreatePerformaInvoiceTransaction.php +++ b/app/Http/Controllers/Bookings/CreateProformaInvoiceTransaction.php @@ -2,18 +2,18 @@ namespace App\Http\Controllers\Bookings; -use App\Classes\Modules\Bookings\ControllersLogic\CreatePerformaInvoiceTransactionLogic; +use App\Classes\Modules\Bookings\ControllersLogic\CreateProformaInvoiceTransactionLogic; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; -class CreatePerformaInvoiceTransaction +class CreateProformaInvoiceTransaction { /** * @param Request $request - * @param CreatePerformaInvoiceTransactionLogic $logic + * @param CreateProformaInvoiceTransactionLogic $logic * @return JsonResponse */ - public function create(Request $request, CreatePerformaInvoiceTransactionLogic $logic): JsonResponse { + public function create(Request $request, CreateProformaInvoiceTransactionLogic $logic): JsonResponse { return $logic->execute($request); } diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php index 81c6118b..401b33d0 100644 --- a/app/Http/Resources/BookingResource.php +++ b/app/Http/Resources/BookingResource.php @@ -42,7 +42,7 @@ class BookingResource extends JsonResource 'delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::DELIVER_ORDER)->first()), 'invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::INVOICE)->first()), 'supplier_delivery_order' => new DocumentResource($this->documents()->where('document_type', DocumentType::SUPPLIER_DELIVER_ORDER)->first()), - 'performa_invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::PERFORMA_INVOICE)->first()), + 'proforma_invoice' => new DocumentResource($this->documents()->where('document_type', DocumentType::PROFORMA_INVOICE)->first()), ], 'status' => $this->status, 'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'), diff --git a/database/seeds/FakeBookingTransactions.php b/database/seeds/FakeBookingTransactions.php index 08ff95f7..7eafda1d 100644 --- a/database/seeds/FakeBookingTransactions.php +++ b/database/seeds/FakeBookingTransactions.php @@ -230,7 +230,7 @@ class FakeBookingTransactions extends Seeder Constants\TransactionType::PAYMENT, Constants\TransactionType::INVOICE, Constants\TransactionType::BILL, - Constants\TransactionType::PERFORMA, + Constants\TransactionType::PROFORMA, Constants\TransactionType::TOP_UP, Constants\TransactionType::REFUND, Constants\TransactionType::PURCHASE_ORDER, diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue index 1f344962..8b30f757 100644 --- a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue +++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue @@ -124,7 +124,7 @@
- +