Commit Graph
100 Commits
Author SHA1 Message Date
Tiago Vasconcelos 610814f0d0 add onboarding tutorial 2022-11-27 16:50:31 +00:00
Tiago Vasconcelos e9109b0b49 make format 2022-11-25 14:24:17 +00:00
Tiago Vasconcelos 78e94df9c5 export order page URL 2022-11-25 14:20:01 +00:00
Tiago Vasconcelos e725ae097d display and backup keys for merchant 2022-11-24 14:42:04 +00:00
Tiago Vasconcelos 7e24e129f6 fix create index error on sqlite 2022-11-15 00:59:41 +00:00
Tiago Vasconcelos d5e1551839 format 2022-11-11 12:12:31 +00:00
Tiago Vasconcelos 82e887b7a8 clean up and add pubkey to order 2022-11-11 12:11:14 +00:00
Tiago Vasconcelos f3fc1e4a2b format 2022-10-25 12:32:19 +01:00
Tiago Vasconcelos 45ef9222fe Merge branch 'main' into diagon-alley 2022-10-25 12:30:42 +01:00
Tiago Vasconcelos c282f38726 cleanup and keys management 2022-10-25 12:30:15 +01:00
Tiago Vasconcelos 227eaeae75 some cleanup 2022-10-25 11:57:01 +01:00
Tiago Vasconcelos 4dcb8d2ca0 redirect to order page 2022-10-25 11:55:55 +01:00
Tiago Vasconcelos 02d8d4ca4a Merge branch 'main' into diagon-alley 2022-10-19 22:09:51 +01:00
Tiago Vasconcelos 532e12ec83 merchant chat functional almost out of WIP 2022-10-19 22:08:48 +01:00
Tiago Vasconcelos ebe8d8b0b9 just for bragging... 2022-10-19 22:07:38 +01:00
Tiago vasconcelos 92a756b9bb make format 2022-10-06 15:34:37 +01:00
Tiago vasconcelos 7316ef7dbb add disclaimer about whole (integer) sats 2022-10-06 15:33:20 +01:00
Tiago vasconcelos 11ec82e339 floor amount when not whole sat 2022-10-06 15:23:59 +01:00
Tiago vasconcelos 8e8bf08ea5 fix issue with splitting to multiple wallets-queue 2022-10-06 15:23:59 +01:00
Tiago vasconcelos c59e9efabc add public key and refactor endpoint 2022-10-04 10:00:42 +01:00
Tiago vasconcelos 12d94b3e60 placeholder for product page WIP 2022-10-04 09:59:34 +01:00
Tiago vasconcelos d5388ba7de add publickey if stored 2022-10-04 09:59:18 +01:00
Tiago vasconcelos bd4fd73417 rename endpoint and add more data 2022-10-04 09:58:53 +01:00
Tiago vasconcelos 93d61a7ac5 Merge branch 'main' into diagon-alley 2022-10-03 10:35:50 +01:00
Tiago vasconcelos 98ef0dfcb1 format 2022-09-30 17:29:35 +01:00
Tiago vasconcelos db2ffadb43 retrieve chat messages from db 2022-09-30 17:28:35 +01:00
Tiago VasconcelosandGitHub b2a26b0a7a add small description in UI (#1023) 2022-09-30 13:41:35 +02:00
Tiago vasconcelos 57bb9665c6 chat messages stored in db 2022-09-30 10:16:34 +01:00
Tiago vasconcelos 8ab9590594 format 2022-09-28 17:03:09 +01:00
Tiago vasconcelos b9371805e2 websockets working localstorage for review 2022-09-28 17:02:15 +01:00
Tiago vasconcelos 62e35ec006 Merge branch 'main' into diagon-alley 2022-09-28 11:14:24 +01:00
Tiago vasconcelos e0b93fbd49 chat and WS initial commit 2022-09-28 11:12:34 +01:00
Tiago vasconcelos 4aa17930fd chat page 2022-09-28 11:12:10 +01:00
Tiago vasconcelos aadb567712 WIP added keys to merchant 2022-09-28 11:11:52 +01:00
f6d12c9d24 prevent ios autozoom on inputs (#945)
Co-authored-by: callebtc <93376500+callebtc@users.noreply.github.com>
2022-09-23 16:40:20 +03:00
Tiago vasconcelos e80daf2795 rename stores to stalls 2022-09-23 10:25:57 +01:00
Tiago vasconcelos 131d9f689c Merge branch 'main' into diagon-alley 2022-09-23 09:49:05 +01:00
Tiago vasconcelos 384cc8305d Merge remote-tracking branch 'lnbits/diagon-alley' into diagon-alley 2022-09-21 18:18:18 +01:00
Tiago vasconcelos c23756f546 Merge branch 'main' into diagon-alley 2022-09-20 10:20:05 +01:00
Tiago vasconcelos ee47575431 format 2022-09-15 15:52:08 +01:00
Tiago vasconcelos ad98cb0d45 marketplace html skeleton 2022-09-15 15:51:12 +01:00
Tiago vasconcelos 6a5c0bd8ee list marketplaces with stalls in index.html 2022-09-13 12:52:26 +01:00
Tiago vasconcelos 807eb59192 Merge branch 'main' into diagon-alley 2022-09-13 09:57:50 +01:00
Tiago vasconcelos 418cc7bf86 make format 2022-09-12 17:01:41 +01:00
Tiago vasconcelos f429037d63 create marketplace with stalls 2022-09-12 16:58:56 +01:00
Tiago vasconcelos 6ef7411999 clean up 2022-09-12 10:21:17 +01:00
Tiago vasconcelos 108e2f579d ui cosmetic on cards 2022-09-12 10:20:58 +01:00
Tiago vasconcelos 51e30c1517 Merge remote-tracking branch 'lnbits/main' into diagon-alley 2022-09-12 08:56:02 +01:00
Tiago vasconcelos 15e9eeb682 Merge remote-tracking branch 'lnbits/main' into fix/tpos_dismiss_btn 2022-09-12 08:52:25 +01:00
Tiago vasconcelos fad040edf1 remove toast - click checkmark to dismiss 2022-09-12 08:49:12 +01:00
Tiago vasconcelos d1eb0b0c4d rollback on removing NFC button 2022-09-08 14:59:19 +01:00
Tiago vasconcelos 0177316075 display NFC button on supported and fix null tip options 2022-09-08 14:59:19 +01:00
Tiago vasconcelos d2f00435cc remove already added prefix ou route - ws working again 2022-09-06 12:30:20 +01:00
Tiago vasconcelos dc6098e1ca remove call to set ticket paid 2022-09-05 12:56:40 +01:00
Tiago vasconcelos e0c048339c update event data on ticket sold 2022-09-05 12:54:37 +01:00
Tiago vasconcelos ddc3ec7e2f add a tooltip and label for adding tip options 2022-09-05 11:55:24 +01:00
Tiago vasconcelos e5644ec4f6 show a dismissable notification after payment succeed 2022-09-05 11:47:27 +01:00
Tiago VasconcelosandGitHub 551c75c2cf set focus on amount (#916) 2022-08-21 23:07:18 +02:00
Tiago VasconcelosandGitHub 1d55fe1d1a add copy invoice button (#917) 2022-08-21 23:06:47 +02:00
Tiago vasconcelos c9884e512b stock values update 2022-08-20 08:18:28 +01:00
Tiago vasconcelos 7c8e3de261 update product stock tests 2022-08-19 13:24:18 +01:00
Tiago vasconcelos a5c6b1135c order paying works 2022-08-19 11:19:45 +01:00
Tiago vasconcelos e76c23b096 remove nostradmin from this branch 2022-08-18 16:56:10 +01:00
Tiago vasconcelos 627914abda Merge branch 'main' into diagon-alley 2022-08-18 16:50:58 +01:00
Tiago vasconcelos 2e9b8c1360 make format 2022-08-18 16:20:15 +01:00
Tiago vasconcelos d6fe562067 have orders show on user page and invoice init 2022-08-18 16:18:07 +01:00
Tiago vasconcelos 4cd86d0daf create order 2022-08-18 10:49:04 +01:00
Tiago VasconcelosandGitHub 7bba742faf delete tips first... (#888) 2022-08-16 17:01:53 +02:00
Tiago vasconcelos 58b046254f make format diagonalley 2022-08-16 12:19:31 +01:00
Tiago vasconcelos 39bae68b1c Merge remote-tracking branch 'lnbits/diagon-alley' into diagon-alley 2022-08-16 12:11:43 +01:00
Tiago vasconcelos 777b9bef1b place order flow WIP 2022-08-16 12:11:30 +01:00
Tiago vasconcelos 35cf441d91 remove privatekey from stall 2022-08-16 12:11:30 +01:00
Tiago vasconcelos 25d0309ff3 ui and checkout 2022-08-16 12:11:30 +01:00
Tiago vasconcelos 8032566f44 place order flow WIP 2022-08-16 12:08:27 +01:00
Tiago vasconcelos d9242ddd5b remove privatekey from stall 2022-08-16 12:07:56 +01:00
Tiago vasconcelos 0a54fe6db8 ui and checkout 2022-08-16 12:07:23 +01:00
Tiago vasconcelos c4509d726a UI and checkout 2022-08-16 12:07:04 +01:00
Tiago vasconcelos af906740ca Merge branch 'main' into diagon-alley 2022-08-16 09:02:06 +01:00
197ff7d054 Core: reserve fee as an .env variable (#631)
* reserve fee as an .env variable

* fixed bad import

* Update .env.example

Co-authored-by: calle <93376500+callebtc@users.noreply.github.com>

* Update lnbits/core/services.py

Co-authored-by: calle <93376500+callebtc@users.noreply.github.com>

* Update lnbits/core/services.py

Co-authored-by: calle <93376500+callebtc@users.noreply.github.com>

* Update lnbits/settings.py

Co-authored-by: calle <93376500+callebtc@users.noreply.github.com>

* variable consistent names

* fix services.py variable names

* percent default fix

* Update lnbits/settings.py

int to float

* Update lnbits/settings.py

int to float

* Update .env.example

int to float

* make format

* fixed failing bleskomat test, expecting 2000 msats fee

* Update tests/extensions/bleskomat/test_lnurl_api.py

revert to 2 sat

* Update .env.example

* Update lnbits/settings.py

Co-authored-by: calle <93376500+callebtc@users.noreply.github.com>
2022-08-13 20:19:08 +02:00
Tiago VasconcelosandGitHub af8af54376 Fix/hotfix custom design (#850)
* allow to toggle custom desing on and off

* make custom design off by default, toggle custom design
2022-08-09 10:05:37 +02:00
Tiago VasconcelosandGitHub 716a30a0fc make instant wallet available in custom vouchers (#830) 2022-08-03 09:51:16 +02:00
Tiago VasconcelosandGitHub 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
Tiago VasconcelosandGitHub c36da4172c reset the form after close (#821) 2022-08-02 16:14:52 +02:00
Tiago VasconcelosandGitHub a1919e0619 reset data (#819) 2022-08-01 12:57:30 +02:00
Tiago VasconcelosandGitHub 925a7735da change z-index for wallet tab (#818) 2022-08-01 12:56:56 +02:00
Tiago vasconcelos a57850f391 update offline dbversion in mock data 2022-07-28 12:09:20 +01:00
Tiago vasconcelos cf11b6c42d Merge remote-tracking branch 'lnbits/main' into fix/offlineshop_fiat_decimals 2022-07-28 11:10:03 +01:00
Tiago vasconcelos 4ca701a442 Merge remote-tracking branch 'lnbits/fix/offlineshop_fiat_decimals' into fix/offlineshop_fiat_decimals 2022-07-28 11:09:06 +01:00
Tiago vasconcelos 56cac668ca add mock data and fix conv 2022-07-28 11:08:55 +01:00
Tiago vasconcelos a601e178ea add missing param in add item 2022-07-28 11:08:15 +01:00
Tiago vasconcelos 7f8ee461a2 stupid 2022-07-28 10:27:31 +01:00
Tiago vasconcelos d322e6d4dc fix conv typo in scrub schema 2022-07-28 10:24:50 +01:00
Tiago vasconcelos 556eef35ab add scrub mock data 2022-07-28 10:10:23 +01:00
Tiago vasconcelos c340a55925 add scrub to conv 2022-07-28 10:00:53 +01:00
Tiago vasconcelos 254fa67859 allow for decimals in fiat unit 2022-07-27 22:49:23 +01:00
Tiago vasconcelos 3f58676849 rename shop to market and create market 2022-07-27 16:46:27 +01:00
Tiago VasconcelosandGitHub 41dc1b0512 Fix/hotfix tpos 2 (#783)
* fix older tpos without tips

* bad math requesting invoice

* make format
2022-07-27 16:45:17 +02:00
Tiago vasconcelos 6d5e9aba39 initial launch market 2022-07-27 15:28:58 +01:00
Tiago VasconcelosandGitHub 27b4db9877 fix older tpos without tips (#778) 2022-07-25 12:52:28 +02:00
Tiago VasconcelosandGitHub 7fbea79e62 Add voucher design (#704)
* allow for custom print of vouchers

* lnbits defaul voucher

* reduce png size

* add template for custom design

* rename lnbits voucher

* send voucher amount to UI

* add some tweaks for default voucher

* added bonus in readme

* blacked

* make default string as constant
2022-07-25 11:22:21 +02:00