diff --git a/migrations.py b/migrations.py
index c4ea3fb..1ff6a7b 100644
--- a/migrations.py
+++ b/migrations.py
@@ -267,3 +267,14 @@ async def m018_add_stripe_reader_id(db: Database):
         ALTER TABLE tpos.pos ADD stripe_reader_id TEXT NULL;
     """
     )
+
+
+async def m019_add_receipt_sats_only(db: Database):
+    """
+    Add receipt option to only show sats on bitcoin transactions
+    """
+    await db.execute(
+        """
+        ALTER TABLE tpos.pos ADD only_show_sats_on_bitcoin BOOLEAN DEFAULT true;
+    """
+    )
diff --git a/models.py b/models.py
index 7d4e956..a2c0da4 100644
--- a/models.py
+++ b/models.py
@@ -19,6 +19,7 @@ class CreateTposInvoice(BaseModel):
     memo: str | None = Query(None)
     exchange_rate: float | None = Query(None, ge=0.0)
     details: dict | None = Query(None)
+    notes: dict | None = Query(None)
     inventory: InventorySale | None = Query(None)
     tip_amount: int | None = Query(None, ge=1)
     user_lnaddress: str | None = Query(None)
@@ -63,6 +64,7 @@ class CreateTposData(BaseModel):
     business_name: str | None
     business_address: str | None
     business_vat_id: str | None
+    only_show_sats_on_bitcoin: bool = Query(True)
     fiat_provider: str | None = Field(None)
     stripe_card_payments: bool = False
     stripe_reader_id: str | None = None
@@ -96,6 +98,7 @@ class TposClean(BaseModel):
     business_name: str | None = None
     business_address: str | None = None
     business_vat_id: str | None = None
+    only_show_sats_on_bitcoin: bool = True
     fiat_provider: str | None = None
     stripe_card_payments: bool = False
     stripe_reader_id: str | None = None
diff --git a/services.py b/services.py
index eda5610..ae26b2a 100644
--- a/services.py
+++ b/services.py
@@ -1,7 +1,6 @@
 from typing import Any
 
 import httpx
-
 from lnbits.core.crud import get_wallet
 from lnbits.core.models import User
 from lnbits.helpers import create_access_token
diff --git a/static/components/order-receipt.js b/static/components/order-receipt.js
new file mode 100644
index 0000000..111187c
--- /dev/null
+++ b/static/components/order-receipt.js
@@ -0,0 +1,53 @@
+window.app.component('order-receipt', {
+  name: 'order-receipt',
+  props: ['data', 'type'],
+  data() {},
+  template: `
+    <div class="q-pa-md">
+    <div class="text-center q-mb-xl">
+    <p class='text-subtitle2 text-uppercase'>Order</p>
+    </div>
+    <q-table v-if="data.extra.details.items && data.extra.details.items.length > 0"
+      dense
+      class="q-ma-none"
+      :hide-pagination="true"
+      :rows-per-page-options="[0]"  
+      :rows="data.extra.details.items"
+      class="q-pa-none text-caption"
+      :columns="[
+          { name: 'title', label: 'Item', field: 'title' },
+          { name: 'quantity', label: 'Qty', field: 'quantity' },
+        ]"
+      row-key="title"
+        hide-bottom
+    >
+      <template v-slot:header="props">
+        <q-tr :props="props">
+          <q-th
+            v-for="col in props.cols"
+            :key="col.name"
+            :props="props"
+          >
+            <span class="q-pa-none" v-text="col.label"></span>
+          </q-th>
+        </q-tr>
+      </template>
+      <template v-slot:body="props">
+        <q-tr :props="props">
+          <q-td key="title" :props="props" class="q-pa-none">
+            <div class="text-subtitle2" v-text="props.row.title"></div>
+            <div
+              v-if="props.row.note"
+              class="text-subtitle2 text-italic"
+              v-text="props.row.note"
+            ></div>
+          </q-td>
+          <q-td key="quantity" :props="props" class="q-pa-none">
+            <span class="text-subtitle2 text-no-wrap" v-text="props.row.quantity"></span>
+          </q-td>
+        </q-tr>
+      </template>
+    </q-table>
+  </div>
+    `
+})
diff --git a/static/components/receipt.js b/static/components/receipt.js
index 80dbd68..06e2a5e 100644
--- a/static/components/receipt.js
+++ b/static/components/receipt.js
@@ -46,6 +46,17 @@ window.app.component('receipt', {
     },
     currencyText() {
       return `(${this.currency})`
+    },
+    isBitcoinTransaction() {
+      return !(
+        this.data.extra?.paid_in_fiat ||
+        this.data.extra?.fiat_method ||
+        this.data.extra?.fiat_payment_request
+      )
+    },
+    showBitcoinDetails() {
+      const onlyShowOnBitcoin = this.data.only_show_sats_on_bitcoin !== false
+      return !onlyShowOnBitcoin || this.isBitcoinTransaction
     }
   },
   methods: {
@@ -66,7 +77,9 @@ window.app.component('receipt', {
     <div class="text-center q-mb-xl">
     <p class='text-h6 text-uppercase'>Receipt</p>
     <p class=''><span v-text="formattedDate"></span></p>
-    <p class=''><span v-text="exchangeRateInfo"></span></p>
+    <p class='' v-if="showBitcoinDetails">
+      <span v-text="exchangeRateInfo"></span>
+    </p>
     </div>
     <div v-if=data.business_name>
       <span v-text="data.business_name"></span>
@@ -79,17 +92,53 @@ window.app.component('receipt', {
       <span v-text="data.business_vat_id"></span>
     </div>
     <q-table v-if="data.extra.details.items && data.extra.details.items.length > 0"
+      dense
+      class="q-ma-none"
       :hide-pagination="true"
       :rows-per-page-options="[0]"  
       :rows="data.extra.details.items"
+      class="q-pa-none text-caption"
       :columns="[
           { name: 'title', label: 'Item', field: 'title' },
-          { name: 'formattedPrice', label: 'Unit Price', field: 'formattedPrice', align: 'right' },
-          { name: 'quantity', label: 'Quantity', field: 'quantity' },
+          { name: 'formattedPrice', label: 'Price', field: 'formattedPrice', align: 'right' },
+          { name: 'quantity', label: 'Qty', field: 'quantity' },
         ]"
       row-key="title"
         hide-bottom
     >
+      <template v-slot:header="props">
+        <q-tr :props="props">
+          <q-th
+            v-for="col in props.cols"
+            :key="col.name"
+            :props="props"
+          >
+            <span class="q-pa-none text-subtitle2 text-no-wrap" v-text="col.label"></span>
+          </q-th>
+        </q-tr>
+      </template>
+      <template v-slot:body="props">
+        <q-tr :props="props">
+          <q-td key="title" :props="props" class="q-pa-none">
+            <div class="text-subtitle2" v-text="props.row.title"></div>
+            <div
+              v-if="props.row.note"
+              class="text-subtitle2 text-italic"
+              v-text="props.row.note"
+            ></div>
+          </q-td>
+          <q-td
+            key="formattedPrice"
+            :props="props"
+            class="q-pa-none text-right text-no-wrap"
+          >
+            <span class="text-subtitle2 text-no-wrap" v-text="props.row.formattedPrice"></span>
+          </q-td>
+          <q-td key="quantity" :props="props" class="q-pa-none">
+            <span class="text-subtitle2 text-no-wrap" v-text="props.row.quantity"></span>
+          </q-td>
+        </q-tr>
+      </template>
     </q-table>
     <div class="q-my-xl q-gutter-md">
       <div class="row">
@@ -119,7 +168,7 @@ window.app.component('receipt', {
         <span v-text="cartTotal.toFixed(2)"></span>
         </div>
       </div>
-      <div class="row">
+      <div class="row" v-if="showBitcoinDetails">
         <div class="col-6">Total (sats)</div>
         <div class="col-6 text-right">
         <span v-text="data.extra.amount"></span>
diff --git a/static/js/index.js b/static/js/index.js
index a88a874..c97c5b0 100644
--- a/static/js/index.js
+++ b/static/js/index.js
@@ -21,6 +21,7 @@ const mapTpos = obj => {
   obj.inventory_omit_tags = omitTagString
     ? omitTagString.split(',').filter(Boolean)
     : []
+  obj.only_show_sats_on_bitcoin = obj.only_show_sats_on_bitcoin ?? true
   obj.itemsMap = new Map()
   obj.items.forEach((item, idx) => {
     let id = `${obj.id}:${idx + 1}`
@@ -106,6 +107,7 @@ window.app = Vue.createApp({
           lnaddress: false,
           lnaddress_cut: 2,
           enable_receipt_print: false,
+          only_show_sats_on_bitcoin: true,
           fiat: false,
           stripe_card_payments: false,
           stripe_reader_id: ''
@@ -241,6 +243,7 @@ window.app = Vue.createApp({
         lnaddress: false,
         lnaddress_cut: 2,
         enable_receipt_print: false,
+        only_show_sats_on_bitcoin: true,
         fiat: false,
         stripe_card_payments: false,
         stripe_reader_id: ''
diff --git a/static/js/tpos.js b/static/js/tpos.js
index c1b34c8..b01f327 100644
--- a/static/js/tpos.js
+++ b/static/js/tpos.js
@@ -125,6 +125,11 @@ window.app = Vue.createApp({
       addedAmount: 0,
       enablePrint: false,
       receiptData: null,
+      orderReceipt: false,
+      printDialog: {
+        show: false,
+        paymentHash: null
+      },
       paymentDetails: null,
       currency_choice: false,
       _currencyResolver: null,
@@ -304,7 +309,8 @@ window.app = Vue.createApp({
       } else {
         this.cart.set(item.id, {
           ...item,
-          quantity: quantity
+          quantity: quantity,
+          note: item.note || null
         })
       }
       this.total = this.total + this.calculateItemPrice(priceSource, quantity)
@@ -353,6 +359,25 @@ window.app = Vue.createApp({
           this.updateCartItemPrice(cartItem, newPrice)
         })
     },
+    promptItemNote(item) {
+      const cartItem = this.cart.get(item.id)
+      if (!cartItem) return
+      this.$q
+        .dialog({
+          title: 'Set note',
+          message: 'Add a note for this item',
+          prompt: {
+            model: cartItem.note || '',
+            type: 'text',
+            placeholder: 'e.g. allergy info'
+          },
+          cancel: true
+        })
+        .onOk(val => {
+          const note = (val || '').trim()
+          this.updateCartItemNote(cartItem, note || null)
+        })
+    },
     updateCartItemPrice(cartItem, newPrice) {
       const roundedPrice =
         this.currency === 'sats' ? Math.ceil(newPrice) : +newPrice.toFixed(2)
@@ -372,6 +397,15 @@ window.app = Vue.createApp({
       this.total = +(this.total - oldItemTotal + newItemTotal).toFixed(2)
       this.cartTaxTotal()
     },
+    updateCartItemNote(cartItem, note) {
+      const existing = this.cart.get(cartItem.id)
+      if (!existing) return
+      const updatedItem = {
+        ...existing,
+        note: note
+      }
+      this.cart.set(cartItem.id, updatedItem)
+    },
     calculateItemPrice(item, qty) {
       let tax = item.tax || this.taxDefault
       if (!tax || this.taxInclusive) return item.price * qty
@@ -751,11 +785,21 @@ window.app = Vue.createApp({
             formattedPrice: item.formattedPrice,
             quantity: item.quantity,
             title: item.title,
-            tax: item.tax || this.taxDefault
+            tax: item.tax || this.taxDefault,
+            note: item.note || null
           })),
           taxIncluded: this.taxInclusive,
           taxValue: this.cartTax
         }
+        const notes = {}
+        ;[...this.cart.values()].forEach(item => {
+          if (item.note) {
+            notes[item.title] = item.note
+          }
+        })
+        if (Object.keys(notes).length) {
+          params.notes = notes
+        }
       }
       if (this.lnaddress) {
         params.user_lnaddress = this.lnaddressDialog.lnaddress
@@ -837,7 +881,7 @@ window.app = Vue.createApp({
             this.clearCart()
             this.showComplete()
             if (this.enablePrint) {
-              this.printReceipt(paymentHash)
+              this.promptPrintType(paymentHash)
             }
             ws.close()
           }
@@ -1133,6 +1177,18 @@ window.app = Vue.createApp({
           this.paymentDetails.exchangeRate = data.extra.details.exchangeRate
         }
         return
+      } catch (error) {
+        console.error('Error showing print options:', error)
+        Quasar.Notify.create({
+          type: 'negative',
+          message: 'Error showing print options.'
+        })
+      }
+    },
+    promptPrintType(paymentHash) {
+      try {
+        this.printDialog.paymentHash = paymentHash
+        this.printDialog.show = true
       } catch (error) {
         console.error('Error fetching receipt data:', error)
         Quasar.Notify.create({
@@ -1141,6 +1197,10 @@ window.app = Vue.createApp({
         })
       }
     },
+    closePrintDialog() {
+      this.printDialog.show = false
+      this.printDialog.paymentHash = null
+    },
     async printReceipt(paymentHash) {
       try {
         if (!this.receiptData) {
@@ -1151,17 +1211,32 @@ window.app = Vue.createApp({
           this.receiptData = data
         }
 
-        this.$q
-          .dialog({
-            title: 'Print Receipt',
-            message: 'Do you want to print the receipt?',
-            cancel: true,
-            persistent: false
-          })
-          .onOk(() => {
-            console.log('Printing receipt for payment hash:', paymentHash)
-            window.print()
-          })
+        this.orderReceipt = false
+        console.log('Printing receipt for payment hash:', paymentHash)
+        await this.$nextTick()
+        window.print()
+      } catch (error) {
+        console.error('Error fetching receipt data:', error)
+        Quasar.Notify.create({
+          type: 'negative',
+          message: 'Error fetching receipt data.'
+        })
+      }
+    },
+    async printOrderReceipt(paymentHash) {
+      try {
+        if (!this.receiptData) {
+          const {data} = await LNbits.api.request(
+            'GET',
+            `/tpos/api/v1/tposs/${this.tposId}/invoices/${paymentHash}?extra=true`
+          )
+          this.receiptData = data
+        }
+
+        this.orderReceipt = true
+        console.log('Printing order receipt for payment hash:', paymentHash)
+        await this.$nextTick()
+        window.print()
       } catch (error) {
         console.error('Error fetching receipt data:', error)
         Quasar.Notify.create({
diff --git a/tasks.py b/tasks.py
index be80e72..be3de17 100644
--- a/tasks.py
+++ b/tasks.py
@@ -1,7 +1,5 @@
 import asyncio
 
-from loguru import logger
-
 from lnbits.core.models import Payment
 from lnbits.core.services import (
     create_invoice,
@@ -10,6 +8,7 @@
     websocket_updater,
 )
 from lnbits.tasks import register_invoice_listener
+from loguru import logger
 
 from .crud import get_tpos
 from .services import deduct_inventory_stock
diff --git a/templates/tpos/_cart.html b/templates/tpos/_cart.html
index 35fa99b..6b6fa2b 100644
--- a/templates/tpos/_cart.html
+++ b/templates/tpos/_cart.html
@@ -38,7 +38,16 @@ <h5 v-show="!denomIsSats" class="q-mt-none q-mb-sm">
                   max-width: 1px;
                 "
               >
-                <span v-text="item.title"></span>
+                <span
+                  class="cursor-pointer"
+                  @click="promptItemNote(item)"
+                  v-text="item.title"
+                ></span>
+                <div
+                  v-if="item.note"
+                  class="text-caption text-grey-6 ellipsis"
+                  v-text="item.note"
+                ></div>
               </td>
               <td>
                 <div class="flex justify-evenly" style="align-items: center">
diff --git a/templates/tpos/dialogs.html b/templates/tpos/dialogs.html
index 691f3ee..f515ce6 100644
--- a/templates/tpos/dialogs.html
+++ b/templates/tpos/dialogs.html
@@ -54,6 +54,34 @@ <h5 class="q-mt-none q-mb-sm">
     </q-card>
   </q-dialog>
 
+  <q-dialog v-model="printDialog.show" @hide="closePrintDialog">
+    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+      <q-card-section class="row items-center q-pb-none">
+        <div class="text-h6">Print Receipt</div>
+        <q-space />
+        <q-btn icon="close" flat round dense v-close-popup />
+      </q-card-section>
+      <q-card-actions align="right">
+        <q-btn
+          round
+          icon="receipt_long"
+          color="secondary"
+          @click.stop="printOrderReceipt(printDialog.paymentHash)"
+        >
+          <q-tooltip>Print order receipt</q-tooltip>
+        </q-btn>
+        <q-btn
+          round
+          icon="print"
+          color="primary"
+          @click.stop="printReceipt(printDialog.paymentHash)"
+        >
+          <q-tooltip>Print receipt</q-tooltip>
+        </q-btn>
+      </q-card-actions>
+    </q-card>
+  </q-dialog>
+
   <q-dialog v-model="tipDialog.show" position="top">
     <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
       <div class="text-center q-mb-xl">
@@ -205,6 +233,11 @@ <h5 class="q-mt-none q-mb-sm">
                     <q-item-label
                       v-text="`${item.quantity} x ${item.title}`"
                     ></q-item-label>
+                    <q-item-label
+                      v-if="item.note"
+                      caption
+                      v-text="item.note"
+                    ></q-item-label>
                     <q-item-label
                       caption
                       v-text="formatAmount(item.price * item.quantity, currency)"
@@ -231,6 +264,14 @@ <h5 class="q-mt-none q-mb-sm">
               align="right"
               v-if="enablePrint && payment.amount > 0"
             >
+              <q-btn
+                round
+                icon="receipt_long"
+                color="secondary"
+                @click.stop="printOrderReceipt(payment.checking_id)"
+              >
+                <q-tooltip>Print order receipt</q-tooltip>
+              </q-btn>
               <q-btn
                 round
                 icon="print"
@@ -321,7 +362,7 @@ <h5 class="q-mt-none q-mb-sm">
     </q-card>
   </q-dialog>
 
-  <q-dialog v-model="currency_choice" persistent>
+  <q-dialog v-model="currency_choice">
     <q-card class="q-pa-md">
       <div class="text-h6 q-mb-md">Payment Method</div>
       <div class="column q-gutter-y-sm">
diff --git a/templates/tpos/index.html b/templates/tpos/index.html
index 9216632..faa99c8 100644
--- a/templates/tpos/index.html
+++ b/templates/tpos/index.html
@@ -521,6 +521,10 @@ <h6 class="text-subtitle1 q-my-none">{{SITE_TITLE}} TPoS extension</h6>
             label="VAT ID"
             placeholder="123456789"
           ></q-input>
+          <q-checkbox
+            v-model="formDialog.data.only_show_sats_on_bitcoin"
+            label="Only show sats & sats conversion rate on bitcoin transactions"
+          ></q-checkbox>
         </template>
         <template v-if="formDialog.advanced.tips">
           <q-select
diff --git a/templates/tpos/tpos.html b/templates/tpos/tpos.html
index a367d7b..1d99e7a 100644
--- a/templates/tpos/tpos.html
+++ b/templates/tpos/tpos.html
@@ -104,7 +104,17 @@ <h5 class="text-italic">
 </q-page-container>
 <template v-if="enablePrint">
   <Teleport to="body">
-    <receipt class="receipt" v-if="receiptData" :data="receiptData"></receipt>
+    <receipt
+      class="receipt"
+      v-if="receiptData && !orderReceipt"
+      :data="receiptData"
+    ></receipt>
+    <order-receipt
+      class="receipt"
+      v-if="receiptData && orderReceipt"
+      :data="receiptData"
+      type="order"
+    ></order-receipt>
   </Teleport>
 </template>
 {% endblock %} {% block styles %}
@@ -193,6 +203,14 @@ <h5 class="text-italic">
     .receipt p {
       margin: 0 !important;
     }
+    .receipt .q-table__middle {
+      overflow: visible !important;
+    }
+    .receipt .q-table td,
+    .receipt .q-table th {
+      white-space: normal !important;
+      word-break: break-word;
+    }
   }
 </style>
 {% endblock %} {% block scripts %}
@@ -222,6 +240,7 @@ <h5 class="text-italic">
 <script src="{{ static_url_for('tpos/static', path='components/item-list.js') }}"></script>
 <script src="{{ static_url_for('tpos/static', path='components/keypad.js') }}"></script>
 <script src="{{ static_url_for('tpos/static', path='components/receipt.js') }}"></script>
+<script src="{{ static_url_for('tpos/static', path='components/order-receipt.js') }}"></script>
 
 <style scoped>
   input::-webkit-outer-spin-button,
diff --git a/views_api.py b/views_api.py
index 4b3c14e..12f3b65 100644
--- a/views_api.py
+++ b/views_api.py
@@ -4,10 +4,6 @@
 
 import httpx
 from fastapi import APIRouter, Depends, HTTPException, Query
-from lnurl import LnurlPayResponse
-from lnurl import decode as decode_lnurl
-from lnurl import handle as lnurl_handle
-
 from lnbits.core.crud import (
     get_latest_payments_by_extension,
     get_standalone_payment,
@@ -20,6 +16,9 @@
     require_admin_key,
     require_invoice_key,
 )
+from lnurl import LnurlPayResponse
+from lnurl import decode as decode_lnurl
+from lnurl import handle as lnurl_handle
 
 from .crud import (
     create_tpos,
@@ -224,8 +223,10 @@ async def api_tpos_create_invoice(tpos_id: str, data: CreateTposInvoice) -> Paym
             "amount": data.amount,
             "exchangeRate": data.exchange_rate if data.exchange_rate else None,
             "details": data.details if data.details else None,
+            "notes": data.notes if data.notes else None,
             "lnaddress": data.user_lnaddress if data.user_lnaddress else None,
             "internal_memo": data.internal_memo if data.internal_memo else None,
+            "paid_in_fiat": data.pay_in_fiat,
         }
         if inventory_payload:
             extra["inventory"] = inventory_payload.dict()
@@ -383,6 +384,7 @@ async def api_tpos_check_invoice(
             "business_name": tpos.business_name,
             "business_address": tpos.business_address,
             "business_vat_id": tpos.business_vat_id,
+            "only_show_sats_on_bitcoin": tpos.only_show_sats_on_bitcoin,
         }
     return {"paid": payment.success}