diff --git a/app/Classes/General/Abstracts/AbstractRule.php b/app/Classes/General/Abstracts/AbstractRule.php
index d2e0568b..8a9b6f86 100644
--- a/app/Classes/General/Abstracts/AbstractRule.php
+++ b/app/Classes/General/Abstracts/AbstractRule.php
@@ -27,7 +27,7 @@ abstract class AbstractRule
     public function passes(?DataTransferObject $object = null): bool {
         try {
             if(!$this->authorized()){
-                throw new AccessForbiddenException('You don\'t have permission to preform this action');
+                throw new AccessForbiddenException('You don\'t have permission to perform this action');
             }
 
             $this->validators($object);
@@ -36,7 +36,7 @@ abstract class AbstractRule
             return true;
 
         } catch(AccessForbiddenException $exception){
-            throw new AccessForbiddenException('You don\'t have permission to preform this action');
+            throw new AccessForbiddenException('You don\'t have permission to perform this action');
         } catch(\Exception $exception){
             throw new RequestValidationException($exception->getMessage());
         }
diff --git a/app/Classes/General/Interfaces/Remarkable.php b/app/Classes/General/Interfaces/Remarkable.php
new file mode 100644
index 00000000..dcbd94ce
--- /dev/null
+++ b/app/Classes/General/Interfaces/Remarkable.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+interface Remarkable
+{
+
+    public function remarks(): morphMany;
+
+}
\ No newline at end of file
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
index 171b4360..a8df7fce 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
@@ -14,12 +14,14 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Transactions\Services\CreatesTransaction;
 use App\Classes\Modules\Transactions\Services\FetchesTransaction;
 use App\Classes\Modules\Bookings\Services\FetchesBookingQuotation;
+use App\Classes\Modules\Remarks\DataTransferObjects\RemarkObject;
 use App\Classes\Modules\Transactions\ControllersLogic\UpdateRefundTransactionStatusLogic;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
 use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionRefundCalculationObject;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\Modules\Remarks\Processors\CreateRemarkProcessor;
 
 class CreateBookingRefundLogic extends AbstractControllerLogic
 {
@@ -52,6 +54,9 @@ class CreateBookingRefundLogic extends AbstractControllerLogic
     /** @var UpdateRefundTransactionStatusLogic */
     private $updateRefundTransactionStatusLogic;
 
+    /** @var CreateRemarkProcessor */
+    private $createRemarkProcessor;
+
     /**
      * CreateBookingPaymentLogic constructor.
      * @param FetchesBookingQuotation $fetchBookingQuotation
@@ -60,8 +65,9 @@ class CreateBookingRefundLogic extends AbstractControllerLogic
      * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
      * @param CreatesTransaction $createsTransaction
      * @param UpdateRefundTransactionStatusLogic $updateRefundTransactionStatusLogic
+     * @param CreateRemarkProcessor $createRemarkProcessor
      */
-    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, UpdateRefundTransactionStatusLogic $updateRefundTransactionStatusLogic)
+    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesTransaction $fetchesTransaction, UpdatesTransactionStatus $updatesTransactionStatus, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, UpdateRefundTransactionStatusLogic $updateRefundTransactionStatusLogic, CreateRemarkProcessor $createRemarkProcessor)
     {
         $this->fetchBookingQuotation = $fetchBookingQuotation;
         $this->fetchesTransaction = $fetchesTransaction;
@@ -69,6 +75,7 @@ class CreateBookingRefundLogic extends AbstractControllerLogic
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
         $this->createsTransaction = $createsTransaction;
         $this->updateRefundTransactionStatusLogic = $updateRefundTransactionStatusLogic;
+        $this->createRemarkProcessor = $createRemarkProcessor;
     }
 
     /**
@@ -132,6 +139,11 @@ class CreateBookingRefundLogic extends AbstractControllerLogic
 
         }
 
+        if($request->input('refundRemark')){
+            $remarkObject = new RemarkObject($request->input('refundRemark'), Auth()->user()->id);
+            $this->createRemarkProcessor->execute($this->fetchesTransaction->execute(['id' => $refund_transaction->id]), $remarkObject);
+        }
+
         return $this->resourceResponse(new TransactionResource($refund_transaction));
     }
 
diff --git a/app/Classes/Modules/Exports/Services/ExportsWhiteFormTransactions.php b/app/Classes/Modules/Exports/Services/ExportsWhiteFormTransactions.php
new file mode 100644
index 00000000..78579fc1
--- /dev/null
+++ b/app/Classes/Modules/Exports/Services/ExportsWhiteFormTransactions.php
@@ -0,0 +1,99 @@
+<?php
+
+namespace App\Classes\Modules\Exports\Services;
+
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Models\Group;
+use Maatwebsite\Excel\Concerns\Exportable;
+use Maatwebsite\Excel\Concerns\FromQuery;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Maatwebsite\Excel\Concerns\WithHeadingRow;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Illuminate\Http\Request;
+use Carbon\Carbon;
+
+class ExportsWhiteFormTransactions implements FromQuery, WithHeadings, WithHeadingRow, WithMapping, ShouldAutoSize
+{
+    use Exportable;
+
+    private $request;
+
+    public function __construct(Request $request)
+    {
+        $this->request = $request;
+    }
+
+    public function headings(): array
+    {
+        return [
+            'Bank Name',
+            'Bank Details',
+            'Bank Acc No.',
+            'Order amount',
+            'Booking Reference',
+        ];
+    }
+
+    /**
+     * @return \Illuminate\Support\Collection|mixed
+     */
+    public function query()
+    {
+        $start_date = $this->request->input('startDate', null);
+        if ($start_date) {
+            $start_date = Carbon::parse($this->request->input('startDate'))->format('Y-m-d');
+        }
+
+        $end_date = $this->request->input('endDate', null);
+        if ($end_date) {
+            $end_date = Carbon::parse($this->request->input('endDate'))->format('Y-m-d');
+        }
+
+        $query = Group::query();
+
+        // todo-new: confirm this
+        // $query->where('type', ::PAYMENT)->where('payment_method', '!=', PaymentMethodType::WALLET);
+        // $query->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED]);
+
+        if ($start_date && $end_date) {
+            $query->whereBetween('created_at', [
+                Carbon::parse($start_date)->format('Y-m-d 0:00:00'),
+                Carbon::parse($end_date)->format('Y-m-d 23:59:59')
+            ]);
+        } elseif ($start_date && !$end_date) {
+            $query->where('created_at', '>=',  Carbon::parse($start_date)->format('Y-m-d 0:00:00'));
+        } elseif (!$start_date && $end_date) {
+            $query->where('created_at', '<=', Carbon::parse($end_date)->format('Y-m-d 23:59:59'));
+        }
+
+        return $query;
+    }
+
+    /**
+     * @param Company $group
+     *
+     * @return array
+     */
+    public function map($group): array
+    {
+        $supplier = $group->issuerCompany;
+        $supplerBank = $supplier->banks->first();
+
+        $bank_name = $supplerBank->bank_name;
+        $holder_name = $supplerBank->holder_name;
+        $account_no = $supplerBank->account_no;
+
+        $bookingReference = $group->transactions()->get()->pluck('owner.owner.marking')->toArray();
+
+        return [
+            $bank_name,
+            $holder_name,
+            $account_no,
+            $group->amount,
+            implode(",", $bookingReference)
+        ];
+    }
+}
diff --git a/app/Classes/Modules/Remarks/Standards/Rules/CanCreateRemark.php b/app/Classes/Modules/Remarks/Standards/Rules/CanCreateRemark.php
index a7d2e5b1..fc51178f 100644
--- a/app/Classes/Modules/Remarks/Standards/Rules/CanCreateRemark.php
+++ b/app/Classes/Modules/Remarks/Standards/Rules/CanCreateRemark.php
@@ -26,7 +26,7 @@ class CanCreateRemark extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
diff --git a/app/Classes/Modules/Remarks/Standards/Rules/CanDeleteRemark.php b/app/Classes/Modules/Remarks/Standards/Rules/CanDeleteRemark.php
index 1c61ac9d..7ddece31 100644
--- a/app/Classes/Modules/Remarks/Standards/Rules/CanDeleteRemark.php
+++ b/app/Classes/Modules/Remarks/Standards/Rules/CanDeleteRemark.php
@@ -13,7 +13,7 @@ class CanDeleteRemark extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
diff --git a/app/Classes/Modules/Remarks/Standards/Rules/CanFetchRemark.php b/app/Classes/Modules/Remarks/Standards/Rules/CanFetchRemark.php
index 31ae8301..6642611c 100644
--- a/app/Classes/Modules/Remarks/Standards/Rules/CanFetchRemark.php
+++ b/app/Classes/Modules/Remarks/Standards/Rules/CanFetchRemark.php
@@ -13,7 +13,7 @@ class CanFetchRemark extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
diff --git a/app/Classes/Modules/Remarks/Standards/Rules/CanListRemarks.php b/app/Classes/Modules/Remarks/Standards/Rules/CanListRemarks.php
index b1372049..4911a53b 100644
--- a/app/Classes/Modules/Remarks/Standards/Rules/CanListRemarks.php
+++ b/app/Classes/Modules/Remarks/Standards/Rules/CanListRemarks.php
@@ -13,7 +13,7 @@ class CanListRemarks extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
diff --git a/app/Classes/Modules/Remarks/Standards/Rules/CanUpdateRemark.php b/app/Classes/Modules/Remarks/Standards/Rules/CanUpdateRemark.php
index f6fd6587..8a8c10e8 100644
--- a/app/Classes/Modules/Remarks/Standards/Rules/CanUpdateRemark.php
+++ b/app/Classes/Modules/Remarks/Standards/Rules/CanUpdateRemark.php
@@ -26,7 +26,7 @@ class CanUpdateRemark extends AbstractRule
     /**
      * @return bool
      */
