tidy up change booking price

This commit is contained in:
edmondlang
2021-11-05 12:24:00 +08:00
parent 7ba5f704d3
commit 87614bdcec
7 changed files with 157 additions and 16 deletions
@@ -0,0 +1,90 @@
<?php
namespace App\Classes\Modules\Bookings\ControllersLogic;
use App\Http\Resources\BookingResource;
use App\Classes\General\Abstracts\AbstractControllerLogic;
use App\Classes\Modules\Bookings\Services\FetchesBooking;
use App\Classes\Modules\Bookings\Standards\Rules\CanUpdateBooking;
use App\Classes\Modules\Bookings\Services\updatesBookingFixedAmount;
use App\Classes\Modules\Bookings\DataTransferObjects\BookingObject;
use App\Classes\Modules\Bookings\Services\CalculatesBookingOutstanding;
use ErrorException;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use App\Classes\Exceptions\MalformedRequestException;
class UpdateBookingAmountLogic extends AbstractControllerLogic
{
/**
* @return array
*/
protected function notification():array {
return [
'title' => 'Updated Booking',
'message' => 'You have successfully updated the Booking'
];
}
/** @var CanUpdateBooking */
private $canUpdateBooking;
/** @var UpdatesBookingFixedAmount */
private $updatesBookingFixedAmount;
/** @var FetchesBooking */
private $fetchesBooking;
/** @var CalculatesBookingOutstanding */
private $calculatesBookingOutstanding;
/**
* UpdateBookingAmountLogic constructor.
* @param CanUpdateBooking $canUpdateBooking
* @param UpdatesBookingFixedAmount $updatesBookingFixedAmount
* @param FetchesBooking $fetchesBooking
* @param CalculatesBookingOutstanding $calculatesBookingOutstanding
*/
public function __construct(
CanUpdateBooking $canUpdateBooking,
UpdatesBookingFixedAmount $updatesBookingFixedAmount,
FetchesBooking $fetchesBooking,
CalculatesBookingOutstanding $calculatesBookingOutstanding
)
{
$this->canUpdateBooking = $canUpdateBooking;
$this->updatesBookingFixedAmount = $updatesBookingFixedAmount;
$this->fetchesBooking = $fetchesBooking;
$this->calculatesBookingOutstanding = $calculatesBookingOutstanding;
}
/**
* @param Request $request
* @return JsonResponse
* @throws ErrorException
*/
public function logic(Request $request) : JsonResponse
{
$booking = $this->fetchesBooking->execute(['id' => $request->route('id')]);
$input_amount = number_format( floatval(str_replace(',', '', $request->input('fix_amount', $booking->fix_amount))), 5, '.', '');
$minimum_amount = $booking->fix_amount - $this->calculatesBookingOutstanding->execute($booking);
if ((float)$input_amount < $minimum_amount) {
throw new MalformedRequestException('Booking Amount cannot be less than '. $minimum_amount .'.');
}
// $this->canUpdateBooking->passes($booking);
$booking = $this->updatesBookingFixedAmount->execute($booking, $input_amount);
return $this->resourceResponse(new BookingResource($booking));
}
}
@@ -17,8 +17,8 @@ class UpdatesBooking extends AbstractUpdateRecord
*/
public function execute(Booking $model, BookingObject $object)
{
$model->transferable_bank_id = $object->getTransferableBankId();
$model->reference = $object->getReference();
$model->bank_id = $object->getTransferableBankId();
$model->marking = $object->getMarking();
$model->fix_amount = $object->getFixAmount();
$model->fix_currency_id = $object->getFixCurrencyId();
$model->convertible_currency_id = $object->getConvertibleCurrencyId();
@@ -0,0 +1,23 @@
<?php
namespace App\Classes\Modules\Bookings\Services;
use App\Classes\General\Eloquent\AbstractUpdateRecord;
use App\Classes\Modules\Bookings\DataTransferObjects\BookingObject;
use App\Models\Booking;
class UpdatesBookingFixedAmount extends AbstractUpdateRecord
{
/**
* @param Booking $model
* @param BookingObject $object
* @return \Illuminate\Database\Eloquent\Model
* @throws \App\Classes\Exceptions\MalformedRequestException
*/
public function execute(Booking $model, float $fixedAmount)
{
$model->fix_amount = $fixedAmount;
return $this->handler($model);
}
}
@@ -0,0 +1,20 @@
<?php
namespace App\Http\Controllers\Bookings;
use App\Classes\Modules\Bookings\ControllersLogic\UpdateBookingAmountLogic;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class UpdateBookingAmountController
{
/**
* @param Request $request
* @param CreateBookingRefundLogic $logic
* @return JsonResponse
*/
public function update(Request $request, UpdateBookingAmountLogic $logic): JsonResponse {
return $logic->execute($request);
}
}
@@ -73,7 +73,7 @@
<div class="font-heading fs-12"><i class="fa fa-edit fs-12 pointer fa-fw requestModal" data-type="editBookingAmount"></i> {{this.data.fixed_currency.short_code}} {{(Math.round((this.data.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}</div>
</div>
<modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="editBookingAmount">
<edit-booking-amount-form-component :data="{name: $store.getters.getUserName}" :section="section"></edit-booking-amount-form-component>
<edit-booking-amount-form-component :data="this.data" :section="section"></edit-booking-amount-form-component>
</modal-component>
</div>
<div class="row align-items-end m-b-10 text-success">
@@ -10,9 +10,9 @@
</div>
<div class="row m-b-10">
<div class="col">
<validation-wrapper-component :validator="$v.parameters.bookingAmount">
<label class="muted">Booking Amount</label>
<input type="text" class="form-control" v-model="parameters.bookingAmount">
<validation-wrapper-component :validator="$v.fix_amount">
<label class="muted">Booking Amount ({{parameters.fixed_currency.short_code}})</label>
<input type="text" class="form-control" v-model="fix_amount" v-money="money">
</validation-wrapper-component>
</div>
</div>
@@ -26,7 +26,7 @@
<div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
</div>
<div class="col p-l-5">
<div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.account.user.update', $store.getters.getUserId), 'put', section, true, true)">Update</div>
<div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">Update</div>
</div>
</div>
</div>
@@ -35,23 +35,29 @@
</div>
</template>
<script>
import updateProfileFormValidation from '../../../general/mixins/accounts/validation/updateProfileFormValidation';
import { required } from "vuelidate/lib/validators";
// import updateProfileHandler from "../updateProfileHandler";
import FormHandler from '../../../general/mixins/formHandler';
export default {
data(){
return {
error: '',
parameters: {
bookingAmount: ''
}
fix_amount: (Math.round((this.data.amount + Number.EPSILON) * 100) / 100).toFixed(2),
}
},
validations: {
parameters: {
bookingAmount: { required },
}
fix_amount: { required },
},
// mixins: [updateProfileFormValidation]
methods: {
submitForm(){
this.parameters = {fix_amount: this.fix_amount},
this.submit(this.route('api.booking.booking_amount.update', this.data.id), 'put', this.section, true, true)
},
successHandler(){
this.closeModal();
this.formHandler('');
},
},
mixins: [FormHandler]
}
</script>
+2
View File
@@ -25,6 +25,8 @@ Route::group(['prefix' => 'booking', 'as' => 'booking.', 'namespace' => 'Booking
Route::post('{id}/purchase_order/verification', 'ApprovePurchaseOrderController@approve')->name('po.approval');
Route::put('{id}/updateAmount', 'UpdateBookingAmountController@update')->name('booking_amount.update');
Route::post('/merge', 'MergeBookingController@merge')->name('merge');
});