From 9a7ec75033adddee47d5dd91e7e3460249484784 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Wed, 25 Aug 2021 15:48:30 +0800 Subject: [PATCH 01/25] create payment refund ui --- .../elements/PaymentHistoryComponent.vue | 132 +++++++++++++++++- 1 file changed, 129 insertions(+), 3 deletions(-) diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue index 6e9ea19f..3abccf8b 100644 --- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue +++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue @@ -2,7 +2,7 @@
-
+
Status
@@ -42,7 +42,7 @@
-
+
@@ -116,6 +116,106 @@
+
+
+ +
+
+
+
+
+
+
+
+
Refund Type:
+
+
+
+ {{refundMethod.name}} +
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
Fully Refund
+
+
+
+
+
+
+
+
+
Partially Refund
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + +
+
+
+
+
{{''}}
+
+
+
+
+
+
+ + + + +
+
+
+
+
{{''}}
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ +
+
+ +
+
@@ -127,7 +227,13 @@ export default { data(){ return { - expanded: false + expandPaymentDetails: false, + expandRefund: false, + refundMethod: { + name: 'Fully Refund', + status: false + }, + amount: (Math.round(1000 * 100) / 100).toFixed(2), } }, computed: { @@ -135,6 +241,26 @@ return this.item.type === 1 ? this.item : this.item.customer_booking; } }, + methods: { + requestRefund(){ + this.expandRefund = !this.expandRefund; + this.expandPaymentDetails = !this.expandPaymentDetails; + }, + clickExpand(){ + if (this.expandPaymentDetails == false && this.expandRefund == false) { + this.expandPaymentDetails = !this.expandPaymentDetails; + } else { + this.expandRefund = false; + this.expandPaymentDetails = false; + } + }, + updateRefundType(refund){ + this.refundMethod = { + name: refund.name, + status: !this.refundMethod.status + } + }, + }, mixins: [componentHandler] } From 579f6df6bacec9106639f535cda86018ede5ff7e Mon Sep 17 00:00:00 2001 From: ahmedsophyudden Date: Sun, 5 Sep 2021 12:15:32 +0800 Subject: [PATCH 02/25] add booking quotation calculation for partial refund request --- .../CreateBookingRefundLogic.php | 46 ++++++++++++++++--- 1 file changed, 40 insertions(+), 6 deletions(-) diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php index 843ecb88..c02d58b1 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php @@ -5,10 +5,15 @@ namespace App\Classes\Modules\Bookings\ControllersLogic; use App\Classes\Exceptions\MalformedRequestException; use App\Classes\General\Abstracts\AbstractControllerLogic; +use App\Classes\Modules\Bookings\Services\FetchesBookingQuotation; use App\Classes\Modules\Transactions\Services\FetchesTransaction; use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus; +use App\Classes\Modules\Transactions\Services\CalculateTransactionRefundOriginalAmount; +use App\Classes\Modules\Transactions\Services\CalculateTransactionRefundAmount; +use App\Classes\Modules\Transactions\Services\CalculateTransactionRefundServiceCharge; use App\Classes\Modules\Companies\Services\FetchesCompanyPaymentAttemptLimit; use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject; +use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyConversionObject; use App\Classes\Modules\Transactions\Services\CreatesTransaction; use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber; use App\Classes\ValueObjects\Constants\ApprovalStatus; @@ -32,12 +37,24 @@ class CreateBookingRefundLogic extends AbstractControllerLogic ]; } + /** @var FetchesBookingQuotation */ + private $fetchBookingQuotation; + /** @var FetchesTransaction */ private $fetchesTransaction; /** @var UpdatesTransactionStatus */ private $updatesTransactionStatus; + /** @var CalculateTransactionRefundOriginalAmount */ + private $calculateTransactionRefundOriginalAmount; + + /** @var CalculateTransactionRefundAmount */ + private $calculateTransactionRefundAmount; + + /** @var CalculateTransactionRefundServiceCharge */ + private $calculateTransactionRefundServiceCharge; + /** @var FetchesCompanyPaymentAttemptLimit */ private $fetchesCompanyPaymentAttemptLimit; @@ -49,16 +66,23 @@ class CreateBookingRefundLogic extends AbstractControllerLogic /** * CreateBookingPaymentLogic constructor. + * @param FetchesBookingQuotation $fetchBookingQuotation * @param FetchesTransaction $fetchesTransaction * @param UpdatesTransactionStatus $updatesTransactionStatus + * @param CalculateTransactionRefundOriginalAmount $calculateTransactionRefundOriginalAmount + * @param CalculateTransactionRefundServiceCharge $calculateTransactionRefundServiceCharge * @param FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber * @param CreatesTransaction $createsTransaction */ - public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction) + public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, CalculateTransactionRefundOriginalAmount $calculateTransactionRefundOriginalAmount, CalculateTransactionRefundAmount $calculateTransactionRefundAmount, CalculateTransactionRefundServiceCharge $calculateTransactionRefundServiceCharge, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction) { + $this->fetchBookingQuotation = $fetchBookingQuotation; $this->fetchesTransaction = $fetchesTransaction; $this->updatesTransactionStatus = $updatesTransactionStatus; + $this->calculateTransactionRefundOriginalAmount = $calculateTransactionRefundOriginalAmount; + $this->calculateTransactionRefundAmount = $calculateTransactionRefundAmount; + $this->calculateTransactionRefundServiceCharge = $calculateTransactionRefundServiceCharge; $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit; $this->generatesTransactionBillNumber = $generatesTransactionBillNumber; $this->createsTransaction = $createsTransaction; @@ -78,15 +102,25 @@ class CreateBookingRefundLogic extends AbstractControllerLogic $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::REFUNDED); + $unrequestedAmount = $this->calculateTransactionRefundOriginalAmount->execute($transaction, $request->input('amount')); + + $conversionObject = new CurrencyConversionObject(floatval(str_replace(',', '', $unrequestedAmount)), $booking->convertible_currency_id, $booking->service_id, $booking->fix_currency_id === 1 ? 0:1); + + $configurations = $this->fetchBookingQuotation->execute($booking->company, $conversionObject); + $paymentAttemptLimit = $this->fetchesCompanyPaymentAttemptLimit->execute($booking->company); $billNumber = $this->generatesTransactionBillNumber->execute('RFD-'); - + + $totalRefundAmount = $this->calculateTransactionRefundAmount->execute($transaction, $configurations->getTotal()); + + $refundServiceCharge = $this->calculateTransactionRefundServiceCharge->execute($transaction, $configurations->getServiceCharge()); + $object = new TransactionObject($billNumber, TransactionType::REFUND, 1, $booking->company->id, - $booking->bank_id, $transaction->payment_method, - $transaction->amount, $transaction->original_amount, 1, - $transaction->original_currency_id, $transaction->currency_rate, - $transaction->tax, $transaction->service_charge, Carbon::now()->addMinutes($paymentAttemptLimit), ApprovalStatus::PENDING_VERIFICATION); + $configurations->getConfigurations()->getBankId(), $configurations->getConversionObject()->getPaymentMethod(), + $totalRefundAmount, $request->input('amount'), 1, + $configurations->getConversionObject()->getCurrencyId(), $configurations->getConfigurations()->getRate(), + $configurations->getTax(), $refundServiceCharge, Carbon::now()->addMinutes($paymentAttemptLimit), ApprovalStatus::PENDING_VERIFICATION); $transaction = $this->createsTransaction->execute($booking, $object); From 4b5f64ca9bfa36c72fd7a7c9367b2b257ecdc14c Mon Sep 17 00:00:00 2001 From: ahmedsophyudden Date: Sun, 5 Sep 2021 12:18:08 +0800 Subject: [PATCH 03/25] add booking quotation calculation for partial refund request --- .../Services/CalculateTransactionRefundAmount.php | 14 ++++++++++++++ .../CalculateTransactionRefundOriginalAmount.php | 14 ++++++++++++++ .../CalculateTransactionRefundServiceCharge.php | 14 ++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 app/Classes/Modules/Transactions/Services/CalculateTransactionRefundAmount.php create mode 100644 app/Classes/Modules/Transactions/Services/CalculateTransactionRefundOriginalAmount.php create mode 100644 app/Classes/Modules/Transactions/Services/CalculateTransactionRefundServiceCharge.php diff --git a/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundAmount.php b/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundAmount.php new file mode 100644 index 00000000..55a9d80b --- /dev/null +++ b/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundAmount.php @@ -0,0 +1,14 @@ +amount == $amount ? $transaction->amount : $transaction->amount - $amount; + } + +} \ No newline at end of file diff --git a/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundOriginalAmount.php b/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundOriginalAmount.php new file mode 100644 index 00000000..15e5cb6d --- /dev/null +++ b/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundOriginalAmount.php @@ -0,0 +1,14 @@ +original_amount == $amount ? $transaction->original_amount : $transaction->original_amount - $amount; + } + +} \ No newline at end of file diff --git a/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundServiceCharge.php b/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundServiceCharge.php new file mode 100644 index 00000000..38e48d8b --- /dev/null +++ b/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundServiceCharge.php @@ -0,0 +1,14 @@ +service_charge == $service_charge ? $transaction->service_charge : $transaction->service_charge - $service_charge; + } + +} \ No newline at end of file From 67a0a63b9b5c99981cead664e6048a64934b682f Mon Sep 17 00:00:00 2001 From: ahmedsophyudden Date: Sun, 5 Sep 2021 20:27:41 +0800 Subject: [PATCH 04/25] edit booking quotation calculation for partial refund request --- .../CreateBookingRefundLogic.php | 16 +++++++++------- app/Http/Resources/TransactionResource.php | 1 + 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php index c02d58b1..0734973e 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php @@ -99,8 +99,14 @@ class CreateBookingRefundLogic extends AbstractControllerLogic $booking = Booking::find($request->route('id')); $transaction = $this->fetchesTransaction->execute(['id' => $request->route('payment_id')]); + + $billNumber = $this->generatesTransactionBillNumber->execute('RFD-').'-'.$transaction->bill_no; + + if((int) $transaction->type === TransactionType::BILL){ + $transaction = $booking->transactions()->payments()->complete()->where('original_amount', '=', $transaction->original_amount)->where('id', '<', $transaction->id)->orderByDesc('id')->first(); + } - $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::REFUNDED); + // $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::REFUNDED); $unrequestedAmount = $this->calculateTransactionRefundOriginalAmount->execute($transaction, $request->input('amount')); @@ -108,19 +114,15 @@ class CreateBookingRefundLogic extends AbstractControllerLogic $configurations = $this->fetchBookingQuotation->execute($booking->company, $conversionObject); - $paymentAttemptLimit = $this->fetchesCompanyPaymentAttemptLimit->execute($booking->company); - - $billNumber = $this->generatesTransactionBillNumber->execute('RFD-'); - $totalRefundAmount = $this->calculateTransactionRefundAmount->execute($transaction, $configurations->getTotal()); - $refundServiceCharge = $this->calculateTransactionRefundServiceCharge->execute($transaction, $configurations->getServiceCharge()); + // $refundServiceCharge = $this->calculateTransactionRefundServiceCharge->execute($transaction, $configurations->getServiceCharge()); $object = new TransactionObject($billNumber, TransactionType::REFUND, 1, $booking->company->id, $configurations->getConfigurations()->getBankId(), $configurations->getConversionObject()->getPaymentMethod(), $totalRefundAmount, $request->input('amount'), 1, $configurations->getConversionObject()->getCurrencyId(), $configurations->getConfigurations()->getRate(), - $configurations->getTax(), $refundServiceCharge, Carbon::now()->addMinutes($paymentAttemptLimit), ApprovalStatus::PENDING_VERIFICATION); + $configurations->getTax(), $configurations->getServiceCharge(), null, ApprovalStatus::PENDING_VERIFICATION); $transaction = $this->createsTransaction->execute($booking, $object); diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php index fc0dff73..9caa6687 100644 --- a/app/Http/Resources/TransactionResource.php +++ b/app/Http/Resources/TransactionResource.php @@ -3,6 +3,7 @@ namespace App\Http\Resources; use App\Classes\ValueObjects\Constants\TransactionType; +use App\Models\Transaction; use Carbon\Carbon; use Illuminate\Http\Resources\Json\JsonResource; From 2b167b1950c3391d476d8a95190b9d9db6fa8d0a Mon Sep 17 00:00:00 2001 From: ahmedsophyudden Date: Sun, 5 Sep 2021 22:52:33 +0800 Subject: [PATCH 05/25] add partial refund credit note flow --- .../CreateBookingRefundCreditNoteLogic.php | 24 +++++++++++++------ .../CreateBookingRefundLogic.php | 14 +++-------- .../CalculateTransactionRefundCreditNote.php | 14 +++++++++++ ...nsactionBillNumberFromRefundBillNumber.php | 22 +++++++++++++++++ 4 files changed, 56 insertions(+), 18 deletions(-) create mode 100644 app/Classes/Modules/Transactions/Services/CalculateTransactionRefundCreditNote.php create mode 100644 app/Classes/Modules/Transactions/Services/FetchTransactionBillNumberFromRefundBillNumber.php diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundCreditNoteLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundCreditNoteLogic.php index 9c66abc5..79a32b11 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundCreditNoteLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundCreditNoteLogic.php @@ -7,10 +7,12 @@ use App\Classes\Exceptions\MalformedRequestException; use App\Classes\General\Abstracts\AbstractControllerLogic; use App\Classes\Modules\Transactions\Services\FetchesTransaction; use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus; +use App\Classes\Modules\Transactions\Services\FetchTransactionBillNumberFromRefundBillNumber; use App\Classes\Modules\Companies\Services\FetchesCompanyPaymentAttemptLimit; use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject; use App\Classes\Modules\Transactions\Services\CreatesTransaction; use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber; +use App\Classes\Modules\Transactions\Services\CalculateTransactionRefundCreditNote; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\TransactionType; use App\Http\Resources\TransactionResource; @@ -38,12 +40,18 @@ class CreateBookingRefundCreditNoteLogic extends AbstractControllerLogic /** @var UpdatesTransactionStatus */ private $updatesTransactionStatus; + /** @var FetchTransactionBillNumberFromRefundBillNumber */ + private $fetchTransactionBillNumberFromRefundBillNumber; + /** @var FetchesCompanyPaymentAttemptLimit */ private $fetchesCompanyPaymentAttemptLimit; /** @var GeneratesTransactionBillNumber */ private $generatesTransactionBillNumber; + /** @var CalculateTransactionRefundCreditNote */ + private $calculateTransactionRefundCreditNote; + /** @var CreatesTransaction */ private $createsTransaction; @@ -51,16 +59,20 @@ class CreateBookingRefundCreditNoteLogic extends AbstractControllerLogic * CreateBookingPaymentLogic constructor. * @param FetchesTransaction $fetchesTransaction * @param UpdatesTransactionStatus $updatesTransactionStatus + * @param FetchTransactionBillNumberFromRefundBillNumber $fetchTransactionBillNumberFromRefundBillNumber * @param FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber + * @param CalculateTransactionRefundCreditNote $calculateTransactionRefundCreditNote * @param CreatesTransaction $createsTransaction */ - public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction) + public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, FetchTransactionBillNumberFromRefundBillNumber $fetchTransactionBillNumberFromRefundBillNumber, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CalculateTransactionRefundCreditNote $calculateTransactionRefundCreditNote, CreatesTransaction $createsTransaction) { $this->fetchesTransaction = $fetchesTransaction; $this->updatesTransactionStatus = $updatesTransactionStatus; + $this->fetchTransactionBillNumberFromRefundBillNumber = $fetchTransactionBillNumberFromRefundBillNumber; $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit; $this->generatesTransactionBillNumber = $generatesTransactionBillNumber; + $this->calculateTransactionRefundCreditNote = $calculateTransactionRefundCreditNote; $this->createsTransaction = $createsTransaction; } @@ -76,17 +88,15 @@ class CreateBookingRefundCreditNoteLogic extends AbstractControllerLogic $transaction = $this->fetchesTransaction->execute(['id' => $request->route('payment_id')]); - $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::REFUNDED); + $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED); - $paymentAttemptLimit = $this->fetchesCompanyPaymentAttemptLimit->execute($booking->company); - - $billNumber = $this->generatesTransactionBillNumber->execute('CDTN-'); + $billNumber = $this->generatesTransactionBillNumber->execute('CRDNT-'); $object = new TransactionObject($billNumber, TransactionType::CREDIT_NOTE, 1, $booking->company->id, $booking->bank_id, $transaction->payment_method, - $transaction->amount, $transaction->original_amount, 1, + $this->calculateTransactionRefundCreditNote->execute($transaction, $transaction->currency_rate), $transaction->original_amount, 1, $transaction->original_currency_id, $transaction->currency_rate, - $transaction->tax, $transaction->service_charge, Carbon::now()->addMinutes($paymentAttemptLimit), ApprovalStatus::PENDING_VERIFICATION); + $transaction->tax, $transaction->service_charge, null, ApprovalStatus::PENDING_VERIFICATION); $transaction = $this->createsTransaction->execute($booking, $object); diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php index 0734973e..0e31eed0 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php @@ -100,13 +100,7 @@ class CreateBookingRefundLogic extends AbstractControllerLogic $transaction = $this->fetchesTransaction->execute(['id' => $request->route('payment_id')]); - $billNumber = $this->generatesTransactionBillNumber->execute('RFD-').'-'.$transaction->bill_no; - - if((int) $transaction->type === TransactionType::BILL){ - $transaction = $booking->transactions()->payments()->complete()->where('original_amount', '=', $transaction->original_amount)->where('id', '<', $transaction->id)->orderByDesc('id')->first(); - } - - // $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::REFUNDED); + $billNumber = $this->generatesTransactionBillNumber->execute('RFD-'); $unrequestedAmount = $this->calculateTransactionRefundOriginalAmount->execute($transaction, $request->input('amount')); @@ -116,13 +110,11 @@ class CreateBookingRefundLogic extends AbstractControllerLogic $totalRefundAmount = $this->calculateTransactionRefundAmount->execute($transaction, $configurations->getTotal()); - // $refundServiceCharge = $this->calculateTransactionRefundServiceCharge->execute($transaction, $configurations->getServiceCharge()); - $object = new TransactionObject($billNumber, TransactionType::REFUND, 1, $booking->company->id, $configurations->getConfigurations()->getBankId(), $configurations->getConversionObject()->getPaymentMethod(), $totalRefundAmount, $request->input('amount'), 1, - $configurations->getConversionObject()->getCurrencyId(), $configurations->getConfigurations()->getRate(), - $configurations->getTax(), $configurations->getServiceCharge(), null, ApprovalStatus::PENDING_VERIFICATION); + $configurations->getConversionObject()->getCurrencyId(), ((int) $transaction->type === TransactionType::BILL) ? $transaction->currency_rate : 0, + 0, 0, null, ApprovalStatus::PENDING_VERIFICATION); $transaction = $this->createsTransaction->execute($booking, $object); diff --git a/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundCreditNote.php b/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundCreditNote.php new file mode 100644 index 00000000..0201cb34 --- /dev/null +++ b/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundCreditNote.php @@ -0,0 +1,14 @@ +original_amount * (1/$currency_rate); + } + +} \ No newline at end of file diff --git a/app/Classes/Modules/Transactions/Services/FetchTransactionBillNumberFromRefundBillNumber.php b/app/Classes/Modules/Transactions/Services/FetchTransactionBillNumberFromRefundBillNumber.php new file mode 100644 index 00000000..8c0cab44 --- /dev/null +++ b/app/Classes/Modules/Transactions/Services/FetchTransactionBillNumberFromRefundBillNumber.php @@ -0,0 +1,22 @@ +bill_no); + + return $array[3].'-'.$array[4].'-'.$array[5]; + + } + +} \ No newline at end of file From 1c4669a8576b1525a7652d2a12d4c8479603d2cd Mon Sep 17 00:00:00 2001 From: ahmedsophyudden Date: Mon, 6 Sep 2021 09:21:56 +0800 Subject: [PATCH 06/25] add partial refund credit note flow --- .../Bookings/ControllersLogic/CreateBookingRefundLogic.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php index 0e31eed0..22f2b95f 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php @@ -102,13 +102,17 @@ class CreateBookingRefundLogic extends AbstractControllerLogic $billNumber = $this->generatesTransactionBillNumber->execute('RFD-'); + if((int) $transaction->type === TransactionType::BILL){ + $customerBooking = $booking->transactions()->payments()->complete()->where('original_amount', '=', $transaction->original_amount)->where('id', '<', $transaction->id)->orderByDesc('id')->first(); + } + $unrequestedAmount = $this->calculateTransactionRefundOriginalAmount->execute($transaction, $request->input('amount')); $conversionObject = new CurrencyConversionObject(floatval(str_replace(',', '', $unrequestedAmount)), $booking->convertible_currency_id, $booking->service_id, $booking->fix_currency_id === 1 ? 0:1); $configurations = $this->fetchBookingQuotation->execute($booking->company, $conversionObject); - $totalRefundAmount = $this->calculateTransactionRefundAmount->execute($transaction, $configurations->getTotal()); + $totalRefundAmount = $this->calculateTransactionRefundAmount->execute(((int) $transaction->type === TransactionType::BILL) ? $customerBooking : $transaction, $configurations->getTotal()); $object = new TransactionObject($billNumber, TransactionType::REFUND, 1, $booking->company->id, $configurations->getConfigurations()->getBankId(), $configurations->getConversionObject()->getPaymentMethod(), From 5d168b79379efc9adc1c748fd9d23cc3f2575525 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 6 Sep 2021 17:22:51 +0800 Subject: [PATCH 07/25] debug invoice --- .../Processors/CreateInvoiceTransactionProcessor.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php index ff76d197..3a01bc8e 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php @@ -170,6 +170,7 @@ class CreateInvoiceTransactionProcessor $invoice_transaction = $this->createsTransaction->execute($po_order_transaction->booking, $transaction_object); $supplier = $this->fetchesCompany->execute(['id' => $transaction->receiver]); + dd($this->fetchesCompany->execute(['id' => $transaction->receiver])); $purchase_order_pdf = LaravelMpdf::loadView('pages.pdfs.purchase_order', ['invoice_transaction' => $invoice_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]); $document_object = new DocumentObject( From d27c3da27642c3a4ce8fe640c126dd04dc36e55b Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 6 Sep 2021 17:23:56 +0800 Subject: [PATCH 08/25] debug invoice --- .../Processors/CreateInvoiceTransactionProcessor.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php index 3a01bc8e..ff76d197 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php @@ -170,7 +170,6 @@ class CreateInvoiceTransactionProcessor $invoice_transaction = $this->createsTransaction->execute($po_order_transaction->booking, $transaction_object); $supplier = $this->fetchesCompany->execute(['id' => $transaction->receiver]); - dd($this->fetchesCompany->execute(['id' => $transaction->receiver])); $purchase_order_pdf = LaravelMpdf::loadView('pages.pdfs.purchase_order', ['invoice_transaction' => $invoice_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]); $document_object = new DocumentObject( From fa4042ecff20a481a4e78328c8f66601aafec21b Mon Sep 17 00:00:00 2001 From: ahmedsophyudden Date: Wed, 8 Sep 2021 23:41:56 +0800 Subject: [PATCH 09/25] edit refund calculation to correct formulat --- .../General/Eloquent/Filters/BillNo.php | 20 ++ .../CreateBookingRefundCreditNoteLogic.php | 45 ++--- .../CreateBookingRefundLogic.php | 45 +---- .../DataTransferObjects/TransactionObject.php | 12 +- .../TransactionRefundCalculationObject.php | 176 ++++++++++++++++++ .../CalculateTransactionRefundAmount.php | 14 -- .../CalculateTransactionRefundCreditNote.php | 14 -- ...lculateTransactionRefundOriginalAmount.php | 14 -- ...alculateTransactionRefundServiceCharge.php | 14 -- .../Services/CreatesTransaction.php | 1 + ...nsactionBillNumberFromRefundBillNumber.php | 22 --- 11 files changed, 233 insertions(+), 144 deletions(-) create mode 100644 app/Classes/General/Eloquent/Filters/BillNo.php create mode 100644 app/Classes/Modules/Transactions/DataTransferObjects/TransactionRefundCalculationObject.php delete mode 100644 app/Classes/Modules/Transactions/Services/CalculateTransactionRefundAmount.php delete mode 100644 app/Classes/Modules/Transactions/Services/CalculateTransactionRefundCreditNote.php delete mode 100644 app/Classes/Modules/Transactions/Services/CalculateTransactionRefundOriginalAmount.php delete mode 100644 app/Classes/Modules/Transactions/Services/CalculateTransactionRefundServiceCharge.php delete mode 100644 app/Classes/Modules/Transactions/Services/FetchTransactionBillNumberFromRefundBillNumber.php diff --git a/app/Classes/General/Eloquent/Filters/BillNo.php b/app/Classes/General/Eloquent/Filters/BillNo.php new file mode 100644 index 00000000..167dcd51 --- /dev/null +++ b/app/Classes/General/Eloquent/Filters/BillNo.php @@ -0,0 +1,20 @@ +where('bill_no', $value); + } + +} \ No newline at end of file diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundCreditNoteLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundCreditNoteLogic.php index 79a32b11..e78a9690 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundCreditNoteLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundCreditNoteLogic.php @@ -7,17 +7,14 @@ use App\Classes\Exceptions\MalformedRequestException; use App\Classes\General\Abstracts\AbstractControllerLogic; use App\Classes\Modules\Transactions\Services\FetchesTransaction; use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus; -use App\Classes\Modules\Transactions\Services\FetchTransactionBillNumberFromRefundBillNumber; -use App\Classes\Modules\Companies\Services\FetchesCompanyPaymentAttemptLimit; use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject; +use App\Classes\Modules\Transactions\DataTransferObjects\TransactionRefundCalculationObject; use App\Classes\Modules\Transactions\Services\CreatesTransaction; use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber; -use App\Classes\Modules\Transactions\Services\CalculateTransactionRefundCreditNote; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\TransactionType; use App\Http\Resources\TransactionResource; use App\Models\Booking; -use Carbon\Carbon; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -40,18 +37,9 @@ class CreateBookingRefundCreditNoteLogic extends AbstractControllerLogic /** @var UpdatesTransactionStatus */ private $updatesTransactionStatus; - /** @var FetchTransactionBillNumberFromRefundBillNumber */ - private $fetchTransactionBillNumberFromRefundBillNumber; - - /** @var FetchesCompanyPaymentAttemptLimit */ - private $fetchesCompanyPaymentAttemptLimit; - /** @var GeneratesTransactionBillNumber */ private $generatesTransactionBillNumber; - /** @var CalculateTransactionRefundCreditNote */ - private $calculateTransactionRefundCreditNote; - /** @var CreatesTransaction */ private $createsTransaction; @@ -59,20 +47,14 @@ class CreateBookingRefundCreditNoteLogic extends AbstractControllerLogic * CreateBookingPaymentLogic constructor. * @param FetchesTransaction $fetchesTransaction * @param UpdatesTransactionStatus $updatesTransactionStatus - * @param FetchTransactionBillNumberFromRefundBillNumber $fetchTransactionBillNumberFromRefundBillNumber - * @param FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber - * @param CalculateTransactionRefundCreditNote $calculateTransactionRefundCreditNote * @param CreatesTransaction $createsTransaction */ - public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, FetchTransactionBillNumberFromRefundBillNumber $fetchTransactionBillNumberFromRefundBillNumber, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CalculateTransactionRefundCreditNote $calculateTransactionRefundCreditNote, CreatesTransaction $createsTransaction) + public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction) { $this->fetchesTransaction = $fetchesTransaction; $this->updatesTransactionStatus = $updatesTransactionStatus; - $this->fetchTransactionBillNumberFromRefundBillNumber = $fetchTransactionBillNumberFromRefundBillNumber; - $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit; $this->generatesTransactionBillNumber = $generatesTransactionBillNumber; - $this->calculateTransactionRefundCreditNote = $calculateTransactionRefundCreditNote; $this->createsTransaction = $createsTransaction; } @@ -90,15 +72,22 @@ class CreateBookingRefundCreditNoteLogic extends AbstractControllerLogic $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED); - $billNumber = $this->generatesTransactionBillNumber->execute('CRDNT-'); - - $object = new TransactionObject($billNumber, TransactionType::CREDIT_NOTE, 1, $booking->company->id, - $booking->bank_id, $transaction->payment_method, - $this->calculateTransactionRefundCreditNote->execute($transaction, $transaction->currency_rate), $transaction->original_amount, 1, - $transaction->original_currency_id, $transaction->currency_rate, - $transaction->tax, $transaction->service_charge, null, ApprovalStatus::PENDING_VERIFICATION); + $paymentReferenceTransaction = $this->fetchesTransaction->execute(['bill_no' => $transaction->payment_reference]); - $transaction = $this->createsTransaction->execute($booking, $object); + if((int) $paymentReferenceTransaction->type === TransactionType::BILL){ + $transactionRefundCalculationObject = new TransactionRefundCalculationObject($booking, $transaction, $transaction->original_amount, $paymentReferenceTransaction->currency_rate); + $transactionRefundCalculationObject->setRefundConversionAmount(); + + $billNumber = $this->generatesTransactionBillNumber->execute('CRDNT-'); + + $object = new TransactionObject($billNumber, TransactionType::CREDIT_NOTE, 1, $booking->company->id, + $booking->bank_id, $paymentReferenceTransaction->payment_method, + $transactionRefundCalculationObject->getRefundConversionAmount(), $transaction->original_amount, 1, + $paymentReferenceTransaction->original_currency_id, $paymentReferenceTransaction->currency_rate, + $paymentReferenceTransaction->tax, $paymentReferenceTransaction->service_charge, null, ApprovalStatus::PENDING_VERIFICATION, [], $paymentReferenceTransaction->bill_no); + + $transaction = $this->createsTransaction->execute($booking, $object); + } return $this->resourceResponse(new TransactionResource($transaction)); } diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php index 22f2b95f..90de18f4 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php @@ -8,19 +8,14 @@ use App\Classes\General\Abstracts\AbstractControllerLogic; use App\Classes\Modules\Bookings\Services\FetchesBookingQuotation; use App\Classes\Modules\Transactions\Services\FetchesTransaction; use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus; -use App\Classes\Modules\Transactions\Services\CalculateTransactionRefundOriginalAmount; -use App\Classes\Modules\Transactions\Services\CalculateTransactionRefundAmount; -use App\Classes\Modules\Transactions\Services\CalculateTransactionRefundServiceCharge; -use App\Classes\Modules\Companies\Services\FetchesCompanyPaymentAttemptLimit; use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject; -use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyConversionObject; +use App\Classes\Modules\Transactions\DataTransferObjects\TransactionRefundCalculationObject; use App\Classes\Modules\Transactions\Services\CreatesTransaction; use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\TransactionType; use App\Http\Resources\TransactionResource; use App\Models\Booking; -use Carbon\Carbon; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; @@ -46,18 +41,6 @@ class CreateBookingRefundLogic extends AbstractControllerLogic /** @var UpdatesTransactionStatus */ private $updatesTransactionStatus; - /** @var CalculateTransactionRefundOriginalAmount */ - private $calculateTransactionRefundOriginalAmount; - - /** @var CalculateTransactionRefundAmount */ - private $calculateTransactionRefundAmount; - - /** @var CalculateTransactionRefundServiceCharge */ - private $calculateTransactionRefundServiceCharge; - - /** @var FetchesCompanyPaymentAttemptLimit */ - private $fetchesCompanyPaymentAttemptLimit; - /** @var GeneratesTransactionBillNumber */ private $generatesTransactionBillNumber; @@ -69,21 +52,14 @@ class CreateBookingRefundLogic extends AbstractControllerLogic * @param FetchesBookingQuotation $fetchBookingQuotation * @param FetchesTransaction $fetchesTransaction * @param UpdatesTransactionStatus $updatesTransactionStatus - * @param CalculateTransactionRefundOriginalAmount $calculateTransactionRefundOriginalAmount - * @param CalculateTransactionRefundServiceCharge $calculateTransactionRefundServiceCharge - * @param FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber * @param CreatesTransaction $createsTransaction */ - public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, CalculateTransactionRefundOriginalAmount $calculateTransactionRefundOriginalAmount, CalculateTransactionRefundAmount $calculateTransactionRefundAmount, CalculateTransactionRefundServiceCharge $calculateTransactionRefundServiceCharge, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction) + public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction) { $this->fetchBookingQuotation = $fetchBookingQuotation; $this->fetchesTransaction = $fetchesTransaction; $this->updatesTransactionStatus = $updatesTransactionStatus; - $this->calculateTransactionRefundOriginalAmount = $calculateTransactionRefundOriginalAmount; - $this->calculateTransactionRefundAmount = $calculateTransactionRefundAmount; - $this->calculateTransactionRefundServiceCharge = $calculateTransactionRefundServiceCharge; - $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit; $this->generatesTransactionBillNumber = $generatesTransactionBillNumber; $this->createsTransaction = $createsTransaction; } @@ -106,19 +82,14 @@ class CreateBookingRefundLogic extends AbstractControllerLogic $customerBooking = $booking->transactions()->payments()->complete()->where('original_amount', '=', $transaction->original_amount)->where('id', '<', $transaction->id)->orderByDesc('id')->first(); } - $unrequestedAmount = $this->calculateTransactionRefundOriginalAmount->execute($transaction, $request->input('amount')); - - $conversionObject = new CurrencyConversionObject(floatval(str_replace(',', '', $unrequestedAmount)), $booking->convertible_currency_id, $booking->service_id, $booking->fix_currency_id === 1 ? 0:1); - - $configurations = $this->fetchBookingQuotation->execute($booking->company, $conversionObject); - - $totalRefundAmount = $this->calculateTransactionRefundAmount->execute(((int) $transaction->type === TransactionType::BILL) ? $customerBooking : $transaction, $configurations->getTotal()); + $transactionRefundCalculationObject = new TransactionRefundCalculationObject($booking, (int) $transaction->type === TransactionType::BILL ? $customerBooking : $transaction, $request->input('amount')); + $transactionRefundCalculationObject->init(); $object = new TransactionObject($billNumber, TransactionType::REFUND, 1, $booking->company->id, - $configurations->getConfigurations()->getBankId(), $configurations->getConversionObject()->getPaymentMethod(), - $totalRefundAmount, $request->input('amount'), 1, - $configurations->getConversionObject()->getCurrencyId(), ((int) $transaction->type === TransactionType::BILL) ? $transaction->currency_rate : 0, - 0, 0, null, ApprovalStatus::PENDING_VERIFICATION); + $transactionRefundCalculationObject->getConfigurations()->getConfigurations()->getBankId(), $transactionRefundCalculationObject->getConversionObject()->getPaymentMethod(), + $transactionRefundCalculationObject->getRefundTotalAmount(), $transactionRefundCalculationObject->getAmount(), 1, + $transactionRefundCalculationObject->getConversionObject()->getCurrencyId(), $transactionRefundCalculationObject->getTransaction()->currency_rate, + $transactionRefundCalculationObject->getRefundTax(), $transactionRefundCalculationObject->getRefundServiceCharge(), null, ApprovalStatus::PENDING_VERIFICATION, [], $transaction->bill_no); $transaction = $this->createsTransaction->execute($booking, $object); diff --git a/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php b/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php index 8fcf4ece..780615a0 100644 --- a/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php +++ b/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php @@ -57,6 +57,9 @@ class TransactionObject implements DataTransferObject /** @var array|null */ private $details; + /** @var string */ + private $paymentReference; + /** * TransactionObject constructor. * @param string $billNo @@ -75,8 +78,9 @@ class TransactionObject implements DataTransferObject * @param Carbon|null $expiresOn * @param int|null $status * @param array|null $details + * @param string $paymentReference */ - public function __construct(string $billNo, string $transactionType, int $issuer, int $receiver, int $recipientBankAccountId, int $paymentMethod, float $amount, float $originalAmount, int $currencyId, int $originalCurrencyId, float $currencyRate, float $tax, float $serviceCharge, ?Carbon $expiresOn, ?int $status = ApprovalStatus::PENDING_SUBMISSION, ?array $details = []) + public function __construct(string $billNo, string $transactionType, int $issuer, int $receiver, int $recipientBankAccountId, int $paymentMethod, float $amount, float $originalAmount, int $currencyId, int $originalCurrencyId, float $currencyRate, float $tax, float $serviceCharge, ?Carbon $expiresOn, ?int $status = ApprovalStatus::PENDING_SUBMISSION, ?array $details = [], ?string $paymentReference = null) { $this->billNo = $billNo; $this->transactionType = $transactionType; @@ -94,6 +98,7 @@ class TransactionObject implements DataTransferObject $this->expiresOn = $expiresOn; $this->status = $status; $this->details = $details; + $this->paymentReference = $paymentReference; } /** @@ -226,6 +231,11 @@ class TransactionObject implements DataTransferObject }, $this->details); } + public function getPaymentReference(): string + { + return $this->paymentReference; + } + diff --git a/app/Classes/Modules/Transactions/DataTransferObjects/TransactionRefundCalculationObject.php b/app/Classes/Modules/Transactions/DataTransferObjects/TransactionRefundCalculationObject.php new file mode 100644 index 00000000..6da9a37d --- /dev/null +++ b/app/Classes/Modules/Transactions/DataTransferObjects/TransactionRefundCalculationObject.php @@ -0,0 +1,176 @@ +booking = $booking; + $this->transaction = $transaction; + $this->amount = $amount; + $this->currency_rate = $currency_rate; + } + + /** + * @return Booking + */ + public function getBooking(): Booking + { + return $this->booking; + } + + /** + * @return Transaction + */ + public function getTransaction(): Transaction + { + return $this->transaction; + } + + public function getAmount(): float + { + return $this->amount; + } + + public function getCurrencyRate(): float + { + return $this->currency_rate; + } + + /** + * @return float + */ + public function setUnrequestedAmount() + { + $this->unrequested_amount = $this->transaction->original_amount == $this->amount ? $this->transaction->original_amount : $this->transaction->original_amount - $this->amount; + return $this; + } + + public function getUnrequestedAmount() + { + return $this->unrequested_amount; + } + + public function setConversionObject() + { + $this->conversionObject = new CurrencyConversionObject(floatval(str_replace(',', '', $this->getUnrequestedAmount())), $this->booking->convertible_currency_id, $this->booking->service_id, $this->booking->fix_currency_id === 1 ? 0 : 1); + return $this; + } + + public function getConversionObject() + { + return $this->conversionObject; + } + + public function setConfigurations() + { + $this->configurations = app('App\Classes\Modules\Bookings\Services\FetchesBookingQuotation')->execute($this->booking->company, $this->getConversionObject()); + return $this; + } + + public function getConfigurations() + { + return $this->configurations; + } + + public function setRefundAmount() + { + $this->refund_amount = $this->transaction->amount == $this->getConfigurations()->getLocalTotal() ? $this->transaction->amount : $this->transaction->amount - $this->getConfigurations()->getLocalTotal(); + return $this; + } + + public function getRefundAmount() + { + return $this->refund_amount; + } + + public function setRefundServiceCharge() + { + $this->refund_service_charge = $this->transaction->service_charge == $this->getConfigurations()->getServiceCharge() ? $this->transaction->service_charge : $this->transaction->service_charge - $this->getConfigurations()->getServiceCharge(); + return $this; + } + + public function getRefundServiceCharge() + { + return $this->refund_service_charge; + } + + public function setRefundTax() + { + $this->refund_tax = $this->transaction->tax == $this->getConfigurations()->getTax() ? $this->transaction->tax : $this->transaction->tax - $this->getConfigurations()->getTax(); + return $this; + } + + public function getRefundTax() + { + return $this->refund_tax; + } + + public function setRefundTotalAmount() + { + $this->refund_total_amount = $this->getRefundAmount() + $this->getRefundServiceCharge() + $this->getRefundTax(); + return $this; + } + + public function getRefundTotalAmount() + { + return $this->refund_total_amount; + } + + public function setRefundConversionAmount() + { + $this->refund_conversion_amount = $this->getCurrencyRate() ? $this->transaction->original_amount * (1 / $this->getCurrencyRate()) : $this->transaction->original_amount; + return $this; + } + + public function getRefundConversionAmount() + { + return $this->refund_conversion_amount; + } + + public function init(){ + $this->setUnrequestedAmount(); + $this->setConversionObject(); + $this->setConfigurations(); + $this->setRefundAmount(); + $this->setRefundServiceCharge(); + $this->setRefundTax(); + $this->setRefundTotalAmount(); + $this->setRefundConversionAmount(); + } +} diff --git a/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundAmount.php b/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundAmount.php deleted file mode 100644 index 55a9d80b..00000000 --- a/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundAmount.php +++ /dev/null @@ -1,14 +0,0 @@ -amount == $amount ? $transaction->amount : $transaction->amount - $amount; - } - -} \ No newline at end of file diff --git a/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundCreditNote.php b/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundCreditNote.php deleted file mode 100644 index 0201cb34..00000000 --- a/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundCreditNote.php +++ /dev/null @@ -1,14 +0,0 @@ -original_amount * (1/$currency_rate); - } - -} \ No newline at end of file diff --git a/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundOriginalAmount.php b/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundOriginalAmount.php deleted file mode 100644 index 15e5cb6d..00000000 --- a/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundOriginalAmount.php +++ /dev/null @@ -1,14 +0,0 @@ -original_amount == $amount ? $transaction->original_amount : $transaction->original_amount - $amount; - } - -} \ No newline at end of file diff --git a/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundServiceCharge.php b/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundServiceCharge.php deleted file mode 100644 index 38e48d8b..00000000 --- a/app/Classes/Modules/Transactions/Services/CalculateTransactionRefundServiceCharge.php +++ /dev/null @@ -1,14 +0,0 @@ -service_charge == $service_charge ? $transaction->service_charge : $transaction->service_charge - $service_charge; - } - -} \ No newline at end of file diff --git a/app/Classes/Modules/Transactions/Services/CreatesTransaction.php b/app/Classes/Modules/Transactions/Services/CreatesTransaction.php index ddebf0d5..debd5854 100644 --- a/app/Classes/Modules/Transactions/Services/CreatesTransaction.php +++ b/app/Classes/Modules/Transactions/Services/CreatesTransaction.php @@ -32,6 +32,7 @@ class CreatesTransaction extends AbstractUpdateRelationshipRecord $model->service_charge = $object->getServiceCharge(); $model->expires_on = $object->getExpiresOn(); $model->status = $object->getStatus(); + $model->payment_reference = $object->getPaymentReference(); return $this->handler($booking->transactions(), $model); diff --git a/app/Classes/Modules/Transactions/Services/FetchTransactionBillNumberFromRefundBillNumber.php b/app/Classes/Modules/Transactions/Services/FetchTransactionBillNumberFromRefundBillNumber.php deleted file mode 100644 index 8c0cab44..00000000 --- a/app/Classes/Modules/Transactions/Services/FetchTransactionBillNumberFromRefundBillNumber.php +++ /dev/null @@ -1,22 +0,0 @@ -bill_no); - - return $array[3].'-'.$array[4].'-'.$array[5]; - - } - -} \ No newline at end of file From cc93b5f03e7986e672323ad10ff17b877d51a618 Mon Sep 17 00:00:00 2001 From: ahmedsophyudden Date: Mon, 27 Sep 2021 11:00:34 +0800 Subject: [PATCH 10/25] create billplz create bill api --- .env.example | 7 ++- .../CreateBillplzBillLogic.php | 56 +++++++++++++++++++ .../Billplzs/Services/CreatesBillplzBill.php | 39 +++++++++++++ .../Billplzs/CreateBillplzBillController.php | 20 +++++++ config/billplz.php | 10 ++++ routes/api.php | 2 + routes/billplz.php | 9 +++ 7 files changed, 142 insertions(+), 1 deletion(-) create mode 100644 app/Classes/Modules/Billplzs/ControllersLogic/CreateBillplzBillLogic.php create mode 100644 app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php create mode 100644 app/Http/Controllers/Billplzs/CreateBillplzBillController.php create mode 100644 config/billplz.php create mode 100644 routes/billplz.php diff --git a/.env.example b/.env.example index 47a20e74..5bf2187f 100644 --- a/.env.example +++ b/.env.example @@ -50,4 +50,9 @@ FILESYSTEM_DRIVER="documents" JWT_SECRET= JWT_TTL=1440 -IS_PRODUCTION=false \ No newline at end of file +IS_PRODUCTION=false + +BILLPLZ_BASE_URL="https://www.billplz-sandbox.com" +BILLPLZ_API_KEY="0fa4c710-761b-4a7a-a501-c2c2d02643d5" +BILLPLZ_COLLECTION_ID="hev2wdjy" +BILLPLZ_CALLBACK_URL="localhost:9003" \ No newline at end of file diff --git a/app/Classes/Modules/Billplzs/ControllersLogic/CreateBillplzBillLogic.php b/app/Classes/Modules/Billplzs/ControllersLogic/CreateBillplzBillLogic.php new file mode 100644 index 00000000..b1333cf6 --- /dev/null +++ b/app/Classes/Modules/Billplzs/ControllersLogic/CreateBillplzBillLogic.php @@ -0,0 +1,56 @@ + 'Created Billplz Bill', + 'message' => 'You have successfully created a new Bill' + ]; + } + + /** @var CreatesBillplzBill */ + private $createsBillplzBill; + + /** + * CreateBookingLogic constructor. + * @param CreatesBillplzBill $createsBillplzBill + */ + public function __construct(CreatesBillplzBill $createsBillplzBill) + { + $this->createsBillplzBill = $createsBillplzBill; + } + + + /** + * @param Request $request + * @return JsonResponse + * @throws \App\Classes\Exceptions\AccessForbiddenException + * @throws \App\Classes\Exceptions\MalformedRequestException + * @throws \App\Classes\Exceptions\RequestValidationException + */ + public function logic(Request $request) : JsonResponse + { + $billPlz = $this->createsBillplzBill->execute($request->user()->name, $request->user()->email, $request->input('billNumber'), 200, $request->input('bankName')); + + if(!$billPlz) throw new MalformedRequestException('Unable to get correct response from billplz server.'); + + return $this->response(['data' => $billPlz]); + + } +} \ No newline at end of file diff --git a/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php new file mode 100644 index 00000000..0bab471f --- /dev/null +++ b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php @@ -0,0 +1,39 @@ +post(config('billplz.base_url').'/api/v3/bills', [ + 'collection_id' => config('billplz.collection_id'), + 'name' => $name, + 'email' => $email, + 'description' => $description, + 'amount' => $amount, + 'callback_url' => config('billplz.callback_url'), + 'reference_1_label' => 'Bank Code', + 'reference_1' => config('billplz.'.strtolower($bank_code)) + ]); + + if($response->successful()){ + $data = $response->json(); + + $data['url'] = $data['url'].'?auto_submit=true'; + + return $data; + }else{ + return null; + } + }catch(\Exception $exception){ + throw new MalformedRequestException('Unable to get correct response from billplz server'); + } + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Billplzs/CreateBillplzBillController.php b/app/Http/Controllers/Billplzs/CreateBillplzBillController.php new file mode 100644 index 00000000..cd62cfec --- /dev/null +++ b/app/Http/Controllers/Billplzs/CreateBillplzBillController.php @@ -0,0 +1,20 @@ +execute($request); + } + +} \ No newline at end of file diff --git a/config/billplz.php b/config/billplz.php new file mode 100644 index 00000000..5166a59e --- /dev/null +++ b/config/billplz.php @@ -0,0 +1,10 @@ + env('BILLPLZ_BASE_URL', 'https://www.billplz-sandbox.com'), + 'api_key' => env('BILLPLZ_API_KEY', '0fa4c710-761b-4a7a-a501-c2c2d02643d5'), + 'collection_id' => env('BILLPLZ_COLLECTION_ID', 'hev2wdjy'), + 'callback_url' => env('BILLPLZ_CALLBACK_URL', 'localhost'), + 'maybank' => 'MB2U0227', + 'cimb' => 'BCBB0235' +]; \ No newline at end of file diff --git a/routes/api.php b/routes/api.php index 146d519a..08c0231d 100644 --- a/routes/api.php +++ b/routes/api.php @@ -47,6 +47,8 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function require __DIR__ . '/announcement.php'; + require __DIR__ . '/billplz.php'; + // require __DIR__ . '/wallet.php'; // require __DIR__ . '/rate.php'; // require __DIR__ . '/receipt.php'; diff --git a/routes/billplz.php b/routes/billplz.php new file mode 100644 index 00000000..cee3c778 --- /dev/null +++ b/routes/billplz.php @@ -0,0 +1,9 @@ + 'billplz', 'as' => 'billplz.', 'namespace' => 'Billplzs'], function () { + Route::group(['prefix' => 'bill', 'as' => 'bill.'], function () { + Route::post('/create', 'CreateBillplzBillController@create')->name('create'); + }); +}); \ No newline at end of file From 5a65aa51f425af346c6c5ccf09faf0dcadd075da Mon Sep 17 00:00:00 2001 From: ahmedsophyudden Date: Wed, 29 Sep 2021 09:29:22 +0800 Subject: [PATCH 11/25] update input in CreateBillplzBillLogic --- .../Billplzs/ControllersLogic/CreateBillplzBillLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Billplzs/ControllersLogic/CreateBillplzBillLogic.php b/app/Classes/Modules/Billplzs/ControllersLogic/CreateBillplzBillLogic.php index b1333cf6..7aabd468 100644 --- a/app/Classes/Modules/Billplzs/ControllersLogic/CreateBillplzBillLogic.php +++ b/app/Classes/Modules/Billplzs/ControllersLogic/CreateBillplzBillLogic.php @@ -46,7 +46,7 @@ class CreateBillplzBillLogic extends AbstractControllerLogic */ public function logic(Request $request) : JsonResponse { - $billPlz = $this->createsBillplzBill->execute($request->user()->name, $request->user()->email, $request->input('billNumber'), 200, $request->input('bankName')); + $billPlz = $this->createsBillplzBill->execute($request->user()->name, $request->user()->email, $request->input('description'), 200, $request->input('bankName')); if(!$billPlz) throw new MalformedRequestException('Unable to get correct response from billplz server.'); From fb84e47d432446cb4a3bdfb88af9cb5fc8a75878 Mon Sep 17 00:00:00 2001 From: ahmedsophyudden Date: Mon, 4 Oct 2021 15:09:36 +0800 Subject: [PATCH 12/25] integrate create billplz bill with create booking payment, and a new billplz callback url --- .env.example | 4 +- .../Eloquent/Filters/PaymentReference.php | 20 +++++ .../ControllersLogic/CallbackBillplzLogic.php | 71 +++++++++++++++ .../BillplzXSignatureObject.php | 88 +++++++++++++++++++ .../Billplzs/Services/CreatesBillplzBill.php | 9 +- .../Billplzs/Services/GetBillplzBill.php | 28 ++++++ .../CreateBookingPaymentLogic.php | 19 +++- .../Billplzs/CallbackBillplzController.php | 20 +++++ app/Http/Resources/BookingResource.php | 1 + config/billplz.php | 2 + routes/api.php | 6 ++ 11 files changed, 262 insertions(+), 6 deletions(-) create mode 100644 app/Classes/General/Eloquent/Filters/PaymentReference.php create mode 100644 app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php create mode 100644 app/Classes/Modules/Billplzs/DataTransferObjects/BillplzXSignatureObject.php create mode 100644 app/Classes/Modules/Billplzs/Services/GetBillplzBill.php create mode 100644 app/Http/Controllers/Billplzs/CallbackBillplzController.php diff --git a/.env.example b/.env.example index 5bf2187f..f9a5dde4 100644 --- a/.env.example +++ b/.env.example @@ -54,5 +54,7 @@ IS_PRODUCTION=false BILLPLZ_BASE_URL="https://www.billplz-sandbox.com" BILLPLZ_API_KEY="0fa4c710-761b-4a7a-a501-c2c2d02643d5" +BILLPLZ_X_SIGNATURE_KEY="S-pbNVthVRsvnPfZlgLwqqOg" BILLPLZ_COLLECTION_ID="hev2wdjy" -BILLPLZ_CALLBACK_URL="localhost:9003" \ No newline at end of file +BILLPLZ_REDIRECT_URL="localhost:9003" +BILLPLZ_CALLBACK_URL="localhost:9003/api/v1/billplz/callback" \ No newline at end of file diff --git a/app/Classes/General/Eloquent/Filters/PaymentReference.php b/app/Classes/General/Eloquent/Filters/PaymentReference.php new file mode 100644 index 00000000..10c1fa49 --- /dev/null +++ b/app/Classes/General/Eloquent/Filters/PaymentReference.php @@ -0,0 +1,20 @@ +where('payment_reference', $value); + } + +} \ No newline at end of file diff --git a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php new file mode 100644 index 00000000..bce275a3 --- /dev/null +++ b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php @@ -0,0 +1,71 @@ + 'Callback Billplz', + 'message' => 'You have successfully receive Billplz callback' + ]; + } + + /** @var GetBillplzBill */ + private $getBillplzBill; + + /** @var UpdatesTransactionStatus */ + private $updatesTransactionStatus; + + + /** + * CreateBookingLogic constructor. + * @param CreateGetBillplzBillsBillplzBill $getBillplzBill + * @param UpdatesTransactionStatus $updatesTransactionStatus + */ + public function __construct(GetBillplzBill $getBillplzBill, UpdatesTransactionStatus $updatesTransactionStatus) + { + $this->getBillplzBill = $getBillplzBill; + $this->updatesTransactionStatus = $updatesTransactionStatus; + } + + + /** + * @param Request $request + * @return JsonResponse + * @throws \App\Classes\Exceptions\AccessForbiddenException + * @throws \App\Classes\Exceptions\MalformedRequestException + * @throws \App\Classes\Exceptions\RequestValidationException + */ + public function logic(Request $request) : JsonResponse + { + $billplzXSignatureObject = new BillplzXSignatureObject($request); + + if(!$billplzXSignatureObject->isValidSignature()) throw new MalformedRequestException('Unable to get correct response from billplz server.'); + + $billPlz = $this->getBillplzBill->execute($request->input('id')); + + if(!$billPlz) throw new MalformedRequestException('Unable to get correct response from billplz server.'); + + if($billPlz->state == 'paid') $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::PENDING_VERIFICATION); + + return $this->response(['data' => $billPlz]); + + } +} \ No newline at end of file diff --git a/app/Classes/Modules/Billplzs/DataTransferObjects/BillplzXSignatureObject.php b/app/Classes/Modules/Billplzs/DataTransferObjects/BillplzXSignatureObject.php new file mode 100644 index 00000000..ac3f178c --- /dev/null +++ b/app/Classes/Modules/Billplzs/DataTransferObjects/BillplzXSignatureObject.php @@ -0,0 +1,88 @@ +request = $request; + + $this->_constructBillplzArray()->_natSortBillplzArray()->_constructBillplzString()->_computeBillplzXSignature(); + } + + private function _constructBillplzArray(){ + foreach($this->request->all() as $key => $value){ + if($key != 'x_signature'){ + $this->billPlzConstructArray[] = $key.$value; + } + } + return $this; + } + + private function _natCaseSortBillplzArray(){ + natcasesort($this->billPlzConstructArray); + return $this; + } + + private function _natSortBillplzArray(){ + natsort($this->billPlzConstructArray); + return $this; + } + + private function _constructBillplzString(){ + $this->billPlzConstructString = implode('|', $this->billPlzConstructArray); + return $this; + } + + private function _computeBillplzXSignature(){ + $this->billPlzComputedXSignature = hash_hmac('sha256', $this->billPlzConstructString, config('billplz.x_signature_key')); + return $this; + } + + /** + * @return array + */ + public function getBillPlzConstructArray(): array + { + return $this->billPlzConstructArray; + } + + /** + * @return string + */ + public function getBillPlzConstructString(): string + { + return $this->billPlzConstructString; + } + + /** + * @return string + */ + public function getBillPlzComputedXSignature(): string + { + return $this->billPlzComputedXSignature; + } + + public function isValidSignature(): bool + { + return $this->billPlzComputedXSignature == $this->request->x_signature ? true : false; + } + +} \ No newline at end of file diff --git a/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php index 0bab471f..4a70e06e 100644 --- a/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php +++ b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php @@ -10,7 +10,7 @@ class CreatesBillplzBill * @return \Illuminate\Database\Eloquent\Model * @throws \App\Classes\Exceptions\MalformedRequestException */ - public function execute(string $name, string $email, string $description, float $amount, string $bank_code) { + public function execute(string $name, string $email, string $description, float $amount, string $bankCode, string $billNumber) { try{ $response = Http::withBasicAuth(config('billplz.api_key').':', '')->post(config('billplz.base_url').'/api/v3/bills', [ 'collection_id' => config('billplz.collection_id'), @@ -18,9 +18,12 @@ class CreatesBillplzBill 'email' => $email, 'description' => $description, 'amount' => $amount, + 'redirect_url' => config('billplz.redirect_url'), 'callback_url' => config('billplz.callback_url'), 'reference_1_label' => 'Bank Code', - 'reference_1' => config('billplz.'.strtolower($bank_code)) + 'reference_1' => $bankCode, + 'reference_2_label' => 'Bill Number', + 'reference_2' => $billNumber ]); if($response->successful()){ @@ -28,7 +31,7 @@ class CreatesBillplzBill $data['url'] = $data['url'].'?auto_submit=true'; - return $data; + return (object) $data; }else{ return null; } diff --git a/app/Classes/Modules/Billplzs/Services/GetBillplzBill.php b/app/Classes/Modules/Billplzs/Services/GetBillplzBill.php new file mode 100644 index 00000000..ff7c129f --- /dev/null +++ b/app/Classes/Modules/Billplzs/Services/GetBillplzBill.php @@ -0,0 +1,28 @@ +get(config('billplz.base_url').'/api/v3/bills/'.$billPlzId); + + if($response->successful()){ + $data = $response->json(); + + return (object) $data; + }else{ + return null; + } + }catch(\Exception $exception){ + throw new MalformedRequestException('Unable to get correct response from billplz server'); + } + } +} \ No newline at end of file diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php index b2a0732a..87f32666 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php @@ -11,7 +11,9 @@ use App\Classes\Modules\Companies\Services\FetchesCompanyPaymentAttemptLimit; use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyConversionObject; use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject; use App\Classes\Modules\Transactions\Services\CreatesTransaction; +use App\Classes\Modules\Transactions\Services\UpdatesTransaction; use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber; +use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\PaymentMethodType; use App\Classes\ValueObjects\Constants\TransactionType; @@ -46,9 +48,15 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic /** @var CreatesTransaction */ private $createsTransaction; + /** @var UpdatesTransaction */ + private $updatesTransaction; + /** @var CalculatesBookingOutstanding */ private $calculatesBookingOutstanding; + /** @var CreatesBillplzBill */ + private $createsBillplzBill; + /** * CreateBookingPaymentLogic constructor. * @param FetchesBookingQuotation $fetchBookingQuotation @@ -56,14 +64,17 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber * @param CreatesTransaction $createsTransaction * @param CalculatesBookingOutstanding $calculatesBookingOutstanding + * @param CreatesBillplzBill $createsBillplzBill */ - public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CalculatesBookingOutstanding $calculatesBookingOutstanding) + public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, UpdatesTransaction $updatesTransaction, CalculatesBookingOutstanding $calculatesBookingOutstanding, CreatesBillplzBill $createsBillplzBill) { $this->fetchBookingQuotation = $fetchBookingQuotation; $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit; $this->generatesTransactionBillNumber = $generatesTransactionBillNumber; $this->createsTransaction = $createsTransaction; + $this->updatesTransaction = $updatesTransaction; $this->calculatesBookingOutstanding = $calculatesBookingOutstanding; + $this->createsBillplzBill = $createsBillplzBill; } /** @@ -88,11 +99,15 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic $billNumber = $this->generatesTransactionBillNumber->execute('PYMT-'); + if(PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')] == PaymentMethodType::PAYMENT_GATEWAY){ + $billPlzBill = $this->createsBillplzBill->execute($request->user()->name, $request->user()->email, 'This payment is made on behave '.$booking->company->name, $configurations->getTotal(), $request->input('bank_code'), $billNumber); + } + $object = new TransactionObject($billNumber, TransactionType::PAYMENT, 1, $booking->company->id, $configurations->getConfigurations()->getBankId(), $configurations->getConversionObject()->getPaymentMethod(), $configurations->getTotal(), $configurations->getForeignTotal(), 1, $configurations->getConversionObject()->getCurrencyId(), $configurations->getConfigurations()->getRate(), - $configurations->getTax(), $configurations->getServiceCharge(), Carbon::now()->addMinutes($paymentAttemptLimit), ApprovalStatus::PENDING_SUBMISSION); + $configurations->getTax(), $configurations->getServiceCharge(), Carbon::now()->addMinutes($paymentAttemptLimit), ApprovalStatus::PENDING_SUBMISSION, [], isset($billPlzBill) ? $billPlzBill->id : NULL); $transaction = $this->createsTransaction->execute($booking, $object); diff --git a/app/Http/Controllers/Billplzs/CallbackBillplzController.php b/app/Http/Controllers/Billplzs/CallbackBillplzController.php new file mode 100644 index 00000000..33525632 --- /dev/null +++ b/app/Http/Controllers/Billplzs/CallbackBillplzController.php @@ -0,0 +1,20 @@ +execute($request); + } + +} \ No newline at end of file diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php index cc5f0dca..865ace28 100644 --- a/app/Http/Resources/BookingResource.php +++ b/app/Http/Resources/BookingResource.php @@ -23,6 +23,7 @@ class BookingResource extends JsonResource */ public function toArray($request) { + // dd($this->service); return [ 'id' => $this->id, 'company' => new CompanyResource($this->company), diff --git a/config/billplz.php b/config/billplz.php index 5166a59e..ac5b3a75 100644 --- a/config/billplz.php +++ b/config/billplz.php @@ -3,7 +3,9 @@ return [ 'base_url' => env('BILLPLZ_BASE_URL', 'https://www.billplz-sandbox.com'), 'api_key' => env('BILLPLZ_API_KEY', '0fa4c710-761b-4a7a-a501-c2c2d02643d5'), + 'x_signature_key' => env('BILLPLZ_X_SIGNATURE_KEY', 'S-pbNVthVRsvnPfZlgLwqqOg'), 'collection_id' => env('BILLPLZ_COLLECTION_ID', 'hev2wdjy'), + 'redirect_url' => env('BILLPLZ_REDIRECT_URL', 'localhost'), 'callback_url' => env('BILLPLZ_CALLBACK_URL', 'localhost'), 'maybank' => 'MB2U0227', 'cimb' => 'BCBB0235' diff --git a/routes/api.php b/routes/api.php index 08c0231d..3bae2eea 100644 --- a/routes/api.php +++ b/routes/api.php @@ -23,6 +23,12 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function Route::get('countries/list', 'Services\CountriesListController@index')->name('list.countries'); }); + Route::group(['prefix' => 'billplz', 'as' => 'billplz.', 'namespace' => 'Billplzs'], function () { + Route::group(['prefix' => 'bill', 'as' => 'bill.'], function () { + Route::post('/callback', 'CallbackBillplzController@callback')->name('callback'); + }); + }); + Route::group(['middleware' => 'valid.token'], function () { From e94ef449282ca1c4d72dbbde76a28cc90f815ca0 Mon Sep 17 00:00:00 2001 From: Fairuz Date: Thu, 7 Oct 2021 01:34:11 +0800 Subject: [PATCH 13/25] Wallet operations --- .../CreateWalletTransactionProcessor.php | 76 +++++++++++++++++++ .../UpdateWalletTransactionProcessor.php | 76 +++++++++++++++++++ .../Services/CreatesWalletTransaction.php | 40 ++++++++++ .../ControllersLogic/CreateWalletLogic.php | 19 +++-- .../ControllersLogic/ListWalletLogic.php | 60 +++++++++++++++ .../ControllersLogic/TopUpWalletLogic.php | 70 +++++++++++++++++ .../UpdateStatusWalletLogic.php | 67 ++++++++++++++++ .../ControllersLogic/WithdrawWalletLogic.php | 70 +++++++++++++++++ .../DataTransferObjects/WalletObject.php | 12 ++- .../Wallets/Services/CreatesWallet.php | 12 +-- .../Modules/Wallets/Services/ListsWallet.php | 30 ++++++++ .../Wallets/Services/UpdatesWallet.php | 27 +++++++ .../Wallets/Standards/Rules/CanListWallet.php | 51 +++++++++++++ .../Standards/Rules/CanTopUpWallet.php | 51 +++++++++++++ .../Standards/Rules/CanWithdrawWallet.php | 51 +++++++++++++ .../Validators/ListWalletValidation.php | 30 ++++++++ .../Validators/TopUpWalletValidation.php | 30 ++++++++ .../Validators/WithdrawWalletValidation.php | 30 ++++++++ .../Constants/TransactionType.php | 2 + .../Wallets/ListWalletController.php | 14 ++++ .../Wallets/TopUpWalletController.php | 15 ++++ .../Wallets/UpdateStatusWalletController.php | 14 ++++ .../Wallets/WithdrawWalletController.php | 15 ++++ app/Models/Company.php | 8 ++ app/Models/Transaction.php | 27 ++++++- app/Models/Wallet.php | 28 +++++-- ..._082211_drop_wallet_transactions_table.php | 28 +++++++ ...1_10_02_082442_alter_wallet_company_id.php | 44 +++++++++++ ...02_083144_alter_transaction_booking_id.php | 45 +++++++++++ routes/api.php | 5 +- routes/wallet.php | 9 ++- 31 files changed, 1027 insertions(+), 29 deletions(-) create mode 100644 app/Classes/Modules/Transactions/Processors/CreateWalletTransactionProcessor.php create mode 100644 app/Classes/Modules/Transactions/Processors/UpdateWalletTransactionProcessor.php create mode 100644 app/Classes/Modules/Transactions/Services/CreatesWalletTransaction.php create mode 100644 app/Classes/Modules/Wallets/ControllersLogic/ListWalletLogic.php create mode 100644 app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php create mode 100644 app/Classes/Modules/Wallets/ControllersLogic/UpdateStatusWalletLogic.php create mode 100644 app/Classes/Modules/Wallets/ControllersLogic/WithdrawWalletLogic.php create mode 100644 app/Classes/Modules/Wallets/Services/ListsWallet.php create mode 100644 app/Classes/Modules/Wallets/Services/UpdatesWallet.php create mode 100644 app/Classes/Modules/Wallets/Standards/Rules/CanListWallet.php create mode 100644 app/Classes/Modules/Wallets/Standards/Rules/CanTopUpWallet.php create mode 100644 app/Classes/Modules/Wallets/Standards/Rules/CanWithdrawWallet.php create mode 100644 app/Classes/Modules/Wallets/Standards/Validators/ListWalletValidation.php create mode 100644 app/Classes/Modules/Wallets/Standards/Validators/TopUpWalletValidation.php create mode 100644 app/Classes/Modules/Wallets/Standards/Validators/WithdrawWalletValidation.php create mode 100644 app/Http/Controllers/Wallets/ListWalletController.php create mode 100644 app/Http/Controllers/Wallets/TopUpWalletController.php create mode 100644 app/Http/Controllers/Wallets/UpdateStatusWalletController.php create mode 100644 app/Http/Controllers/Wallets/WithdrawWalletController.php create mode 100644 database/migrations/2021_10_02_082211_drop_wallet_transactions_table.php create mode 100644 database/migrations/2021_10_02_082442_alter_wallet_company_id.php create mode 100644 database/migrations/2021_10_02_083144_alter_transaction_booking_id.php diff --git a/app/Classes/Modules/Transactions/Processors/CreateWalletTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateWalletTransactionProcessor.php new file mode 100644 index 00000000..4bde6135 --- /dev/null +++ b/app/Classes/Modules/Transactions/Processors/CreateWalletTransactionProcessor.php @@ -0,0 +1,76 @@ +generatesTransactionBillNumber = $generatesTransactionBillNumber; + $this->createsWalletTransaction = $createsWalletTransaction; + } + + + /** + * @param Booking $booking + * @return void + * @throws \App\Classes\Exceptions\MalformedRequestException + */ + public function execute(Wallet $wallet, WalletObject $walletOject, int $transactionType) + { + + $billNumber = $this->generatesTransactionBillNumber->execute('WAL-'); + + $transaction_object = new TransactionObject( + $billNumber, + $transactionType, + $wallet->company->id, + 1, + 1, + PaymentMethodType::BA, + $walletOject->getAmount(), + $walletOject->getAmount(), + $wallet->currency_id, + $wallet->currency_id, + 0, + 0, + 0, + null, + ApprovalStatus::PENDING_SUBMISSION + ); + $walletTransaction = $this->createsWalletTransaction->execute($wallet, $transaction_object); + + return $walletTransaction; + } +} diff --git a/app/Classes/Modules/Transactions/Processors/UpdateWalletTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/UpdateWalletTransactionProcessor.php new file mode 100644 index 00000000..95f484a0 --- /dev/null +++ b/app/Classes/Modules/Transactions/Processors/UpdateWalletTransactionProcessor.php @@ -0,0 +1,76 @@ +fetchesTransaction = $fetchesTransaction; + $this->updatesTransactionStatus = $updatesTransactionStatus; + $this->updatesWallet = $updatesWallet; + } + + + /** + * @param Booking $booking + * @return void + * @throws \App\Classes\Exceptions\MalformedRequestException + */ + public function execute(int $transactionId, int $transactionStatus) + { + + $transaction = $this->fetchesTransaction->execute(['id' => $transactionId]); + $wallet = $transaction->wallet; + + $walletOject = new WalletObject( $wallet->company->id, $wallet->currency_id, $wallet->code, $transaction->amount); + + $this->updatesTransactionStatus->execute($transaction, $transactionStatus); + + $this->updatesWallet->execute($wallet, $walletOject); + + return $wallet; + } +} diff --git a/app/Classes/Modules/Transactions/Services/CreatesWalletTransaction.php b/app/Classes/Modules/Transactions/Services/CreatesWalletTransaction.php new file mode 100644 index 00000000..7c3eacd6 --- /dev/null +++ b/app/Classes/Modules/Transactions/Services/CreatesWalletTransaction.php @@ -0,0 +1,40 @@ +bill_no = $object->getBillNo(); + $model->type = $object->getTransactionType(); + $model->issuer = $object->getIssuer(); + $model->receiver = $object->getReceiver(); + $model->recipient_bank_account_id = $object->getRecipientBankAccountId(); + $model->payment_method = $object->getPaymentMethod(); + $model->amount = $object->getAmount(); + $model->original_amount = $object->getOriginalAmount(); + $model->currency_id = $object->getCurrencyId(); + $model->original_currency_id = $object->getOriginalCurrencyId(); + $model->currency_rate = $object->getCurrencyRate(); + $model->tax = $object->getTax(); + $model->service_charge = $object->getServiceCharge(); + $model->expires_on = $object->getExpiresOn(); + $model->status = $object->getStatus(); + $model->booking_id = 0; + + return $this->handler($wallet->transactions(), $model); + + } +} diff --git a/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php index efcff6b3..f0a16958 100644 --- a/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php +++ b/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php @@ -9,6 +9,7 @@ use App\Classes\Modules\Wallets\Services\CreatesWallet; use App\Classes\Modules\Wallets\Services\GeneratesWalletCode; use App\Classes\Modules\Wallets\Standards\Rules\CanCreateCompanyWallet; use App\Http\Resources\WalletResource; +use App\Classes\Modules\Companies\Services\FetchesCompany; use ErrorException; use Illuminate\Http\JsonResponse; @@ -38,14 +39,18 @@ class CreateWalletLogic extends AbstractControllerLogic /** @var CanCreateCompanyWallet */ private $canCreateCompanyWallet; + /** @var FetchesCompany */ + private $fetchesCompany; + /** * CreateWalletLogic constructor. * @param CreatesWallet $createsWallet * @param GeneratesWalletCode $generatesWalletCode * @param CanCreateCompanyWallet $canCreateCompanyWallet */ - public function __construct(CreatesWallet $createsWallet, GeneratesWalletCode $generatesWalletCode, CanCreateCompanyWallet $canCreateCompanyWallet) + public function __construct(CreatesWallet $createsWallet, GeneratesWalletCode $generatesWalletCode, CanCreateCompanyWallet $canCreateCompanyWallet, FetchesCompany $fetchesCompany) { + $this->fetchesCompany = $fetchesCompany; $this->createsWallet = $createsWallet; $this->generatesWalletCode = $generatesWalletCode; $this->canCreateCompanyWallet = $canCreateCompanyWallet; @@ -58,24 +63,22 @@ class CreateWalletLogic extends AbstractControllerLogic */ public function logic(Request $request) : JsonResponse { - try { DB::beginTransaction(); - $object = new WalletObject($request->input('currency_id'), $request->input('company_id'), $this->generatesWalletCode->execute()); + $object = new WalletObject($request->input('company_id'), $request->input('currency_id'), $this->generatesWalletCode->execute()); $this->canCreateCompanyWallet->passes($object); - $wallet = $this->createsWallet->execute($object); + $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]); + + $wallet = $this->createsWallet->execute($object, $company); DB::commit(); return $this->resourceResponse(new WalletResource($wallet)); - } catch (\Exception $exception) { - throw new ErrorException($exception->getMessage(), $exception->getCode()); - } } -} \ No newline at end of file +} diff --git a/app/Classes/Modules/Wallets/ControllersLogic/ListWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/ListWalletLogic.php new file mode 100644 index 00000000..cf6b86bb --- /dev/null +++ b/app/Classes/Modules/Wallets/ControllersLogic/ListWalletLogic.php @@ -0,0 +1,60 @@ + 'List Company Wallet', + 'message' => 'You have successfully list company wallet' + ]; + } + + /** @var ListWallet */ + private $listsWallet; + + /** @var CanCreateCompanyWallet */ + private $canListWallet; + + /** + * CreateWalletLogic constructor. + * @param CreatesWallet $createsWallet + * @param GeneratesWalletCode $generatesWalletCode + * @param CanCreateCompanyWallet $canCreateCompanyWallet + */ + public function __construct(CanListWallet $canListWallet, ListsWallet $listsWallet) + { + $this->canListWallet = $canListWallet; + $this->listsWallet = $listsWallet; + } + + /** + * @param Request $request + * @return JsonResponse + * @throws ErrorException + */ + public function logic(Request $request) : JsonResponse + { + //$this->canListWallet->passes(); + + $query = $this->listsWallet->execute($this->listsWallet->deserializeFilters($request->input('filters'))); + + return $this->collectionResponse(WalletResource::collection($query)); + } +} diff --git a/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php new file mode 100644 index 00000000..817a9038 --- /dev/null +++ b/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php @@ -0,0 +1,70 @@ + 'TopUp into Company Wallet', + 'message' => 'You have successfully topup company wallet' + ]; + } + + /** @var ListWallet */ + private $fetchesWallet; + + /** @var CanCreateCompanyWallet */ + private $canListWallet; + + /** @var CreateInvoiceTransactionProcessor */ + private $createWalletTransactionProcessor; + + /** + * CreateWalletLogic constructor. + * @param CreatesWallet $createsWallet + * @param GeneratesWalletCode $generatesWalletCode + * @param CanCreateCompanyWallet $canCreateCompanyWallet + */ + public function __construct(FetchesWallet $fetchesWallet, CreateWalletTransactionProcessor $createWalletTransactionProcessor) + { + $this->fetchesWallet = $fetchesWallet; + $this->createWalletTransactionProcessor = $createWalletTransactionProcessor; + } + + /** + * @param Request $request + * @return JsonResponse + * @throws ErrorException + */ + public function logic(Request $request) : JsonResponse + { + //$this->canListWallet->passes(); + $wallet = $this->fetchesWallet->execute(['id' => $request->input('wallet_id')]); + + $walletOject = new WalletObject( $wallet->company->id, $wallet->currency_id, $wallet->code, $request->input('amount')); + $transaction = $this->createWalletTransactionProcessor->execute($wallet, $walletOject, TransactionType::TOP_UP); + + return $this->resourceResponse(new WalletResource($wallet)); + + } +} diff --git a/app/Classes/Modules/Wallets/ControllersLogic/UpdateStatusWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/UpdateStatusWalletLogic.php new file mode 100644 index 00000000..a14051b7 --- /dev/null +++ b/app/Classes/Modules/Wallets/ControllersLogic/UpdateStatusWalletLogic.php @@ -0,0 +1,67 @@ + 'Update Status Transaction Company Wallet', + 'message' => 'You have successfully status transaction company wallet' + ]; + } + + /** @var ListWallet */ + private $fetchesWallet; + + /** @var CanCreateCompanyWallet */ + private $canListWallet; + + /** @var UpdateWalletTransactionProcessor */ + private $updateWalletTransactionProcessor; + + /** + * CreateWalletLogic constructor. + * @param CreatesWallet $createsWallet + * @param GeneratesWalletCode $generatesWalletCode + * @param CanCreateCompanyWallet $canCreateCompanyWallet + */ + public function __construct(FetchesWallet $fetchesWallet, UpdateWalletTransactionProcessor $updateWalletTransactionProcessor) + { + $this->fetchesWallet = $fetchesWallet; + $this->updateWalletTransactionProcessor = $updateWalletTransactionProcessor; + } + + /** + * @param Request $request + * @return JsonResponse + * @throws ErrorException + */ + public function logic(Request $request) : JsonResponse + { + $wallet = $this->updateWalletTransactionProcessor->execute($request->input('id'), $request->input('status')); + + return $this->resourceResponse(new WalletResource($wallet)); + + } +} diff --git a/app/Classes/Modules/Wallets/ControllersLogic/WithdrawWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/WithdrawWalletLogic.php new file mode 100644 index 00000000..3a2bb21a --- /dev/null +++ b/app/Classes/Modules/Wallets/ControllersLogic/WithdrawWalletLogic.php @@ -0,0 +1,70 @@ + 'Withdraw from Company Wallet', + 'message' => 'You have successfully withdraw company wallet' + ]; + } + + /** @var ListWallet */ + private $fetchesWallet; + + /** @var CanCreateCompanyWallet */ + private $canListWallet; + + /** @var CreateInvoiceTransactionProcessor */ + private $createWalletTransactionProcessor; + + /** + * CreateWalletLogic constructor. + * @param CreatesWallet $createsWallet + * @param GeneratesWalletCode $generatesWalletCode + * @param CanCreateCompanyWallet $canCreateCompanyWallet + */ + public function __construct(FetchesWallet $fetchesWallet, CreateWalletTransactionProcessor $createWalletTransactionProcessor) + { + $this->fetchesWallet = $fetchesWallet; + $this->createWalletTransactionProcessor = $createWalletTransactionProcessor; + } + + /** + * @param Request $request + * @return JsonResponse + * @throws ErrorException + */ + public function logic(Request $request) : JsonResponse + { + //$this->canListWallet->passes(); + $wallet = $this->fetchesWallet->execute(['id' => $request->input('wallet_id')]); + + $walletOject = new WalletObject( $wallet->company->id, $wallet->currency_id, $wallet->code, $request->input('amount')); + $transaction = $this->createWalletTransactionProcessor->execute($wallet, $walletOject, TransactionType::WITHDRAW); + + return $this->resourceResponse(new WalletResource($wallet)); + + } +} diff --git a/app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php b/app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php index 6f4fcd83..4bfae2f4 100644 --- a/app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php +++ b/app/Classes/Modules/Wallets/DataTransferObjects/WalletObject.php @@ -16,17 +16,20 @@ class WalletObject implements DataTransferObject /** @var int */ private $code; + private $amount; + /** * WalletObject constructor. * @param int $company_id * @param int $currency * @param int $code */ - public function __construct(int $company_id, int $currency, int $code) + public function __construct(int $company_id, int $currency, int $code, float $amount=0) { $this->company_id = $company_id; $this->currency_id = $currency; $this->code = $code; + $this->amount = $amount; } /** @@ -53,7 +56,10 @@ class WalletObject implements DataTransferObject return $this->code; } + public function getAmount(): float + { + return $this->amount; + } - -} \ No newline at end of file +} diff --git a/app/Classes/Modules/Wallets/Services/CreatesWallet.php b/app/Classes/Modules/Wallets/Services/CreatesWallet.php index 720049cb..c114b9de 100644 --- a/app/Classes/Modules/Wallets/Services/CreatesWallet.php +++ b/app/Classes/Modules/Wallets/Services/CreatesWallet.php @@ -3,24 +3,26 @@ namespace App\Classes\Modules\Wallets\Services; use App\Classes\General\Eloquent\AbstractUpdateRecord; +use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord; use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject; use App\Models\Wallet; +use App\Models\Company; -class CreatesWallet extends AbstractUpdateRecord +class CreatesWallet extends AbstractUpdateRelationshipRecord { /** * @param WalletObject $object * @return \Illuminate\Database\Eloquent\Model * @throws \App\Classes\Exceptions\MalformedRequestException */ - public function execute(WalletObject $object) { + public function execute(WalletObject $object, Company $company) { $model = new Wallet(); - $model->company_id = $object->getCompanyId(); + //$model->company_id = $object->getCompanyId(); $model->code = $object->getCode(); $model->currency_id = $object->getCurrency(); - return $this->handler($model); + return $this->handler($company->wallets(), $model); } -} \ No newline at end of file +} diff --git a/app/Classes/Modules/Wallets/Services/ListsWallet.php b/app/Classes/Modules/Wallets/Services/ListsWallet.php new file mode 100644 index 00000000..c11e2063 --- /dev/null +++ b/app/Classes/Modules/Wallets/Services/ListsWallet.php @@ -0,0 +1,30 @@ +repository = $repository; + } + + /** + * @return Builder + */ + public function getRepository(): Builder + { + return $this->repository->newQuery(); + } +} diff --git a/app/Classes/Modules/Wallets/Services/UpdatesWallet.php b/app/Classes/Modules/Wallets/Services/UpdatesWallet.php new file mode 100644 index 00000000..24ce2415 --- /dev/null +++ b/app/Classes/Modules/Wallets/Services/UpdatesWallet.php @@ -0,0 +1,27 @@ +amount += $object->getAmount(); + $model->code = $object->getCode(); + $model->currency_id = $object->getCurrency(); + + + return $this->handler($model); + + } +} diff --git a/app/Classes/Modules/Wallets/Standards/Rules/CanListWallet.php b/app/Classes/Modules/Wallets/Standards/Rules/CanListWallet.php new file mode 100644 index 00000000..c87cb316 --- /dev/null +++ b/app/Classes/Modules/Wallets/Standards/Rules/CanListWallet.php @@ -0,0 +1,51 @@ +listWalletValidation = $listWalletValidation; + } + + + /** + * @return bool + */ + protected function authorized(): bool + { + // TODO Set Authorization rules + return true; + } + + /** + * @param WalletObject $object + * @return bool + * @throws \App\Classes\Exceptions\RequestValidationException + */ + protected function validators($object): bool + { + return $this->listWalletValidation->validate($object); + } + + /** + * @param WalletTransactionObject $object + * @return bool + */ + protected function criteria($object): bool + { + return true; + } + +} diff --git a/app/Classes/Modules/Wallets/Standards/Rules/CanTopUpWallet.php b/app/Classes/Modules/Wallets/Standards/Rules/CanTopUpWallet.php new file mode 100644 index 00000000..9a005498 --- /dev/null +++ b/app/Classes/Modules/Wallets/Standards/Rules/CanTopUpWallet.php @@ -0,0 +1,51 @@ +topUpWalletValidation = $topUpWalletValidation; + } + + + /** + * @return bool + */ + protected function authorized(): bool + { + // TODO Set Authorization rules + return true; + } + + /** + * @param WalletObject $object + * @return bool + * @throws \App\Classes\Exceptions\RequestValidationException + */ + protected function validators($object): bool + { + return $this->topUpWalletValidation->validate($object); + } + + /** + * @param WalletTransactionObject $object + * @return bool + */ + protected function criteria($object): bool + { + return true; + } + +} diff --git a/app/Classes/Modules/Wallets/Standards/Rules/CanWithdrawWallet.php b/app/Classes/Modules/Wallets/Standards/Rules/CanWithdrawWallet.php new file mode 100644 index 00000000..6fb4019d --- /dev/null +++ b/app/Classes/Modules/Wallets/Standards/Rules/CanWithdrawWallet.php @@ -0,0 +1,51 @@ +witdrawWalletValidation = $witdrawWalletValidation; + } + + + /** + * @return bool + */ + protected function authorized(): bool + { + // TODO Set Authorization rules + return true; + } + + /** + * @param WalletObject $object + * @return bool + * @throws \App\Classes\Exceptions\RequestValidationException + */ + protected function validators($object): bool + { + return $this->witdrawWalletValidation->validate($object); + } + + /** + * @param WalletTransactionObject $object + * @return bool + */ + protected function criteria($object): bool + { + return true; + } + +} diff --git a/app/Classes/Modules/Wallets/Standards/Validators/ListWalletValidation.php b/app/Classes/Modules/Wallets/Standards/Validators/ListWalletValidation.php new file mode 100644 index 00000000..1f75aa54 --- /dev/null +++ b/app/Classes/Modules/Wallets/Standards/Validators/ListWalletValidation.php @@ -0,0 +1,30 @@ +execute($request); + } +} diff --git a/app/Http/Controllers/Wallets/TopUpWalletController.php b/app/Http/Controllers/Wallets/TopUpWalletController.php new file mode 100644 index 00000000..aaa707bd --- /dev/null +++ b/app/Http/Controllers/Wallets/TopUpWalletController.php @@ -0,0 +1,15 @@ +execute($request); + } +} diff --git a/app/Http/Controllers/Wallets/UpdateStatusWalletController.php b/app/Http/Controllers/Wallets/UpdateStatusWalletController.php new file mode 100644 index 00000000..21eea924 --- /dev/null +++ b/app/Http/Controllers/Wallets/UpdateStatusWalletController.php @@ -0,0 +1,14 @@ +execute($request); + } +} diff --git a/app/Http/Controllers/Wallets/WithdrawWalletController.php b/app/Http/Controllers/Wallets/WithdrawWalletController.php new file mode 100644 index 00000000..0d125aa7 --- /dev/null +++ b/app/Http/Controllers/Wallets/WithdrawWalletController.php @@ -0,0 +1,15 @@ +execute($request); + } +} diff --git a/app/Models/Company.php b/app/Models/Company.php index c1a6a191..eba6677f 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -90,6 +90,14 @@ class Company extends AbstractModel implements Documentable return $this->HasMany(Booking::class, 'company_id'); } + /** + * @return MorphMany + */ + public function wallets(): morphMany + { + return $this->morphMany(Wallet::class, 'owner'); + } + /** * @return Builder */ diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 9d1ed5b9..c290ac4b 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -10,18 +10,41 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\MorphMany; +use Illuminate\Database\Eloquent\Relations\MorphTo; class Transaction extends AbstractModel implements Documentable { protected $table = 'transactions'; + public function owner(): morphTo + { + return $this->morphTo(); + } + /** + * @return MorphMany + */ + public function booking(): morphMany + { + //return $this->BelongsTo( Booking::class, 'booking_id', 'id'); + return $this->morphMany(Booking::class, 'owner'); + } + + /** + * @return MorphMany + */ + public function wallets(): morphMany + { + return $this->morphMany(Wallet::class, 'owner'); + } + + /** * @return BelongsTo */ - public function booking(): BelongsTo + public function wallet(): BelongsTo { - return $this->BelongsTo( Booking::class, 'booking_id', 'id'); + return $this->BelongsTo(Wallet::class, 'owner_id', 'id'); } /** diff --git a/app/Models/Wallet.php b/app/Models/Wallet.php index f9808e9e..52d8f718 100644 --- a/app/Models/Wallet.php +++ b/app/Models/Wallet.php @@ -2,16 +2,34 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Relations\HasOne; - +use Illuminate\Database\Eloquent\Relations\HasMany; +use Illuminate\Database\Eloquent\Relations\MorphTo; +use Illuminate\Database\Eloquent\SoftDeletes; +use Illuminate\Database\Eloquent\Relations\BelongsTo; +use Illuminate\Database\Eloquent\Relations\MorphMany; class Wallet extends AbstractModel { - protected $table = 'wallets'; + use SoftDeletes; - public function company(): HasOne + protected $table = 'wallets'; + /** + * @return \Illuminate\Database\Eloquent\Relations\MorphTo + */ + public function owner(): morphTo { - return $this->hasOne(Company::class, 'company_id', 'id'); + return $this->morphTo(); + } + public function company(): BelongsTo + { + return $this->BelongsTo(Company::class, 'owner_id', 'id'); } + /** + * @return morphMany + */ + public function transactions(): morphMany + { + return $this->morphMany(Transaction::class, 'owner'); + } } diff --git a/database/migrations/2021_10_02_082211_drop_wallet_transactions_table.php b/database/migrations/2021_10_02_082211_drop_wallet_transactions_table.php new file mode 100644 index 00000000..f16eeba3 --- /dev/null +++ b/database/migrations/2021_10_02_082211_drop_wallet_transactions_table.php @@ -0,0 +1,28 @@ +dropForeign('wallets_company_id_foreign'); + $table->dropColumn('company_id'); + }); + } + + if (!Schema::hasColumn('wallets', 'owner_id')) { + Schema::table('wallets', function (Blueprint $table) { + $table->morphs('owner'); + }); + + //In-case the model name lengthy + Schema::table('wallets', function (Blueprint $table) { + $table->string('owner_type', 250)->change(); + }); + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/database/migrations/2021_10_02_083144_alter_transaction_booking_id.php b/database/migrations/2021_10_02_083144_alter_transaction_booking_id.php new file mode 100644 index 00000000..e95c1e58 --- /dev/null +++ b/database/migrations/2021_10_02_083144_alter_transaction_booking_id.php @@ -0,0 +1,45 @@ +morphs('owner'); + }); + + //In-case the model name lengthy + Schema::table('transactions', function (Blueprint $table) { + $table->string('owner_type', 250)->change(); + }); + + DB::statement("UPDATE transactions SET owner_type='App\\\\Models\\\\Booking', owner_id = booking_id"); + + Schema::table('transactions', function (Blueprint $table) { + $table->dropForeign('transactions_booking_id_foreign'); + //$table->dropColumn('booking_id'); + }); + } + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/routes/api.php b/routes/api.php index 146d519a..426033a3 100644 --- a/routes/api.php +++ b/routes/api.php @@ -14,7 +14,7 @@ use Illuminate\Support\Facades\Route; */ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function () { - + require __DIR__ . '/account.php'; // Route::get('/rate/calculate', 'RateCalculateCurrencyController@convert')->name('calculate'); @@ -47,7 +47,8 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function require __DIR__ . '/announcement.php'; -// require __DIR__ . '/wallet.php'; + require __DIR__ . '/wallet.php'; + // require __DIR__ . '/rate.php'; // require __DIR__ . '/receipt.php'; diff --git a/routes/wallet.php b/routes/wallet.php index 6b19a47c..13288fb2 100644 --- a/routes/wallet.php +++ b/routes/wallet.php @@ -3,8 +3,9 @@ use Illuminate\Support\Facades\Route; Route::group(['prefix' => 'wallets', 'namespace' => 'Wallets', 'as' => 'wallet.'], function () { - + Route::get('/', 'ListWalletController@list')->name('list'); Route::post('/create', 'CreateWalletController@create')->name('create'); - Route::post('/create-transaction/{id}', 'CreateWalletTransactionController@create')->name('create_transaction'); - -}); \ No newline at end of file + Route::post('/topup', 'TopUpWalletController@topUp')->name('topup'); + Route::post('/withdraw', 'WithdrawWalletController@withdraw')->name('withdraw'); + Route::post('/update-status', 'UpdateStatusWalletController@updateStatus')->name('update.status'); +}); From 9861c62c141b351a0e999159d98d0535c868e3e6 Mon Sep 17 00:00:00 2001 From: ahmedsophyudden Date: Thu, 7 Oct 2021 10:49:54 +0800 Subject: [PATCH 14/25] integrate create billplz bill with create booking payment, and a new billplz callback url --- .../ControllersLogic/CallbackBillplzLogic.php | 13 ++++++++++-- .../BillplzXSignatureObject.php | 20 +++++++++++++++++-- .../Billplzs/Services/CreatesBillplzBill.php | 4 ++-- routes/web.php | 4 ++++ 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php index bce275a3..eb472ce5 100644 --- a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php +++ b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php @@ -12,6 +12,7 @@ use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\Modules\Billplzs\Services\GetBillplzBill; use App\Classes\Modules\Billplzs\DataTransferObjects\BillplzXSignatureObject; use App\Classes\General\Abstracts\AbstractControllerLogic; +use App\Classes\Modules\Transactions\Services\FetchesTransaction; use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus; class CallbackBillplzLogic extends AbstractControllerLogic @@ -30,6 +31,9 @@ class CallbackBillplzLogic extends AbstractControllerLogic /** @var GetBillplzBill */ private $getBillplzBill; + /** @var FetchesTransaction */ + private $fetchesTransaction; + /** @var UpdatesTransactionStatus */ private $updatesTransactionStatus; @@ -37,11 +41,13 @@ class CallbackBillplzLogic extends AbstractControllerLogic /** * CreateBookingLogic constructor. * @param CreateGetBillplzBillsBillplzBill $getBillplzBill + * @param FetchesTransaction $fetchesTransaction * @param UpdatesTransactionStatus $updatesTransactionStatus */ - public function __construct(GetBillplzBill $getBillplzBill, UpdatesTransactionStatus $updatesTransactionStatus) + public function __construct(GetBillplzBill $getBillplzBill, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus) { $this->getBillplzBill = $getBillplzBill; + $this->fetchesTransaction = $fetchesTransaction; $this->updatesTransactionStatus = $updatesTransactionStatus; } @@ -55,14 +61,17 @@ class CallbackBillplzLogic extends AbstractControllerLogic */ public function logic(Request $request) : JsonResponse { + $billplzXSignatureObject = new BillplzXSignatureObject($request); if(!$billplzXSignatureObject->isValidSignature()) throw new MalformedRequestException('Unable to get correct response from billplz server.'); - $billPlz = $this->getBillplzBill->execute($request->input('id')); + $billPlz = $this->getBillplzBill->execute($billplzXSignatureObject->getBillPlzId()); if(!$billPlz) throw new MalformedRequestException('Unable to get correct response from billplz server.'); + $transaction = $this->fetchesTransaction->execute(['payment_reference' => $billplzXSignatureObject->getBillPlzId()]); + if($billPlz->state == 'paid') $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::PENDING_VERIFICATION); return $this->response(['data' => $billPlz]); diff --git a/app/Classes/Modules/Billplzs/DataTransferObjects/BillplzXSignatureObject.php b/app/Classes/Modules/Billplzs/DataTransferObjects/BillplzXSignatureObject.php index ac3f178c..db3e3ad6 100644 --- a/app/Classes/Modules/Billplzs/DataTransferObjects/BillplzXSignatureObject.php +++ b/app/Classes/Modules/Billplzs/DataTransferObjects/BillplzXSignatureObject.php @@ -8,6 +8,9 @@ use App\Classes\General\Interfaces\DataTransferObject; class BillplzXSignatureObject implements DataTransferObject { + /** @var string */ + private $billPlzId; + /** @var array */ private $billPlzConstructArray; @@ -20,16 +23,24 @@ class BillplzXSignatureObject implements DataTransferObject /** @var Request */ private $request; + /** @var string */ + private $requestXSignature; + public function __construct(Request $request) { $this->request = $request; + $this->billPlzId = $request->id ? $request->id : $request->{'billplz[id]'}; + + $this->requestXSignature = $request->x_signature ? $request->x_signature : $request->{'billplz[x_signature]'}; + $this->_constructBillplzArray()->_natSortBillplzArray()->_constructBillplzString()->_computeBillplzXSignature(); } private function _constructBillplzArray(){ foreach($this->request->all() as $key => $value){ - if($key != 'x_signature'){ + if($key != 'x_signature' && $key != 'billplz[x_signature]'){ + $key = str_replace(']', '', str_replace('[', '', $key)); $this->billPlzConstructArray[] = $key.$value; } } @@ -56,6 +67,11 @@ class BillplzXSignatureObject implements DataTransferObject return $this; } + public function getBillPlzId(): string + { + return $this->billPlzId; + } + /** * @return array */ @@ -82,7 +98,7 @@ class BillplzXSignatureObject implements DataTransferObject public function isValidSignature(): bool { - return $this->billPlzComputedXSignature == $this->request->x_signature ? true : false; + return $this->billPlzComputedXSignature == $this->requestXSignature ? true : false; } } \ No newline at end of file diff --git a/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php index 4a70e06e..bd97728e 100644 --- a/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php +++ b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php @@ -10,7 +10,7 @@ class CreatesBillplzBill * @return \Illuminate\Database\Eloquent\Model * @throws \App\Classes\Exceptions\MalformedRequestException */ - public function execute(string $name, string $email, string $description, float $amount, string $bankCode, string $billNumber) { + public function execute(string $name, string $email, string $description, float $amount, string $billNumber, string $bankCode = '') { try{ $response = Http::withBasicAuth(config('billplz.api_key').':', '')->post(config('billplz.base_url').'/api/v3/bills', [ 'collection_id' => config('billplz.collection_id'), @@ -21,7 +21,7 @@ class CreatesBillplzBill 'redirect_url' => config('billplz.redirect_url'), 'callback_url' => config('billplz.callback_url'), 'reference_1_label' => 'Bank Code', - 'reference_1' => $bankCode, + 'reference_1' => $bankCode ? $bankCode : config('billplz.maybank'), 'reference_2_label' => 'Bill Number', 'reference_2' => $billNumber ]); diff --git a/routes/web.php b/routes/web.php index 1578a131..09c802af 100644 --- a/routes/web.php +++ b/routes/web.php @@ -69,6 +69,10 @@ Route::get('/transfer/merge/{marking}', function ($marking) { return view('pages.booking_merge', ['marking' => $marking]); })->name('booking.merge'); +Route::get('/bookings/billplz', function () { + return view('pages.billplz_redirect'); +})->name('bookings.billplz'); + Route::get('/export/customers/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@export'); Route::get('/export/transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@transactions'); From ab534ea8ed3f86d33e5eb57d3bf25ce853cdfe98 Mon Sep 17 00:00:00 2001 From: ahmedsophyudden Date: Thu, 7 Oct 2021 10:59:43 +0800 Subject: [PATCH 15/25] integrate create billplz bill with create booking payment, and a new billplz callback url --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index f9a5dde4..6367c9b8 100644 --- a/.env.example +++ b/.env.example @@ -56,5 +56,5 @@ BILLPLZ_BASE_URL="https://www.billplz-sandbox.com" BILLPLZ_API_KEY="0fa4c710-761b-4a7a-a501-c2c2d02643d5" BILLPLZ_X_SIGNATURE_KEY="S-pbNVthVRsvnPfZlgLwqqOg" BILLPLZ_COLLECTION_ID="hev2wdjy" -BILLPLZ_REDIRECT_URL="localhost:9003" +BILLPLZ_REDIRECT_URL="http://localhost:9003/bookings/billplz" BILLPLZ_CALLBACK_URL="localhost:9003/api/v1/billplz/callback" \ No newline at end of file From 223caa2c3307cd0c02ca0bca6d7fe1627fbb4eb3 Mon Sep 17 00:00:00 2001 From: ahmedsophyudden Date: Thu, 7 Oct 2021 11:00:50 +0800 Subject: [PATCH 16/25] integrate create billplz bill with create booking payment, and a new billplz callback url --- .../Bookings/ControllersLogic/CreateBookingPaymentLogic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php index 87f32666..f0958c14 100644 --- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php +++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php @@ -100,7 +100,7 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic $billNumber = $this->generatesTransactionBillNumber->execute('PYMT-'); if(PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')] == PaymentMethodType::PAYMENT_GATEWAY){ - $billPlzBill = $this->createsBillplzBill->execute($request->user()->name, $request->user()->email, 'This payment is made on behave '.$booking->company->name, $configurations->getTotal(), $request->input('bank_code'), $billNumber); + $billPlzBill = $this->createsBillplzBill->execute($request->user()->name, $request->user()->email, 'This payment is made on behave '.$booking->company->name, $configurations->getTotal(), $billNumber, $request->input('bank_code')); } $object = new TransactionObject($billNumber, TransactionType::PAYMENT, 1, $booking->company->id, From d56442e6ff9ca53387657071f74623795a0ce4af Mon Sep 17 00:00:00 2001 From: Fairuz Date: Thu, 7 Oct 2021 21:15:29 +0800 Subject: [PATCH 17/25] Wallet operations --- .../CreateWalletTransactionProcessor.php | 17 +--------- .../UpdateWalletTransactionProcessor.php | 32 +++++++------------ .../ControllersLogic/CreateWalletLogic.php | 18 +++-------- .../ControllersLogic/TopUpWalletLogic.php | 18 ++++++----- .../ControllersLogic/WithdrawWalletLogic.php | 18 ++++++----- .../Wallets/Services/UpdatesWallet.php | 2 +- 6 files changed, 39 insertions(+), 66 deletions(-) diff --git a/app/Classes/Modules/Transactions/Processors/CreateWalletTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateWalletTransactionProcessor.php index 4bde6135..7297c670 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateWalletTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateWalletTransactionProcessor.php @@ -2,30 +2,15 @@ namespace App\Classes\Modules\Transactions\Processors; -use App\Classes\Modules\Bookings\Services\CalculatesBookingPayableAmount; -use App\Classes\Modules\Bookings\Services\CalculatesBookingTransferredAmount; -use App\Classes\Modules\ServiceTypes\Services\FetchesServiceConfigurations; -use App\Classes\Modules\Transactions\Services\ListsTransactions; +use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject; use App\Classes\Modules\Transactions\Services\CreatesWalletTransaction; use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber; -use App\Classes\Modules\Bookings\Services\CalculatesBookingPaidAmount; -use App\Classes\Modules\Bookings\Services\CalculatesBookingCurrencyAverageRate; -use App\Classes\Modules\Companies\Services\FetchesCompany; -use App\Classes\Modules\Documents\Services\CreatesDocument; -use App\Classes\Modules\Documents\Services\CreatesFiles; -use App\Classes\Modules\Bookings\Services\UpdatesBookingStatus; -use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject; - use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject; -use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject; use App\Classes\ValueObjects\Constants\ApprovalStatus; use App\Classes\ValueObjects\Constants\SegmentConstants; use App\Classes\ValueObjects\Constants\TransactionType; use App\Classes\ValueObjects\Constants\PaymentMethodType; use App\Models\Wallet; -use App\Models\Document; -use App\Models\SegmentConstant; -use Meneses\LaravelMpdf\Facades\LaravelMpdf; class CreateWalletTransactionProcessor { diff --git a/app/Classes/Modules/Transactions/Processors/UpdateWalletTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/UpdateWalletTransactionProcessor.php index 95f484a0..7c7277f8 100644 --- a/app/Classes/Modules/Transactions/Processors/UpdateWalletTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/UpdateWalletTransactionProcessor.php @@ -2,35 +2,16 @@ namespace App\Classes\Modules\Transactions\Processors; -use App\Classes\Modules\Bookings\Services\CalculatesBookingPayableAmount; -use App\Classes\Modules\Bookings\Services\CalculatesBookingTransferredAmount; -use App\Classes\Modules\ServiceTypes\Services\FetchesServiceConfigurations; -use App\Classes\Modules\Transactions\Services\ListsTransactions; -use App\Classes\Modules\Transactions\Services\CreatesWalletTransaction; -use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber; -use App\Classes\Modules\Bookings\Services\CalculatesBookingPaidAmount; -use App\Classes\Modules\Bookings\Services\CalculatesBookingCurrencyAverageRate; -use App\Classes\Modules\Companies\Services\FetchesCompany; -use App\Classes\Modules\Documents\Services\CreatesDocument; -use App\Classes\Modules\Documents\Services\CreatesFiles; -use App\Classes\Modules\Bookings\Services\UpdatesBookingStatus; - use App\Classes\Modules\Wallets\DataTransferObjects\WalletObject; use App\Classes\Modules\Transactions\Services\FetchesTransaction; use App\Classes\Modules\Wallets\Services\FetchesWallet; use App\Classes\Modules\Wallets\Services\UpdatesWallet; use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus; - use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject; -use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject; use App\Classes\ValueObjects\Constants\ApprovalStatus; -use App\Classes\ValueObjects\Constants\SegmentConstants; use App\Classes\ValueObjects\Constants\TransactionType; use App\Classes\ValueObjects\Constants\PaymentMethodType; use App\Models\Wallet; -use App\Models\Document; -use App\Models\SegmentConstant; -use Meneses\LaravelMpdf\Facades\LaravelMpdf; class UpdateWalletTransactionProcessor { @@ -65,7 +46,18 @@ class UpdateWalletTransactionProcessor $transaction = $this->fetchesTransaction->execute(['id' => $transactionId]); $wallet = $transaction->wallet; - $walletOject = new WalletObject( $wallet->company->id, $wallet->currency_id, $wallet->code, $transaction->amount); + switch($transaction->type){ + case TransactionType::TOP_UP: + $updateWalletAmount = $transaction->amount + $wallet->amount; + break; + case TransactionType::WITHDRAW: + $updateWalletAmount = $wallet->amount - $transaction->amount; + break; + default: + break; + } + + $walletOject = new WalletObject( $wallet->company->id, $wallet->currency_id, $wallet->code, $updateWalletAmount); $this->updatesTransactionStatus->execute($transaction, $transactionStatus); diff --git a/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php index f0a16958..9a613b43 100644 --- a/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php +++ b/app/Classes/Modules/Wallets/ControllersLogic/CreateWalletLogic.php @@ -63,22 +63,14 @@ class CreateWalletLogic extends AbstractControllerLogic */ public function logic(Request $request) : JsonResponse { + $object = new WalletObject($request->input('company_id'), $request->input('currency_id'), $this->generatesWalletCode->execute()); - DB::beginTransaction(); + $this->canCreateCompanyWallet->passes($object); + $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]); - $object = new WalletObject($request->input('company_id'), $request->input('currency_id'), $this->generatesWalletCode->execute()); - - $this->canCreateCompanyWallet->passes($object); - - $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]); - - $wallet = $this->createsWallet->execute($object, $company); - - DB::commit(); - - return $this->resourceResponse(new WalletResource($wallet)); - + $wallet = $this->createsWallet->execute($object, $company); + return $this->resourceResponse(new WalletResource($wallet)); } } diff --git a/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php index 817a9038..8497ec32 100644 --- a/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php +++ b/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php @@ -9,7 +9,7 @@ use App\Classes\Modules\Wallets\Services\ListsWallet; use App\Classes\Modules\Wallets\Services\FetchesWallet; use App\Classes\ValueObjects\Constants\TransactionType; -use App\Classes\Modules\Wallets\Standards\Rules\CanListWallet; +use App\Classes\Modules\Wallets\Standards\Rules\CanTopUpWallet; use App\Http\Resources\WalletResource; use App\Classes\Modules\Transactions\Processors\CreateWalletTransactionProcessor; @@ -30,13 +30,13 @@ class TopUpWalletLogic extends AbstractControllerLogic ]; } - /** @var ListWallet */ + /** @var FetchesWallet */ private $fetchesWallet; - /** @var CanCreateCompanyWallet */ - private $canListWallet; + /** @var CanTopUpWallet */ + private $canTopUpWallet; - /** @var CreateInvoiceTransactionProcessor */ + /** @var CreateWalletTransactionProcessor */ private $createWalletTransactionProcessor; /** @@ -45,8 +45,9 @@ class TopUpWalletLogic extends AbstractControllerLogic * @param GeneratesWalletCode $generatesWalletCode * @param CanCreateCompanyWallet $canCreateCompanyWallet */ - public function __construct(FetchesWallet $fetchesWallet, CreateWalletTransactionProcessor $createWalletTransactionProcessor) + public function __construct(CanTopUpWallet $canTopUpWallet, FetchesWallet $fetchesWallet, CreateWalletTransactionProcessor $createWalletTransactionProcessor) { + $this->canTopUpWallet = $canTopUpWallet; $this->fetchesWallet = $fetchesWallet; $this->createWalletTransactionProcessor = $createWalletTransactionProcessor; } @@ -58,13 +59,14 @@ class TopUpWalletLogic extends AbstractControllerLogic */ public function logic(Request $request) : JsonResponse { - //$this->canListWallet->passes(); $wallet = $this->fetchesWallet->execute(['id' => $request->input('wallet_id')]); $walletOject = new WalletObject( $wallet->company->id, $wallet->currency_id, $wallet->code, $request->input('amount')); + + $this->canTopUpWallet->passes($walletOject); + $transaction = $this->createWalletTransactionProcessor->execute($wallet, $walletOject, TransactionType::TOP_UP); return $this->resourceResponse(new WalletResource($wallet)); - } } diff --git a/app/Classes/Modules/Wallets/ControllersLogic/WithdrawWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/WithdrawWalletLogic.php index 3a2bb21a..b1491ab7 100644 --- a/app/Classes/Modules/Wallets/ControllersLogic/WithdrawWalletLogic.php +++ b/app/Classes/Modules/Wallets/ControllersLogic/WithdrawWalletLogic.php @@ -9,7 +9,7 @@ use App\Classes\Modules\Wallets\Services\ListsWallet; use App\Classes\Modules\Wallets\Services\FetchesWallet; use App\Classes\ValueObjects\Constants\TransactionType; -use App\Classes\Modules\Wallets\Standards\Rules\CanListWallet; +use App\Classes\Modules\Wallets\Standards\Rules\CanWithdrawWallet; use App\Http\Resources\WalletResource; use App\Classes\Modules\Transactions\Processors\CreateWalletTransactionProcessor; @@ -30,13 +30,13 @@ class WithdrawWalletLogic extends AbstractControllerLogic ]; } - /** @var ListWallet */ + /** @var FetchesWallet */ private $fetchesWallet; - /** @var CanCreateCompanyWallet */ - private $canListWallet; + /** @var CanWithdrawWallet */ + private $canWithdrawWallet; - /** @var CreateInvoiceTransactionProcessor */ + /** @var CreateWalletTransactionProcessor */ private $createWalletTransactionProcessor; /** @@ -45,8 +45,9 @@ class WithdrawWalletLogic extends AbstractControllerLogic * @param GeneratesWalletCode $generatesWalletCode * @param CanCreateCompanyWallet $canCreateCompanyWallet */ - public function __construct(FetchesWallet $fetchesWallet, CreateWalletTransactionProcessor $createWalletTransactionProcessor) + public function __construct(CanWithdrawWallet $canWithdrawWallet, FetchesWallet $fetchesWallet, CreateWalletTransactionProcessor $createWalletTransactionProcessor) { + $this->canWithdrawWallet = $canWithdrawWallet; $this->fetchesWallet = $fetchesWallet; $this->createWalletTransactionProcessor = $createWalletTransactionProcessor; } @@ -58,13 +59,14 @@ class WithdrawWalletLogic extends AbstractControllerLogic */ public function logic(Request $request) : JsonResponse { - //$this->canListWallet->passes(); $wallet = $this->fetchesWallet->execute(['id' => $request->input('wallet_id')]); $walletOject = new WalletObject( $wallet->company->id, $wallet->currency_id, $wallet->code, $request->input('amount')); + + $this->canWithdrawWallet->passes($walletOject); + $transaction = $this->createWalletTransactionProcessor->execute($wallet, $walletOject, TransactionType::WITHDRAW); return $this->resourceResponse(new WalletResource($wallet)); - } } diff --git a/app/Classes/Modules/Wallets/Services/UpdatesWallet.php b/app/Classes/Modules/Wallets/Services/UpdatesWallet.php index 24ce2415..8b268fab 100644 --- a/app/Classes/Modules/Wallets/Services/UpdatesWallet.php +++ b/app/Classes/Modules/Wallets/Services/UpdatesWallet.php @@ -16,7 +16,7 @@ class UpdatesWallet extends AbstractUpdateRecord * @throws \App\Classes\Exceptions\MalformedRequestException */ public function execute(Wallet $model, WalletObject $object) { - $model->amount += $object->getAmount(); + $model->amount = $object->getAmount(); $model->code = $object->getCode(); $model->currency_id = $object->getCurrency(); From 7dbe51bda91d370bcda8e070c01437bb1c66aad1 Mon Sep 17 00:00:00 2001 From: ahmedsophyudden Date: Fri, 8 Oct 2021 10:31:23 +0800 Subject: [PATCH 18/25] integrate create billplz bill with create booking payment, and a new billplz callback url --- .../Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php | 2 +- app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php | 2 +- .../bookings/forms/BookingPaymentQuotationComponent.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php index eb472ce5..8dece746 100644 --- a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php +++ b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php @@ -72,7 +72,7 @@ class CallbackBillplzLogic extends AbstractControllerLogic $transaction = $this->fetchesTransaction->execute(['payment_reference' => $billplzXSignatureObject->getBillPlzId()]); - if($billPlz->state == 'paid') $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::PENDING_VERIFICATION); + if($billPlz->state == 'paid') $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED); return $this->response(['data' => $billPlz]); diff --git a/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php index bd97728e..7cf4bdef 100644 --- a/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php +++ b/app/Classes/Modules/Billplzs/Services/CreatesBillplzBill.php @@ -10,7 +10,7 @@ class CreatesBillplzBill * @return \Illuminate\Database\Eloquent\Model * @throws \App\Classes\Exceptions\MalformedRequestException */ - public function execute(string $name, string $email, string $description, float $amount, string $billNumber, string $bankCode = '') { + public function execute(string $name, string $email, string $description, float $amount, string $billNumber, ?string $bankCode = null) { try{ $response = Http::withBasicAuth(config('billplz.api_key').':', '')->post(config('billplz.base_url').'/api/v3/bills', [ 'collection_id' => config('billplz.collection_id'), diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue index 9efbe54c..b98d2762 100644 --- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue +++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue @@ -169,7 +169,7 @@
-
+
From 13c948d40e01365097e875c91b7d461a5af10881 Mon Sep 17 00:00:00 2001 From: ahmedsophyudden Date: Fri, 8 Oct 2021 10:32:55 +0800 Subject: [PATCH 19/25] integrate create billplz bill with create booking payment, and a new billplz callback url --- .../bookings/forms/BookingPaymentQuotationComponent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue index b98d2762..9efbe54c 100644 --- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue +++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue @@ -169,7 +169,7 @@
-
+
From 004e56cd2ec9eb90c036ba610cddb70241d94ceb Mon Sep 17 00:00:00 2001 From: Fairuz Date: Fri, 8 Oct 2021 21:56:37 +0800 Subject: [PATCH 20/25] Wallet approval / reject --- .../Wallets/ControllersLogic/UpdateStatusWalletLogic.php | 4 +++- routes/wallet.php | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Classes/Modules/Wallets/ControllersLogic/UpdateStatusWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/UpdateStatusWalletLogic.php index a14051b7..b051d3e3 100644 --- a/app/Classes/Modules/Wallets/ControllersLogic/UpdateStatusWalletLogic.php +++ b/app/Classes/Modules/Wallets/ControllersLogic/UpdateStatusWalletLogic.php @@ -59,7 +59,9 @@ class UpdateStatusWalletLogic extends AbstractControllerLogic */ public function logic(Request $request) : JsonResponse { - $wallet = $this->updateWalletTransactionProcessor->execute($request->input('id'), $request->input('status')); + $status = ($request->route('status')=='approve') ? 2 : 4; + + $wallet = $this->updateWalletTransactionProcessor->execute($request->route('transaction_id'), $status); return $this->resourceResponse(new WalletResource($wallet)); diff --git a/routes/wallet.php b/routes/wallet.php index 13288fb2..7ad2a479 100644 --- a/routes/wallet.php +++ b/routes/wallet.php @@ -7,5 +7,6 @@ Route::group(['prefix' => 'wallets', 'namespace' => 'Wallets', 'as' => 'wallet.' Route::post('/create', 'CreateWalletController@create')->name('create'); Route::post('/topup', 'TopUpWalletController@topUp')->name('topup'); Route::post('/withdraw', 'WithdrawWalletController@withdraw')->name('withdraw'); - Route::post('/update-status', 'UpdateStatusWalletController@updateStatus')->name('update.status'); + Route::put('/{transaction_id}/update-status/{status}', 'UpdateStatusWalletController@updateStatus')->where('status', 'approve|reject')->name('approval'); + }); From 5e0799687f18942a0727abefeca9e4bd3dd033ce Mon Sep 17 00:00:00 2001 From: ahmedsophyudden Date: Fri, 15 Oct 2021 19:20:55 +0800 Subject: [PATCH 21/25] added billplz_redirect.blade sample page --- .../views/pages/billplz_redirect.blade.php | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 resources/views/pages/billplz_redirect.blade.php diff --git a/resources/views/pages/billplz_redirect.blade.php b/resources/views/pages/billplz_redirect.blade.php new file mode 100644 index 00000000..a2e924a4 --- /dev/null +++ b/resources/views/pages/billplz_redirect.blade.php @@ -0,0 +1,33 @@ + + \ No newline at end of file From 2ffefc03bb7e67ab86ba17406621e1a66c84b932 Mon Sep 17 00:00:00 2001 From: glovetleong Date: Fri, 22 Oct 2021 14:47:01 +0800 Subject: [PATCH 22/25] fix MorphMany transaction --- app/Classes/General/Interfaces/Transactionable.php | 13 +++++++++++++ .../ControllersLogic/CreateBookingPaymentLogic.php | 3 +-- .../CreateSupplierTransactionLogic.php | 4 ++-- .../Transactions/Services/CreatesTransaction.php | 7 +++---- app/Http/Resources/BookingResource.php | 7 ++++++- app/Models/Booking.php | 9 +++++---- app/Models/Transaction.php | 5 ++--- composer.json | 1 + ...21_10_02_083144_alter_transaction_booking_id.php | 2 +- 9 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 app/Classes/General/Interfaces/Transactionable.php diff --git a/app/Classes/General/Interfaces/Transactionable.php b/app/Classes/General/Interfaces/Transactionable.php new file mode 100644 index 00000000..174cb48d --- /dev/null +++ b/app/Classes/General/Interfaces/Transactionable.php @@ -0,0 +1,13 @@ +route('id')); $conversionObject = new CurrencyConversionObject(floatval(str_replace(',', '', $request->input('amount'))), $booking->convertible_currency_id, $booking->service_id, $booking->fix_currency_id === 1 ? 0:1, PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')]); @@ -95,7 +94,7 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic $configurations->getTax(), $configurations->getServiceCharge(), Carbon::now()->addMinutes($paymentAttemptLimit), ApprovalStatus::PENDING_SUBMISSION); $transaction = $this->createsTransaction->execute($booking, $object); - + return $this->resourceResponse(new TransactionResource($transaction)); } diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php index 01e18b40..fde2b235 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php @@ -101,7 +101,7 @@ class CreateSupplierTransactionLogic extends AbstractControllerLogic /** @var Transaction $payment */ $payment = $this->fetchesTransaction->execute(['id' => $payment['id']]); - + if($payment->status !== ApprovalStatus::APPROVED) continue; $this->updatesTransactionStatus->execute($payment, ApprovalStatus::COMPLETED); @@ -109,7 +109,7 @@ class CreateSupplierTransactionLogic extends AbstractControllerLogic $object = new TransactionObject($billNumber, TransactionType::BILL, $supplier->id, 1, $supplier->banks()->where('default', true)->first()->id, PaymentMethodType::CASH, $payment->original_amount * (1 / $rate), $payment->original_amount, 1, $payment->original_currency_id, - $rate, 0, 0, null, ApprovalStatus::APPROVED); + $rate, 0, 0, null, ApprovalStatus:: APPROVED); $transactions[] = $this->createsTransaction->execute($payment->booking, $object); } diff --git a/app/Classes/Modules/Transactions/Services/CreatesTransaction.php b/app/Classes/Modules/Transactions/Services/CreatesTransaction.php index ddebf0d5..fd5a403b 100644 --- a/app/Classes/Modules/Transactions/Services/CreatesTransaction.php +++ b/app/Classes/Modules/Transactions/Services/CreatesTransaction.php @@ -2,8 +2,8 @@ namespace App\Classes\Modules\Transactions\Services; -use App\Classes\General\Eloquent\AbstractUpdateRecord; use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord; +use App\Classes\General\Interfaces\Transactionable; use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject; use App\Models\Booking; use App\Models\Transaction; @@ -15,7 +15,7 @@ class CreatesTransaction extends AbstractUpdateRelationshipRecord * @return \Illuminate\Database\Eloquent\Model * @throws \App\Classes\Exceptions\MalformedRequestException */ - public function execute(Booking $booking, TransactionObject $object) { + public function execute(Transactionable $transactionable, TransactionObject $object) { $model = new Transaction(); $model->bill_no = $object->getBillNo(); $model->type = $object->getTransactionType(); @@ -33,8 +33,7 @@ class CreatesTransaction extends AbstractUpdateRelationshipRecord $model->expires_on = $object->getExpiresOn(); $model->status = $object->getStatus(); - - return $this->handler($booking->transactions(), $model); + return $this->handler($transactionable->transactions(), $model); } } \ No newline at end of file diff --git a/app/Http/Resources/BookingResource.php b/app/Http/Resources/BookingResource.php index cc5f0dca..6333d46d 100644 --- a/app/Http/Resources/BookingResource.php +++ b/app/Http/Resources/BookingResource.php @@ -46,7 +46,12 @@ class BookingResource extends JsonResource 'created_at' => Carbon::parse($this->created_at)->format('d-m-Y'), $this->mergeWhen($this->relationLoaded('transactions'), [ 'purchase_order' => new TransactionResource($this->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first()), - 'payment_attempts' => TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '>=', Carbon::now())->get()), + 'payment_attempts' => TransactionResource::collection( + $this->transactions() + ->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION) + ->whereDate('expires_on', '>=', Carbon::now()) + ->get() + ), 'expired_payment_attempts' => TransactionResource::collection($this->transactions()->payments()->where('status', ApprovalStatus::PENDING_SUBMISSION)->whereDate('expires_on', '<', Carbon::now())->get()), 'payment_history' => TransactionResource::collection($this->transactions()->where(function($query){ $query->where(function($query){ diff --git a/app/Models/Booking.php b/app/Models/Booking.php index 33c33341..c3492241 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\Transactionable; use App\Classes\ValueObjects\Constants\RoleTypes; use App\Scopes\CustomerBookingsScope; use Illuminate\Database\Eloquent\Builder; @@ -24,7 +25,7 @@ use Illuminate\Database\Eloquent\SoftDeletes; * @property \App\Models\Currency convertible_currency_id * @property \App\Models\Currency conversion_currency_id */ -class Booking extends AbstractModel implements Documentable +class Booking extends AbstractModel implements Documentable, Transactionable { use SoftDeletes; @@ -89,11 +90,11 @@ class Booking extends AbstractModel implements Documentable } /** - * @return HasMany + * @return MorphMany */ - public function transactions(): HasMany + public function transactions(): MorphMany { - return $this->HasMany(Transaction::class, 'booking_id'); + return $this->MorphMany(Transaction::class, 'owner'); } protected static function booted() diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index c290ac4b..cad64361 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -25,10 +25,9 @@ class Transaction extends AbstractModel implements Documentable /** * @return MorphMany */ - public function booking(): morphMany + public function booking(): BelongsTo { - //return $this->BelongsTo( Booking::class, 'booking_id', 'id'); - return $this->morphMany(Booking::class, 'owner'); + return $this->BelongsTo(Booking::class, 'owner_id', 'id'); } /** diff --git a/composer.json b/composer.json index 7a3ac9b3..7715f0ca 100644 --- a/composer.json +++ b/composer.json @@ -13,6 +13,7 @@ "ext-json": "^1.6", "barryvdh/laravel-dompdf": "^0.9.0", "carlos-meneses/laravel-mpdf": "^2.1", + "doctrine/dbal": "2.*", "fideloper/proxy": "^4.2", "fruitcake/laravel-cors": "^1.0", "guzzlehttp/guzzle": "^6.3", diff --git a/database/migrations/2021_10_02_083144_alter_transaction_booking_id.php b/database/migrations/2021_10_02_083144_alter_transaction_booking_id.php index e95c1e58..a37da4e4 100644 --- a/database/migrations/2021_10_02_083144_alter_transaction_booking_id.php +++ b/database/migrations/2021_10_02_083144_alter_transaction_booking_id.php @@ -28,7 +28,7 @@ class AlterTransactionBookingId extends Migration Schema::table('transactions', function (Blueprint $table) { $table->dropForeign('transactions_booking_id_foreign'); - //$table->dropColumn('booking_id'); + $table->dropColumn('booking_id'); }); } } From beed76c407e1367693dbe6c0f7f42b63b4e6a237 Mon Sep 17 00:00:00 2001 From: glovetleong Date: Tue, 26 Oct 2021 22:04:19 +0800 Subject: [PATCH 23/25] company transactions owner_id --- app/Models/Company.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Company.php b/app/Models/Company.php index ab94c46e..7b8e4387 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -99,7 +99,7 @@ class Company extends AbstractModel implements Documentable */ public function transactions(): hasManyDeep { - return $this->hasManyDeep(Transaction::class, [Booking::class], ['company_id', 'booking_id'], ['id', 'id']); + return $this->hasManyDeep(Transaction::class, [Booking::class], ['company_id', 'owner_id'], ['id', 'id']); } /** From 70f95f511d98c7dff39d0443cd2df84da351443d Mon Sep 17 00:00:00 2001 From: glovetleong Date: Wed, 27 Oct 2021 14:22:32 +0800 Subject: [PATCH 24/25] transaction status downgrade --- .../ControllersLogic/CreatePaymentProofDocumentLogic.php | 2 +- .../ControllersLogic/CreateSupplierTransactionLogic.php | 2 +- app/Models/Transaction.php | 2 +- resources/views/pages/dashboards/admin.blade.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreatePaymentProofDocumentLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreatePaymentProofDocumentLogic.php index 111cd0db..81eb0c8a 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/CreatePaymentProofDocumentLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/CreatePaymentProofDocumentLogic.php @@ -83,7 +83,7 @@ class CreatePaymentProofDocumentLogic extends AbstractControllerLogic $this->createsFile->execute($document, $object); - $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::COMPLETED); + $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED); $this->createInvoiceTransactionProcessor->execute($transaction->booking); diff --git a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php index fde2b235..f496ab4f 100644 --- a/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php +++ b/app/Classes/Modules/Transactions/ControllersLogic/CreateSupplierTransactionLogic.php @@ -109,7 +109,7 @@ class CreateSupplierTransactionLogic extends AbstractControllerLogic $object = new TransactionObject($billNumber, TransactionType::BILL, $supplier->id, 1, $supplier->banks()->where('default', true)->first()->id, PaymentMethodType::CASH, $payment->original_amount * (1 / $rate), $payment->original_amount, 1, $payment->original_currency_id, - $rate, 0, 0, null, ApprovalStatus:: APPROVED); + $rate, 0, 0, null, ApprovalStatus::PENDING_VERIFICATION); $transactions[] = $this->createsTransaction->execute($payment->booking, $object); } diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index e10e1781..f24fee8d 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -157,6 +157,6 @@ class Transaction extends AbstractModel implements Documentable */ public function scopeTransferred(Builder $query) { - return $query->whereIn('status', [ApprovalStatus::COMPLETED]); + return $query->whereIn('status', [ApprovalStatus::APPROVED]); } } diff --git a/resources/views/pages/dashboards/admin.blade.php b/resources/views/pages/dashboards/admin.blade.php index 7471027f..13e9e7ac 100644 --- a/resources/views/pages/dashboards/admin.blade.php +++ b/resources/views/pages/dashboards/admin.blade.php @@ -328,7 +328,7 @@
- + From 9459c8fa3abf3b44f1e6d157ed84f94e2e57627e Mon Sep 17 00:00:00 2001 From: ahmedsophyudden Date: Mon, 8 Nov 2021 10:20:58 +0800 Subject: [PATCH 25/25] update TransactionObject getPaymentReference return data type to allow null --- .../Transactions/DataTransferObjects/TransactionObject.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php b/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php index 780615a0..6b097b9e 100644 --- a/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php +++ b/app/Classes/Modules/Transactions/DataTransferObjects/TransactionObject.php @@ -231,7 +231,10 @@ class TransactionObject implements DataTransferObject }, $this->details); } - public function getPaymentReference(): string + /** + * @return string|null + */ + public function getPaymentReference(): ?string { return $this->paymentReference; }