-    protected function authorized($object): bool
+    protected function authorized(): bool
     {
         // TODO  Set Authorization rules
         return true;
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/UpdateGroupTransferFeeLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/UpdateGroupTransferFeeLogic.php
new file mode 100644
index 00000000..b4cd4d02
--- /dev/null
+++ b/app/Classes/Modules/Transactions/ControllersLogic/UpdateGroupTransferFeeLogic.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
+use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Http\Resources\GroupResource;
+use App\Classes\Modules\Transactions\Services\FetchesGroup;
+use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\PaymentMethodType;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Models\Transaction;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateGroupTransferFeeLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Group Transfer Fee',
+            'message' => 'You have successfully updated transfer fee for this Group Transaction'
+        ];
+    }
+
+    /** @var FetchesGroup */
+    private $fetchesGroup;
+
+    /** @var CreatesTransaction */
+    private $createsTransaction;
+
+    /** @var GeneratesTransactionBillNumber */
+    private $generatesTransactionBillNumber;
+
+    /**
+     * UpdateGroupTransferFeeLogic constructor.
+     * @param FetchesGroup $fetchesGroup
+     * @param CreatesTransaction $createsTransaction
+     * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
+     */
+    public function __construct(FetchesGroup $fetchesGroup, CreatesTransaction $createsTransaction, GeneratesTransactionBillNumber $generatesTransactionBillNumber)
+    {
+        $this->fetchesGroup = $fetchesGroup;
+        $this->createsTransaction = $createsTransaction;
+        $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $group = $this->fetchesGroup->execute(['id' => $request->route('id')]);
+        $supplier = $group->issuerCompany;
+        $fee = $request->input('fee');
+
+        $transfer_fee = $group->morphTransactions()->where('type', TransactionType::TRANSFER_FEE)->first();
+
+        if ($transfer_fee) {
+            $transfer_fee->amount = $fee;
+            $transfer_fee->original_amount = $fee;
+            $transfer_fee->save();
+        } else {
+            $transferFeeNumber = $this->generatesTransactionBillNumber->execute('TRFR-');
+            $object = new TransactionObject($transferFeeNumber, TransactionType::TRANSFER_FEE, 1, $supplier->id,
+                $supplier->banks()->where('default', true)->first()->id, PaymentMethodType::CASH,
+                $fee, $fee, $group->original_currency_id, $group->original_currency_id,
+                1, 0, 0, null, ApprovalStatus::APPROVED);
+
+            $model = new Transaction();
+            $model->bill_no = $object->getBillNo();
+            $model->type = $object->getTransactionType();
+            $model->issuer = $object->getIssuer();
+            $model->receiver = $object->getReceiver();
+            $model->recipient_bank_account_id = $object->getRecipientBankAccountId();
+            $model->payment_method = $object->getPaymentMethod();
+            $model->amount = $object->getAmount();
+            $model->original_amount = $object->getOriginalAmount();
+            $model->currency_id = $object->getCurrencyId();
+            $model->original_currency_id = $object->getOriginalCurrencyId();
+            $model->currency_rate = $object->getCurrencyRate();
+            $model->tax = $object->getTax();
+            $model->service_charge = $object->getServiceCharge();
+            $model->expires_on = $object->getExpiresOn();
+            $model->status = $object->getStatus();
+            $model->payment_reference = $object->getPaymentReference();
+
+            $group->morphTransactions()->save($model);
+        }
+
+        return $this->resourceResponse(new GroupResource($group));
+    }
+
+}
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php
index cc98847a..771113c5 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/UpdateRefundTransactionStatusLogic.php
@@ -100,7 +100,7 @@ class UpdateRefundTransactionStatusLogic extends AbstractControllerLogic
 
         $booking = $paymentTransaction->owner;
 
