diff --git a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
index 09bc5982..a9b4550d 100644
--- a/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
+++ b/app/Classes/Modules/Transactions/Processors/CreateInvoiceTransactionProcessor.php
@@ -17,6 +17,8 @@ use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+
 use App\Models\Booking;
 use App\Models\Document;
 use Meneses\LaravelLaravelMpdf\Facades\LaravelLaravelMpdf;
@@ -78,6 +80,13 @@ class CreateInvoiceTransactionProcessor
      */
     public function execute(Booking $booking) 
     {
+        $service_type = $booking->service()
+            ->first()
+            ->constants()
+            ->where('reference', SegmentConstants::SERVICE_TYPE)
+            ->first();
+        $is_billable = $service_type->detail->is_billable;
+
         $po_order_transaction = $booking->transactions()
             ->where('type', TransactionType::PURCHASE_ORDER)
             ->whereIn('status', [ApprovalStatus::APPROVED, ApprovalStatus::COMPLETED])
@@ -128,41 +137,45 @@ class CreateInvoiceTransactionProcessor
 
                 $supplier = $this->fetchesCompany->execute(['id' => $transaction->receiver]);
 
-                $purchase_order_pdf = LaravelMpdf::loadView('pages.pdfs.purchase_order', ['invoice_transaction' => $invoice_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
-                $document_object = new DocumentObject(
-                    DocumentType::PURCHASE_ORDER,
-                    [chunk_split('data:application/pdf;base64,'.base64_encode($purchase_order_pdf->output()))],
-                    '',
-                    ApprovalStatus::COMPLETED,
-                    'purchase_orders'
-                );
-                $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
-                $this->createsFile->execute($document, $document_object);
+                if ($is_billable) {
+                    $purchase_order_pdf = LaravelMpdf::loadView('pages.pdfs.purchase_order', ['invoice_transaction' => $invoice_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
+                    $document_object = new DocumentObject(
+                        DocumentType::PURCHASE_ORDER,
+                        [chunk_split('data:application/pdf;base64,'.base64_encode($purchase_order_pdf->output()))],
+                        '',
+                        ApprovalStatus::COMPLETED,
+                        'purchase_orders'
+                    );
+                    $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
+                    $this->createsFile->execute($document, $document_object);
+                }
 
-                $deliver_order_pdf = LaravelMpdf::loadView('pages.pdfs.deliver_order', ['invoice_transaction' => $invoice_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
-                $document_object = new DocumentObject(
-                    DocumentType::DELIVER_ORDER,
-                    [chunk_split('data:application/pdf;base64,'.base64_encode($deliver_order_pdf->output()))],
-                    '',
-                    ApprovalStatus::COMPLETED,
-                    'deliver_orders'
-                );
+                if ($is_billable) {
+                    $deliver_order_pdf = LaravelMpdf::loadView('pages.pdfs.deliver_order', ['invoice_transaction' => $invoice_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
+                    $document_object = new DocumentObject(
+                        DocumentType::DELIVER_ORDER,
+                        [chunk_split('data:application/pdf;base64,'.base64_encode($deliver_order_pdf->output()))],
+                        '',
+                        ApprovalStatus::COMPLETED,
+                        'deliver_orders'
+                    );
 
-                /** @var Document $document */
-                $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
-                $this->createsFile->execute($document, $document_object);
+                    $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
+                    $this->createsFile->execute($document, $document_object);
+                }
 
-
-                $invoice_pdf = LaravelMpdf::loadView('pages.pdfs.invoice', ['invoice_transaction' => $invoice_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
-                $document_object = new DocumentObject(
-                    DocumentType::INVOICE,
-                    [chunk_split('data:application/pdf;base64,'.base64_encode($invoice_pdf->output()))],
-                    '',
-                    ApprovalStatus::COMPLETED,
-                    'invoices'
-                );
-                $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
-                $this->createsFile->execute($document, $document_object);
+                if ($is_billable) {
+                    $invoice_pdf = LaravelMpdf::loadView('pages.pdfs.invoice', ['invoice_transaction' => $invoice_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
+                    $document_object = new DocumentObject(
+                        DocumentType::INVOICE,
+                        [chunk_split('data:application/pdf;base64,'.base64_encode($invoice_pdf->output()))],
+                        '',
+                        ApprovalStatus::COMPLETED,
+                        'invoices'
+                    );
+                    $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
+                    $this->createsFile->execute($document, $document_object);
+                }
 
                 $billNumber = $this->generatesTransactionBillNumber->execute('SPDO-');
 
@@ -187,16 +200,18 @@ class CreateInvoiceTransactionProcessor
                 );
                 $supplier_deliver_order_transaction = $this->createsTransaction->execute($po_order_transaction->booking, $transaction_object);
 
-                $supplier_order_pdf = LaravelMpdf::loadView('pages.pdfs.supplier_deliver_order', ['supplier_deliver_order_transaction' => $supplier_deliver_order_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
-                $document_object = new DocumentObject(
-                    DocumentType::SUPPLIER_DELIVER_ORDER,
-                    [chunk_split('data:application/pdf;base64,'.base64_encode($supplier_order_pdf->output()))],
-                    '',
-                    ApprovalStatus::COMPLETED,
-                    'supplier_deliver_orders'
-                );
-                $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
-                $this->createsFile->execute($document, $document_object);
+                if ($is_billable) {
+                    $supplier_order_pdf = LaravelMpdf::loadView('pages.pdfs.supplier_deliver_order', ['supplier_deliver_order_transaction' => $supplier_deliver_order_transaction, 'po_order_transaction' => $po_order_transaction, 'supplier' => $supplier]);
+                    $document_object = new DocumentObject(
+                        DocumentType::SUPPLIER_DELIVER_ORDER,
+                        [chunk_split('data:application/pdf;base64,'.base64_encode($supplier_order_pdf->output()))],
+                        '',
+                        ApprovalStatus::COMPLETED,
+                        'supplier_deliver_orders'
+                    );
+                    $document = $this->createsDocument->execute($po_order_transaction->booking, $document_object);
+                    $this->createsFile->execute($document, $document_object);
+                }
 
                 $this->updatesBookingStatus->execute($booking, ApprovalStatus::COMPLETED);
             }
diff --git a/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue
index 7772b761..dad284ef 100644
--- a/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/PaymentProofComponent.vue
@@ -37,7 +37,7 @@
                                     </div>
                                 </div>
                                 <div class="col-auto p-l-5 p-r-5 bg-success requestModal pointer" data-type="paymentProofModal">
-                                    <div class="row align-items-center h-100">
+                                    <div @click="selectedID(item.id)" class="row align-items-center h-100">
                                         <div class="col">
                                             <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
                                                  width="30" height="30"
@@ -47,7 +47,7 @@
                                     </div>
                                 </div>
                                 <modal-component type="paymentProofModal">
-                                    <payment-proof-form-component section="paymentProofSection" :id="item.id" :data="item"></payment-proof-form-component>
+                                    <payment-proof-form-component v-if="selected_id == item.id" section="paymentProofSection" :id="item.id" :data="item"></payment-proof-form-component>
                                 </modal-component>
                             </div>
                         </div>
@@ -61,6 +61,16 @@
 <script>
     import componentHandler from '../../../general/mixins/componentHandler';
     export default {
-        mixins: [componentHandler]
+        mixins: [componentHandler],
+        data(){
+            return {
+                selected_id: '',
+            }
+        },
+        methods: {
+            selectedID(id){
+                this.selected_id = id;
+            }
+        }
     }
 </script>