lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4722 commits 1 branch 0 tags 100 MiB
Commit graph

86 commits

Author SHA1 Message Date
Rafael Taranto
2e31ab391f chore: migrating to nodejs 22 2025-03-31 15:43:08 +01:00
Rafael Taranto
0caa5cbc9a feat: show unpaired device names on transactions 2025-03-27 12:30:27 +00:00
Rafael Taranto
0c289f7d37 Merge branch 'dev' into backport/csv-empty-txs 2024-11-29 13:47:38 +00:00
siiky
0c1fd7ce87 fix: export fixed fee and transaction fee 2024-11-28 11:00:07 +00:00
siiky
8fc3d7d819 refactor: rename cashInFee to fixedFee 2024-11-28 10:42:00 +00:00
André Sá
753595e0df fix: don't export empty transactions to simplified CSV 2024-11-26 13:18:50 +00:00
André Sá
eed09b52ca refactor: simplified CSV testing 2024-11-26 13:18:39 +00:00
André Sá
4dc4d14742 fix: export all transactions to CSV 2024-11-26 13:18:29 +00:00
Rafael Taranto
35e40f4528 Merge remote-tracking branch 'origin/release-9.0' into chore/merge-9-into-10-20240206 2024-02-06 08:51:09 +00:00
Rafael Taranto
72442d55da chore: fix merge issues 2024-01-08 10:37:19 +00:00
Rafael Taranto
d18b5bb29d Merge remote-tracking branch 'origin/release-8.1.10' into merge-8.1-into-9 2024-01-08 10:34:44 +00:00
Rafael Taranto
1bbd68f429 feat: display fee on admin 2024-01-07 21:34:23 +00:00
Rafael Taranto
3221a7a828 fix: UI stuff and mailgun typos 2023-12-15 11:59:38 +00:00
Rafael Taranto
21b88f182e refactor: use recyclers instead of stackers 2023-10-09 14:41:33 +01:00
Rafael Taranto
546ba7b780 fix: ln merge issues and deprecate some libs 2023-10-05 22:55:02 +01:00
José Oliveira
6cd72aed00 chore: simplify filter function 2023-09-28 18:15:27 +01:00
José Oliveira
12a7ed0bd6 feat: add galoy config and UI safeguards 2023-09-28 17:20:13 +01:00
Sérgio Salgado
266eb44076 fix: bills and machine data fetching for machine profile page 2023-06-07 14:27:45 +01:00
Sérgio Salgado
4338b3d98e fix: cashbox batch creation with the new settings 
fix: correctly update cassette and stacker count post-cashout tx
 2023-06-07 14:27:43 +01:00
Sérgio Salgado
45f722e724 feat: add emptyUnit bills table 
feat: rework cash unit operations
fix: multiple fixes for the empty unit workflow
 2023-06-07 14:27:43 +01:00
Sérgio Salgado
f3ab63766e feat: add bill math cassette-agnostic solution 
fix: multiple generic fixes related with the recyclers
fix: slight UI data changes
 2023-06-07 14:27:42 +01:00
Sérgio Salgado
211c4b1ea7 feat: add aveiro cash units to the devices table 
feat: change data fetching to accomodate the new cash units
 2023-06-07 14:27:42 +01:00
Taranto
ec32a6f0cd Merge remote-tracking branch 'upstream/release-8.0' into chore/merge-8.0-into-8.1 2022-08-22 16:00:56 +01:00
André Sá
740f6dfc98 fix: don't add fixed fee twice for profit calculation 2022-08-10 10:51:20 +01:00
Sérgio Salgado
10245bbb19 feat: show transaction sweep status 2022-07-29 19:25:23 +01:00
Sérgio Salgado
2a85bfce2b fix: check for date validity before conversion 2022-07-11 17:16:53 +01:00
Taranto
4023470fec Merge remote-tracking branch 'upstream/release-8.0' into merge-release-8.0-into-dev-220906 2022-06-09 23:56:40 +01:00
Sérgio Salgado
c5ba1b34b3 fix: issue with continuously building the csv 
fix: added missing columns on downloaded logs
 2022-05-26 14:30:42 +01:00