-        $reference = $refundTransaction->amount == $paymentTransaction->amount ? 'Fully Refund for Ref. ' . $booking->marking : 'Partially Refund for Ref. ' . $booking->marking;
+        $reference = $refundTransaction->amount - $paymentTransaction->amount < 0.01 ? 'Fully Refund for Ref. ' . $booking->marking : 'Partially Refund for Ref. ' . $booking->marking;
 
         $refundAmount = $this->calculatesBookingRefundAmount->calculateRefundAmount($paymentTransaction, $booking->fix_currency_id);
 
@@ -111,10 +111,10 @@ class UpdateRefundTransactionStatusLogic extends AbstractControllerLogic
             $po_transaction = $booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first();
 
             if ($po_transaction) {
-                $this->updatesTransactionStatus->execute($po_transaction, (float) number_format($po_transaction->amount, 2, '.', '')  === (float) number_format((float)$booking->fix_amount - $refundAmount, 2, '.', '') ? ApprovalStatus::PENDING_VERIFICATION : ApprovalStatus::PENDING_SUBMISSION);
+                $this->updatesTransactionStatus->execute($po_transaction, (float) number_format($po_transaction->amount, 2, '.', '')  === (float) number_format((float)$booking->fix_amount - $refundTransaction->original_amount, 2, '.', '') ? ApprovalStatus::PENDING_VERIFICATION : ApprovalStatus::PENDING_SUBMISSION);
             }
 
