Commit Graph

259 Commits

Author SHA1 Message Date
Vlad Stan
0592c02c10 fix: merge bug 2022-11-28 16:17:18 +02:00
Vlad Stan
810cb46e34 fix: SQL syntax 2022-11-28 16:11:05 +02:00
Vlad Stan
3d314eae38 fix: sql insert 2022-11-28 16:02:07 +02:00
Vlad Stan
e818f34888 fix: rebase clean-up 2022-11-28 15:52:39 +02:00
Vlad Stan
2f5e5cf4d4 fix: quote user column 2022-11-28 15:25:19 +02:00
Vlad Stan
7380c37c73 fix: timestamp does not exist on themes 2022-11-28 15:25:19 +02:00
ben
58eefd4d30 isort 2022-11-28 15:25:19 +02:00
ben
63d52581f2 Primary key 2022-11-28 15:24:23 +02:00
ben
879996039f formatting 2022-11-28 15:24:23 +02:00
ben
577d5fccd7 adding missing css to public_charge 2022-11-28 15:24:12 +02:00
ben
e192b6c3f5 Added lost return 2022-11-28 15:24:12 +02:00
ben
1d01ed861b resolving conflict errors 2022-11-28 15:23:49 +02:00
ben
16183a0317 Trying to fix conflict errors 2022-11-28 15:23:49 +02:00
ben
769bce0f94 Added back custom_css 2022-11-28 15:23:49 +02:00
ben
254cb8cce1 added back custom css to public page 2022-11-28 15:23:33 +02:00
ben
3a9dbb97c5 fixed admin check 2022-11-28 15:23:06 +02:00
ben
7dc90177ec Auto stash before checking out "HEAD" 2022-11-28 15:23:06 +02:00
ben
a19bb520c3 removed compact_charge 2022-11-28 15:22:35 +02:00
ben
5b75d4f262 added back crud 2022-11-28 15:21:34 +02:00
ben
5c029a7af9 only allows admins to use custom themes 2022-11-28 15:20:35 +02:00
ben
a26a13a88d Now you can have multiple themes 2022-11-28 15:19:51 +02:00
Black Coffee
6f9d32478b run isort and black 2022-11-28 15:18:01 +02:00
Black Coffee
1d8f4cb01b Change user to user_id in satspay settings table and fixed first use bug 2022-11-28 15:18:01 +02:00
Black Coffee
6dd52acc5b Remove console.log from satspay index.html 2022-11-28 15:18:01 +02:00
Black Coffee
f074d81827 Remove theme settings on satspay invoice page and default to blue theme to allow users to skin satspay invoice page more easily 2022-11-28 15:18:01 +02:00
Black Coffee
1296dd8574 Removed unused custom css api call from display.html 2022-11-28 15:17:35 +02:00
Black Coffee
7106dee2ce Custom CSS on SatsPay server working!:) 2022-11-28 15:17:19 +02:00
Black Coffee
220dc699cf Settings now save and load and have an insert or delete for new / existing settings 2022-11-28 15:14:26 +02:00
Black Coffee
4e9132ec04 SatsPay server save custom css settings now working 2022-11-28 15:13:57 +02:00
Black Coffee
00cb7a8d21 Added satspay settings migration 2022-11-28 15:11:39 +02:00
Vlad Stan
44754df991 refactor: remove single use var 2022-11-25 14:37:26 +02:00
Vlad Stan
cd53f9930b chore: update comment 2022-11-25 14:37:02 +02:00
Vlad Stan
3178b79fe4 chore: format code 2022-11-25 14:31:00 +02:00
Vlad Stan
15c257fd65 fix: object is not subscriable 2022-11-25 14:20:56 +02:00
Vlad Stan
1a9cd81ee9 fix: persist webhook call status 2022-11-25 14:12:13 +02:00
Vlad Stan
1aecedac84 refactor: move business logic logic to helpers.py 2022-11-25 11:25:40 +02:00
Vlad Stan
6f5c9a7798 chore: code clean-up 2022-11-25 11:06:45 +02:00
Vlad Stan
5440d4ab19 feat: store onchain charge config with the charge 2022-11-25 10:48:57 +02:00
Vlad Stan
4e984eae56 fix: center back button 2022-11-24 17:39:40 +02:00
Vlad Stan
3356bab5ca fix: refresh when both onchain and ln are present 2022-11-24 17:33:58 +02:00
Vlad Stan
d3c3622d22 fix: mempool hostname 2022-11-24 17:20:12 +02:00
Vlad Stan
00ba09d201 fix: remove wallet inkey 2022-11-24 17:08:32 +02:00
Vlad Stan
fdfd9b1d9f fix: call webhook in the background (from the task.py) 2022-11-24 16:57:59 +02:00
Vlad Stan
a641ef4836 refactor: remove duplicate code 2022-11-24 16:55:35 +02:00
Vlad Stan
4b4f18fad5 fix: oldObj should not overwrite properties 2022-11-24 11:39:35 +02:00
Vlad Stan
a8d4835b74 fix: use lnbitswallet form data 2022-11-24 10:42:28 +02:00
Vlad Stan
69c0b753f5 fix: remove de-selected wallet 2022-11-23 17:32:34 +02:00
Vlad Stan
b9986b562a fix: oldObj values lost 2022-11-23 17:04:08 +02:00
Thomas Verstreken
b698dac52c
Fix typo's (#1136)
Costumer to Customer, costumer to customer
2022-11-19 14:10:12 -06:00
ChuckNorrison
3cbbe2a93d fix integer to bigint for extensions
Some more INTEGER to BIGINT conversion for postgresql database
2022-11-17 15:44:59 +01:00
Tiago Vasconcelos
7d7a2b67ee fix raise error on delete request 2022-11-17 14:47:52 +02:00
Vlad Stan
9de38f908b
fix: wallet not found error (#1063) 2022-10-20 16:40:23 +02:00
calle
5a12f4f237
Improved SSE listeners (#865)
* logging listeners

* comments

* generate privkey upon init

* listener queue

* remove duplicate check

* make format

* reuse channel

* error handling in sse listener

* uuid for listeners

* register named invoices

* uuid for listeners and listener list

* fix poetry lock

* setuptools

* requirements asyncio timeout

* setuptool;s

* make format

* remove async-timeout

* async_timeout readd

* try lower setuptools version

* try lower lower setuptools version

* back to current version + fix, maybe

* fix worflows to use poetry 1.2.1

* remove uneeded setuptools from build-system

* fix up formatting workflow

* debug to trace

* more traces

* debug logs to trace

Co-authored-by: dni âš¡ <office@dnilabs.com>
2022-10-04 09:51:47 +02:00
Tiago Vasconcelos
9154660479
Fix/tipjar desc and satspay (#824)
* fix tipjar description from screwing charges

* small fix for charges when onchain isn't set

* make dni happy

* make black happy
2022-08-02 16:16:32 +02:00
Vlad Stan
191124d8fc chore: code format 2022-07-28 16:34:42 +03:00
Vlad Stan
66a3b24dd5 chore: code clean-up 2022-07-28 15:35:54 +03:00
Vlad Stan
809d03d3db fix: at least one charge must be active in order to fetch balance 2022-07-28 15:35:54 +03:00
Vlad Stan
f9fd071315 feat: update API doc to use swagger 2022-07-28 15:35:54 +03:00
Vlad Stan
739c108bdf feat: add (hh:mm) to time columns 2022-07-28 15:35:39 +03:00
Vlad Stan
c419afc1b1 refactor: code clean-up 2022-07-28 15:35:39 +03:00
Vlad Stan
46a7b54a00 fix: fix progress for charges 2022-07-28 15:35:39 +03:00
Vlad Stan
0f204485c3 feat: return time_elapsed, time_left and paid fields 2022-07-28 15:35:39 +03:00
Vlad Stan
8c6b31ec12 feat: mapCharge now computes fields progress, timeLeft and fixes time 2022-07-28 15:35:39 +03:00
Vlad Stan
d79d4e371e feat: use datetime to compute time_left and time_elapsed 2022-07-28 15:35:39 +03:00
Vlad Stan
e4078504ba fix: do not update charge if balance has not changed 2022-07-28 15:35:39 +03:00
Vlad Stan
25f37b0e4f chore: code clean-up 2022-07-28 15:35:39 +03:00
Vlad Stan
057de41678 feat: only refresh balance on the back-end if new funds are detected by the front-end refresh 2022-07-28 15:35:39 +03:00
Vlad Stan
31b6a9410c refactor: move setInterval outside method logic 2022-07-28 15:35:39 +03:00
Vlad Stan
ac3f95e6c2 feat: use custom mempool_endpoint for the charge details 2022-07-28 15:35:39 +03:00
Vlad Stan
4cb54ce549 feat: allow refresh balance for individual charge
- expired or paid charges are not auto-refreshed
2022-07-28 15:35:39 +03:00
Vlad Stan
5a3e1d7fbb feat: add expanding details to rows 2022-07-28 15:35:39 +03:00
Vlad Stan
4fa8b5a292 feat: enforce order for charges ORDER BY "timestamp" DESC 2022-07-28 15:35:39 +03:00
Vlad Stan
ccae7876d9 feat: show status as badge 2022-07-28 15:35:39 +03:00
Vlad Stan
cce341fb39 fix: search and export csv layout 2022-07-28 15:35:39 +03:00
Vlad Stan
5317d5afd5 feat: use multiple charges balance endpoint (one call only) 2022-07-28 15:35:39 +03:00
Vlad Stan
6da62c648a feat: use single charge endpoint for balance 2022-07-28 15:35:39 +03:00
Vlad Stan
40f5cf77f6 feat: add endpoint for multiple charges balance; 2022-07-28 15:35:39 +03:00
Vlad Stan
475fd566e6 fix: remove retry logic for pending funds 2022-07-28 15:35:39 +03:00
Vlad Stan
a9506cee11 feat: show pending funds 2022-07-28 15:35:39 +03:00
Vlad Stan
efbf34a51e feat: show message when new payment detected 2022-07-28 15:35:39 +03:00
Vlad Stan
0cd8ba956a feat: more UI polishing 2022-07-28 15:35:39 +03:00
Vlad Stan
05bc887ad5 feat: make the panels responsive 2022-07-28 15:35:39 +03:00
Vlad Stan
80e1545920 core: code format 2022-07-28 15:35:39 +03:00
Vlad Stan
728209da7d refactor: replace mempool internal API with a more generic config API 2022-07-28 15:35:39 +03:00
Vlad Stan
3bd4253292 feat: use bootstrap tables for the layout (not fixed px values) 2022-07-28 15:34:37 +03:00
Vlad Stan
912a7e1c4b feat: add web-socket to mempool; & replace UI mappings 2022-07-28 15:34:37 +03:00
Vlad Stan
d74b48b0b6 refactor: method renamings 2022-07-28 15:34:37 +03:00
Vlad Stan
615520bcb3 feat: separate invoice check from onchain check 2022-07-28 15:34:36 +03:00
Vlad Stan
1dd51a2752 refactor: extract methods to utils 2022-07-28 15:34:36 +03:00
Vlad Stan
e3d36e6a3a feat: extract utils to static/js 2022-07-28 15:34:36 +03:00
Vlad Stan
09a9a0f9ec refactor: remove extra state fields 2022-07-28 15:34:36 +03:00
Vlad Stan
74322232d0 fix: add await for rescan 2022-07-28 15:34:36 +03:00
Vlad Stan
91c6d32852 feat: do client side rescan for onchain address 2022-07-28 15:34:36 +03:00
Vlad Stan
6c21bf359c choe: format 2022-07-28 15:34:36 +03:00
Vlad Stan
b5e97f08a6 chore: code clean-up 2022-07-28 15:34:36 +03:00
Vlad Stan
8e05a11978 refactor: replace var with const 2022-07-28 15:34:36 +03:00
Vlad Stan
50b2dcfcaa refactor: clean-up unnecessary self 2022-07-28 15:34:36 +03:00
Vlad Stan
6cfa8e30bc refactor: replace promises with async/await 2022-07-28 15:34:36 +03:00
Vlad Stan
5a005e830c chore: add a todo 2022-07-28 15:34:36 +03:00
Vlad Stan
d93b199735 fix: pass charge param as JSON 2022-07-28 15:34:36 +03:00
Vlad Stan
2b5fc82110 feat: update text Watch-Only -> Onchain Wallet (watch-only) 2022-07-28 15:03:22 +03:00
ben
3a28ff1020 added swagger to extensions 2022-07-27 19:21:04 +01:00
Tiago Vasconcelos
348033da1b
python code styling (#739) 2022-07-15 19:11:11 +02:00
calle
089313f613
Logging with loguru (#708)
* logging

* requirements

* add loguru dependency

* restore it

* add loguru

* set log level in .env file

* remove service fee print

* set log level

* more logging

* more logging

* more logging

* pyament.checking_id

* fix
2022-07-07 14:30:16 +02:00
calle
92887ed169
Format: prettier (#707)
* format: prettier

* gh-actions: add prettier checkg

* actions
2022-07-05 21:14:56 +02:00
blackcoffeexbt
f44bd55b4b
Corrected example CURL requests in multiple extension API docs (#689)
* Updated api docs example CURL calls for satspay server

* Updated api docs example CURL calls for copilot extension

* Updated api docs example CURL calls for jukebox extension

* Updated api docs example CURL calls for livestream extension

* Updated api docs example CURL calls for lnaddress extension

* Updated api docs example CURL calls for lnurldevices extension

* Updated api docs example CURL calls for lnurlp extension

* Updated api docs example CURL calls for offlineshop extension

* Updated api docs example CURL calls for paywall extension

* Updated api docs example CURL calls for satsdice extension

* Updated api docs example CURL calls for splitpayments extension

* Fix typo double slash in satsdice extension api docs

* Updated api docs example CURL calls for tpos extension

* Updated api docs example CURL calls for watchonly extension
2022-07-05 17:20:42 +02:00
Ben Arc
ce6620882f Satspay tooltip fix (quart commit 8e3230287dd191a743479ee9ceb2f497c43dd9bc) 2022-03-11 13:25:14 +00:00
benarc
228717195b back 2022-01-30 19:43:30 +00:00
Arc
db666fd103
Merge pull request #475 from talvasconcelos/fix/chargepermission
fix wallet key permission for create
2021-12-31 15:43:10 +00:00
Tiago vasconcelos
6ba88d262b fix issue #472 2021-12-30 16:21:44 +00:00
Tiago vasconcelos
e3c6d7aebe fix :// in bitcoin 2021-12-29 15:19:09 +00:00
Tiago vasconcelos
87105b22bb fix lightning://
fix lightning://
2021-12-29 15:15:49 +00:00
Tiago vasconcelos
2991cbce1f add listener to invoice 2021-12-29 12:57:43 +00:00
Tiago vasconcelos
df2345bda9 added require_invoice_key
clean up
2021-12-28 15:22:45 +00:00
Tiago vasconcelos
0ef0188462 index 2021-12-28 15:16:45 +00:00
Tiago vasconcelos
e42fdde2ac fix wallet key permission for create 2021-12-28 14:47:44 +00:00
Tiago vasconcelos
cfac70d394 general cleanup and unused imports removal 2021-11-25 18:52:16 +00:00
Tiago vasconcelos
1537b06e00 reset form 2021-11-10 17:00:53 +00:00
benarc
e03370188a Fixed payment checking 2021-10-22 00:41:30 +01:00
Tiago vasconcelos
a840970366 fix require admin key endpoints 2021-10-20 12:03:11 +01:00
benarc
1d3bb016a2 I want them to turn black 2021-10-17 18:33:29 +01:00
Tiago vasconcelos
ec4117a5f4 satspay done 2021-10-14 22:30:29 +01:00
Tiago vasconcelos
e939666107 satspay initial converstion 2021-10-14 11:45:56 +01:00
Tiago vasconcelos
43f36afeb0 satspay ext added 2021-10-14 10:02:02 +01:00
Tiago vasconcelos
6edac8ae8d remove extensions 2021-10-01 10:49:11 +01:00
Tiago vasconcelos
5495dac6d3 satspay started;views_api refactored 2021-08-22 10:29:01 +01:00
Ben Arc
bbdb96f4ac Converted views 2021-08-21 01:55:07 +01:00
Ben Arc
8dea1e28f0 Added pydantic to models 2021-08-20 14:46:08 +01:00
Ben Arc
fe123d6d31 Put extensions back so we can start converting 2021-08-20 12:44:03 +01:00
Ben Arc
9c313586bd removed all but one extension, so we can focus on core 2021-08-16 18:12:48 +01:00
Ben Arc
aa1c83cdc4 added dynamic titles for continuity 2021-07-25 14:26:20 +01:00
fiatjaf
2f309c9863 postgres support. 2021-07-02 17:34:31 -03:00
Ben Arc
b0c0b9f851 Changed primary/secondary colours to branded 2021-06-29 02:10:30 +01:00
Ben Arc
778926a714 updated for black 2021-06-13 13:04:18 +01:00
Ben Arc
8500b7767c Fixed button bug 2021-06-10 23:09:24 +01:00
Tiago vasconcelos
239e0cdbcf button default on statspay default to back to merchant 2021-06-10 12:03:44 -03:00
Tiago vasconcelos
5dacf52bdb sats pay server documentation 2021-06-10 12:03:44 -03:00
Ben Arc
86c03fa5d9 Deleted some prints 2021-04-13 00:18:10 +01:00
Ben Arc
61f6e2a4f2 Fixed prettier (again) 2021-04-09 00:49:01 +01:00
Ben Arc
d872f0d138 black formatting 2021-04-09 00:41:19 +01:00
Ben Arc
6a18766a82 Fixed prettier 2021-04-09 00:36:56 +01:00
Ben Arc
4219513a8a Cleaned up api 2021-04-09 00:22:52 +01:00
Ben Arc
6a7c28eb0e Deleted some prints 2021-04-08 01:34:44 +01:00
Ben Arc
8d3d828e49 Some formatting 2021-04-08 01:04:55 +01:00
Ben Arc
b7090d963b Removed ability to update charge, as caused too many issues 2021-04-08 01:01:10 +01:00
Ben Arc
2d8f85f77c SatsPayServer works apart from updating charges 2021-04-07 22:51:33 +01:00
Ben Arc
90319bfd8c Satspay mostly working 2021-04-07 01:50:38 +01:00
Ben Arc
f5d06653a6 Counted working 2021-04-05 01:48:35 +01:00
Ben Arc
744662fb63 Started fixing endpoints 2021-04-05 00:10:54 +01:00
Ben Arc
55748b427b Initial commit 2021-04-04 18:20:52 +01:00