diff --git a/README.md b/README.md index fb8ebe2..a14bdef 100644 --- a/README.md +++ b/README.md @@ -102,3 +102,12 @@ On the regular TPoS you can also add value to a total. Enter a value and click t ![atm withdraw](https://i.imgur.com/rYXtn93.png) 6. After successful withdraw, the green check will show and TPOS exists ATM mode\ ![atm success](https://i.imgur.com/FaHltvW.png) + +## Tax settings + +For tax settings, by default tax is included in the price. You'll need to set a default tax rate in percentage (ex: 13). If items have a tax value, as some products may have different tax (VAT usually), it overides the default value. + +- **Tax Exclusive means tax is applied on top of the unit price.** +- **Tax Inclusive means the unit price includes tax.** + +When using the normal keypad PoS, the default tax value is used, and tax value is always included in the value. diff --git a/crud.py b/crud.py index baa5ed7..12ef7c3 100644 --- a/crud.py +++ b/crud.py @@ -1,10 +1,11 @@ from typing import List, Optional, Union +from loguru import logger + from lnbits.helpers import urlsafe_short_hash from . import db -from .models import CreateTposData, TPoS, TPoSClean, LNURLCharge -from loguru import logger +from .models import CreateTposData, LNURLCharge, TPoS, TPoSClean async def get_current_timestamp(): diff --git a/migrations.py b/migrations.py index 60ff7f0..3936daa 100644 --- a/migrations.py +++ b/migrations.py @@ -78,7 +78,7 @@ async def m005_initial(db): Initial withdraws table. """ await db.execute( - f""" + """ CREATE TABLE tpos.withdraws ( id TEXT PRIMARY KEY, tpos_id TEXT NOT NULL, @@ -108,10 +108,23 @@ async def m007_atm_premium(db): await db.execute("ALTER TABLE tpos.pos ADD COLUMN withdrawpremium FLOAT;") - async def m008_atm_time_option_and_pin_toggle(db): """ Add a time mins/sec and pin toggle """ - await db.execute("ALTER TABLE tpos.pos ADD COLUMN withdrawtimeopt TEXT DEFAULT 'mins';") - await db.execute("ALTER TABLE tpos.pos ADD COLUMN withdrawpindisabled BOOL NOT NULL DEFAULT false;") + await db.execute( + "ALTER TABLE tpos.pos ADD COLUMN withdrawtimeopt TEXT DEFAULT 'mins';" + ) + await db.execute( + "ALTER TABLE tpos.pos ADD COLUMN withdrawpindisabled BOOL NOT NULL DEFAULT false;" + ) + + +async def m009_tax_inclusive(db): + """ + Add tax_inclusive column + """ + await db.execute( + "ALTER TABLE tpos.pos ADD COLUMN tax_inclusive BOOL NOT NULL DEFAULT true;" + ) + await db.execute("ALTER TABLE tpos.pos ADD COLUMN tax_default FLOAT DEFAULT 0;") diff --git a/models.py b/models.py index c41fc83..79d2379 100644 --- a/models.py +++ b/models.py @@ -1,11 +1,11 @@ from sqlite3 import Row -from typing import Optional, Any, List +from typing import List, Optional from fastapi import Request from lnurl import Lnurl, LnurlWithdrawResponse from lnurl import encode as lnurl_encode -from lnurl.models import ClearnetUrl, MilliSatoshi -from pydantic import BaseModel, Field +from lnurl.types import ClearnetUrl, MilliSatoshi +from pydantic import BaseModel, Field, validator class CreateTposData(BaseModel): @@ -22,32 +22,8 @@ class CreateTposData(BaseModel): withdrawbtwn: int = Field(10, ge=1) withdrawpremium: float = Field(None) withdrawpindisabled: bool = Field(False) - - -class TPoS(BaseModel): - id: str - wallet: str - name: str - currency: str - tip_options: Optional[str] - tip_wallet: Optional[str] - withdrawlimit: Optional[int] - withdrawpin: Optional[int] - withdrawamt: int - withdrawtime: int - withdrawtimeopt: Optional[str] - withdrawbtwn: int - withdrawpremium: Optional[float] - withdrawpindisabled: Optional[bool] - items: Optional[str] - - @classmethod - def from_row(cls, row: Row) -> "TPoS": - return cls(**dict(row)) - - @property - def withdrawamtposs(self) -> int: - return self.withdrawlimit - self.withdrawamt if self.withdrawlimit else 0 + tax_inclusive: bool = Field(True) + tax_default: float = Field(None) class TPoSClean(BaseModel): @@ -63,6 +39,8 @@ class TPoSClean(BaseModel): withdrawpremium: Optional[float] withdrawpindisabled: Optional[bool] items: Optional[str] + tax_inclusive: bool + tax_default: Optional[float] @classmethod def from_row(cls, row: Row) -> "TPoSClean": @@ -73,6 +51,12 @@ def withdrawamtposs(self) -> int: return self.withdrawlimit - self.withdrawamt if self.withdrawlimit else 0 +class TPoS(TPoSClean, BaseModel): + wallet: str + tip_wallet: Optional[str] + withdrawpin: Optional[int] + + class LNURLCharge(BaseModel): id: str tpos_id: str @@ -120,10 +104,14 @@ class Item(BaseModel): price: float title: str description: Optional[str] - tax: Optional[float] = 0.0 + tax: Optional[float] = Field(0, ge=0.0) disabled: bool = False categories: Optional[List[str]] = [] + @validator("tax", pre=True, always=True) + def set_default_tax(cls, v): + return v or 0 + class CreateUpdateItemData(BaseModel): items: List[Item] diff --git a/static/components/item-list/item-list.html b/static/components/item-list/item-list.html new file mode 100644 index 0000000..cb153cb --- /dev/null +++ b/static/components/item-list/item-list.html @@ -0,0 +1,53 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + +
diff --git a/static/components/item-list/item-list.js b/static/components/item-list/item-list.js new file mode 100644 index 0000000..3e02c92 --- /dev/null +++ b/static/components/item-list/item-list.js @@ -0,0 +1,20 @@ +async function itemList(path) { + const template = await loadTemplateAsync(path) + + Vue.component('item-list', { + name: 'item-list', + props: ['items', 'inclusive', 'format', 'currency', 'add-product'], + template, + + data: function () { + return {} + }, + computed: {}, + methods: { + addToCart(item) { + this.$emit('add-product', item) + } + }, + created() {} + }) +} diff --git a/static/js/tpos.js b/static/js/tpos.js new file mode 100644 index 0000000..0e5b63d --- /dev/null +++ b/static/js/tpos.js @@ -0,0 +1,765 @@ +const tposJS = async () => { + Vue.component(VueQrcode.name, VueQrcode) + + await itemList('static/components/item-list/item-list.html') + + new Vue({ + el: '#vue', + mixins: [windowMixin], + delimiters: ['${', '}'], + data: function () { + return { + tposId: tpos.id, + currency: tpos.currency, + withdrawamtposs: tpos.withdrawamtposs, + atmPremium: tpos.withdrawpremium / 100, + withdrawpinopen: withdrawpinopen, + tip_options: null, + exchangeRate: null, + stack: [], + tipAmount: 0.0, + tipRounding: null, + hasNFC: false, + atmBox: false, + atmPin: null, + hidePin: true, + atmMode: false, + atmToken: '', + nfcTagReading: false, + lastPaymentsDialog: { + show: false, + data: [] + }, + invoiceDialog: { + show: false, + data: null, + dismissMsg: null, + paymentChecker: null + }, + tipDialog: { + show: false + }, + urlDialog: { + show: false + }, + complete: { + show: false + }, + rounding: false, + isFullScreen: false, + total: 0.0, + cartTax: 0.0, + itemsTable: { + filter: '', + columns: [ + { + name: 'delete', + align: 'left', + label: '', + field: '' + }, + { + name: 'edit', + align: 'left', + label: '', + field: '' + }, + + { + name: 'id', + align: 'left', + label: 'ID', + field: 'id' + }, + { + name: 'title', + align: 'left', + label: 'Title', + field: 'title' + }, + { + name: 'price', + align: 'left', + label: 'Price', + field: 'price' + }, + { + name: 'disabled', + align: 'left', + label: 'Disabled', + field: 'disabled' + } + ], + pagination: { + rowsPerPage: 10 + } + }, + monochrome: this.$q.localStorage.getItem('lnbits.tpos.color') || false, + showPoS: true, + cartDrawer: this.$q.screen.width > 1200, + searchTerm: '', + categoryFilter: '', + cart: new Map(), + denomIsSats: tpos.currency == 'sats' + } + }, + computed: { + amount: function () { + if (!this.stack.length) return 0.0 + return ( + this.stack.reduce((acc, dig) => acc * 10 + dig, 0) * + (this.currency == 'sats' ? 1 : 0.01) + ) + }, + amountFormatted: function () { + return this.formatAmount(this.amount, this.currency) + }, + totalFormatted() { + return this.formatAmount(this.total, this.currency) + }, + amountWithTipFormatted: function () { + return this.formatAmount(this.amount + this.tipAmount, this.currency) + }, + sat: function () { + if (!this.exchangeRate) return 0 + return Math.ceil(this.amount * this.exchangeRate) + }, + totalSat: function () { + if (!this.exchangeRate) return 0 + return Math.ceil(this.total * this.exchangeRate) + }, + tipAmountSat: function () { + if (!this.exchangeRate) return 0 + return Math.ceil(this.tipAmount * this.exchangeRate) + }, + tipAmountFormatted: function () { + return LNbits.utils.formatSat(this.tipAmountSat) + }, + fsat: function () { + return LNbits.utils.formatSat(this.sat) + }, + totalfsat: function () { + return LNbits.utils.formatSat(this.totalSat) + }, + roundToSugestion() { + switch (true) { + case this.amount > 50: + toNext = 10 + break + case this.amount > 6: + toNext = 5 + break + case this.amount > 2.5: + toNext = 1 + break + default: + toNext = 0.5 + break + } + + return Math.ceil(this.amount / toNext) * toNext + }, + fullScreenIcon() { + return this.isFullScreen ? 'fullscreen_exit' : 'fullscreen' + }, + filteredItems() { + // filter out disabled items + let items = this.items.filter(item => !item.disabled) + // if searchTerm entered, filter out items that don't match + if (this.searchTerm) { + items = items.filter(item => { + return item.title + .toLowerCase() + .includes(this.searchTerm.toLowerCase()) + }) + } + // if categoryFilter entered, filter out items that don't match + if (this.categoryFilter) { + items = items.filter(item => { + return item.categories + .map(c => c.toLowerCase()) + .includes(this.categoryFilter.toLowerCase()) + }) + } + return items + }, + drawerWidth() { + return this.$q.screen.width < 500 ? 375 : 450 + }, + formattedCartTax(){ + return this.formatAmount(this.cartTax, this.currency) + }, + taxSubtotal(){ + if (this.taxInclusive) return this.totalFormatted + return this.formatAmount(Math.floor(this.total - this.cartTax), this.currency) + + } + }, + methods: { + addAmount() { + this.total = +(this.total + this.amount).toFixed(2) + this.stack = [] + }, + cancelAddAmount() { + this.total = 0.0 + this.stack = [] + }, + addToCart(item, quantity = 1) { + if (this.cart.has(item.id)) { + this.cart.set(item.id, { + ...this.cart.get(item.id), + quantity: this.cart.get(item.id).quantity + quantity + }) + } else { + this.cart.set(item.id, { + ...item, + quantity: quantity + }) + } + this.total = this.total + this.calculateItemPrice(item, quantity) + this.cartTaxTotal() + }, + removeFromCart(item, quantity = 1) { + let item_quantity = this.cart.get(item.id).quantity + if (item_quantity == 1 || item_quantity == quantity) { + this.cart.delete(item.id) + } else { + this.cart.set(item.id, { + ...this.cart.get(item.id), + quantity: this.cart.get(item.id).quantity - quantity + }) + } + this.total = this.total - this.calculateItemPrice(item, quantity) + this.cartTaxTotal() + }, + calculateItemPrice(item, qty) { + let tax = item.tax || this.taxDefault + if (!tax || this.taxInclusive) return item.price * qty + + // add tax to price + return item.price * (1 + tax * 0.01) * qty + }, + cartTaxTotal(){ + if(!this.cart.size) return 0.0 + let total = 0.0 + for (let item of this.cart.values()) { + let tax = item.tax || this.taxDefault + total += item.price * item.quantity * (tax * 0.01) + } + this.cartTax = total + }, + clearCart() { + this.cart.clear() + this.cartTax = 0.0 + this.total = 0.0 + }, + atm() { + if (this.atmPremium > 0) { + this.exchangeRate = this.exchangeRate / (1 + this.atmPremium) + } + if (this.withdrawpinopen != 0) { + this.atmPin = this.withdrawpinopen + this.atmSubmit() + return + } + if (this.withdrawamtposs > 0) { + this.atmBox = true + } + }, + atmSubmit() { + self = this + LNbits.api + .request('GET', `/tpos/api/v1/atm/` + this.tposId + `/` + this.atmPin) + .then(function (res) { + self.atmToken = res.data.id + if (res.data.claimed == false) { + self.atmBox = false + self.atmMode = true + } + }) + .catch(function (error) { + LNbits.utils.notifyApiError(error) + }) + }, + atmGetWithdraw: function () { + self = this + var dialog = this.invoiceDialog + LNbits.api + .request( + 'GET', + `/tpos/api/v1/atm/withdraw/` + this.atmToken + `/` + this.sat + ) + .then(function (res) { + lnurl = res.data.lnurl + dialog.data = {payment_request: lnurl} + dialog.show = true + self.readNfcTag() + dialog.dismissMsg = self.$q.notify({ + timeout: 0, + message: 'Withdraw...' + }) + if (location.protocol !== 'http:') { + self.withdrawUrl = + 'wss://' + + document.domain + + ':' + + location.port + + '/api/v1/ws/' + + self.atmToken + } else { + self.withdrawUrl = + 'ws://' + + document.domain + + ':' + + location.port + + '/api/v1/ws/' + + self.atmToken + } + this.connectionWithdraw = new WebSocket(self.withdrawUrl) + this.connectionWithdraw.onmessage = e => { + if (e.data == 'paid') { + dialog.show = false + self.atmPin = null + self.atmToken = '' + self.complete.show = true + self.atmMode = false + this.connectionWithdraw.close() + } + } + this.getRates() + }) + .catch(function (error) { + LNbits.utils.notifyApiError(error) + }) + }, + setRounding() { + this.rounding = true + this.tipRounding = this.roundToSugestion + this.$nextTick(() => this.$refs.inputRounding.focus()) + }, + calculatePercent() { + let change = ((this.tipRounding - this.amount) / this.amount) * 100 + if (change < 0) { + this.$q.notify({ + type: 'warning', + message: 'Amount with tip must be greater than initial amount.' + }) + this.tipRounding = this.roundToSugestion + return + } + this.processTipSelection(change) + }, + closeInvoiceDialog: function () { + this.stack = [] + this.tipAmount = 0.0 + var dialog = this.invoiceDialog + setTimeout(function () { + clearInterval(dialog.paymentChecker) + dialog.dismissMsg() + }, 3000) + }, + processTipSelection: function (selectedTipOption) { + this.tipDialog.show = false + + if (!selectedTipOption) { + this.tipAmount = 0.0 + return this.showInvoice() + } + + this.tipAmount = (selectedTipOption / 100) * this.amount + this.showInvoice() + }, + submitForm: function () { + if (this.total != 0.0) { + if(this.amount > 0.0){ + this.total = this.total + this.amount + } + if (this.currency == 'sats') { + this.stack = Array.from(String(Math.ceil(this.total), Number)) + } else { + this.stack = Array.from(String(Math.ceil(this.total * 100)), Number) + } + } + + if (!this.exchangeRate || this.exchangeRate == 0 || this.sat == 0) { + this.$q.notify({ + type: 'negative', + message: + 'Exchange rate not available, or wrong value. Please try again later.' + }) + return + } + + if (this.tip_options && this.tip_options.length) { + this.rounding = false + this.tipRounding = null + this.showTipModal() + } else { + this.showInvoice() + } + }, + showTipModal: function () { + if (!this.atmMode) { + this.tipDialog.show = true + } else { + this.showInvoice() + } + }, + showInvoice: function () { + var self = this + if (self.atmMode) { + this.atmGetWithdraw() + } else { + var dialog = this.invoiceDialog + + let params = { + amount: this.sat, + memo: this.amountFormatted, + tipAmount: this.tipAmountSat + } + if (this.cart.size) { + let details = [...this.cart.values()].map(item => { + return { + price: item.price, + formattedPrice: item.formattedPrice, + quantity: item.quantity, + title: item.title, + tax: item.tax || this.taxDefault + } + }) + + params.details = { + currency: this.currency, + exchangeRate: this.exchangeRate, + items: details, + taxIncluded: this.taxInclusive, + taxValue: this.cartTax, + } + } + + axios + .post('/tpos/api/v1/tposs/' + this.tposId + '/invoices', null, { + params: {...params} + }) + .then(function (response) { + dialog.data = response.data + dialog.show = true + self.readNfcTag() + + dialog.dismissMsg = self.$q.notify({ + timeout: 0, + message: 'Waiting for payment...' + }) + + dialog.paymentChecker = setInterval(function () { + axios + .get( + '/tpos/api/v1/tposs/' + + self.tposId + + '/invoices/' + + response.data.payment_hash + ) + .then(function (res) { + if (res.data.paid) { + clearInterval(dialog.paymentChecker) + dialog.dismissMsg() + dialog.show = false + self.clearCart() + + self.complete.show = true + } + }) + }, 3000) + }) + .catch(function (error) { + LNbits.utils.notifyApiError(error) + }) + } + }, + readNfcTag: function () { + try { + const self = this + + if (typeof NDEFReader == 'undefined') { + console.debug('NFC not supported on this device or browser.') + return + } + + const ndef = new NDEFReader() + + const readerAbortController = new AbortController() + readerAbortController.signal.onabort = event => { + console.debug('All NFC Read operations have been aborted.') + } + + this.nfcTagReading = true + this.$q.notify({ + message: this.atmMode + ? 'Tap your NFC tag to withdraw with LNURLp.' + : 'Tap your NFC tag to pay this invoice with LNURLw.' + }) + + return ndef.scan({signal: readerAbortController.signal}).then(() => { + ndef.onreadingerror = () => { + self.nfcTagReading = false + + this.$q.notify({ + type: 'negative', + message: 'There was an error reading this NFC tag.' + }) + + readerAbortController.abort() + } + + ndef.onreading = ({message}) => { + //Decode NDEF data from tag + const textDecoder = new TextDecoder('utf-8') + + const record = message.records.find(el => { + const payload = textDecoder.decode(el.data) + return payload.toUpperCase().indexOf('LNURL') !== -1 + }) + + const lnurl = textDecoder.decode(record.data) + + //User feedback, show loader icon + self.nfcTagReading = false + if (self.atmMode) { + const URL = lnurl.replace('lnurlp://', 'https://') + LNbits.api + .request('GET', `${lnurl.replace('lnurlw://', 'https://')}`) + .then(res => { + self.makeWithdraw(res.data.payLink, readerAbortController) + }) + } else { + self.payInvoice(lnurl, readerAbortController) + } + + this.$q.notify({ + type: 'positive', + message: 'NFC tag read successfully.' + }) + } + }) + } catch (error) { + this.nfcTagReading = false + this.$q.notify({ + type: 'negative', + message: error + ? error.toString() + : 'An unexpected error has occurred.' + }) + } + }, + makeWithdraw(payLink, readerAbortController) { + if (!payLink) { + this.$q.notify({ + type: 'negative', + message: 'LNURL not found in NFC tag.' + }) + return + } + LNbits.api + .request( + 'GET', + `/tpos/api/v1/atm/withdraw/${this.atmToken}/${this.sat}/pay?payLink=${payLink}` + ) + .then(res => { + if (!res.data.success) { + this.$q.notify({ + type: 'negative', + message: res.data.detail + }) + } else { + this.stack = [] + this.total = 0.0 + this.$q.notify({ + type: 'positive', + message: 'Topup successful!' + }) + } + readerAbortController.abort() + }) + .catch(e => { + console.error(e) + readerAbortController.abort() + }) + }, + payInvoice: function (lnurl, readerAbortController) { + const self = this + + return axios + .post( + '/tpos/api/v1/tposs/' + + self.tposId + + '/invoices/' + + self.invoiceDialog.data.payment_request + + '/pay', + { + lnurl: lnurl + } + ) + .then(response => { + if (!response.data.success) { + this.$q.notify({ + type: 'negative', + message: response.data.detail + }) + } + + readerAbortController.abort() + }) + }, + getRates() { + if (this.currency == 'sats') { + this.exchangeRate = 1 + } else { + LNbits.api + .request('GET', `/tpos/api/v1/rate/${this.currency}`) + .then(response => { + this.exchangeRate = response.data.rate + }) + .catch(e => console.error(e)) + } + }, + getLastPayments() { + return axios + .get(`/tpos/api/v1/tposs/${this.tposId}/invoices`) + .then(res => { + if (res.data && res.data.length) { + let last = [...res.data] + this.lastPaymentsDialog.data = last.map(obj => { + obj.dateFrom = moment(obj.time * 1000).fromNow() + return obj + }) + } + }) + .catch(e => console.error(e)) + }, + showLastPayments() { + this.getLastPayments() + this.lastPaymentsDialog.show = true + }, + toggleFullscreen() { + if (document.fullscreenElement) return document.exitFullscreen() + + const elem = document.documentElement + elem + .requestFullscreen({navigationUI: 'show'}) + .then(() => { + document.addEventListener('fullscreenchange', () => { + this.isFullScreen = document.fullscreenElement + }) + }) + .catch(err => console.error(err)) + }, + handleColorScheme(val) { + this.$q.localStorage.set('lnbits.tpos.color', val) + }, + extractCategories(items) { + let categories = new Set() + items + .map(item => { + item.categories && + item.categories.forEach(category => categories.add(category)) + }) + .filter(Boolean) + + if (categories.size) { + categories = ['All', ...categories] + } + return Array.from(categories) + }, + handleCategoryBtn(category) { + if (this.categoryFilter == category) { + this.categoryFilter = '' + } else { + this.categoryFilter = category == 'All' ? '' : category + } + }, + formatAmount: function (amount, currency) { + if (currency == 'sats') { + return LNbits.utils.formatSat(amount) + ' sat' + } else { + return LNbits.utils.formatCurrency( + Number(amount).toFixed(2), + currency + ) + } + } + }, + created: function () { + var getRates = this.getRates + getRates() + this.pinDisabled = tpos.withdrawpindisabled + this.taxInclusive = tpos.tax_inclusive + this.taxDefault = tpos.tax_default + + this.tip_options = tpos.tip_options == 'null' ? null : tpos.tip_options + + if (tpos.tip_wallet) { + this.tip_options.push('Round') + } + + this.items = tpos.items + this.items.forEach((item, id) => { + item.formattedPrice = this.formatAmount(item.price, this.currency) + item.id = id + return item + }) + if (this.items.length > 0) { + this.showPoS = false + this.categories = this.extractCategories(this.items) + } + + window.addEventListener('keyup', event => { + // do nothing if the event was already processed + if (event.defaultPrevented) return + + // active only in the the PoS mode, not in the Cart mode or ATM pin + if (!this.showPoS || this.atmBox) return + + // prevent weird behaviour when setting round tip + if (this.tipDialog.show) return + + const {key} = event + if (key >= '0' && key <= '9') { + // buttons 0 ... 9 + this.stack.push(Number(key)) + } else + switch (key) { + case 'Backspace': // button ⬅ + this.stack.pop() + break + case 'Enter': // button OK + this.submitForm() + break + case 'c': // button C + case 'C': + case 'Escape': + if (this.total > 0.0) { + this.cancelAddAmount() + } else { + this.stack = [] + } + break + case '+': // button + + this.addAmount() + break + default: + // return if we didn't handle anything + return + } + + // cancel the default action to avoid it being handled twice + event.preventDefault() + }) + + setInterval(function () { + getRates() + }, 120000) + } + }) +} + +tposJS() diff --git a/static/js/utils.js b/static/js/utils.js new file mode 100644 index 0000000..11ebc81 --- /dev/null +++ b/static/js/utils.js @@ -0,0 +1,18 @@ +function loadTemplateAsync(path) { + const result = new Promise(resolve => { + const xhttp = new XMLHttpRequest() + + xhttp.onreadystatechange = function () { + if (this.readyState == 4) { + if (this.status == 200) resolve(this.responseText) + + if (this.status == 404) resolve(`
Page not found: ${path}
`) + } + } + + xhttp.open('GET', path, true) + xhttp.send() + }) + + return result +} diff --git a/templates/tpos/dialogs.html b/templates/tpos/dialogs.html new file mode 100644 index 0000000..3fe576a --- /dev/null +++ b/templates/tpos/dialogs.html @@ -0,0 +1,199 @@ + diff --git a/templates/tpos/index.html b/templates/tpos/index.html index 4f7fb50..ea47174 100644 --- a/templates/tpos/index.html +++ b/templates/tpos/index.html @@ -229,7 +229,6 @@
TPoS
-
TPoS :columns="itemsTable.columns" :pagination.sync="itemsTable.pagination" > + - + + + + + Tax Inclusive means the unit price includes tax. (default) +
+ Tax Exclusive means tax is applied on top of the unit price. + + +
+
+ + +
+
+ +
+
+ + + +
{{SITE_TITLE}} TPoS extension dense v-model.number="itemDialog.data.tax" label="Tax %" + :hint="`${itemDialog.taxInclusive ? 'Tax is included on unit price' : 'Tax is added on top of unit price'}. You can change behaviour on TPoS settings.`" > tip_options: [], withdrawbtwn: 10, withdrawtimeopt: '', - withdrawpindisabled: false + withdrawpindisabled: false, + tax_inclusive: true }, advanced: { tips: false, @@ -890,6 +949,12 @@
label: 'Price', field: 'price' }, + { + name: 'tax', + align: 'left', + label: 'Tax', + field: 'tax' + }, { name: 'disabled', align: 'left', @@ -933,7 +998,8 @@
this.formDialog.data = { withdrawpin: null, tip_options: [], - withdrawbtwn: 10 + withdrawbtwn: 10, + tax_inclusive: true } }, getTPoSs: function () { @@ -1069,6 +1135,7 @@
openItemDialog(id) { const [tposId, itemId] = id.split(':') const tpos = _.findWhere(this.tposs, {id: tposId}) + if (itemId) { const item = tpos.itemsMap.get(id) this.itemDialog.data = { @@ -1078,6 +1145,7 @@
} else { this.itemDialog.data.tpos = tposId } + this.itemDialog.taxInclusive = tpos.tax_inclusive this.itemDialog.data.currency = tpos.currency this.itemDialog.show = true }, @@ -1138,6 +1206,10 @@
}) }, updateTposItems(tposId, wallet, data) { + const tpos = _.findWhere(this.tposs, {id: tposId}) + if (tpos.tax_inclusive != this.taxInclusive) { + data.tax_inclusive = this.taxInclusive + } LNbits.api .request( 'PUT', diff --git a/templates/tpos/tpos.html b/templates/tpos/tpos.html index 82a7d50..2b81178 100644 --- a/templates/tpos/tpos.html +++ b/templates/tpos/tpos.html @@ -45,7 +45,7 @@
v-if="atmMode == true" rounded color="negative" - >EXIT ATM
EXIT ATM
@@ -233,13 +233,18 @@
:breakpoint="1200" >
+
+ Hide Cart +

${totalFormatted}

${totalfsat} sat
-
+
@@ -288,7 +293,9 @@
- ${item.formattedPrice} +
+ ${item.formattedPrice} +
-
+
+ + + Subtotal + + + + + + + + + Total + ${totalFormatted} + + +
-
+
@@ -369,7 +394,13 @@
${item.title}
-
${item.formattedPrice}
+
+ ${item.formattedPrice} + + (tax ${taxInclusive ? 'incl.' : 'excl.'} ${item.tax || + taxDefault}%) + +
+
+ + +
> - - - - - - - Pay in wallet - -
-

${ amountWithTipFormatted }

-
- ${ fsat } - sat - ( + ${ tipAmountFormatted } tip) -
- - - NFC supported - - NFC not supported -
-
- Copy invoice - Close -
- - - - - -
- Would you like to leave a tip? -
-
- ${ tip }% - -
- - - Ok -
-
-
- No, thanks - Close -
- - - - - - - - -
-

- {{ tpos.name }}
{{ request.url }} -

-
-
- Copy URL - Close -
- - - - - - - - - - - - - - - - - No paid invoices - - - - - ${payment.amount / 1000} sats - Hash: ${payment.checking_id.slice(0, 30)}... - - - ${payment.dateFrom} - - - - - - - - - - -
Withdraw PIN
- - - - -
- -
- - - - + {% include "tpos/dialogs.html" %} {% endblock %} {% block styles %} @@ -668,731 +513,33 @@
} {% endblock %} {% block scripts %} - + - readerAbortController.abort() - } - - ndef.onreading = ({message}) => { - //Decode NDEF data from tag - const textDecoder = new TextDecoder('utf-8') - - const record = message.records.find(el => { - const payload = textDecoder.decode(el.data) - return payload.toUpperCase().indexOf('LNURL') !== -1 - }) - - const lnurl = textDecoder.decode(record.data) - - //User feedback, show loader icon - self.nfcTagReading = false - if (self.atmMode) { - const URL = lnurl.replace('lnurlp://', 'https://') - LNbits.api - .request('GET', `${lnurl.replace('lnurlw://', 'https://')}`) - .then(res => { - self.makeWithdraw(res.data.payLink, readerAbortController) - }) - } else { - self.payInvoice(lnurl, readerAbortController) - } - - this.$q.notify({ - type: 'positive', - message: 'NFC tag read successfully.' - }) - } - }) - } catch (error) { - this.nfcTagReading = false - this.$q.notify({ - type: 'negative', - message: error - ? error.toString() - : 'An unexpected error has occurred.' - }) - } - }, - makeWithdraw(payLink, readerAbortController) { - if (!payLink) { - this.$q.notify({ - type: 'negative', - message: 'LNURL not found in NFC tag.' - }) - return - } - LNbits.api - .request( - 'GET', - `/tpos/api/v1/atm/withdraw/${this.atmToken}/${this.sat}/pay?payLink=${payLink}` - ) - .then(res => { - if (!res.data.success) { - this.$q.notify({ - type: 'negative', - message: res.data.detail - }) - } else { - this.stack = [] - this.total = 0.0 - this.$q.notify({ - type: 'positive', - message: 'Topup successful!' - }) - } - readerAbortController.abort() - }) - .catch(e => { - console.error(e) - readerAbortController.abort() - }) - }, - payInvoice: function (lnurl, readerAbortController) { - const self = this - - return axios - .post( - '/tpos/api/v1/tposs/' + - self.tposId + - '/invoices/' + - self.invoiceDialog.data.payment_request + - '/pay', - { - lnurl: lnurl - } - ) - .then(response => { - if (!response.data.success) { - this.$q.notify({ - type: 'negative', - message: response.data.detail - }) - } - - readerAbortController.abort() - }) - }, - getRates() { - if (this.currency == 'sats') { - this.exchangeRate = 1 - } else { - LNbits.api - .request('GET', `/tpos/api/v1/rate/${this.currency}`) - .then(response => { - this.exchangeRate = response.data.rate - }) - .catch(e => console.error(e)) - } - }, - getLastPayments() { - return axios - .get(`/tpos/api/v1/tposs/${this.tposId}/invoices`) - .then(res => { - if (res.data && res.data.length) { - let last = [...res.data] - this.lastPaymentsDialog.data = last.map(obj => { - obj.dateFrom = moment(obj.time * 1000).fromNow() - return obj - }) - } - }) - .catch(e => console.error(e)) - }, - showLastPayments() { - this.getLastPayments() - this.lastPaymentsDialog.show = true - }, - toggleFullscreen() { - if (document.fullscreenElement) return document.exitFullscreen() - - const elem = document.documentElement - elem - .requestFullscreen({navigationUI: 'show'}) - .then(() => { - document.addEventListener('fullscreenchange', () => { - this.isFullScreen = document.fullscreenElement - }) - }) - .catch(err => console.error(err)) - }, - handleColorScheme(val) { - this.$q.localStorage.set('lnbits.tpos.color', val) - }, - extractCategories(items) { - let categories = new Set() - items - .map(item => { - item.categories && - item.categories.forEach(category => categories.add(category)) - }) - .filter(Boolean) - - if (categories.size) { - categories = ['All', ...categories] - } - return Array.from(categories) - }, - handleCategoryBtn(category) { - if (this.categoryFilter == category) { - this.categoryFilter = '' - } else { - this.categoryFilter = category == 'All' ? '' : category - } - }, - formatAmount: function (amount, currency) { - if (currency == 'sats') { - return LNbits.utils.formatSat(amount) + ' sat' - } else { - return LNbits.utils.formatCurrency( - Number(amount).toFixed(2), - currency - ) - } - } - }, - created: function () { - var getRates = this.getRates - getRates() - this.pinDisabled = JSON.parse('{{ tpos.withdrawpindisabled | tojson }}') - this.tip_options = - '{{ tpos.tip_options | tojson }}' == 'null' - ? null - : JSON.parse('{{ tpos.tip_options }}') - - if ('{{ tpos.tip_wallet }}') { - this.tip_options.push('Round') - } - - this.items = JSON.parse(`{{ tpos.items | safe }}`) - this.items.forEach((item, id) => { - item.formattedPrice = this.formatAmount(item.price, this.currency) - item.id = id - return item - }) - if (this.items.length > 0) { - this.showPoS = false - this.categories = this.extractCategories(this.items) - } - - window.addEventListener('keyup', event => { - // do nothing if the event was already processed - if (event.defaultPrevented) return - - // active only in the the PoS mode, not in the Cart mode or ATM pin - if (!this.showPoS || this.atmBox) return - - // prevent weird behaviour when setting round tip - if (this.tipDialog.show) return + - const {key} = event - if (key >= '0' && key <= '9') { - // buttons 0 ... 9 - this.stack.push(Number(key)) - } else - switch (key) { - case 'Backspace': // button ⬅ - this.stack.pop() - break - case 'Enter': // button OK - this.submitForm() - break - case 'c': // button C - case 'C': - case 'Escape': - if (this.total > 0.0) { - this.cancelAddAmount() - } else { - this.stack = [] - } - break - case '+': // button + - this.addAmount() - break - default: - // return if we didn't handle anything - return - } + - // cancel the default action to avoid it being handled twice - event.preventDefault() - }) - setInterval(function () { - getRates() - }, 120000) - } - }) -