Commit Graph
100 Commits
Author SHA1 Message Date
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 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
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
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
c8ab2859fd Splitpayments: floating point percentage for split value (#690)
* allow for float in model

* recreate DB with float type

* remove rounding in UI

* black

Co-authored-by: callebtc <93376500+callebtc@users.noreply.github.com>
2022-07-17 20:00:06 +02:00
Tiago VasconcelosandGitHub 2b827d37fa return lnurl in create link (#685) 2022-07-17 14:39:02 +02:00
Tiago VasconcelosandGitHub 348033da1b python code styling (#739) 2022-07-15 19:11:11 +02:00
Tiago vasconcelos f9bb1024a7 rename stall to store 2022-07-15 10:43:06 +01:00
Tiago vasconcelos 88c45a9c45 create and edit products 2022-07-15 10:22:13 +01:00
Tiago vasconcelos c19618eddc create product 2022-07-12 17:22:03 +01:00
Tiago vasconcelos b11597b0de fix create edit delete permissions 2022-07-12 15:29:46 +01:00
Tiago vasconcelos 2fed92e69a black'ed 2022-07-12 15:25:25 +01:00
Tiago vasconcelos 4fde09e0cc stalls/stores create update with human readable zones 2022-07-12 15:07:56 +01:00
Tiago vasconcelos fd280aee1a create and display zones 2022-07-12 11:02:27 +01:00
Tiago vasconcelos 4deb116076 clean up optional nostr,timestamp 2022-07-12 11:02:12 +01:00
Tiago vasconcelos 89181eb74e add timespamp on orders, nullable nostr,user keyword 2022-07-12 11:01:15 +01:00
Tiago vasconcelos f72ec97b37 remove nostrAdmin check 2022-07-11 21:38:05 +01:00
847fd18796 update readme link (#687)
Co-authored-by: calle <93376500+callebtc@users.noreply.github.com>
2022-07-07 00:14:27 +02:00
Tiago VasconcelosandGitHub 1b064ceda4 fix issue #683 (#684) 2022-07-05 21:40:05 +02:00
Tiago vasconcelos 42d342cd0d blacked 2022-07-05 16:21:49 +01:00
Tiago vasconcelos 6154454f15 hotfix api_payments failing 2022-06-29 10:55:54 +01:00
Tiago vasconcelos c8a6caa4e3 update api section title 2022-06-28 11:12:42 +01:00
Tiago vasconcelos 6147bd23ec fix typo 2022-06-22 17:08:08 +01:00
Tiago vasconcelos 6867d65733 one final addition to readme 2022-06-22 17:04:23 +01:00
Tiago vasconcelos fea92354a8 some vanity bling 2022-06-22 16:51:14 +01:00
Tiago vasconcelos a7efff858b bring back list scrub 2022-06-22 16:46:27 +01:00
Tiago vasconcelos 267530f217 readme 2022-06-22 16:46:15 +01:00
Tiago vasconcelos 6b66ca1531 correct api instructions and add readme 2022-06-22 16:45:54 +01:00
Tiago vasconcelos 73b8bd682c clean up 2022-06-22 13:30:06 +01:00
Tiago vasconcelos c90cf6ee1b general clean up 2022-06-21 16:44:59 +01:00
Tiago vasconcelos 6a4170f4cc scrubbing works, duplicated code warning 2022-06-21 15:33:23 +01:00
Tiago vasconcelos d8445450d8 quik fix logo placement 2022-06-21 10:45:09 +01:00
Tiago vasconcelos 10e1bbcb66 pay lnurl 2022-06-21 10:31:18 +01:00
Tiago vasconcelos f6d922e1b7 update scrub links 2022-06-17 12:33:14 +01:00
Tiago vasconcelos 1a394d0a73 create scrub link 2022-06-17 11:41:12 +01:00
Tiago vasconcelos 3e8d2a5ba1 fix response 2022-06-15 16:49:39 +01:00
Tiago vasconcelos 1ebba9f846 send json response basic error 2022-06-15 16:37:10 +01:00
Tiago vasconcelos 626a93a46c add json response for basic error 2022-06-15 16:20:20 +01:00
Tiago vasconcelos c4f9206c10 change status code 2022-06-13 21:43:17 +01:00
Tiago vasconcelos 5ceb8639f9 clean up and comment 2022-06-13 16:18:16 +01:00
Tiago vasconcelos 9279129f07 check if request is from browser 2022-06-13 15:18:14 +01:00
77fbea25af Allow for custom image logo (#642)
* first test

* add custom URL logo

* some styling

* fixed typo, wrong import

* Update .env.example

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

Co-authored-by: calle <93376500+callebtc@users.noreply.github.com>
2022-06-08 16:23:36 +02:00
Tiago VasconcelosandGitHub 7c4ce9bf96 Extension: add example extension (#644)
* add example ext files

* remove from extension list
2022-06-01 13:53:47 +02:00
Tiago vasconcelos 98891b7680 get bookmark promp fired on new wallet 2022-05-17 12:16:41 +01:00