Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into cross-login

app/Classes/Modules/Bookings/ControllersLogic/CancelBookingLogic.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\ControllersLogic;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\Modules\Bookings\Services\CancelsBooking;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Http\Resources\BookingResource;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Bookings\Services\FetchesBooking;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CancelBookingLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Cancel Booking',
+            'message' => 'You have successfully canceled the Booking'
+        ];
+    }
+
+
+    /** @var FetchesBooking */
+    private $fetchesBooking;
+
+    /** @var CancelsBooking */
+    private $cancelsBooking;
+
+    /**
+     * CancelBookingLogic constructor.
+     * @param FetchesBooking $fetchesBooking
+     * @param CancelsBooking $cancelsBooking
+     */
+    public function __construct(FetchesBooking $fetchesBooking, CancelsBooking $cancelsBooking)
+    {
+        $this->fetchesBooking = $fetchesBooking;
+        $this->cancelsBooking = $cancelsBooking;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $booking = $this->fetchesBooking->execute(['id' => $request->route('id')]);
+
+        $bookingActivePayments = $booking->transactions()->where('type', '=', TransactionType::PAYMENT)->whereIn('status', [ApprovalStatus::PENDING_VERIFICATION, ApprovalStatus::APPROVED])->get();
+
+        if(count($bookingActivePayments)){
+            throw new MalformedRequestException('You can\'t cancel an order with active payments');
+        }
+
+        $this->cancelsBooking->execute($booking);
+
+        return $this->resourceResponse(new BookingResource($booking));
+    }
+
+}

app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundCreditNoteLogic.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\ControllersLogic;
+
+
+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\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\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;
+
+class CreateBookingRefundCreditNoteLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Create Refund Booking',
+            'message' => 'You have successfully created a refund booking'
+        ];
+    }
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var FetchesCompanyPaymentAttemptLimit */
+    private $fetchesCompanyPaymentAttemptLimit;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /**
+     * CreateBookingPaymentLogic constructor.
+     * @param FetchesTransaction $fetchesTransaction
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CreatesTransaction $createsTransaction
+     */
+    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction)
+    {
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsTransaction = $createsTransaction;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $booking = Booking::find($request->route('id'));
+
+        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('payment_id')]);
+        
+        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::REFUNDED);
+
+        $paymentAttemptLimit = $this->fetchesCompanyPaymentAttemptLimit->execute($booking->company);
+
+        $billNumber = $this->generatesTransactionBillNumber->execute('CDTN-');
+        
+        $object = new TransactionObject($billNumber, TransactionType::CREDIT_NOTE, 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);
+
+        $transaction = $this->createsTransaction->execute($booking, $object);
+
+        return $this->resourceResponse(new TransactionResource($transaction));
+    }
+
+
+}

app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\ControllersLogic;
+
+
+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\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\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;
+
+class CreateBookingRefundLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Create Refund Booking',
+            'message' => 'You have successfully created a refund booking'
+        ];
+    }
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var UpdatesTransactionStatus */
+    private $updatesTransactionStatus;
+
+    /** @var FetchesCompanyPaymentAttemptLimit */
+    private $fetchesCompanyPaymentAttemptLimit;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /**
+     * CreateBookingPaymentLogic constructor.
+     * @param FetchesTransaction $fetchesTransaction
+     * @param UpdatesTransactionStatus $updatesTransactionStatus
+     * @param FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     * @param CreatesTransaction $createsTransaction
+     */
+    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction)
+    {
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->updatesTransactionStatus = $updatesTransactionStatus;
+        $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+        $this->createsTransaction = $createsTransaction;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $booking = Booking::find($request->route('id'));
+
+        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('payment_id')]);
+        
+        $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::REFUNDED);
+
+        $paymentAttemptLimit = $this->fetchesCompanyPaymentAttemptLimit->execute($booking->company);
+
+        $billNumber = $this->generatesTransactionBillNumber->execute('RFD-');
+        
+        $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);
+
+        $transaction = $this->createsTransaction->execute($booking, $object);
+
+        return $this->resourceResponse(new TransactionResource($transaction));
+    }
+
+
+}

