diff --git a/.gitignore b/.gitignore
index a4dfdd60..95d268cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,15 @@ npm-debug.log
 yarn-error.log
 /storage/file
 composer.lock
-yarn.lock
\ No newline at end of file
+yarn.lock
+.DS_Store
+public/.DS_Store
+public/images/.DS_Store
+gox.iml
+rebuild_docker.sh
+docker/*
+db/*
+docker-compose.yml
+package-lock.json
+public/*
+/public/*
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/AbstractDeleteMultipleRecord.php b/app/Classes/General/Eloquent/AbstractDeleteMultipleRecord.php
new file mode 100644
index 00000000..a6d1b493
--- /dev/null
+++ b/app/Classes/General/Eloquent/AbstractDeleteMultipleRecord.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\General\Eloquent;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\QueryException;
+
+abstract class AbstractDeleteMultipleRecord
+{
+
+    /**
+     * @param Builder $query
+     * @param array $ids
+     * @return mixed
+     * @throws MalformedRequestException
+     */
+    public function handler(Builder $query, array $ids){
+        try{
+
+            $record_deleted = $query->whereIn('id',$ids)->delete();
+
+            return ($record_deleted == count($ids)) ? true : false;
+
+        } catch (QueryException|\Exception $exception){
+            throw new MalformedRequestException('Unable to delete the record due to unexpected error');
+        }
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/AbstractUpdateMultipleRecord.php b/app/Classes/General/Eloquent/AbstractUpdateMultipleRecord.php
new file mode 100644
index 00000000..26b89a30
--- /dev/null
+++ b/app/Classes/General/Eloquent/AbstractUpdateMultipleRecord.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\General\Eloquent;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\QueryException;
+
+abstract class AbstractUpdateMultipleRecord
+{
+
+    /**
+     * @param Builder $query
+     * @param array $ids
+     * @param array $values
+     * @return mixed
+     * @throws MalformedRequestException
+     */
+    public function handler(Builder $query, array $ids, array $values){
+        try{
+
+            $record_updated = $query->whereIn('id',$ids)->update($values);
+
+            return ($record_updated == count($ids)) ? true : false;
+
+        } catch (QueryException|\Exception $exception){
+            throw new MalformedRequestException('Unable to update the record due to unexpected error');
+        }
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/ConvertibleCurrencyId.php b/app/Classes/General/Eloquent/Filters/ConvertibleCurrencyId.php
new file mode 100644
index 00000000..3d5701f7
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/ConvertibleCurrencyId.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class ConvertibleCurrencyId implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('convertible_currency_id', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/FixedCurrencyId.php b/app/Classes/General/Eloquent/Filters/FixedCurrencyId.php
new file mode 100644
index 00000000..bd582f82
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/FixedCurrencyId.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class FixedCurrencyId implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('fix_currency_id', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/General/Eloquent/Filters/IdIn.php b/app/Classes/General/Eloquent/Filters/IdIn.php
new file mode 100644
index 00000000..cfe9358e
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/IdIn.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class IdIn implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->whereIn('id', $value);
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/MergeBookingLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/MergeBookingLogic.php
new file mode 100644
index 00000000..70529125
--- /dev/null
+++ b/app/Classes/Modules/Bookings/ControllersLogic/MergeBookingLogic.php
@@ -0,0 +1,146 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Bookings\Services\DeleteMultipleTransaction;
+use App\Classes\Modules\Bookings\Standards\Rules\CanMergeBooking;
+
+use App\Classes\Modules\Bookings\DataTransferObjects\BookingMergeObject;
+use App\Classes\Modules\Bookings\Services\GetBookings;
+use App\Classes\Modules\Bookings\Services\UpdatesBookingTransaction;
+use App\Classes\Modules\Bookings\Services\DeleteMultipleBooking;
+
+use App\Classes\Modules\Transactions\Services\FetchesTransactionDetail;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class MergeBookingLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Merge Booking',
+            'message' => 'You have successfully merged Booking'
+        ];
+    }
+
+    /** @var CanMergeBooking */
+    private $canMergeBooking;
+
+    /** @var GetBookings */
+    private $getBookings;
+
+    /** @var FetchesTransactionDetail */
+    private $fetchesTransactionDetail;
+
+    /** @var UpdatesBookingTransaction */
+    private $updatesBookingTransaction;
+
+    /** @var DeleteMultipleBooking */
+    private $deletesMultipleBooking;
+
+    /** @var DeleteMultipleTransaction */
+    private $deletesMultipleTransaction;
+
+    /**
+     * MergeBookingLogic constructor.
+     * @param CanMergeBooking $canMergeBooking
+     * @param GetBookings $getBookings
+     * @param FetchesTransactionDetail $fetchesTransactionDetail
+     * @param UpdatesBookingTransaction $updatesBookingTransaction
+     * @param DeleteMultipleBooking $deletesMultipleBooking
+     * @param DeleteMultipleTransaction $deletesMultipleTransaction
+     */
+    public function __construct(CanMergeBooking $canMergeBooking, GetBookings $getBookings, FetchesTransactionDetail $fetchesTransactionDetail, UpdatesBookingTransaction $updatesBookingTransaction, DeleteMultipleBooking $deletesMultipleBooking, DeleteMultipleTransaction $deletesMultipleTransaction)
+    {
+        $this->canMergeBooking = $canMergeBooking;
+        $this->getBookings = $getBookings;
+        $this->updatesBookingTransaction = $updatesBookingTransaction;
+        $this->deletesMultipleBooking = $deletesMultipleBooking;
+        $this->deletesMultipleTransaction = $deletesMultipleTransaction;
+        $this->fetchesTransactionDetail = $fetchesTransactionDetail;
+    }
+
+
+    /**
+     * @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
+    {
+        $transaction_amount = null;
+        $transaction_original_amount = null;
+
+        $booking_ids_to_merge = [];
+        $booking_update_values = [];
+
+        $transaction_ids_to_merge = [];
+        $transaction_update_values = [];
+        $transaction_po_delete = [];
+
+        $transaction_details_ids = [];
+        $transaction_details_values = [];
+
+        $booking_object = new BookingMergeObject($request->get('id'),$request->get('booking_ids'));
+
+        $this->canMergeBooking->passes($booking_object);
+
+        $booking_main = $this->getBookings->handler(['id'=> $booking_object->getId()])[0];
+        $bookings_to_merge = $this->getBookings->handler(['id_in'=> $booking_object->getBookingIds()]);
+
+        $booking_amount = $booking_main->fix_amount;
+        $booking_main_transaction = $booking_main->transactions()->first();
+
+        $transaction_amount = $booking_main_transaction->amount;
+        $transaction_original_amount = $booking_main_transaction->original_amount;
+
+        foreach($bookings_to_merge as $booking)
+        {
+            $booking_amount += $booking->fix_amount;
+            $bookings_to_merge_transaction = $booking->transactions()->first();
+
+            $transaction_update_values['booking_id']=$booking_main->id;
+            $transaction_amount += $bookings_to_merge_transaction->amount;
+            $transaction_original_amount += $bookings_to_merge_transaction->original_amount;
+            $transaction_ids_to_merge[]=$bookings_to_merge_transaction->id;
+
+            if($bookings_to_merge_transaction->type==7) {
+                $transaction_po_delete[] = $bookings_to_merge_transaction->id;
+            }
+
+            $booking_ids_to_merge[]=$booking->id;
+
+            foreach($bookings_to_merge_transaction->transactionDetails()->get() as $transaction_detail){
+                $transaction_details_ids[] = $transaction_detail->id;
+                $transaction_details_values['transaction_id'] = $booking_main_transaction->id;
+
+            }
+        }
+
+        $booking_update_values['fix_amount']=$booking_amount;
+
+        //Update all transactions
+        $this->updatesBookingTransaction->execute(
+            $booking_main->id,$booking_update_values,
+            $transaction_ids_to_merge, $transaction_update_values,
+            $transaction_details_ids, $transaction_details_values
+        );
+
+        //Soft delete merged booking
+        $this->deletesMultipleBooking->execute($booking_ids_to_merge);
+
+        //Soft delete merged transaction with status 7 (purchase order)
+        if(count($transaction_po_delete)>0) {
+            $this->deletesMultipleTransaction->execute($transaction_po_delete);
+        }
+
+        return $this->response();
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/DataTransferObjects/BookingMergeObject.php b/app/Classes/Modules/Bookings/DataTransferObjects/BookingMergeObject.php
new file mode 100644
index 00000000..03c90e2e
--- /dev/null
+++ b/app/Classes/Modules/Bookings/DataTransferObjects/BookingMergeObject.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class BookingMergeObject implements DataTransferObject
+{
+
+    /** @var int */
+    private $id;
+
+    /** @var array */
+    private $bookingIds;
+
+    /** @var float */
+    private $bookingAmount;
+
+    /** @var float */
+    private $transactionAmount;
+
+    /**
+     * BookingMergeObject constructor.
+     * @param int $id
+     * @param array $bookingIds
+     */
+    public function __construct(int $id, array $bookingIds)
+    {
+        $this->id = $id;
+        $this->bookingIds = $bookingIds;
+    }
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return array
+     */
+    public function getBookingIds(): array
+    {
+        return $this->bookingIds;
+    }
+
+    /**
+     * @return float
+     */
+    public function getBookingAmount(): float
+    {
+        return $this->bookingAmount;
+    }
+
+    /**
+     * @param float $amount
+     * @return float
+     */
+    public function setBookingAmount(float $amount)
+    {
+        $this->bookingAmount = $amount;
+    }
+
+    /**
+     * @return float
+     */
+    public function getTransactionAmount(): float
+    {
+        return $this->transactionAmount;
+    }
+
+    /**
+     * @param float $amount
+     * @return float
+     */
+    public function setTransactionAmount(float $amount)
+    {
+        $this->transactionAmount = $amount;
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/Services/DeleteMultipleBooking.php b/app/Classes/Modules/Bookings/Services/DeleteMultipleBooking.php
new file mode 100644
index 00000000..f35c14db
--- /dev/null
+++ b/app/Classes/Modules/Bookings/Services/DeleteMultipleBooking.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteMultipleRecord;
+use App\Models\Booking;
+
+class DeleteMultipleBooking extends AbstractDeleteMultipleRecord
+{
+    /**
+     * @param array $ids
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(array $ids) {
+        return $this->handler(Booking::query(), $ids);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/Services/DeleteMultipleTransaction.php b/app/Classes/Modules/Bookings/Services/DeleteMultipleTransaction.php
new file mode 100644
index 00000000..d0d6d206
--- /dev/null
+++ b/app/Classes/Modules/Bookings/Services/DeleteMultipleTransaction.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteMultipleRecord;
+use App\Models\Transaction;
+
+class DeleteMultipleTransaction extends AbstractDeleteMultipleRecord
+{
+    /**
+     * @param array $ids
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(array $ids) {
+        return $this->handler(Transaction::query(), $ids);
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/Services/FetchesBooking.php b/app/Classes/Modules/Bookings/Services/FetchesBooking.php
index b38f5a15..fbb001ff 100644
--- a/app/Classes/Modules/Bookings/Services/FetchesBooking.php
+++ b/app/Classes/Modules/Bookings/Services/FetchesBooking.php
@@ -30,4 +30,5 @@ class FetchesBooking extends AbstractFetchRecord
     {
         return $this->repository->newQuery();
     }
+
 }
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/Services/GetBookings.php b/app/Classes/Modules/Bookings/Services/GetBookings.php
new file mode 100644
index 00000000..b90697ae
--- /dev/null
+++ b/app/Classes/Modules/Bookings/Services/GetBookings.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Services;
+
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\General\Eloquent\AbstractGetRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Booking;
+use Illuminate\Database\Eloquent\Collection;
+
+class GetBookings extends AbstractGetRecord
+{
+
+    /** @var Booking */
+    private $repository;
+
+    /**
+     * FetchesUser constructor.
+     * @param Booking $repository
+     */
+    public function __construct(Booking $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+
+    /**
+     * @param Builder $query
+     * @return Collection
+     * @throws ResourceNotFoundException
+     */
+    public function getResults(Builder $query):Collection
+    {
+        if (!$query->exists()) {
+            throw new ResourceNotFoundException('Unable to find any record based on the criteria provided');
+        }
+
+        return $query->get();
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/Services/UpdatesBookingTransaction.php b/app/Classes/Modules/Bookings/Services/UpdatesBookingTransaction.php
new file mode 100644
index 00000000..d28bdc62
--- /dev/null
+++ b/app/Classes/Modules/Bookings/Services/UpdatesBookingTransaction.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateMultipleRecord;
+use App\Models\Booking;
+use App\Models\Transaction;
+use App\Models\TransactionDetail;
+
+class UpdatesBookingTransaction extends AbstractUpdateMultipleRecord
+{
+    /**
+     * @param int $booking_id
+     * @param array $booking_values
+     * @param array $transaction_ids
+     * @param array $transaction_values
+     * @param array $transaction_detail_ids
+     * @param array $transaction_detail_values
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(int $booking_id, array $booking_values, array $transaction_ids, array $transaction_values, array $transaction_detail_ids, array $transaction_detail_values) {
+
+        $booking_update_success = $this->handler(Booking::query(),[$booking_id],$booking_values);
+        if($booking_update_success) {
+            $booking_update_success = $this->handler(Transaction::query(), $transaction_ids, $transaction_values);
+            $booking_update_success = $this->handler(TransactionDetail::query(), $transaction_detail_ids, $transaction_detail_values);
+        }
+
+        return $booking_update_success;
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/Standards/Criterias/BookingsAreMergeable.php b/app/Classes/Modules/Bookings/Standards/Criterias/BookingsAreMergeable.php
new file mode 100644
index 00000000..f25aa2a8
--- /dev/null
+++ b/app/Classes/Modules/Bookings/Standards/Criterias/BookingsAreMergeable.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Standards\Criterias;
+
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use App\Classes\General\Eloquent\AbstractGetRecord;
+use App\Classes\Modules\Bookings\DataTransferObjects\BookingMergeObject;
+use App\Classes\Modules\Bookings\Services\FetchesBooking;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Booking;
+
+class BookingsAreMergeable
+{
+
+    /** @var Booking */
+    private $repository;
+
+    /**
+     * BookingsAreMergeable constructor.
+     * @param Booking $repository
+     */
+    public function __construct(Booking $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @param BookingMergeObject $object
+     * @return bool
+     * @throws ResourceNotFoundException
+     */
+    public function execute(BookingMergeObject $object){
+
+        $bookingOriginal=$this->repository->where(['id'=> $object->getId(),'status' => ApprovalStatus::APPROVED,])->first();
+        $bookingToMerge=$this->repository->whereIn('id', $object->getBookingIds())
+            ->where([
+                'status' => ApprovalStatus::APPROVED,
+                'service_id' => $bookingOriginal->service_id,
+                'fix_currency_id' => $bookingOriginal->fix_currency_id,
+                'convertible_currency_id' => $bookingOriginal->convertible_currency_id,
+            ])->get();
+
+        if($bookingOriginal===null || $bookingToMerge->count() !== count($object->getBookingIds())){
+            throw new ResourceNotFoundException('The booking doesn\'t exist');
+        }
+        return true;
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/Standards/Rules/CanMergeBooking.php b/app/Classes/Modules/Bookings/Standards/Rules/CanMergeBooking.php
new file mode 100644
index 00000000..f348346e
--- /dev/null
+++ b/app/Classes/Modules/Bookings/Standards/Rules/CanMergeBooking.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Standards\Rules;
+
+use App\Classes\Exceptions\ResourceNotFoundException;
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Bookings\Standards\Criterias\BookingsAreMergeable;
+use App\Classes\Modules\Bookings\DataTransferObjects\BookingMergeObject;
+use App\Classes\Modules\Bookings\DataTransferObjects\BookingObject;
+use App\Classes\Modules\Bookings\Standards\Validators\BookingMergeValidation;
+
+class CanMergeBooking extends AbstractRule
+{
+
+    /** @var BookingMergeValidation */
+    private $bookingMergeValidation;
+
+    /** @var BookingsAreMergeable */
+    private $bookingsAreMergeable;
+
+
+    /**
+     * CanCreateBooking constructor.
+     * @param BookingMergeValidation $bookingMergeValidation
+     * @param BookingsAreMergeable $bookingsAreMergeable
+     */
+    public function __construct(BookingMergeValidation $bookingMergeValidation, BookingsAreMergeable $bookingsAreMergeable)
+    {
+        $this->bookingMergeValidation = $bookingMergeValidation;
+        $this->bookingsAreMergeable = $bookingsAreMergeable;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        return true;
+    }
+
+    /**
+     * @param BookingObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->bookingMergeValidation->validate($object);
+    }
+
+    /**
+     * @param BookingMergeObject $object
+     * @return bool
+     * @throws ResourceNotFoundException
+     */
+    protected function criteria($object): bool
+    {
+        $this->bookingsAreMergeable->execute($object);
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/Standards/Validators/BookingMergeValidation.php b/app/Classes/Modules/Bookings/Standards/Validators/BookingMergeValidation.php
new file mode 100644
index 00000000..8f6bf2a3
--- /dev/null
+++ b/app/Classes/Modules/Bookings/Standards/Validators/BookingMergeValidation.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Classes\Modules\Bookings\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\Bookings\DataTransferObjects\BookingMergeObject;
+use App\Classes\Modules\Bookings\DataTransferObjects\BookingObject;
+
+class BookingMergeValidation extends AbstractValidation
+{
+    /**
+     * @param BookingMergeObject $object
+     * @return array
+     */
+    protected function data($object): array 
+    {
+        return [
+            'id' => $object->getId(),
+            'booking_ids' => $object->getBookingIds()
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array 
+    {
+        return [
+            'id' => 'required|integer',
+            'booking_ids' => 'required|array|min:1',
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array 
+    {
+        return [];
+    }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Bookings/MergeBookingController.php b/app/Http/Controllers/Bookings/MergeBookingController.php
new file mode 100644
index 00000000..40d733a9
--- /dev/null
+++ b/app/Http/Controllers/Bookings/MergeBookingController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Bookings;
+
+use App\Classes\Modules\Bookings\ControllersLogic\MergeBookingLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class MergeBookingController
+{
+    /**
+     * @param Request $request
+     * @param MergeBookingLogic $logic
+     * @return JsonResponse
+     */
+    public function merge(Request $request, MergeBookingLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
\ No newline at end of file
diff --git a/database/seeds/FakeBookingTransactions.php b/database/seeds/FakeBookingTransactions.php
new file mode 100644
index 00000000..08ff95f7
--- /dev/null
+++ b/database/seeds/FakeBookingTransactions.php
@@ -0,0 +1,298 @@
+<?php
+
+use Illuminate\Database\Seeder;
+use App\Classes\ValueObjects\Constants as Constants;
+use App\Models as Models;
+use Illuminate\Support\Facades\DB;
+
+class FakeBookingTransactions extends Seeder
+{
+    /**
+     * Run the database seeds.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        if(App()->environment('local')) {
+            //Add user to map company, and auth user for bookings
+            $email = 'bookmaster@cief.com';
+            $password = 'bo@k!ng$123';
+            $booking_user = [
+                'name' => 'Book Master',
+                'email' => $email,
+                'password' => bcrypt($password),
+                'type' => Constants\RoleTypes::USER,
+                'status' => Constants\ApprovalStatus::APPROVED,
+            ];
+            $user = Models\User::updateOrCreate(['email' => $email], $booking_user);
+            $user_id = $user->id;
+
+            //Add 3 Entity: 2 company + 1 individual
+            $companies = [
+                [
+                    'name' => 'Maersk Line SDN BHD',
+                    'reference' => 'MAERSK-123',
+                    'type' => Constants\CompanyType::COMPANY_BUSINESS,
+                    'business_type' => Constants\BusinessType::FREIGHT_FORWARDER,
+                    'status' => Constants\ApprovalStatus::APPROVED,
+                ],
+                [
+                    'name' => 'Sunrise Importer SDN BHD',
+                    'reference' => 'SSMID-E',
+                    'type' => Constants\CompanyType::COMPANY_BUSINESS,
+                    'business_type' => Constants\BusinessType::IMPORTER,
+                    'status' => Constants\ApprovalStatus::APPROVED,
+                ],
+                [
+                    'name' => 'Han Solo',
+                    'reference' => '880101-14-6541',
+                    'type' => Constants\CompanyType::PERSONAL_BUSINESS,
+                    'business_type' => Constants\BusinessType::IMPORTER,
+                    'status' => Constants\ApprovalStatus::APPROVED,
+                ]
+            ];
+
+            $addresses = [
+                [
+                    'company_id' => null, //fill-up later
+                    'country_id' => 1,
+                    'state_id' => 15,
+                    'district_id' => 402,
+                    'postcode' => '63000',
+                    'street_one' => 'Vertex Tower, Cybersquare,',
+                    'street_two' => 'Jalan Teknorat 6, Cyber 5',
+                    'billing' => 1
+                ]
+            ];
+
+            $contacts = [
+                [
+                    'company_id' => null, //fill-up later
+                    'country_id' => 1,
+                    'reference' => 'main',
+                    'phone' => '0123456789',
+                    'email' => 'email@edomain.com'
+                ]
+            ];
+
+            $banks = [
+                [
+                    'company_id' => null, //fill-up later
+                    'reference' => 'CBB',
+                    'bank_name' => 'Citibank Berhad',
+                    'holder_name' => '', //fill-up later, use company name
+                    'account_no' => '0123456789',
+                    'bank_branch' => 'Menara Citibank Kuala Lumpur',
+                    'swift' => null,
+                    'snap' => null,
+                    'type' => Constants\BankAccountType::EXTERNAL,
+                    'default' => 0,
+                    'status' => 2,
+                    'country_id' => 2,
+                ]
+            ];
+
+            $company_ids = [];
+            $address_ids = [];
+            $contact_ids = [];
+            $bank_ids = [];
+
+            foreach ($companies as $company) {
+                $check = ['name' => $company['name']];
+                $added = Models\Company::updateOrCreate($check, $company);
+                $company_ids[] = $added->id;
+
+                //Add address
+                foreach ($addresses as $address) {
+                    $address['company_id'] = $added->id;
+                    $address['street_one'] = $company['name'] . ", " . $address['street_one'];
+                    $check_address = ['street_one' => $address['street_one']];
+                    $added_address = Models\Address::updateOrCreate($check_address, $address);
+                    $address_ids[$added->id][] = $added_address->id;
+                }
+
+                //Add contact
+                foreach ($contacts as $contact) {
+                    $contact['company_id'] = $added->id;
+                    $contact['reference'] = $company['name'] . ", " . $contact['reference'];
+                    $check_contact = ['reference' => $contact['reference']];
+                    $added_contact = Models\Contact::updateOrCreate($check_contact, $contact);
+                    $contact_ids[$added->id][] = $added_contact->id;
+                }
+
+                //Add bank
+                foreach ($banks as $bank) {
+                    $bank['company_id'] = $added->id;
+                    $bank['reference'] = $company['name'] . ", " . $bank['reference'];
+                    $check_bank = ['reference' => $bank['reference']];
+                    $added_bank = Models\Bank::updateOrCreate($check_bank, $bank);
+                    $bank_ids[$added->id][] = $added_bank->id;
+                }
+
+                //Model employee have issue: Unknown column 'updated_at' in 'field list'
+                DB::table('employees')->updateOrInsert(
+                    ['company_id' => $added->id, 'user_id' => $user_id, 'status' => 2],
+                    ['company_id' => $added->id, 'user_id' => $user_id, 'status' => 2]
+                );
+
+                Models\Document::updateOrCreate(
+                    ['owner_id' => $added->id, 'status' => 2],
+                    [
+                        'owner_type' => 'App\Models\Company',
+                        'owner_id' => $added->id,
+                        'status' => 2,
+                        'document_type' => ($company['type'] == Constants\CompanyType::COMPANY_BUSINESS) ? Constants\DocumentType::SSM_REGISTRATION : Constants\DocumentType::IDENTITY_CARD,
+                        'reference' => $company['reference'],
+                    ]
+                );
+
+               Models\SegmentCompany::updateOrCreate(
+                    ['company_id' => $added->id, 'segment_id' => 1],
+                    ['company_id' => $added->id, 'segment_id' => 1]
+                );
+            }
+
+
+            //Booking, Transactions require auth user
+            $user = new Models\User;
+            $user->email = $email;
+            $user->password = $password;
+            auth()->login($user);
+
+            $bookings = [
+                [
+                    'company_id' => null, //fill-up later
+                    'marking' => null, //fill-up later
+                    'service_id' => 1,
+                    'bank_id' => null, //fill-up later
+                    'fix_amount' => null, //fill-up later
+                    'fix_currency_id' => 2,
+                    'convertible_currency_id' => 2,
+                    'conversion_currency_id' => 1,
+                    'status' => Constants\ApprovalStatus::APPROVED,
+                ],
+            ];
+
+            $transactions = [
+                [
+                    'booking_id' => null, //fill-up later
+                    'type' => null, //fill-up later
+                    'issuer' => null, //fill-up later
+                    'receiver' => 1,
+                    'recipient_bank_account_id' => 1,
+                    'payment_method' => 2,
+                    'payment_reference' => 2,
+                    'bill_no' => null, //fill-up later
+                    'amount' => null, //fill-up later
+                    'original_amount' => null, //fill-up later
+                    'currency_id' => 2,
+                    'original_currency_id' => 2,
+                    'currency_rate' => 1.0,
+                    'tax' => 1.0,
+                    'service_charge' => 0.0,
+                    'expires_on' => null,
+                    'status' => 0,
+                ],
+            ];
+
+            $transaction_details = [
+                [
+                    'transaction_id' => null, //fill-up later
+                    'product_code' => 'MBP15',
+                    'product_name' => 'Macbook Pro 15"',
+                    'quantity' => 2,
+                    'price' => 1000,
+                    'amount' => 2000,
+                ],
+                [
+                    'transaction_id' => null, //fill-up later
+                    'product_code' => 'IP12',
+                    'product_name' => 'iPad Pro 12"',
+                    'quantity' => 2,
+                    'price' => 1000,
+                    'amount' => 2000,
+                ],
+                [
+                    'transaction_id' => null, //fill-up later
+                    'product_code' => 'IMC24',
+                    'product_name' => 'iMac',
+                    'quantity' => 2,
+                    'price' => 1000,
+                    'amount' => 2000,
+                ],
+            ];
+
+            $booking_ids = [];
+            $transaction_ids = [];
+            $transaction_types = [
+                Constants\TransactionType::PAYMENT_ATTEMPT,
+                Constants\TransactionType::PAYMENT,
+                Constants\TransactionType::INVOICE,
+                Constants\TransactionType::BILL,
+                Constants\TransactionType::PERFORMA,
+                Constants\TransactionType::TOP_UP,
+                Constants\TransactionType::REFUND,
+                Constants\TransactionType::PURCHASE_ORDER,
+                Constants\TransactionType::SUPPLIER_DELIVER,
+            ];
+
+            foreach ($company_ids as $company_id) {
+                foreach ($transaction_types as $transaction_type) {
+                    foreach ($bookings as $booking) {
+
+                        $marking = mt_rand(20000, 20100); //Limit marking within 100 for easier to remember
+
+                        $booking['company_id'] = $company_id;
+                        $booking['bank_id'] = $bank_ids[$company_id][0];
+                        $booking['marking'] = $marking;
+                        $fix_amount = [4000,8000];
+                        $booking['fix_amount'] = $fix_amount[array_rand($fix_amount)];;
+                        $booking['created_at'] = date('Y-m-d H:i:s');
+                        $booking['updated_at'] = date('Y-m-d H:i:s');
+
+                        $check_booking = ['marking' => $booking['marking']];
+                        $added_booking = Models\Booking::updateOrCreate($check_booking, $booking);
+                        $booking_ids[] = $added_booking->id;
+                        $booking_id = $added_booking->id;
+
+                        foreach ($transactions as $transaction) {
+
+                            $bill_no = $code = mt_rand(100000001, 999999999);
+
+                            $transaction['booking_id'] = $booking_id;
+                            $transaction['type'] = $transaction_type;
+                            $transaction['issuer'] = $company_id;
+
+                            $transaction['bill_no'] = $bill_no;
+                            $transaction['amount'] = 6000;
+                            $transaction['original_amount'] = 6000;
+
+                            $transaction['created_at'] = date('Y-m-d H:i:s');
+                            $transaction['updated_at'] = date('Y-m-d H:i:s');
+
+                            $check_transaction = ['bill_no' => $transaction['bill_no']];
+                            $added_transaction = Models\Transaction::updateOrCreate($check_transaction, $transaction);
+                            $transaction_ids[] = $added_transaction->id;
+                            $transaction_id = $added_transaction->id;
+
+                            foreach ($transaction_details as $transaction_detail) {
+                                $transaction_detail['transaction_id'] = $transaction_id;
+
+                                $transaction_detail['created_at'] = date('Y-m-d H:i:s');
+                                $transaction_detail['updated_at'] = date('Y-m-d H:i:s');
+
+                                $check_transaction_details = [
+                                    'transaction_id' => $transaction_detail['transaction_id'],
+                                    'product_code' => $transaction_detail['product_code']
+                                ];
+                                Models\TransactionDetail::updateOrCreate($check_transaction_details,
+                                    $transaction_detail);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/resources/assets/vue/components/bookings/elements/BookingMergeModalComponent.vue b/resources/assets/vue/components/bookings/elements/BookingMergeModalComponent.vue
new file mode 100644
index 00000000..83d2e4fd
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/BookingMergeModalComponent.vue
@@ -0,0 +1,80 @@
+<template>
+    <div class="row m-b-10 parentContainer">
+        <div class="col">
+            <div class="row align-items-center">
+                <div class="col p-t-5 p-b-5">
+                    <div class="col text-center">
+                        <div class="row m-b-20">
+                            <div class="col">
+                                <h5 class="all-caps">Merge Transfers</h5>
+                                <div class="fs-11">Are you sure you want to merge? This action is undoable.</div>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col p-r-5">
+                                <div data-dismiss="modal" class="btn btn-sm btn-default bg-master-lighter btn-block b-rad-none">Cancel</div>
+                            </div>
+                            <div class="col p-l-5">
+                                <div data-dismiss="modal" class="btn btn-sm btn-success btn-block b-rad-none" @click="mergeTransfer()">Merge</div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import staticFormHandler from '../../../general/mixins/staticFormHandler'
+    export default {
+        props: {
+            'section' : {
+                type: String,
+                required:true,
+            },
+            'booking': {
+                type: Object,
+                required: true
+            },
+            'bookingToMerge': {
+                type: Array,
+                required: true
+            },
+        },
+        data(){
+            return {
+                parameters:null,
+                isLoading: false,
+            }
+        },
+        methods: {
+            mergeTransfer(){
+
+                this.$root.$emit('setLoading', true);
+
+                let bookings=[];
+                this.bookingToMerge.forEach(function(booking) {
+                    bookings.push(booking.id);
+                });
+                this.parameters = {};
+
+                if(bookings.length>0) {
+                    this.$set(this.parameters, 'id', this.booking.id);
+                    this.$set(this.parameters, 'booking_ids', bookings);
+                    this.submit(route('api.booking.merge'), 'post', this.section, true, true);
+                }
+            },
+            successHandler(){
+                setTimeout(function(marking){
+                    window.location.href = this.route('booking.details', marking);
+                }, 2000, this.booking.marking);
+            },
+            errorHandler() {
+                this.$root.$emit('setLoading', false);
+            },
+        },
+        mixins: [componentHandler, staticFormHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/bookings/elements/BookingMergeableComponent.vue b/resources/assets/vue/components/bookings/elements/BookingMergeableComponent.vue
new file mode 100644
index 00000000..d3ca4c28
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/BookingMergeableComponent.vue
@@ -0,0 +1,82 @@
+<template>
+    <div class="row align-items-center m-b-10 parentContainer">
+        <div class="row w-100 m-0 p-0">
+            <div class="col-auto hide" @click="showPurchaseDetails(item.id)">
+                <div class="hint-text">
+                    <i class="fa fa-plus fs-8 muted hint-text"></i>
+                </div>
+            </div>
+            <div class="col-auto pt-1 pb-0 pr-1">
+                <div class="font-heading fs-12" style="line-height: 0px;">
+                    <input type="checkbox" v-bind:data-id="this.item.id" @change="selectedBookings">
+                </div>
+            </div>
+            <div class="col-auto" :style="minWidth">
+                <div class="font-heading all-caps fs-11">{{this.item.created_at}}</div>
+            </div>
+            <div class="col-auto" :style="minWidth">
+                <div class="font-heading all-caps fs-11 bold">{{this.item.marking}}</div>
+            </div>
+            <div class="col-auto" :style="minWidth">
+                <div class="font-heading fs-11 bold">
+                    <span class="flag-icon fs-11" :class="'flag-icon-'+item.convertible_currency.country.short_code.toLowerCase()"></span> {{this.item.convertible_currency.short_code}}
+                </div>
+            </div>
+            <div class="col-auto" :style="minWidth">
+                <div class="font-heading fs-11">{{this.item.service.name}}</div>
+            </div>
+            <div class="col-auto" :style="minWidth150">
+                <div class="font-heading fs-11 text-success bold" v-if="item.purchase_order!==null">{{formatAmount(this.item.purchase_order.amount)}} {{this.item.purchase_order.original_currency.short_code}}</div>
+            </div>
+            <div class="col-auto" :style="minWidth150">
+                <div class="font-heading fs-11 text-success bold">{{formatAmount(this.item.amount)}} {{this.item.fixed_currency.short_code}}</div>
+            </div>
+        </div>
+
+        <div class="row text-left no-margin bg-white hide" v-if="item.purchase_order!==null" v-for="po in (this.item.purchase_order ? this.item.purchase_order.details : [])" v-bind:key="po.id">
+            <div class="col">
+                <div class="font-heading fs-11 text-success bold">{{po.description}}</div>
+            </div>
+            <div class="col">
+                <div class="font-heading fs-11 text-success bold">{{po.quantity}}</div>
+            </div>
+            <div class="col">
+                <div class="font-heading fs-11 text-success bold">{{po.unit_price}}</div>
+            </div>
+            <div class="col">
+                <div class="font-heading fs-11 text-success bold">{{po.total}}</div>
+            </div>
+        </div>
+    </div>
+
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+                minWidth:{
+                    minWidth:'100px',
+                },
+                minWidth150:{
+                    minWidth:'150px',
+                },
+                selected_id:0,
+            }
+        },
+        methods: {
+            selectedBookings(e) {
+                this.$root.$emit('selectedBookings', e.target, this.item);
+            },
+            showPurchaseDetails(id){
+                console.log(this.selected_id);
+                this.selected_id = id;
+            },
+            formatAmount(amount){
+                return (Math.round((amount + Number.EPSILON) * 100) / 100).toFixed(2)
+            },
+        },
+        mixins: [componentHandler]
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
index ce03bcdb..5e9cc914 100644
--- a/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/PurchaseOrderFormComponent.vue
@@ -111,7 +111,8 @@
                                         <div class="font-heading fs-10">But don't worry you can always merge your transfer orders into one to complete your purchase order successfully and generate your invoice.</div>
                                     </div>
                                 </div>
-                                <button class="btn btn-xs all-caps b-rad-none btn-warning">Merge Transfer Orders</button>
+                                <!--link to merge: route('booking.merge',this.data.marking) -->
+                                <a class="btn btn-xs all-caps b-rad-none btn-warning" href="#">Merge Transfer Orders</a>
                             </div>
                         </div>
                     </div>
diff --git a/resources/assets/vue/components/bookings/sections/BookingMergeSectionComponent.vue b/resources/assets/vue/components/bookings/sections/BookingMergeSectionComponent.vue
new file mode 100644
index 00000000..65abfab2
--- /dev/null
+++ b/resources/assets/vue/components/bookings/sections/BookingMergeSectionComponent.vue
@@ -0,0 +1,245 @@
+<template>
+    <div class="row parentContainer">
+        <div class="col">
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+            <div class="row" v-show="!isLoading" v-if="booking">
+                <div class="col-9">
+                    <div class="row">
+                        <div class="col bg-white p-t-25 p-b-0">
+                            <div class="absolute" style="top: -5px;right: -5px;width: 0px;height: 0px;border-style: solid;border-width: 0px 110px 110px 0px;border-color: transparent rgb(249, 249, 249) transparent transparent;z-index: 2;">
+                                <div @mouseover="bearShowing = true" style="width: 52px;height: 30px;margin-top: 75px;margin-left: 22px;"></div>
+                            </div>
+                            <div class="absolute shadow-sm " style="top: 0px; right: 0px; width: 0px; height: 0px; border-style: solid; border-width: 100px 0px 0px 100px; border-color: transparent transparent transparent rgb(255, 255, 255); z-index: 1;"></div>
+                            <!--<bear-component class="animate__animated animate__slow animate__fadeInDown" v-on:mouseover.native="bearShowing = true" v-on:mouseleave.native="bearShowing = false" v-if="bearShowing"></bear-component>-->
+                            <div class="row align-items-center m-b-0">
+                                <div class="col-auto p-r-0">
+                                    <div class="icon-thumbnail icon-35 bg-transparent">
+                                        <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                             width="35" height="35"
+                                             viewBox="0 0 172 172"
+                                             style=" fill:#000000;"><defs><linearGradient x1="69.875" y1="39.05475" x2="69.875" y2="54.29019" gradientUnits="userSpaceOnUse" id="color-1_L06xtIstZ632_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="69.875" y1="17.09788" x2="69.875" y2="144.1575" gradientUnits="userSpaceOnUse" id="color-2_L06xtIstZ632_gr2"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="69.875" y1="17.09788" x2="69.875" y2="144.1575" gradientUnits="userSpaceOnUse" id="color-3_L06xtIstZ632_gr3"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="69.875" y1="17.09788" x2="69.875" y2="144.1575" gradientUnits="userSpaceOnUse" id="color-4_L06xtIstZ632_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="48.375" y1="17.09788" x2="48.375" y2="144.1575" gradientUnits="userSpaceOnUse" id="color-5_L06xtIstZ632_gr5"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="59.125" y1="17.09788" x2="59.125" y2="144.1575" gradientUnits="userSpaceOnUse" id="color-6_L06xtIstZ632_gr6"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="69.875" y1="17.09788" x2="69.875" y2="144.1575" gradientUnits="userSpaceOnUse" id="color-7_L06xtIstZ632_gr7"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="86" y1="17.09788" x2="86" y2="144.1575" gradientUnits="userSpaceOnUse" id="color-8_L06xtIstZ632_gr8"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient><linearGradient x1="130.34375" y1="17.09788" x2="130.34375" y2="144.1575" gradientUnits="userSpaceOnUse" id="color-9_L06xtIstZ632_gr9"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g><path d="M48.23794,53.75h43.27681c1.40556,0 2.54775,-1.14219 2.54775,-2.55044v-5.65181c0,-1.40556 -1.14219,-2.54775 -2.55044,-2.54775h-43.27412c-1.40825,0 -2.55044,1.14219 -2.55044,2.55044v5.65181c0,1.40556 1.14219,2.54775 2.55044,2.54775z" fill="url(#color-1_L06xtIstZ632_gr1)"></path><rect x="17" y="23" transform="scale(2.6875,2.6875)" width="18" height="2" fill="url(#color-2_L06xtIstZ632_gr2)"></rect><rect x="17" y="28" transform="scale(2.6875,2.6875)" width="18" height="2" fill="url(#color-3_L06xtIstZ632_gr3)"></rect><rect x="17" y="33" transform="scale(2.6875,2.6875)" width="18" height="2" fill="url(#color-4_L06xtIstZ632_gr4)"></rect><rect x="17" y="39" transform="scale(2.6875,2.6875)" width="2" height="3" fill="url(#color-5_L06xtIstZ632_gr5)"></rect><rect x="21" y="39" transform="scale(2.6875,2.6875)" width="2" height="3" fill="url(#color-6_L06xtIstZ632_gr6)"></rect><rect x="25" y="39" transform="scale(2.6875,2.6875)" width="2" height="3" fill="url(#color-7_L06xtIstZ632_gr7)"></rect><path d="M155.875,86c0,-12.01044 -7.92006,-22.20413 -18.8125,-25.63606v-35.7545c0,-2.18494 -1.30075,-4.14144 -3.31369,-4.97456c-1.99681,-0.83044 -4.28387,-0.38431 -5.82381,1.15025l-4.02587,4.0205l-6.78325,-4.95306c-1.892,-1.38675 -4.43706,-1.38944 -6.32906,-0.00269l-7.04125,5.15194l-7.052,-5.14925c-1.88931,-1.38675 -4.43438,-1.38944 -6.32906,-0.00269l-7.04125,5.15194l-7.05469,-5.14925c-1.88931,-1.38675 -4.43437,-1.38944 -6.32906,-0.00269l-7.04125,5.15194l-7.052,-5.14925c-1.88931,-1.38675 -4.43437,-1.38944 -6.32906,-0.00269l-6.77519,4.95306l-4.042,-4.01781c-1.54263,-1.53456 -3.82969,-1.98606 -5.82381,-1.15025c-2.01294,0.83312 -3.31369,2.78962 -3.31369,4.97456v101.70575h-13.4375v13.4375c0,7.40944 6.03075,13.4375 13.4375,13.4375h94.05981c7.40944,-0.00269 13.44019,-6.03075 13.44019,-13.44019v-28.11394c10.89244,-3.43194 18.8125,-13.62562 18.8125,-25.63606zM29.5625,147.8125c-4.44513,0 -8.0625,-3.61738 -8.0625,-8.0625v-8.0625h88.6875v8.0625c0,3.02344 1.00244,5.375 2.69019,8.0625zM131.6875,139.75c0,4.44512 -3.61738,8.0625 -8.0625,8.0625c-4.44512,0 -8.0625,-3.61738 -8.0625,-8.0625v-13.4375h-80.625v-24.1875h-0.00269l-0.02419,-77.53169l4.03663,4.01781c1.88125,1.8705 4.79988,2.09356 6.94987,0.53213l6.7725,-4.95575l7.05469,5.15194c1.89737,1.38406 4.43438,1.37869 6.32637,0l7.04125,-5.15194l7.05738,5.15194c1.89469,1.38137 4.429,1.38137 6.32369,0l7.04394,-5.15194l7.05469,5.15194c1.89737,1.38406 4.43437,1.37869 6.32637,0l7.04125,-5.15194l6.78862,4.95575c2.14194,1.56413 5.06594,1.34106 6.94719,-0.53213l4.01244,-4.00169v34.65263c-0.88419,-0.08869 -1.77912,-0.13706 -2.6875,-0.13706c-14.81888,0 -26.875,12.05613 -26.875,26.875c0,14.81887 12.05612,26.875 26.875,26.875c0.90838,0 1.80331,-0.04838 2.6875,-0.13706zM129,107.5c-11.85456,0 -21.5,-9.64544 -21.5,-21.5c0,-11.85456 9.64544,-21.5 21.5,-21.5c11.85456,0 21.5,9.64544 21.5,21.5c0,11.85456 -9.64544,21.5 -21.5,21.5z" fill="url(#color-8_L06xtIstZ632_gr8)"></path><path d="M140.53744,75.25l-14.22763,14.79469l-6.15975,-6.407l-3.80013,3.95331l6.15975,6.407c1.04812,1.09113 2.42413,1.634 3.80281,1.634c1.37869,0 2.75469,-0.54287 3.80281,-1.634l14.22225,-14.79469z" fill="url(#color-9_L06xtIstZ632_gr9)"></path></g></g></svg>
+                                    </div>
+                                </div>
+                                <div class="col-auto p-l-0">
+                                    <div class="font-heading all-caps fs-12 bold hint-text">Merge Transfer</div>
+                                </div>
+                                <div class="col-12 p-3 p-b-0">
+                                    <p>Merge multiple transfer orders to generate a single invoice for your purchase order</p>
+                                </div>
+                            </div>
+                            <div class="row b-b b-dashed b-grey p-b-0" >
+                                <div class="col-10">
+                                    <div class="row m-b-15">
+                                        <div class="col-auto">
+                                            <div class="font-heading fs-10 muted all-caps">Date</div>
+                                            <div class="font-heading fs-10">
+                                                {{booking.created_at}}
+                                            </div>
+                                        </div>
+                                        <div class="col-auto">
+                                            <div class="font-heading fs-10 muted all-caps">Reference</div>
+                                            <div class="font-heading fs-10">
+                                                {{booking.marking}}
+                                            </div>
+                                        </div>
+                                        <div class="col-auto">
+                                            <div class="font-heading fs-10 muted all-caps">{{booking.company.type === 1 ? 'SSM Registration No.' : 'Identification Card No.'}}</div>
+                                            <div class="font-heading fs-10 text-info">
+                                                {{booking.company.identification.reference}}
+                                            </div>
+                                        </div>
+                                        <div class="col-auto">
+                                            <div class="font-heading fs-10 muted all-caps">Purchase Order Amount</div>
+                                            <div class="font-heading fs-10 text-info" v-if="booking.purchase_order!==null">
+                                                {{formatAmount(booking.purchase_order.amount)}}
+                                            </div>
+                                        </div>
+                                        <div class="col-auto">
+                                            <div class="font-heading fs-10 muted all-caps">Booking Amount</div>
+                                            <div class="font-heading fs-10 text-info">
+                                                {{formatAmount(booking.amount)}}
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col bg-white padding-15">
+                            <div class="row">
+                                <p class="col-auto pull-left">Select Transfer Orders to merge with the order above</p>
+                            </div>
+                            <div class="b-b b-dashed b-grey p-b-25">
+                                <div class="row align-items-center m-b-5 parentContainer">
+                                    <div class="col-auto pl3">
+                                        <div class="font-heading fs-12" style="line-height: 0px;">
+                                            <input type="checkbox" class="hide"/>
+                                        </div>
+                                    </div>
+                                    <div class="col-auto" :style="minWidth">
+                                        <div class="font-heading fs-10 muted all-caps">Created At</div>
+                                    </div>
+                                    <div class="col-auto" :style="minWidth">
+                                        <div class="font-heading fs-10 muted all-caps">Marking</div>
+                                    </div>
+                                    <div class="col-auto" :style="minWidth">
+                                        <div class="font-heading fs-10 muted all-caps">Currency</div>
+                                    </div>
+                                    <div class="col-auto" :style="minWidth">
+                                        <div class="font-heading fs-10 muted all-caps">Type</div>
+                                    </div>
+                                    <div class="col-auto" :style="minWidth150">
+                                        <div class="font-heading fs-10 muted all-caps">P.O. Amount</div>
+                                    </div>
+                                    <div class="col-auto" :style="minWidth150">
+                                        <div class="font-heading fs-10 muted all-caps">Booking Amount</div>
+                                    </div>
+                                </div>
+                                <list-component key="2" section="transferSection" :endpoint="route('api.booking.list')" :options="{per_page: 25, id_not: booking.id, company_id: booking.company_id, status: 2,service_id:booking.service.id,convertible_currency_id:booking.convertible_currency.id,fixed_currency_id:booking.fixed_currency.id,with_transactions:true}">
+                                    <template slot="list" slot-scope="{data}">
+                                        <booking-mergeable-component :data="data"></booking-mergeable-component>
+                                    </template>
+                                </list-component>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-3">
+                    <div class="row m-l-0 m-r-0 m-b-15">
+                        <div class="col bg-danger padding-15">
+                            <div class="text-justify text-white fs-12">
+                                Be cautious when merging multiple transfer orders, double check your reference numbers and the transfer amount before proceeding.
+                                <br/><br/>
+                                Please note that merged transfer orders can't be un-merged.
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row no-margin">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col bg-white padding-15">
+                                    <div class="row" >
+                                        <div class="col">
+                                            <div class="row align-items-end text-complete">
+                                                <div class="col">
+                                                    <div class="font-heading all-caps fs-10">Purchase Order Total Amount:</div>
+                                                </div>
+                                                <div class="col-12 text-left m-t-10 m-b-10">
+                                                    <div class="font-heading fs-12">
+                                                        <span class="bold text-success">{{totalPurchaseAmount}}</span>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <button class="btn btn-xs all-caps b-rad-none btn-success btn-block requestModal" data-type="mergeTransferModal" :class="[{'disabled':!validForSubmit}]">Merge Transfer Orders</button>
+                                                </div>
+                                            </div>
+                                            <modal-component type="mergeTransferModal">
+                                                <booking-merge-modal-component section="bookingDetailSection" :booking="this.booking" :bookingToMerge="this.bookings" :section="section">></booking-merge-modal-component>
+                                            </modal-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import BookingMergeModalComponent from "../elements/BookingMergeModalComponent";
+    export default {
+        components: {BookingMergeModalComponent},
+        props: {
+            marking: {
+                type: Number,
+                required: true
+            }
+        },
+        data(){
+            return {
+                minWidth:{
+                    minWidth:'100px',
+                },
+                minWidth150:{
+                    minWidth:'150px',
+                },
+                section: 'bookingMergeSection',
+                selected_id: '',
+                isLoading: true,
+                booking: null,
+                attention: false,
+                bearShowing: false,
+                bookings:[],
+                parameters:null,
+            }
+        },
+        computed: {
+            pendingQueue () {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            },
+            totalAmount(){
+                return (Math.round((this.booking.amount + Number.EPSILON) * 100) / 100).toFixed(2);
+            },
+            totalPurchaseAmount(){
+
+                let totalPurchase = (this.booking.purchase_order) ? this.booking.purchase_order.amount : 0;
+                this.bookings.forEach(function(booking) {
+                    totalPurchase += (booking.purchase_order ? booking.purchase_order.amount : 0);
+                });
+                return (Math.round((totalPurchase + Number.EPSILON) * 100) / 100).toFixed(2);
+            },
+            validForSubmit(){
+                return (this.bookings.length>0);// && this.totalAmount == this.totalPurchaseAmount);
+            }
+        },
+        watch: {
+            pendingQueue(inComplete){
+                if(inComplete){
+                    this.fetchBooking();
+                }
+            }
+        },
+        created(){
+            this.$store.dispatch('updateListQueue', {'name': this.section});
+        },
+        mounted() {
+            this.$root.$on('selectedBookings', (el, item) => {
+                if (el.checked) {
+                    this.bookings.push(item);
+                } else {
+                    let index = this.bookings.findIndex(b => b.id == el.dataset.id);
+                    if (index > -1) {
+                        this.bookings.splice(index, 1);
+                    }
+                }
+            });
+            this.$root.$on('setLoading', (isLoading) => {
+                this.isLoading = isLoading;
+            });
+        },
+        methods: {
+            fetchBooking(){
+                this.isLoading = true;
+                this.submit(route('api.booking.show', this.marking), 'get', this.section, false, false)
+            },
+            successHandler(response){
+                this.isLoading = false;
+                this.booking = response.payload.data;
+            },
+            errorHandler(){
+                window.location.href = this.route('dashboard');
+            },
+            getAmountClass(){
+                return  this.totalAmount == this.totalPurchaseAmount ? 'text-success' : 'text-danger';
+            },
+            formatAmount(amount){
+              return (Math.round((amount + Number.EPSILON) * 100) / 100).toFixed(2)
+            },
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/resources/assets/vue/components/general/elements/ListComponent.vue b/resources/assets/vue/components/general/elements/ListComponent.vue
index f2e0cfa4..c11278c5 100644
--- a/resources/assets/vue/components/general/elements/ListComponent.vue
+++ b/resources/assets/vue/components/general/elements/ListComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <transition-component group enter-class="animate__animated animate__fadeInUp animate__delay-1 animate__faster p-r-30" leave-class="animate__animated animate__fadeOutDown animate__faster p-r-30" style="min-height: 300px;">
+    <transition-component group enter-class="animate__animated animate__fadeInUp animate__delay-1 animate__faster p-r-30" leave-class="animate__animated animate__fadeOutDown animate__faster p-r-30" style="min-height: 300px;width:100%">
         <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
         <div class="row" key="2" v-show="!$store.getters.isLoading(section)">
             <div class="col">
diff --git a/resources/views/pages/booking_merge.blade.php b/resources/views/pages/booking_merge.blade.php
new file mode 100644
index 00000000..e23db5bd
--- /dev/null
+++ b/resources/views/pages/booking_merge.blade.php
@@ -0,0 +1,8 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <div class="row">
+        <div class="col">
+            <booking-merge-section-component :marking={{$marking}}></booking-merge-section-component>
+        </div>
+    </div>
+@endsection
\ No newline at end of file
diff --git a/routes/booking.php b/routes/booking.php
index 8f60bfb2..6b54ff92 100644
--- a/routes/booking.php
+++ b/routes/booking.php
@@ -17,5 +17,7 @@ Route::group(['prefix' => 'booking', 'as' => 'booking.', 'namespace' => 'Booking
     });
 
     Route::post('{id}/purchase_order/verification', 'ApprovePurchaseOrderController@approve')->name('po.approval');
+    //Temporarily disabled
+    //Route::post('/merge', 'MergeBookingController@merge')->name('merge');
 
 });
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index c3c0c925..eca220e9 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -37,4 +37,6 @@ Route::get('/transfer/{marking}', function ($marking) {
     return view('pages.booking_details', ['marking' => $marking]);
 })->name('booking.details');
 
-
+Route::get('/transfer/merge/{marking}', function ($marking) {
+    return view('pages.booking_merge', ['marking' => $marking]);
+})->name('booking.merge');