Sérgio Salgado
f4d6b5e454 feat: decouple l-s entrypoint 2022-04-19 22:47:36 +01:00
Sérgio Salgado
64a4860df0 feat: add profit field to transactions 2022-02-25 18:46:40 +00:00
Taranto
080f451269 chore: lamassu-coins rename 2022-02-18 20:15:39 +00:00
André Sá
e252480daa fix: revert recent pairing changes 
48973f442e
6dee47a171
16513a8238
 2022-02-18 15:52:24 +00:00
Sérgio Salgado
639dbe8eb1 fix: remove override reset on customer data saving via admin 2022-02-14 15:28:38 +00:00
Sérgio Salgado
81d74eb40b fix: add missing custom requirement data on customer data communication with machine 
fix: create function to reset the override flag in custom requirement data
 2022-02-14 15:20:58 +00:00
Rafael Taranto
70f13725b5 Merge pull request #1097 from siiky/feat/lam-308/pairing-tokens 
feat: support older machine versions
 2022-02-14 10:34:01 +00:00
Rafael Taranto
43afaae89f Merge pull request #1064 from siiky/fix/lam-266/profits-calculation 
Profits calculation
 2022-02-14 10:30:06 +00:00
André Sá
b03901ddd4 Merge branch 'dev' into fix/lam-298/custom_info_requests_flow 
* dev: (40 commits)
  fix: remove unnecessary variable
  fix: check for starting supervisor state
  fix: Ethereum sends
  fix: force balance to big number
  fix: XMR sendCoins interface
  chore: update react
  fix: update only if node is stopped
  fix: convert bn.js to bignumber.js bignum
  fix: wallet file checking
  fix: show batching errors on admin fix: funding page should take into account batching transactions
  fix: add feeMultiplier parameter
  fix: BN functions on sendCoinsBatch
  fix: remove allowTransactionBatching from being required
  feat: disable transaction batching editing unless it's BTC
  feat: add transaction batching option to advanced wallet settings
  fix: pollingRoutes typo
  fix: button style and incomplete url
  fix: remove date width
  fix: l-c import on lamassu-send-coins script
  chore: built react files
  ...
 2022-02-11 15:16:00 +00:00
André Sá
48973f442e feat: support older machine versions 2022-02-08 18:21:02 +00:00
André Sá
c985458bff Merge branch 'dev' into fix/lam-266/profits-calculation 2022-02-04 18:25:06 +00:00
Sérgio Salgado
63a86ae8db fix: show batching errors on admin 
fix: funding page should take into account batching transactions
 2022-02-03 20:54:48 +00:00
André Sá
94089620ad Merge branch 'dev' into fix/lam-266/profits-calculation 2022-01-28 16:49:44 +00:00
André Sá
c07ee43b85 fix: correctly calculate fiat profit 2022-01-28 12:24:07 +00:00
André Sá
c5bf50b932 Merge branch 'dev' into fix/lam-298/custom_info_requests_flow 2022-01-27 11:13:41 +00:00
André Sá
9d49c172f4 fix: reset custom info override when customer reanswers question 2022-01-26 16:25:28 +00:00
Sérgio Salgado
904c383431 feat: add ciphertrace base implementation 2022-01-21 18:26:57 +00:00
Rafael Taranto
f9d1b3551b Merge pull request #1060 from ubavic/custom_info_request_delete 
fix: custom info request delete
 2022-01-20 19:52:53 +00:00
Nikola Ubavic
bf19631447 fix: custom info request delete 2022-01-20 13:59:34 +01:00
Rafael Taranto
d5b7b088cd Merge pull request #1055 from chaotixkilla/feat-custom-info-requests-as-manual-triggers 
Add custom info request manual trigger behavior
 2022-01-19 14:37:58 +00:00
Sérgio Salgado
556d8433fa feat: add testing customer toggle 2022-01-19 02:23:26 +00:00
Sérgio Salgado
87a3b718db fix: allow for custom info requests to be allowed or blocked 
fix: improve custom info requests backend
fix: add custom info requests to trigger overrides
 2022-01-18 18:46:55 +00:00