diff --git a/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyBookingQuotationLogic.php b/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyBookingQuotationLogic.php index 926acaae..2fc53955 100644 --- a/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyBookingQuotationLogic.php +++ b/app/Classes/Modules/Companies/ControllersLogic/FetchCompanyBookingQuotationLogic.php @@ -69,7 +69,7 @@ class FetchCompanyBookingQuotationLogic extends AbstractControllerLogic /** @var Currency $currency */ $currency = $this->fetchesCurrency->execute(['id' => $conversionObject->getCurrencyId()]); - if($calculationObject->getConvertibleTotal() < $calculationObject->getConfigurations()->getMinLimit()) throw new RequestValidationException('Your transfer is below the minimum amount allowed of '.$calculationObject->getConfigurations()->getMinLimit().' '.$currency->short_code); + if($calculationObject->getConvertibleTotal() < $calculationObject->getConfigurations()->getMinLimit()) throw new RequestValidationException('Your transfer is below the minimum amount allowed of '.number_format($calculationObject->getConfigurations()->getMinLimit()).' '.$currency->short_code); //TODO add po limit validation return $this->response(['data' => $this->generatesBookingQuotation->execute($calculationObject, 0, $conversionObject)]); diff --git a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php index 28a34057..079e55d9 100644 --- a/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/CreateProformaInvoiceTransactionProcessor.php @@ -110,6 +110,7 @@ class CreateProformaInvoiceTransactionProcessor $transaction = $booking->transactions() ->where('type', TransactionType::PAYMENT) + ->whereNotIn('status', [ApprovalStatus::SUSPENDED]) ->first(); if (!$transaction) { diff --git a/routes/web.php b/routes/web.php index 421c3e49..85d0d0af 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1133,6 +1133,7 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}', echo 'PO approve date'; echo 'Remark'; echo 'Add Remarks'; + echo 'Upload Bank Slip'; echo ''; echo ''; echo ''; @@ -1150,7 +1151,7 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}', echo '' . $bill->created_at->format('d-m-Y h:i A') . ''; echo '' . $bill->issuerCompany->name . ''; echo '' . ($bill->status === ApprovalStatus::APPROVED ? $bill->updated_at->format('d-m-Y h:i A') : 'Pending Upload') . ''; - echo '' . ($po ? $po->updated_at->format('d-m-Y h:i A') : 'Pending Submission') . ''; + echo '' . ($po ? $po->updated_at->format('d-m-Y h:i A') : 'Pending Submission') . ''; echo '' . ($po ? ($po->status === ApprovalStatus::APPROVED ? $po->updated_at->format('d-m-Y h:i A') : '' ) : '' ). ''; $remarks = $bill->remarks; echo ''; @@ -1167,11 +1168,88 @@ Route::get('/show-white-form-transactions-in-date-range/{from_date}/{to_date}', echo csrf_field(); echo ''; echo ''; + echo '' ; + if ($bill->status !== ApprovalStatus::APPROVED) { + echo '
'; + echo ''; + echo ''; + echo csrf_field(); + echo '
'; + } + echo ''; echo ''; } echo ''; echo ''; + // script + echo ''; }); Route::get('check-duplicate-refunds', function () {