Commit Graph

348 Commits

Author SHA1 Message Date
Mario Dian
4e167b35be Bug fixes
- fix `tip reset` when cart content changes
- fix negative cart value when deleting empty cart items
2018-12-27 13:19:51 +08:00
Mario Dian
16873384a8 - fix cart item removal
- fix empty qty field
- remove tip when total changes
2018-12-27 12:57:31 +08:00
Mario Dian
c7e90cd7df New PoS design 2018-12-27 12:57:31 +08:00
Nicolas Dorier
8c5b00b1a3
Merge pull request #470 from Kukks/feature/bootstrapbump
update bootstrap to 4.2.1
2018-12-27 13:40:42 +09:00
nicolas.dorier
caa6978d80 Save the KeyPath of the WalletKeyPathRoot of the hardware wallet so we don't have to scan for it 2018-12-26 14:04:00 +09:00
nicolas.dorier
af22d6a4e3 Remove preliminary test to know if the ledger can handle the store. If it can't signing will fail anyway. 2018-12-25 19:33:03 +09:00
nicolas.dorier
0eabb3c37c Remove useless query to ledger xpub in the Add derivation scheme screen 2018-12-25 19:02:11 +09:00
Kukks
6f896cb096 update bootstrap to 4.2.1 2018-12-22 17:32:03 +01:00
Kukks
9cb50446f4 update bootstrap to 4.2.1 2018-12-22 16:55:24 +01:00
nicolas.dorier
968c820702 Add turkish translation 2018-12-21 14:15:05 +09:00
Kukks
fc9cd5bdf0 Merge remote-tracking branch 'btcpayserver/master' into feature/coinswitch 2018-12-20 17:57:04 +01:00
Kukks
a434c45196 fix function names 2018-12-20 17:56:57 +01:00
Nicolas Dorier
87b316ec23
Merge pull request #439 from Kukks/grs-clightning
Add lightning icon for GRS
2018-12-20 22:43:28 +09:00
Andrew Camilleri
30a3a84ec9 fix final issues with integration 2018-12-20 14:33:31 +01:00
nicolas.dorier
3f6ff25322 update es-ES 2018-12-20 17:00:30 +09:00
Kukks
3e2ff55954 Merge remote-tracking branch 'btcpayserver/master' into feature/coinswitch 2018-12-19 10:41:36 +01:00
Kukks
40c645e433 coinswitch integration 2018-12-18 20:14:59 +01:00
Kukks
b2e5415a35 coinswitch integration 2018-12-18 20:00:30 +01:00
Kukks
2b4603a234 coinswitch integration 2018-12-18 19:01:58 +01:00
nicolas.dorier
7bf03e497b In cart js, add space to symbol if needed (fix #450) 2018-12-18 00:38:59 +09:00
nicolas.dorier
d60889f952 Merge branch 'pos-product-management' of https://github.com/mariodian/btcpayserver into mariodian-pos-product-management 2018-12-15 23:22:07 +09:00
Mario Dian
d039890a9b Create js-only product management in PoS 2018-12-14 16:03:02 +08:00
nicolas.dorier
41e88c07fe update languages 2018-12-14 13:14:03 +09:00
Kukks
c00c95efcf initial coinswitch work 2018-12-11 12:47:38 +01:00
Kukks
becf488714 Merge remote-tracking branch 'btcpayserver/master' into grs-clightning 2018-12-10 10:42:08 +01:00
nicolas.dorier
682693a9f0 Update translations 2018-12-06 17:23:42 +09:00
nicolas.dorier
e75a1a8b70 Improve ledger feedback for asking authorization to access xpub 2018-12-04 21:22:27 +09:00
Andrew Camilleri
580494fea7 add correct icon 2018-12-04 11:46:01 +01:00
nicolas.dorier
cad602ad14 Fix several issues in cart
* Fix: Only USD currency with 2 decimals were properly handled for tips
* Fix: All PoS apps would were sharing the same basket
* Fix: Currency formatting was not using server side information
* Fix: Various bug of formatting for decimal 0 and more than 2.
2018-12-04 13:04:26 +09:00
Nicolas Dorier
a653421514
Merge pull request #428 from mariodian/fix-pos-cart-currency
Fix currency format for total amount
2018-12-01 14:09:01 +09:00
Mario Dian
8f234a02cb Add currency formats for major currencies 2018-12-01 12:59:45 +08:00
nicolas.dorier
705dbf12d7 Change translation of the expiration screen 2018-12-01 13:19:35 +09:00
nicolas.dorier
fe11b11c13 Add Polski and Srpski 2018-12-01 12:02:53 +09:00
Mario Dian
f2a43ad1f3 Escape js properties in html template 2018-11-30 21:14:09 +08:00
Mario Dian
cbbe5cfb25 - fix currency format for numbers over 999
- fix cart table
2018-11-30 20:01:47 +08:00
Mario Dian
1831692761 Enable shopping cart, add items to cart, enable tips (#410)
Modal cart, remove items, checkout

Fix removal and adding of cart items

Improve cart UI

Add cart bundle, remove unused js files from the view when cart isn't used

Do not enable cart by default

Do not put modal into the view when the cart is disabled

Escape js properties

Work with amounts as cents

Make animation speed look constant

Enable tips in the cart

Fix cart UI
2018-11-27 15:14:32 +09:00
nicolas.dorier
4350785cef Remove double slash 2018-11-17 00:23:51 +09:00
nicolas.dorier
9a2a85ac3d Update translations 2018-11-17 00:22:18 +09:00
nicolas.dorier
4af5b94013 Add tooling which pull transifex translation automatically, add Slovenčina. (Close #386) 2018-11-14 16:48:25 +09:00
nicolas.dorier
dc749462ec automatically detect the btcpay server url in btcpay.js 2018-11-10 23:43:48 +09:00
Andrew Camilleri
daf4e5ce6c I am sorry for so many prs <3 (#389)
* make language loading more solid

* disable browser lang preferences

* pr fix

* pr fixes

* pr fixes

* make sure language files are named correctly

* fix dropdown width issue when in modal form

* fix issue from jquery hell
2018-11-09 21:13:00 +09:00
Rockstar Developer
cfdf8b1670 Example modal in invoice list (#387) 2018-11-09 17:13:45 +09:00
Andrew Camilleri
f23e2a3ec4 async i18n and json translation format (#369)
* start working on loading locales async and as json

* finish off langs and UI

* fix path

* fix tests
2018-11-09 16:48:38 +09:00
Rockstar Developer
aa1ac3da50 Modal invoice through btcpay.js (#381)
* Modal through btcpay.js

* Handling close action depending on whether is modal or not

* Tweaking button position

* Stripping trailing slashes if present when setting site root
2018-11-09 16:09:09 +09:00
David
7b596e6d9c Add Bitcore BTX support (#259) 2018-11-03 13:42:17 +09:00
nicolas.dorier
88044f6b76 Decouple Wallet Send screen from Ledger Wallet 2018-11-01 00:19:25 +09:00
britttttk
1ff0a98d30 Adding Ukrainian Translation (#352) 2018-10-24 15:18:31 +09:00
britttttk
f0efd52cb7 Adding Kazakh Language (#350) 2018-10-24 15:17:09 +09:00
britttttk
bb8fa88688 Adding Vietnamese (#351) 2018-10-24 15:16:30 +09:00
Andrew Camilleri
4b976c13c1 Changelly v2 (#343)
* Disable shapeshift and use changelly

* UI to manage changelly payment method

* wip on changelly api

* Add in Vue component for changelly and remove target currency from payment method

* add changelly merhcant id

* Small fixes to get Conversion to load

* wip fixing the component

* fix merge conflict

* fixes to UI

* remove debug, fix fee calc and move changelly to own partials

* Update ChangellyController.cs

* move original vue setup back to checkout

* Update core.js

* Extracting Changelly component to js file

* Proposal for loading spinner

* remove zone

* imrpove changelly ui

* add in changelly config checks

* try new method to calculate amount + remove to currency from list

* abstract changelly lofgic to provider and reduce dependency on js component

* Add UTs for Changelly

* refactor changelly backend

* fix failing UT

* add shitcoin tax

* pr changes

* pr changes

* WIP: getting rid of changelly dependency

* client caching, compiling code, cleaner code

* Cleaner changelly

* fiat!

* updat i18n, css and error styler

* default keys

* pr changes part 1

* part2

* fix tests

* fix loader alignment and retry button responsiveness

* final pr change
2018-10-24 14:52:19 +09:00
nicolas.dorier
f419c56a3c Revert "Changelly Support (#267)"
This reverts commit a5fca7a1c4.
2018-10-18 12:27:46 +09:00
Andrew Camilleri
a5fca7a1c4 Changelly Support (#267)
* Disable shapeshift and use changelly

* UI to manage changelly payment method

* wip on changelly api

* Add in Vue component for changelly and remove target currency from payment method

* add changelly merhcant id

* Small fixes to get Conversion to load

* wip fixing the component

* fix merge conflict

* fixes to UI

* remove debug, fix fee calc and move changelly to own partials

* Update ChangellyController.cs

* move original vue setup back to checkout

* Update core.js

* Extracting Changelly component to js file

* Proposal for loading spinner

* remove zone

* imrpove changelly ui

* add in changelly config checks

* try new method to calculate amount + remove to currency from list

* abstract changelly lofgic to provider and reduce dependency on js component

* Add UTs for Changelly

* refactor changelly backend

* fix failing UT

* add shitcoin tax

* pr changes

* pr changes
2018-10-18 12:13:39 +09:00
Rockstar Developer
6278145374 Removing old QR update code (#337) 2018-10-17 11:55:49 +09:00
Rockstar Developer
84018a5caa Bugfixing race condition for QR code switch (#335)
Ref: #334
2018-10-17 11:49:30 +09:00
Denny Biasiolli
a4fbb2de7e creating italian localization file (#310) 2018-10-14 21:34:15 +09:00
Rockstar Developer
d04bfb58a2 Resolving issue with long translations breaking layout (#330) 2018-10-12 14:01:44 +09:00
britttttk
9bec38559f Nepali Translation (#311)
* Nepali Language

* Delete Checkout.cshtml

* Delete LanguageService.cs

* add np.js

* Match Language File Style
2018-10-12 10:11:03 +09:00
Sosthene
2856454d41 [langs-fr] Correction and some minor improvement (#316) 2018-10-12 10:10:42 +09:00
britttttk
b3c4fc4003 Added Russian (#312) 2018-10-12 10:10:20 +09:00
Rockstar Developer
c2bbc04c4c Various bugfixes (#308)
* NotifyEmail field on Invoice, sending email when triggered

* Styling invoices page

* Exporting Invoices in JSON

* Recoding based on feedback

* Fixing image breaking responsive layout on mobile

* Reducing amount of data sent in email notification

* Turning bundling on by default
2018-10-12 10:09:13 +09:00
Sosthene
60707fdbd1 Add simplified chinese translation (#326)
* Add Chinese Simplified translation

* Add Chinese simplified translation
2018-10-11 14:25:16 +09:00
nicolas.dorier
da2fb876cb Can pass pre filled amount and address to Send Wallet 2018-10-09 23:48:14 +09:00
Rockstar Developer
d459839bf7 Displaying Node Info as QR code for Lightning payments (#318)
* Styling elements required for Node info

* Allowing switching QR between bolt11 and node info for lightning

* Equal width for Bolt11 and Node info buttons

* Certain languages were too verbose for display of "Pay with"

Fixes: #317
2018-10-08 07:19:55 +09:00
Gruve_p
1e2ffcadf0 Add GRS lightning image (#309) 2018-10-03 11:25:52 +09:00
nicolas.dorier
fb15c5b354 Increase timeout for wallet, update references 2018-09-28 10:15:35 +09:00
nicolas.dorier
87678c58ac Fix error message for ledger signing 2018-09-27 15:43:34 +09:00
nicolas.dorier
feab4cc48a update ledgerwebsocket 2018-09-27 15:21:26 +09:00
nicolas.dorier
0d3364b3da Change button path to api/v1/invoices 2018-09-08 14:53:42 +09:00
rockstardev
0abd62dfe8 Moving PayButton handler to public controller 2018-09-08 14:53:41 +09:00
nicolas.dorier
013dfa1b61 Properly escape attributes, make the preview an actual form rather than an image 2018-08-23 11:55:29 +09:00
rockstardev
2b6faa8d20 Migrating generator to work on store path 2018-08-22 14:05:12 +02:00
rockstardev
4111b8a5a3 Maintaining AppId reference 2018-08-22 12:59:55 +02:00
rockstardev
5b5a2e8c25 Reorganizing Javascript code and references 2018-08-22 11:10:46 +02:00
rockstardev
9ec0c23c52 Folder for pay buttons, donate button 2018-08-22 10:59:24 +02:00
rockstardev
57daf27fdd Completion of UI for rest of Pay Button gneerator 2018-08-11 13:34:52 +02:00
rockstardev
d00fa42553 Always showing currency name to prevent LND confusion
Discussion: https://forkbitpay.slack.com/archives/C6PSCRFAM/p1533125977000141
2018-08-05 22:45:48 +02:00
Benjamin Nitschke
a3ae694048 Added Dash support for BTCPayServer 2018-07-27 21:06:19 +02:00
nicolas.dorier
1606f43609 Show the fiat price when sending coins 2018-07-26 23:23:28 +09:00
nicolas.dorier
ad1307746c Add a "Wallet" menu 2018-07-26 22:32:50 +09:00
nicolas.dorier
e0c718f4ba Fix wallet alert 2018-07-23 00:21:40 +09:00
rockstardev
2187e05a10 Renaming BTG image to conform to new naming scheme for onchain/offchain 2018-07-17 23:32:44 -05:00
rockstardev
4c07483383 Merge remote-tracking branch 'source/master' into dev-currency-selection 2018-07-17 23:29:52 -05:00
rockstardev
c40b47b1dd Hover indicator and handling case with only one currency 2018-07-17 22:54:09 -05:00
rockstardev
a2d17bfa7e Closing currency selection dialog once invoice expired or paid 2018-07-17 22:30:02 -05:00
Vutov
8154986102 Added BTG lightning svg 2018-07-17 13:43:37 +03:00
rockstardev
203494e809 Tweaking CSS styles and display of payment method selection 2018-07-17 00:14:56 -05:00
rockstardev
d49bbc95af Tweaking display with display name and crypto code 2018-07-16 23:43:52 -05:00
rockstardev
c44132fd35 Using same icon for onchain and offchain per user feedback 2018-07-16 23:29:55 -05:00
rockstardev
c54c39926b Fitting longer wallet addresses, displaying ellipsis for overflow
Ref: https://github.com/btcpayserver/btcpayserver/issues/223
2018-07-13 16:45:32 -05:00
rockstardev
33d18a3278 Displaying payment method name during checkout
Ref: https://github.com/btcpayserver/btcpayserver/issues/152
2018-07-13 15:58:59 -05:00
Romano
eb6dbd1247
Merge branch 'master' into master 2018-07-13 15:07:15 +02:00
Romano
f2aa15310a
Viacoin: add support 2018-07-13 12:53:04 +02:00
Romano
f0257fb8f7
[Translation Dutch]: improve translation 2018-07-12 12:57:15 +02:00
nicolas.dorier
6ea2d9175d hamburger menu should not be black 2018-07-12 16:34:09 +09:00
nicolas.dorier
5ee9a92f1e Do not use external website for highlightjs 2018-07-12 01:20:44 +09:00
nicolas.dorier
65c7c85c14 Do not put youtube on the front page (doing suspicious ads requests from the website) 2018-07-12 00:55:06 +09:00
rockstardev
162d76206e Handling unlikely state transition from paid to invalid
Ref: https://github.com/btcpayserver/btcpayserver/issues/216
2018-07-07 10:38:07 -05:00
nicolas.dorier
caecb26420 fix typos and sentences referencing Bitcoin 2018-06-25 11:58:07 +09:00
nicolas.dorier
5feb520843 Add support for groestlcoin 2018-06-24 00:45:57 +09:00
Oliver Ziegler
0780df4fd7 Support UFO 2018-06-09 17:25:45 +02:00