app/Classes/Modules/Bookings/ControllersLogic/RestoreBookingLogic.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\ControllersLogic;
+
+use App\Classes\Modules\Bookings\Services\CancelsBooking;
+use App\Classes\Modules\Bookings\Services\RestoresBooking;
+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\CanDeleteBooking;
+use App\Classes\Modules\Bookings\Services\DeletesBooking;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RestoreBookingLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Restore Booking',
+            'message' => 'You have successfully restored the Booking'
+        ];
+    }
+
+    /** @var CanDeleteBooking */
+    private $canDeleteBooking;
+
+    /** @var FetchesBooking */
+    private $fetchesBooking;
+
+    /** @var RestoresBooking */
+    private $restoresBooking;
+
+    /**
+     * RestoreBookingLogic constructor.
+     * @param CanDeleteBooking $canDeleteBooking
+     * @param FetchesBooking $fetchesBooking
+     * @param RestoresBooking $restoresBooking
+     */
+    public function __construct(CanDeleteBooking $canDeleteBooking, FetchesBooking $fetchesBooking, RestoresBooking $restoresBooking)
+    {
+        $this->canDeleteBooking = $canDeleteBooking;
+        $this->fetchesBooking = $fetchesBooking;
+        $this->restoresBooking = $restoresBooking;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $booking = $this->fetchesBooking->execute(['id' => $request->route('id')]);
+
+        $this->restoresBooking->execute($booking);
+
+        return $this->resourceResponse(new BookingResource($booking));
+    }
+
+}

app/Classes/Modules/Bookings/Services/CalculatesBookingRefundAmount.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Services;
+
+
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Booking;
+use Carbon\Carbon;
+
+class CalculatesBookingRefundAmount
+{
+
+    public function execute(Booking $booking){
+        return $booking->transactions()->refunds()->complete()->sum('original_amount');
+    }
+
+}

app/Classes/Modules/Bookings/Services/CancelsBooking.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Booking;
+
+class CancelsBooking extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Booking $model
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Booking $model) {
+
+        $model->status = ApprovalStatus::SUSPENDED;
+
+        return $this->handler($model);
+    }
+}

app/Classes/Modules/Bookings/Services/RestoresBooking.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Booking;
+
+class RestoresBooking extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Booking $model
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Booking $model) {
+
+        $model->status = ApprovalStatus::APPROVED;
+
+        return $this->handler($model);
+    }
+}

app/Classes/Modules/Bookings/Standards/Rules/CanDeleteBooking.php

@@ -34,7 +34,7 @@ class CanDeleteBooking extends AbstractRule
 
 
     /**
-     * @param BookingObject $object
+     * @param $object
      * @return bool
      */
     protected function criteria($object): bool

app/Classes/ValueObjects/Constants/ApprovalStatus.php

@@ -18,4 +18,5 @@ final class ApprovalStatus {
 
     public const EXPIRED = 6;
 
+    public const REFUNDED = 7;
 }

app/Classes/ValueObjects/Constants/TransactionType.php

@@ -22,4 +22,5 @@ final class TransactionType {
 
     public const SUPPLIER_DELIVER = 8;
 
+    public const CREDIT_NOTE = 9;
 }

