Auto stash before rebase of "main"

This commit is contained in:
Tiago Vasconcelos 2023-03-09 10:23:33 +00:00
parent cb1c6446aa
commit d7dae2be8b
2 changed files with 46 additions and 4 deletions

View file

@ -123,7 +123,8 @@
:type="isPwd ? 'password' : 'text'"
v-if="!customerUseExtension"
v-model.trim="checkoutDialog.data.privkey"
hint="Enter your private key or see bellow for instructions"
label="Private key"
hint="Enter your private key"
>
<template v-slot:append>
<q-icon
@ -241,4 +242,23 @@
</q-inner-loading>
</q-card>
</q-dialog>
<!-- ORDER DOWNLOAD DIALOG -->
<q-dialog v-model="downloadOrderDialog.show" position="top">
<q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
<q-card-section>
<div class="text-h6">Order data</div>
<div class="text-subtitle2">{{ stall.pubkey }}</div>
<small
>Send the bellow message, to the merchant pubkey, in any Nostr
client</small
>
</q-card-section>
<q-separator dark inset />
<q-card-section>
<pre>{{JSON.stringify(downloadOrderDialog.data, null, 2)}}</pre>
</q-card-section>
</q-card>
</q-dialog>
</div>

View file

@ -39,6 +39,10 @@ async function customerStall(path) {
payment_request: null
},
show: false
},
downloadOrderDialog: {
show: false,
data: {}
}
}
},
@ -115,7 +119,25 @@ async function customerStall(path) {
}
},
async downloadOrder() {
return
let created_at = Math.floor(Date.now() / 1000)
let order = this.checkoutDialog.data
// this.downloadOrderDialog.data = {
// name: orderData?.username,
// address: orderData.address,
// message: orderData?.message,
// contact: {
// nostr: this.customerPubkey,
// phone: null,
// email: orderData?.email
// },
// items: Array.from(this.cart.products, p => {
// return {product_id: p[0], quantity: p[1].quantity}
// })
// }
// orderObj.id = await hash(
// [this.customerPubkey, created_at, JSON.stringify(orderObj)].join(':')
// )
this.resetCheckout()
},
async getFromExtension() {
this.customerPubkey = await window.nostr.getPublicKey()
@ -126,7 +148,7 @@ async function customerStall(path) {
// Check if user is logged in
if (this.customerPubkey) {
this.checkoutDialog.data.pubkey = this.customerPubkey
if (this.customerPrivkey && !useExtension) {
if (this.customerPrivkey && !this.useExtension) {
this.checkoutDialog.data.privkey = this.customerPrivkey
}
}
@ -277,7 +299,7 @@ async function customerStall(path) {
event.content
)
}
console.log(`${mine ? 'Me' : 'Merchant'}: ${plaintext}`)
//console.log(`${mine ? 'Me' : 'Merchant'}: ${plaintext}`)
this.messageFilter(plaintext, cb => Promise.resolve(pool.close))
} catch {