Commit graph

299 commits

Author SHA1 Message Date
Kukks
444e761d41 Merge remote-tracking branch 'btcpayserver/master' into feature/coinswitch 2018-12-28 12:33:55 +01:00
Kukks
68a3def35a save state for coinswitch started order 2018-12-28 12:33:47 +01:00
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
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