diff --git a/app/Classes/Modules/Transactions/ControllersLogic/DeleteTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/DeleteTransactionLogic.php
index 56d24523..7fff74f5 100644
--- a/app/Classes/Modules/Transactions/ControllersLogic/DeleteTransactionLogic.php
+++ b/app/Classes/Modules/Transactions/ControllersLogic/DeleteTransactionLogic.php
@@ -30,7 +30,7 @@ class DeleteTransactionLogic extends AbstractControllerLogic
 
 
     /**
-     * SuspendTransactionLogic constructor.
+     * DeleteTransactionLogic constructor.
      * @param FetchesTransaction $fetchesTransaction
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      */
diff --git a/app/Classes/Modules/Transactions/ControllersLogic/WaiveTransactionLogic.php b/app/Classes/Modules/Transactions/ControllersLogic/WaiveTransactionLogic.php
new file mode 100644
index 00000000..61e48ac0
--- /dev/null
+++ b/app/Classes/Modules/Transactions/ControllersLogic/WaiveTransactionLogic.php
@@ -0,0 +1,65 @@
+<?php
+
+
+namespace App\Classes\Modules\Transactions\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Transactions\DataTransferObjects\WaiveTransactionObject;
+use App\Classes\Modules\Transactions\Services\FetchesTransaction;
+use App\Classes\Modules\Transactions\Services\UpdatesTransactionIsWaived;
+use App\Classes\Modules\Transactions\Standards\Rules\CanWaiveTransaction;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
+
+class WaiveTransactionLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Waive Transaction',
+            'message' => 'You have successfully waived the transaction'
+        ];
+    }
+
+    /** @var FetchesTransaction */
+    private $fetchesTransaction;
+
+    /** @var UpdatesTransactionIsWaived */
+    private $updatesTransactionIsWaived;
+
+    /** @var CanWaiveTransaction */
+    private $canWaiveTransaction;
+
+
+    /**
+     * WaiveTransactionLogic constructor.
+     * @param FetchesTransaction $fetchesTransaction
+     * @param UpdatesTransactionIsWaived $updatesTransactionIsWaived
+     * @param CanWaiveTransaction $canWaiveTransaction
+     */
+    public function __construct(FetchesTransaction $fetchesTransaction, UpdatesTransactionIsWaived $updatesTransactionIsWaived, CanWaiveTransaction $canWaiveTransaction)
+    {
+        $this->fetchesTransaction = $fetchesTransaction;
+        $this->updatesTransactionIsWaived = $updatesTransactionIsWaived;
+        $this->canWaiveTransaction = $canWaiveTransaction;
+    }
+
+
+    public function logic(Request $request) : JsonResponse
+    {
+        $transaction = $this->fetchesTransaction->execute(['id' => $request->route('id')]);
+
+        $object = new WaiveTransactionObject($transaction->id, $transaction->bill_no, $transaction->type, $transaction->status);
+        $this->canWaiveTransaction->passes($object);
+
+        $this->updatesTransactionIsWaived->execute($transaction);
+        Log::info(Auth::user()->email." waive storage invoice charges with bill_no: ".$transaction->bill_no);
+
+        return $this->response([]);
+    }
+}
diff --git a/app/Classes/Modules/Transactions/DataTransferObjects/WaiveTransactionObject.php b/app/Classes/Modules/Transactions/DataTransferObjects/WaiveTransactionObject.php
new file mode 100644
index 00000000..452a75d6
--- /dev/null
+++ b/app/Classes/Modules/Transactions/DataTransferObjects/WaiveTransactionObject.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class WaiveTransactionObject implements DataTransferObject
+{
+
+    /** @var int */
+    private $id;
+
+    /** @var string */
+    private $billNo;
+
+    /** @var int */
+    private $type;
+
+    /** @var int */
+    private $status;
+
+    public function __construct(int $id, string $billNo, int $type, int $status)
+    {
+        $this->id = $id;
+        $this->billNo = $billNo;
+        $this->type = $type;
+        $this->status = $status;
+    }
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getBillNo(): string
+    {
+        return $this->billNo;
+    }
+
+    /**
+     * @return int
+     */
+    public function getType(): int
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return int
+     */
+    public function getStatus(): int
+    {
+        return $this->status;
+    }
+}
diff --git a/app/Classes/Modules/Transactions/Services/UpdatesTransactionIsWaived.php b/app/Classes/Modules/Transactions/Services/UpdatesTransactionIsWaived.php
new file mode 100644
index 00000000..9f9a6ae3
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Services/UpdatesTransactionIsWaived.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Models\Transaction;
+
+class UpdatesTransactionIsWaived extends AbstractUpdateRecord
+{
+
+    /**
+     * @param Transaction $model
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Transaction $model)
+    {
+        $model->is_waived = 1;
+
+        return $this->handler($model);
+    }
+}
diff --git a/app/Classes/Modules/Transactions/Standards/Rules/CanWaiveTransaction.php b/app/Classes/Modules/Transactions/Standards/Rules/CanWaiveTransaction.php
new file mode 100644
index 00000000..5a596acb
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Standards/Rules/CanWaiveTransaction.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Transactions\DataTransferObjects\WaiveTransactionObject;
+use App\Classes\Modules\Transactions\Standards\Validators\WaiveTransactionValidation;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+
+class CanWaiveTransaction extends AbstractRule
+{
+
+    /** @var WaiveTransactionValidation */
+    private $waiveTransactionValidation;
+
+
+    public function __construct(WaiveTransactionValidation $waiveTransactionValidation)
+    {
+        $this->waiveTransactionValidation = $waiveTransactionValidation;
+    }
+
+      /**
+     * @return bool
+     */
+    protected function authorized($object): bool
+    {
+        $user = Auth()->user();
+        if($user){
+            $roleToCheck = Auth()->user()->type;
+            if (in_array($roleToCheck, RoleTypes::ADMIN_ROLES)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * @param WaiveTransactionObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->waiveTransactionValidation->validate($object);
+    }
+
+    /**
+     * @param $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Transactions/Standards/Validators/WaiveTransactionValidation.php b/app/Classes/Modules/Transactions/Standards/Validators/WaiveTransactionValidation.php
new file mode 100644
index 00000000..d7a80ef3
--- /dev/null
+++ b/app/Classes/Modules/Transactions/Standards/Validators/WaiveTransactionValidation.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Classes\Modules\Transactions\Standards\Validators;
+
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\Transactions\DataTransferObjects\WaiveTransactionObject;
+
+class WaiveTransactionValidation extends AbstractValidation
+{
+
+    /**
+     * @param WaiveTransactionObject $object
+     * @return array
+     */
+    protected function data($object): array {
+        return [
+            'id' => $object->getId(),
+            'billNo' => $object->getBillNo(),
+            'type' => $object->getType(),
+            'status' => $object->getStatus(),
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array {
+        return [
+            'id' => 'required',
+            'type' => ['required', 'numeric', 'in:16'], //Only storage invoice (type 16) can be waived
+            'status' => ['required', 'numeric', 'in:2'], //Approve storage invoice only, paid invoice stricly forbidden
+            // 'billNo' => 'required',
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array {
+        return [];
+    }
+
+}
diff --git a/app/Http/Controllers/Transactions/WaiveTransactionController.php b/app/Http/Controllers/Transactions/WaiveTransactionController.php
new file mode 100644
index 00000000..cb36a973
--- /dev/null
+++ b/app/Http/Controllers/Transactions/WaiveTransactionController.php
@@ -0,0 +1,21 @@
+<?php
+
+
+namespace App\Http\Controllers\Transactions;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Classes\Modules\Transactions\ControllersLogic\WaiveTransactionLogic;
+
+
+class WaiveTransactionController
+{
+    /**
+     * @param Request $request
+     * @param WaiveTransactionLogic $logic
+     * @return JsonResponse
+     */
+    public function waive(Request $request, WaiveTransactionLogic $logic) : JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Resources/TransactionWithStorageResource.php b/app/Http/Resources/TransactionWithStorageResource.php
index d9b0822f..d072913a 100644
--- a/app/Http/Resources/TransactionWithStorageResource.php
+++ b/app/Http/Resources/TransactionWithStorageResource.php
@@ -120,6 +120,7 @@ class TransactionWithStorageResource extends JsonResource
             ),
             'remarks' => RemarkResource::collection($this->remarks),
             'storages' => $this->storages ? $this->storages : null, //from middleware
+            'is_waived' => (int) $this->is_waived,
             'expires_on' => Carbon::parse($this->expires_on)->format('d-m-Y h:s:i'),
             'updated_at' => Carbon::parse($this->updated_at)->format('d-m-Y'),
             'created_at' => Carbon::parse($this->created_at)->format('d-m-Y')
diff --git a/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingVariant2Component.vue b/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingVariant2Component.vue
index a8ce2941..dd73291f 100644
--- a/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingVariant2Component.vue
+++ b/resources/assets/vue/components/paymentsBilling/elements/CustomerPaymentsBillingVariant2Component.vue
@@ -68,11 +68,25 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="col-1 p-l-0 p-r-0 d-flex justify-content-center align-items-center" v-if="$store.getters.isAdmin">
+                            <span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" v-if="item.type === 16 && item.is_waived === 0 && item.status === 2" :data-type="'waiveInvoice-' + item.id">
+                                Waive Transaction
+                            </span>
+                            <span class="d-inline-block m-r-15 text-primary bold" v-else-if="item.type === 16 && item.is_waived === 1">
+                                Transaction Waived
+                            </span>
+                            <span class="d-inline-block m-r-15 text-primary bold" v-else>
+                                N/A
+                            </span>
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" v-if="item.type === 16 && item.is_waived === 0 && item.status === 2" :type="'waiveInvoice-' + item.id">
+                                <waive-invoice-form-component :data="item" :section="section"></waive-invoice-form-component>
+                            </modal-component>
+                        </div>
                         <div class="col-1 p-l-0 p-r-0 d-flex justify-content-center align-items-center" v-if="$store.getters.isSuperAdmin">
-                            <span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" data-type="deleteInvoice">
+                            <span class="d-inline-block m-r-15 text-primary bold text-underline pointer requestModal" :data-type="'deleteInvoice-' + item.id">
                                 <i class="fa fa-close"></i>
                             </span>
-                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteInvoice">
+                            <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" :type="'deleteInvoice-' + item.id">
                                 <delete-invoice-form-component :data="item" :section="section"></delete-invoice-form-component>
                             </modal-component>
                         </div>
diff --git a/resources/assets/vue/components/paymentsBilling/forms/WaiveInvoiceFormComponent.vue b/resources/assets/vue/components/paymentsBilling/forms/WaiveInvoiceFormComponent.vue
new file mode 100644
index 00000000..9895bbd1
--- /dev/null
+++ b/resources/assets/vue/components/paymentsBilling/forms/WaiveInvoiceFormComponent.vue
@@ -0,0 +1,30 @@
+<template>
+    <div class="row" @keyup.enter="submitForm">
+        <div class="col bg-white padding-40 b-rad-lg">
+            <div class="row">
+                <div class="col text-center">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h5 class="all-caps">Waive Invoice</h5>
+                            <div class="fs-11">This action cannot be undone. Are you sure you want to waive this invoice (MYR {{(Math.round((data.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}})?</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 class="btn btn-danger w-100 btn-sm" @click="submit(route('api.transaction.waive', data.id), 'post', section, true, true)">Confirm</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import modalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        mixins: [modalFormHandler]
+    }
+</script>
diff --git a/routes/transaction.php b/routes/transaction.php
index 7c2e600f..caa5b6fb 100644
--- a/routes/transaction.php
+++ b/routes/transaction.php
@@ -10,6 +10,7 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
     Route::delete('/delete-payment/{id}', 'DeletePaymentTransactionController@delete')->name('payment.delete');
     Route::put('{id}/status/update/{status}', 'UpdateTransactionStatusController@update')->where('status', 'approve|expire|reject')->name('update');
     route::post('/{invoice_id}/regenerate', 'RegenerateSingleShippingInvoiceTransactionController@regenerate')->name('invoice.regenerate');
+    Route::post('/waive/{id}', 'WaiveTransactionController@waive')->name('waive');
 
     Route::get('wallet/list', 'ListWalletTransactionsController@list')->name('wallet.list');