mirror of
https://github.com/lnbits/lnbits-legend.git
synced 2025-02-25 15:10:41 +01:00
some cleanup
This commit is contained in:
parent
4dcb8d2ca0
commit
227eaeae75
2 changed files with 15 additions and 23 deletions
|
@ -580,6 +580,7 @@
|
|||
<q-tr :props="props">
|
||||
<q-td auto-width>
|
||||
<q-btn
|
||||
disabled
|
||||
unelevated
|
||||
dense
|
||||
size="xs"
|
||||
|
@ -670,7 +671,7 @@
|
|||
:href="'/diagonalley/stalls/' + props.row.id"
|
||||
target="_blank"
|
||||
></q-btn>
|
||||
<q-tooltip> Link to pass to stall relay </q-tooltip>
|
||||
<q-tooltip> Stall simple UI shopping cart </q-tooltip>
|
||||
</q-td>
|
||||
<q-td v-for="col in props.cols" :key="col.name" :props="props">
|
||||
{{ col.value }}
|
||||
|
@ -1952,17 +1953,22 @@
|
|||
})
|
||||
})
|
||||
},
|
||||
shipOrder: function (order_id) {
|
||||
var self = this
|
||||
|
||||
shipOrder(order_id){
|
||||
LNbits.api
|
||||
.request(
|
||||
'GET',
|
||||
'/diagonalley/api/v1/orders/shipped/' + order_id,
|
||||
this.g.user.wallets[0].inkey
|
||||
)
|
||||
.then(function (response) {
|
||||
self.orders.push(mapOrders(response.data))
|
||||
.then((response) => {
|
||||
console.log(response.data)
|
||||
this.orders = _.reject(this.orders, (obj) => {
|
||||
return obj.id == order_id
|
||||
})
|
||||
this.orders.push(mapOrders(response.data))
|
||||
})
|
||||
.catch((error) => {
|
||||
LNbits.utils.notifyApiError(error)
|
||||
})
|
||||
},
|
||||
exportOrdersCSV: function () {
|
||||
|
@ -1999,7 +2005,7 @@
|
|||
]
|
||||
}
|
||||
}
|
||||
console.log({chat})
|
||||
//console.log({chat})
|
||||
this.$q.localStorage.set(`lnbits.diagonalley.${this.g.user.id}`, {
|
||||
...data,
|
||||
chat
|
||||
|
@ -2014,28 +2020,16 @@
|
|||
let idx = this.orders.findIndex(f => f.invoiceid == key)
|
||||
if (!lastMsgs[key]) {
|
||||
this.updateLastSeenMsg(key)
|
||||
//this.orders[idx].unread = true
|
||||
return
|
||||
}
|
||||
console.log(
|
||||
'Key',
|
||||
key,
|
||||
'saved:',
|
||||
lastMsgs[key].timestamp,
|
||||
'messages: ',
|
||||
Math.max(...this.messages[key].map(c => c.timestamp)),
|
||||
lastMsgs[key].timestamp <
|
||||
Math.max(...this.messages[key].map(c => c.timestamp))
|
||||
)
|
||||
|
||||
if (
|
||||
lastMsgs[key].timestamp <
|
||||
Math.max(...this.messages[key].map(c => c.timestamp))
|
||||
) {
|
||||
this.$set(this.orders[idx], 'unread', true)
|
||||
// this.orders[idx].unread = true
|
||||
} else {
|
||||
this.$set(this.orders[idx], 'unread', false)
|
||||
// this.orders[idx].unread = false
|
||||
}
|
||||
console.log('Order:', this.orders[idx])
|
||||
}
|
||||
|
|
|
@ -286,8 +286,6 @@ async def api_diagonalley_order_create(data: createOrder):
|
|||
"payment_request": payment_request,
|
||||
"order_reference": ref,
|
||||
}
|
||||
# order = await create_diagonalley_order(wallet_id=wallet.wallet.id, data=data)
|
||||
# return order.dict()
|
||||
|
||||
|
||||
@diagonalley_ext.get("/api/v1/orders/payments/{payment_hash}")
|
||||
|
@ -352,7 +350,7 @@ async def api_diagonalley_order_shipped(
|
|||
"SELECT * FROM diagonalley.orders WHERE id = ?", (order_id,)
|
||||
)
|
||||
|
||||
return [order.dict() for order in get_diagonalley_orders(order["wallet"])]
|
||||
return order
|
||||
|
||||
|
||||
###List products based on stall id
|
||||
|
|
Loading…
Add table
Reference in a new issue