Michilis/lnbits
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,151 Commits 66 Branches 114 Tags
98ef0dfcb1ca4e2aa9eb9b663013bb32c32c849f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Tiago VasconcelosGitHubcallebtc
 		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
Tiago VasconcelosGitHubcalle
 		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
Tiago VasconcelosandGitHub ff5b1189b5 Fix/tpos tips #697 (#713) 
* small fastapi convertion

* make tip add up to invoice

* make tip add to invoice

* display existing tpos

* clean console logs

* suggestion from @leesalminen

* blacked
 2022-07-25 11:19:03 +02:00
Tiago vasconcelos 0f238286a3 add order_details table 2022-07-25 10:11:03 +01:00
Tiago vasconcelos 245e2a353e add cart menu and filter products 2022-07-20 17:00:24 +01:00
Tiago vasconcelos e56b26146a toolbar 2022-07-20 11:47:03 +01:00
Tiago vasconcelos b151341148 add a placeholder img for no photo product 2022-07-20 11:46:48 +01:00
Tiago vasconcelos 6965459f5d add StaticFiles 2022-07-20 11:46:20 +01:00
Tiago VasconcelosGitHubcallebtc
 		ed2c5cc586 Fix/lnurl auth (#757) 
* remove g() and add wallet

* wallet type

* add wallet object

* send wallet as param

* make lnurlauth work

* remove g() and add wallet

* wallet type

* add wallet object

* send wallet as param

* make lnurlauth work

* black'ed

* blacked

Co-authored-by: callebtc <93376500+callebtc@users.noreply.github.com>
 2022-07-19 11:35:28 +02:00
Tiago vasconcelos f7f442c9d7 add stall page 2022-07-19 10:13:06 +01:00
Tiago vasconcelos b79fb373a8 clean prints 2022-07-19 10:12:54 +01:00
Tiago vasconcelos b0db9ecf78 Merge remote-tracking branch 'lnbits/diagon-alley' into diagon-alley 2022-07-18 09:12:10 +01:00
Tiago vasconcelos df780124d7 rename stall to store 2022-07-18 09:11:19 +01:00
Tiago vasconcelos e8e161098f create and edit products 2022-07-18 09:11:19 +01:00
Tiago vasconcelos 83fe977a85 create product 2022-07-18 09:11:19 +01:00
Tiago vasconcelos 5618de2cd3 fix create edit delete permissions 2022-07-18 09:11:19 +01:00
Tiago vasconcelos 00e6aced53 black'ed 2022-07-18 09:11:19 +01:00
Tiago vasconcelos 7eb0d13590 stalls/stores create update with human readable zones 2022-07-18 09:11:19 +01:00
Tiago vasconcelos 820852e08b create and display zones 2022-07-18 09:11:19 +01:00
Tiago vasconcelos d3038fe49b clean up optional nostr,timestamp 2022-07-18 09:11:19 +01:00
Tiago vasconcelos e1b6288860 add timespamp on orders, nullable nostr,user keyword 2022-07-18 09:11:19 +01:00
Tiago vasconcelos 99d285335e remove nostrAdmin check 2022-07-18 09:11:19 +01:00
Tiago vasconcelos a55dd18528 UI fires up 2022-07-18 09:11:19 +01:00
Tiago vasconcelos c41f6033be orders 2022-07-18 09:11:19 +01:00
Tiago vasconcelos 8b37302164 stalls 2022-07-18 09:11:19 +01:00
Tiago vasconcelos ebaf0c990f zones 2022-07-18 09:11:19 +01:00
Tiago vasconcelos 5cc39930e5 products 2022-07-18 09:11:19 +01:00