app/Http/Controllers/Bookings/CancelBookingController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\CancelBookingLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CancelBookingController
+{
+    /**
+     * @param Request $request
+     * @param CancelBookingLogic $logic
+     * @return JsonResponse
+     */
+    public function cancel(Request $request, CancelBookingLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Http/Controllers/Bookings/CreateBookingRefundController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\CreateBookingRefundLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateBookingRefundController
+{
+    /**
+     * @param Request $request
+     * @param CreateBookingRefundLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateBookingRefundLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/Bookings/CreateBookingRefundCreditNoteController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\CreateBookingRefundCreditNoteLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateBookingRefundCreditNoteController
+{
+    /**
+     * @param Request $request
+     * @param CreateBookingRefundCreditNoteLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateBookingRefundCreditNoteLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}

app/Http/Controllers/Bookings/RestoreBookingController.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\RestoreBookingLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RestoreBookingController
+{
+    /**
+     * @param Request $request
+     * @param RestoreBookingLogic $logic
+     * @return JsonResponse
+     */
+    public function restore(Request $request, RestoreBookingLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}

app/Models/Transaction.php

@@ -84,6 +84,15 @@ class Transaction extends AbstractModel implements Documentable
         return $query->where('type', TransactionType::BILL);
     }
 
+    /**
+     * @param Builder $query
+     * @return Builder
+     */
+    public function scopeRefunds(Builder $query)
+    {
+        return $query->where('type', TransactionType::REFUND);
+    }
+
 
     /**
      * @param Builder $query

resources/assets/vue/components/bookings/elements/BookingComponent.vue

@@ -52,17 +52,26 @@
                 Pending...
             </div>
         </div>
-        <div class="col-2 p-r-5">
+        <div class="col-2 p-r-5 parentContainer">
             <div class="row align-items-center">
                 <div class="col-auto ml-auto">
-                    <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal hide" data-type="deleteBank">
-                        <i class="fa fa-times fa-fw"></i>
-                    </button>
+                    <div class="btn btn-xs btn-default b-rad-none requestModal" v-if="item.status !== 5 && item.paid_amount === 0 && item.floating_amount === 0 && $store.getters.isAdmin" data-type="cancelBooking">
+                        <i class="fa fa-fw fa-times text-danger"></i>
+                    </div>
+                    <div class="btn btn-xs btn-default b-rad-none requestModal" v-if="item.status === 5 && item.paid_amount === 0 && item.floating_amount === 0 && $store.getters.isAdmin" data-type="restoreBooking">
+                        <i class="fa fa-fw fa-history text-success"></i>
+                    </div>
                     <a class="btn btn-xs btn-info b-rad-none" :href="route('booking.details', item.marking)">
                         <i class="fa fa-angle-right fa-fw"></i>
                     </a>
                 </div>
             </div>
+            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="cancelBooking">
+                <cancel-booking-form-component :data="item" section="oderList" class="text-center"></cancel-booking-form-component>
+            </modal-component>
+            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="restoreBooking">
+                <restore-booking-form-component :data="item" section="oderList" class="text-center"></restore-booking-form-component>
+            </modal-component>
         </div>
     </div>
 </template>
@@ -70,6 +79,11 @@
 <script>
     import componentHandler from '../../../general/mixins/componentHandler';
     export default {
+        data(){
+            return {
+                expanded: false
+            }
+        },
         mixins: [componentHandler]
     }
 </script>

resources/assets/vue/components/bookings/forms/CancelBookingFormComponent.vue

@@ -0,0 +1,40 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to cancel this order?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.booking.cancel', item.id), 'put', section, true, true)">Confirm</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        mixins: [componentHandler, ModalFormHandler],
+        methods: {
+            successHandler(){
+                this.closeModal();
+                this.$store.dispatch('reloadList', {'name': 'customerTransferListSection'});
+                this.$store.dispatch('reloadList', {'name': 'transferSection'});
+            }
+        }
+
+    }
+</script>

resources/assets/vue/components/bookings/forms/RestoreBookingFormComponent.vue

@@ -0,0 +1,40 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to restore this order?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default 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.booking.restore', item.id), 'put', section, true, true)">Restore</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        mixins: [componentHandler, modalFormHandler],
+        methods: {
+            successHandler(){
+                this.closeModal();
+                this.$store.dispatch('reloadList', {'name': 'customerTransferListSection'});
+                this.$store.dispatch('reloadList', {'name': 'transferSection'});
+            }
+        }
+
+    }
+</script>

resources/views/pages/settings.blade.php

@@ -515,7 +515,7 @@
             <div class="col-4 p-r-0">
                 <div class="row">
                     <div class="col">
-                        <div class="row tabsContainer">
+                        <div class="row tabsContainer" v-if="$store.getters.isAdmin">
                             <div class="col">
                                 <div class="row m-l-0 m-r-0 d-none d-md-flex">
                                     <div class="col" v-if="$store.getters.isAdmin">
@@ -570,7 +570,7 @@
                                         <div class="row tabsContainer tabContent" tab-name="customer-list" v-if="$store.getters.isAdmin">
                                             <company-quick-view-section-component></company-quick-view-section-component>
                                         </div>
-                                        <div class="row tabsContainer tabContent" v-bind:class="{ hide: $store.getters.isAdmin }" v-else tab-name="announcement-list">
+                                        <div class="row tabsContainer tabContent hide" tab-name="announcement-list">
                                             <announcement-quick-view-section-component></announcement-quick-view-section-component>
                                         </div>
                                         <div class="row tabsContainer hide tabContent" tab-name="PO">

routes/booking.php

@@ -7,6 +7,8 @@ Route::group(['prefix' => 'booking', 'as' => 'booking.', 'namespace' => 'Booking
     Route::get('/list', 'ListBookingsController@list')->name('list');
     Route::post('/create', 'CreateBookingController@create')->name('create');
     Route::put('/update/{id}', 'UpdateBookingController@update')->name('update');
+    Route::put('/cancel/{id}', 'CancelBookingController@cancel')->name('cancel');
+    Route::put('/restore/{id}', 'RestoreBookingController@restore')->name('restore');
     Route::delete('/delete/{id}', 'DeleteBookingController@delete')->name('delete');
 
     Route::group(['prefix' => '{id}/payment', 'as' => 'payment.'], function () {
@@ -16,6 +18,11 @@ Route::group(['prefix' => 'booking', 'as' => 'booking.', 'namespace' => 'Booking
         Route::put('/{payment_id}/approval/{status}', 'ApprovePaymentVerificationController@approve')->where('status', 'approve|reject')->name('approval');
     });
 
+    Route::group(['prefix' => '{id}/refund', 'as' => 'refund.'], function () {
+        Route::post('{payment_id}/create', 'CreateBookingRefundController@create')->name('create');
+        Route::post('{payment_id}/credit_note/create', 'CreateBookingRefundCreditNoteController@create')->name('credit_note.create');
+    });
+
     Route::post('{id}/purchase_order/verification', 'ApprovePurchaseOrderController@approve')->name('po.approval');
 
     Route::post('/merge', 'MergeBookingController@merge')->name('merge');