-            $request['fix_amount'] = $booking->fix_amount - $refundAmount;
+            $request['fix_amount'] = $booking->fix_amount - $refundTransaction->original_amount;
             $request->route()->setParameter('id', $booking->id);
             $this->updateBookingAmountLogic->execute($request);
         }
diff --git a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
index 0f351c7d..7e484c6c 100644
--- a/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
+++ b/app/Http/Controllers/Exports/ExportCustomersToExcelController.php
@@ -19,6 +19,7 @@ use App\Classes\Modules\Exports\Services\ExportsImportedInvoiceMappeds;
 use App\Models\TransactionMappingLog;
 use App\Classes\Modules\Exports\Services\ExportsReceiptTransactions;
 use App\Classes\Modules\Exports\Services\ExportsImportedReceiptMappeds;
+use App\Classes\Modules\Exports\Services\ExportsWhiteFormTransactions;
 
 class ExportCustomersToExcelController
 {
@@ -54,6 +55,13 @@ class ExportCustomersToExcelController
         return $response;
     }
 
+    public function whiteFormTransactions(Request $request){
+        $exportsTransactions = new ExportsWhiteFormTransactions($request);
+        $response = $exportsTransactions->download('white-form-transactions.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
+        ob_end_clean();
+        return $response;
+    }
+
     public function walletTransactions(Request $request){
         $exportsTransactions = new ExportsWalletTransactions($request);
         $response = $exportsTransactions->download('wallet-transactions.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']);
diff --git a/app/Http/Controllers/Transactions/UpdateGroupTransferFeeController.php b/app/Http/Controllers/Transactions/UpdateGroupTransferFeeController.php
new file mode 100644
index 00000000..948dff39
--- /dev/null
+++ b/app/Http/Controllers/Transactions/UpdateGroupTransferFeeController.php
@@ -0,0 +1,20 @@
+<?php
+
+
+namespace App\Http\Controllers\Transactions;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Transactions\ControllersLogic\UpdateGroupTransferFeeLogic;
+
+class UpdateGroupTransferFeeController
+{
+    /**
+     * @param Request $request
+     * @param DeleteGroupTransactionLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateGroupTransferFeeLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Resources/GroupResource.php b/app/Http/Resources/GroupResource.php
index abd017ec..fdddd195 100644
--- a/app/Http/Resources/GroupResource.php
+++ b/app/Http/Resources/GroupResource.php
@@ -21,6 +21,13 @@ class GroupResource extends JsonResource
      */
     public function toArray($request)
     {
+        $transfer_fee = $this->morphTransactions()->where('type', TransactionType::TRANSFER_FEE)->first();
+
+        if ($transfer_fee) {
+            $transfer_fee = (float) $transfer_fee->amount;
+        } else {
+            $transfer_fee = 0;
+        }
 
         if(!$this->issuerCompany){
             dd($this->id);
@@ -36,6 +43,7 @@ class GroupResource extends JsonResource
             'currency' => new CurrencyResource($this->currency),
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y h:i:s A'),
             'currency_rate' => (float) $this->currency_rate,
+            'transfer_fee' => $transfer_fee,
             'transactions' => $this->transactions()->get()->pluck('owner.owner.marking'),
             'complete_transactions' => $this->transactions()->whereHasMorph('owner', [Transaction::class], function($query){
                 return $query->whereHas('booking', function($query){
diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index b431c854..d259d777 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -53,6 +53,7 @@ class TransactionResource extends JsonResource
                 'value' => $days->gt(Carbon::now()) ? '+' : '-',
                 'duration' => $days->diff(Carbon::now())->format('%d'),
             ],
+            'remarks' => RemarkResource::collection($this->remarks),
             'redemption' => new VoucherRedemptionResource($this->voucherRedemption)
         ];
     }
diff --git a/app/Models/Group.php b/app/Models/Group.php
index 8cb6cd8a..2b8cceae 100644
--- a/app/Models/Group.php
+++ b/app/Models/Group.php
@@ -21,6 +21,14 @@ class Group extends Model implements Documentable
         return $this->belongsToMany(Transaction::class, GroupTransaction::class);
     }
 
+    /**
+     * @return MorphMany
+     */
+    public function morphTransactions(): MorphMany
+    {
+        return $this->MorphMany(Transaction::class, 'owner');
+    }
+
     /**
      * @return MorphMany
      */
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index aba5decc..31b67e69 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use App\Classes\General\Interfaces\Documentable;
+use App\Classes\General\Interfaces\Remarkable;
 use App\Classes\General\Interfaces\Transactionable;
 use App\Classes\General\Interfaces\Voucherifiable;
 use App\Classes\General\Traits\LogData;
@@ -21,7 +22,7 @@ use Staudenmeir\EloquentHasManyDeep\HasTableAlias;
 use App\Models\StatementTransactionOwner;
 
 
-class Transaction extends AbstractModel implements Documentable, Transactionable, Voucherifiable
+class Transaction extends AbstractModel implements Documentable, Transactionable, Voucherifiable, Remarkable
 {
     use HasTableAlias;
     use SoftDeletes;
diff --git a/resources/assets/vue/components/bookings/elements/BillGroupComponent.vue b/resources/assets/vue/components/bookings/elements/BillGroupComponent.vue
index e93eb1ad..9a309cde 100644
--- a/resources/assets/vue/components/bookings/elements/BillGroupComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/BillGroupComponent.vue
@@ -216,6 +216,12 @@
                                                     {{ group.currency.short_code }} {{formatAmount(group.amount)}}
                                                 </div>
                                             </div>
+                                            <div class="col-2">
+                                                <div class="font-heading fs-12 muted all-caps">Transfer Fee</div>
+                                                <div class="font-heading fs-12">
+                                                    {{ group.original_currency.short_code }} {{formatAmount(group.transfer_fee)}}
+                                                </div>
+                                            </div>
                                             <div class="col-auto">
                                                 <div class="font-heading fs-12 muted all-caps">PO Completion</div>
                                                 <div class="col">
diff --git a/resources/assets/vue/components/bookings/elements/DownloadBillingWithDatesComponent.vue b/resources/assets/vue/components/bookings/elements/DownloadBillingWithDatesComponent.vue
index 99be4562..2d89690e 100644
--- a/resources/assets/vue/components/bookings/elements/DownloadBillingWithDatesComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/DownloadBillingWithDatesComponent.vue
@@ -16,6 +16,12 @@
                                 <date-picker-component :parameters="parameters" v-model.lazy="parameters.endDate"></date-picker-component>
                             </validation-wrapper-component>
                         </div>
+                        <div class="col-12 col-md mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
+                            <validation-wrapper-component selectable :validator="$v.parameters.reportType">
+                                <label class="all-caps">Report Type</label>
+                                <select-component :options="['Payments Report', 'Wallets Report', 'White Form Report']" v-model="parameters.reportType"></select-component>
+                            </validation-wrapper-component>
+                        </div>
                         <div class="col-12 col-md-auto p-l-3 p-r-3 p-md-0">
                             <div class="btn btn-lg btn-primary fs-11 w-100 h-100 d-flex justify-content-center align-items-center" @click="downloadReport()">
                                 <span>
@@ -46,9 +52,20 @@ export default {
             parameters: {
                 startDate: '',
                 endDate: '',
+                reportType: '',
             },
         }
     },
+    mounted(){
+        switch(this.section) {
+            case 'paymentsReportSection':
+                this.parameters.reportType = 'Payments Report'
+                break;
+            case 'walletsReportSection':
+                this.parameters.reportType = 'Wallets Report'
+                break;
+        }
+    },
     validations: {
         parameters: {
             startDate: {
@@ -57,19 +74,25 @@ export default {
             endDate: {
                 required
             },
+            reportType: {
+                required
+            },
         }
     },
     methods: {
         downloadReport(){
             var apiRoute = '';
             if(!this.validate()){ return; }
-            switch(this.section) {
-                case 'paymentsReportSection':
+            switch(this.parameters.reportType) {
+                case 'Payments Report':
                     apiRoute = route('paymentTransactions.export');
                     break;
-                case 'walletsReportSection':
+                case 'Wallets Report':
                     apiRoute = route('walletTransactions.export');
                     break;
+                case 'White Form Report':
+                    apiRoute = route('whiteFormTransactions.export');
+                    break;
             }
             window.open(apiRoute + '?startDate=' + this.parameters.startDate + '&endDate=' + this.parameters.endDate, '_blank');
         },
diff --git a/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue b/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
index 827557ea..cbf8bd48 100644
--- a/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/DownloadSupplierWhiteFormComponent.vue
@@ -4,25 +4,25 @@
             <div class="row">
                 <div class="col-12">
                     <div class="row m-l-0 m-r-0">
-                        <div class="col mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
+                        <div class="col-12 col-md mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
                             <validation-wrapper-component selectable :validator="$v.parameters.supplier">
                                 <label>Supplier</label>
                                 <selectable-component :disableOnFetch="true" :endpoint="route('api.company.list')  + '?filters=' + JSON.stringify({'business_type': 3, 'status_in': [1, 2, 0]})" section="exportSupplierFilterSection" valueColumn="id" :labelColumn="['name']" v-model="parameters.supplier"></selectable-component>
                             </validation-wrapper-component>
                         </div>
-                        <div class="col mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
+                        <div class="col-12 col-md mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
                             <validation-wrapper-component :validator="$v.parameters.startDate">
                                 <label class="all-caps">Start Date</label>
                                 <date-picker-component :parameters="parameters" v-model.lazy="parameters.startDate"></date-picker-component>
                             </validation-wrapper-component>
                         </div>
-                        <div class="col mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
+                        <div class="col-12 col-md mb-2 mb-md-0 p-l-3 p-r-3 p-md-0">
                             <validation-wrapper-component :validator="$v.parameters.endDate">
                                 <label class="all-caps">End Date</label>
                                 <date-picker-component :parameters="parameters" v-model.lazy="parameters.endDate"></date-picker-component>
                             </validation-wrapper-component>
                         </div>
-                        <div class="col-auto p-l-3 p-r-3 p-md-0">
+                        <div class="col-12 col-md-auto p-l-3 p-r-3 p-md-0">
                             <div class="btn btn-lg btn-primary fs-11 w-100 h-100 d-flex justify-content-center align-items-center" @click="bulkDownloadWhiteForm()">
                                 <span>
                                     Export
diff --git a/resources/assets/vue/components/bookings/elements/EditTransferFeeFormComponent.vue b/resources/assets/vue/components/bookings/elements/EditTransferFeeFormComponent.vue
new file mode 100644
index 00000000..bb82964a
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/EditTransferFeeFormComponent.vue
@@ -0,0 +1,79 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <h5 class="all-caps m-b-5 bold no-margin">Edit Transaction Group Fee</h5>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col p-r-0">
+                            <validation-wrapper-component :validator="$v.parameters.fee">
+                                <label class="all-caps">Transfer Fee</label>
+                                <input type="text" class="form-control" v-model.lazy="parameters.fee" v-money="{decimal: '.',thousands: ',', precision: 2}">
+                            </validation-wrapper-component>
+                        </div>
+                        <div class="col-auto b-r b-t b-b b-grey">
+                            <div class="row h-100 align-items-center">
+                                <div class="col">
+                                    <div class="font-heading fs-10 muted">CNY</div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">Update</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import { required } from "vuelidate/lib/validators";
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+
+    export default {
+        props: {
+            transfer_fee:{
+                type: Number,
+                required: true
+            },
+            id: {
+                type: Number,
+                required: true
+            }
+        },
+        data(){
+            return {
+                error: '',
+                parameters: {
+                    fee: (Math.round((this.transfer_fee + Number.EPSILON) * 100) / 100).toFixed(2)
+                },
+            }
+        },
+        validations: {
+            parameters: {
+                fee: { },
+            },
+        },
+        methods: {
+            submitForm() {
+                this.submit(route('api.transaction.group.fee.update', this.id), 'put', this.section, true, true);
+            }
+        },
+        mixins: [ModalFormHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
index 33cc6db5..bd7d89ca 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
@@ -332,6 +332,14 @@
                                     <div class="font-heading fs-10 bold" :class="[{'text-warning': refund.status === 1}, {'text-success': refund.status === 2}, {'text-danger': refund.status === 4}]">{{ refund.status === 1 ? 'Pending Verification' : refund.status === 2 ? 'Approved' : 'Rejected'}}</div>
                                 </div>
                             </div>
+                            <div class="col-auto" v-if="$store.getters.isAdmin">
+                                <span class="btn requestModal no-border" size="large" data-type="chatmodal">
+                                    <i class="fa fa-comment-o"></i>
+                                </span>
+                                <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="chatmodal">
+                                    <remark-component :section="section" :data="refund" module_type="Transaction"></remark-component>
+                                </modal-component>
+                            </div>
                             <div class="col text-right">
                                 <div class="font-heading fs-10 muted all-caps">Amount</div>
                                 <div class="font-heading fs-10">
diff --git a/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue b/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue
index c87122a5..3470891a 100644
--- a/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/RefundConfirmationComponent.vue
@@ -35,6 +35,14 @@
                     </div>
                 </div>
             </div>
+            <div class="row m-t-5 m-b-5">
+                <div class="col">
+                    <validation-wrapper-component :validator="$v.refundRemark">
+                        <label>Refund Remarks</label>
+                        <input class="form-control" name="amount" v-model="refundRemark" >
+                    </validation-wrapper-component>
+                </div>
+            </div>
             <div class="row m-t-10 m-b-10">
                 <div class="col">
                     <div class="font-heading all-caps fs-10 m-b-5">Paid Amount: {{ paidAmount }}</div>
@@ -71,6 +79,7 @@ export default {
     data() {
         return {
             refundAmount: (Math.round((this.data.original_amount - this.data.refunded_amount + Number.EPSILON) * 100) / 100).toFixed(2),
+            refundRemark: '',
             refundMethod: { name: 'Fully Refund', status: false },
             refundMethods: [
                 { name: 'Fully Refund', label: 'Full Refund' },
@@ -82,7 +91,8 @@ export default {
         return {
             refundAmount: {
                 maxValue: maxValue(this.refundMaxValue)
-            }
+            }, 
+            refundRemark: {}
         }
     },
     computed: {
@@ -96,6 +106,7 @@ export default {
     methods: {
         submitForm() {
             this.parameters.amount = this.refundAmount;
+            this.parameters.refundRemark = this.refundRemark;
             this.submit(this.route('api.booking.refund.create', this.data.booking.id, this.data.id), 'post', this.section, true, true)
         },
         updateRefundType(refund) {
diff --git a/resources/assets/vue/components/bookings/elements/TransactionGroupPaymentComponent.vue b/resources/assets/vue/components/bookings/elements/TransactionGroupPaymentComponent.vue
index 7fdd579f..2696ceb5 100644
--- a/resources/assets/vue/components/bookings/elements/TransactionGroupPaymentComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/TransactionGroupPaymentComponent.vue
@@ -36,6 +36,12 @@
                                 {{item.original_currency.short_code}} {{(Math.round((item.original_amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
                             </div>
                         </div>
+                        <div class="col-auto">
+                            <div class="font-heading fs-10 muted all-caps">Transfer Fee</div>
+                            <div class="font-heading fs-10">
+                                {{item.original_currency.short_code}} {{(Math.round((item.transfer_fee + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+                            </div>
+                        </div>
                         <div class="col text-right">
                             <div class="font-heading fs-10 muted all-caps">Amount</div>
                             <div class="font-heading fs-14 text-success bold">
@@ -75,6 +81,18 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="col-auto">
+                            <div class="row parentContainer">
+                                <div class="col p-l-0">
+                                    <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="editTransactionGroup">
+                                        Edit Transfer Fee
+                                    </button>
+                                    <modal-component small type="editTransactionGroup">
+                                        <edit-transfer-fee-form-component :section="section" :transfer_fee="item.transfer_fee" :id="item.id"></edit-transfer-fee-form-component>
+                                    </modal-component>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                     <div class="row" v-if="expanded">
                         <div class="col">
diff --git a/resources/assets/vue/components/general/elements/RemarkComponent.vue b/resources/assets/vue/components/general/elements/RemarkComponent.vue
index f2f9bf30..4825c088 100644
--- a/resources/assets/vue/components/general/elements/RemarkComponent.vue
+++ b/resources/assets/vue/components/general/elements/RemarkComponent.vue
@@ -3,17 +3,34 @@
         <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 padding-30" v-show="!isLoading"> -->
-            <div class="row justify-content-center"  v-show="!isLoading">
-
+            <div class="row justify-content-center flex-column bg-white rounded padding-30" v-show="!isLoading">
+                <h4 class="m-b-20">Remarks</h4>
                 <div class="col">
                     <div class="row" v-for="remark in data.remarks">
                         <div class="col">
                             <remark-list-component :section="section" :data="remark"></remark-list-component>
                         </div>
                     </div>
+                    <div class="row align-items-center justify-content-center p-t-50 p-b-50" v-if="!data.remarks.length">
+                        <div class="col-10">
+                            <div class="row align-items-center justify-content-center  hint-text">
+                                <div class="col-4 hint-text">
+                                    <img src="/images/not-found-illustration.png" class="w-100 hint-text" />
+                                </div>
+                            </div>
+                            <div class="row text-center">
+                                <div class="col">
+                                    <div class="row m-t-20">
+                                        <div class="col">
+                                            <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Nothing To Show Here Yet!</p>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                     <remark-comment-form-component :section="section" :module_type="module_type" :id="data.id"></remark-comment-form-component>
                 </div>
-            
             </div>
         </div>
     </div>
diff --git a/resources/assets/vue/components/general/elements/RemarkListComponent.vue b/resources/assets/vue/components/general/elements/RemarkListComponent.vue
index da218ea9..85d8a6a8 100644
--- a/resources/assets/vue/components/general/elements/RemarkListComponent.vue
+++ b/resources/assets/vue/components/general/elements/RemarkListComponent.vue
@@ -41,12 +41,12 @@
             <div class="row">
                 <div class="col">
                     <p v-if="!isEdit">{{item.content}}</p>
-                    <container-comment-form-component :section="section" :data="item" :id="item.owner_id" v-on:submit="isEdit=false" v-if="isEdit"></container-comment-form-component>
+                    <remark-comment-form-component :section="section" :data="item" :id="item.owner_id" v-on:submit="isEdit=false" v-if="isEdit" module_type="Transaction"></remark-comment-form-component>
                 </div>
             </div>
 
             <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteComment">
-                <delete-container-comment-form-component :section="section" :data="item"></delete-container-comment-form-component>
+                <delete-remark-form-component :section="section" :data="item"></delete-remark-form-component>
             </modal-component>
         </div>  
     </div>
diff --git a/resources/assets/vue/components/general/forms/RemarkCommentFormComponent.vue b/resources/assets/vue/components/general/forms/RemarkCommentFormComponent.vue
index 7da26ca8..ed35250c 100644
--- a/resources/assets/vue/components/general/forms/RemarkCommentFormComponent.vue
+++ b/resources/assets/vue/components/general/forms/RemarkCommentFormComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="row m-t-5">
+    <div class="row m-t-5" @keyup.enter="submitForm">
         <div class="col">
             <validation-wrapper-component :validator="$v.parameters.content">
                 <input type="text" class="form-control fs-12" placeholder="Write your comments..." v-model.trim="parameters.content">
@@ -48,6 +48,10 @@
             submitForm() {
                 this.submit(this.data ? this.route('api.remark.update', this.data.id) : this.route('api.remark.create', this.id), this.data ? 'put' : 'post', this.section, true, true);
                 this.$emit('submit')
+            },
+            successHandler(response){
+                this.parameters.content = '';
+                this.closeModal();
             }
         },
         mixins: [modalFormHandler]
diff --git a/routes/transaction.php b/routes/transaction.php
index d20d160d..654b3fb8 100644
--- a/routes/transaction.php
+++ b/routes/transaction.php
@@ -32,6 +32,7 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
         Route::get('/list', 'ListGroupsController@list')->name('list');
         Route::delete('/{id}/delete', 'DeleteGroupController@delete')->name('delete');
         Route::put('/{id}/update', 'UpdateGroupController@update')->name('update');
+        Route::put('/{id}/update/fee', 'UpdateGroupTransferFeeController@update')->name('fee.update');
         Route::post('/{id}/approve', 'CreateBulkPurchaseOrderDocumentController@aprove')->name('approve');
         Route::post('/bulk/po', 'CreateBulkPurchaseOrderDocumentController@create')->name('bulk.po');
 
diff --git a/routes/web.php b/routes/web.php
index 861f5bdf..e797557a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -220,12 +220,6 @@ Route::post('/support', function (Request $request) {
 
 Route::get('/online_payment/redirect', 'Billplz\CallbackBillplzController@callback')->name('online_payment.redirect');
 
-Route::get('/export/customers/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@export');
-Route::get('/export/transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@transactions');
-Route::get('/export/analytic/booking', 'Exports\ExportAnalyticToExcelController@bookingData');
-Route::get('/export/analytic/bills', 'Exports\ExportAnalyticToExcelController@billingData');
-Route::get('/export/customers/leads', 'Exports\ExportCustomersToExcelController@leadsData')->name('leads.export');
-
 Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsProducts $exportsProducts) {
     return $exportsProducts->download('products.csv', Excel::CSV, ['Content-Type' => 'text/csv']);
 })->name('products.random');
@@ -287,12 +281,16 @@ Route::get('/export/customers/f614e339d7058904a831aad742e24d55', 'Exports\Export
 Route::get('/export/transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@transactions');
 Route::get('/export/null-debtor/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@nullDebtor')->name('newDebtor.export');
 Route::get('/export/payment-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@paymentTransactions')->name('paymentTransactions.export');
+Route::get('/export/white-form-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@whiteFormTransactions')->name('whiteFormTransactions.export');
 Route::get('/export/wallet-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@walletTransactions')->name('walletTransactions.export');
 Route::get('/export/booking-transactions', 'Exports\ExportCustomersToExcelController@bookingTransactions')->name('export.transactions.booking');
 Route::get('/export/invoice-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@invoiceTransactions')->name('invoiceTransactions.export');
 Route::get('/export/receipt-transactions/f614e339d7058904a831aad742e24d55', 'Exports\ExportCustomersToExcelController@receiptTransactions')->name('receiptTransactions.export');
 Route::get('/export/imported-invoice-mapped', 'Exports\ExportCustomersToExcelController@importedInvoiceMapped')->name('importedInvoiceMapped.export');
 Route::get('/export/imported-receipt-mapped', 'Exports\ExportCustomersToExcelController@importedReceiptMapped')->name('importedReceiptMapped.export');
+Route::get('/export/analytic/booking', 'Exports\ExportAnalyticToExcelController@bookingData');
+Route::get('/export/analytic/bills', 'Exports\ExportAnalyticToExcelController@billingData');
+Route::get('/export/customers/leads', 'Exports\ExportCustomersToExcelController@leadsData')->name('leads.export');
 
 Route::get('/products', function (\App\Classes\Modules\Exports\Services\ExportsProducts $exportsProducts) {
     $bookings = Booking::where(function($query){