Skip to content

Printable receipts and transaction reports #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pokkst merged 8 commits into from
Oct 20, 2022
Merged

Printable receipts and transaction reports #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a39db8a
Bugfix: the transaction confirmation screen does not appear when usin…
Jun 13, 2022
fe99a46
Merge remote-tracking branch 'upstream/master'
thesquaregroot Sep 14, 2022
f0db861
Print receipts on payment success and from transaction history page.
thesquaregroot Sep 15, 2022
b3a5a50
Datetime filter buttons on transactions page (collecting datetimes, n…
thesquaregroot Sep 29, 2022
42e06f1
Date filtering and preset buttons.
thesquaregroot Oct 3, 2022
dd06248
Clear button during start/end date entry.
thesquaregroot Oct 3, 2022
29e9495
Floating action button for printing sales reports.
thesquaregroot Oct 4, 2022
567df1e
Fiat total in report.
thesquaregroot Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/java/com/bitcoin/merchant/app/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ open class MainActivity : AppCompatActivity(), WebSocketListener {
if (!payment.isUnderpayment && !payment.isOverpayment) {
Log.d(TAG, "${payment.txHash} has been received.")
val i = Intent(Action.ACKNOWLEDGE_BIP21_PAYMENT)
payment.toIntent(i)
LocalBroadcastManager.getInstance(this).sendBroadcast(i)
} else {
if (payment.isUnderpayment) {
Expand Down
16 changes: 13 additions & 3 deletions app/src/main/java/com/bitcoin/merchant/app/screens/PaymentRequestFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import com.bitcoin.merchant.app.currency.CurrencyExchange
import com.bitcoin.merchant.app.model.Analytics
import com.bitcoin.merchant.app.model.PaymentTarget
import com.bitcoin.merchant.app.network.ExpectedPayments
import com.bitcoin.merchant.app.network.PaymentReceived
import com.bitcoin.merchant.app.screens.dialogs.DialogHelper
import com.bitcoin.merchant.app.screens.dialogs.SnackHelper
import com.bitcoin.merchant.app.screens.features.ToolbarAwareFragment
Expand Down Expand Up @@ -65,6 +66,7 @@ class PaymentRequestFragment : ToolbarAwareFragment() {
private lateinit var ivReceivingQr: ImageView
private lateinit var progressLayout: LinearLayout
private lateinit var ivCancel: ImageView
private lateinit var ivReceipt: Button
private lateinit var ivDone: Button
private lateinit var bip70Manager: Bip70Manager
private lateinit var bip70PayService: Bip70PayService
Expand All @@ -89,7 +91,9 @@ class PaymentRequestFragment : ToolbarAwareFragment() {
bip70Manager.reconnectIfNecessary()
}
if (Action.ACKNOWLEDGE_BIP21_PAYMENT == intent.action) {
showCheckMark()
val paymentReceived = PaymentReceived(intent)
val receiptHtml = PrintUtil.createReceiptHtml(activity, paymentReceived)
showCheckMark(receiptHtml)
soundAlert()
}
}
Expand Down Expand Up @@ -126,7 +130,8 @@ class PaymentRequestFragment : ToolbarAwareFragment() {
Log.i(TAG, "record new Tx:$i")
val fiatFormatted = AmountUtil(activity).formatFiat(i.fiatTotal)
app.paymentProcessor.recordInDatabase(i, fiatFormatted)
showCheckMark()
val receiptHtml = PrintUtil.createReceiptHtml(activity, i)
showCheckMark(receiptHtml)
soundAlert()
}

Expand Down Expand Up @@ -299,6 +304,7 @@ class PaymentRequestFragment : ToolbarAwareFragment() {
waitingLayout = v.findViewById(R.id.layout_waiting)
receivedLayout = v.findViewById(R.id.layout_complete)
ivCancel = v.findViewById(R.id.iv_cancel)
ivReceipt = v.findViewById(R.id.iv_receipt)
ivDone = v.findViewById(R.id.iv_done)
fabShare = v.findViewById(R.id.fab_share)
ivCancel.setOnClickListener { deleteActiveInvoiceAndExitScreen() }
Expand Down Expand Up @@ -495,7 +501,7 @@ class PaymentRequestFragment : ToolbarAwareFragment() {
}.start()
}

private fun showCheckMark() {
private fun showCheckMark(receiptHtml: String) {
tvConnectionStatus.visibility = View.GONE // hide it white top bar on green background
waitingLayout.visibility = View.GONE
receivedLayout.visibility = View.VISIBLE
Expand All @@ -505,12 +511,16 @@ class PaymentRequestFragment : ToolbarAwareFragment() {
if(bip21Address != null) {
ExpectedPayments.getInstance().removePayment(bip21Address)
}
ivReceipt.setOnClickListener {
PrintUtil.printHtml(activity, receiptHtml)
}
ivDone.setOnClickListener {
AppUtil.setStatusBarColor(activity, R.color.gray)
exitScreen()
}
}


private fun setInvoiceReadyToShare(ready: Boolean) {
if (ready) {
fabShare.backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(app, R.color.bitcoindotcom_green))
Expand Down
Loading