Commit graph

45 commits

Author SHA1 Message Date
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
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
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
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
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á
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
Sérgio Salgado
904c383431 feat: add ciphertrace base implementation 2022-01-21 18:26:57 +00:00
Sérgio Salgado
556d8433fa feat: add testing customer toggle 2022-01-19 02:23:26 +00:00
Rafael Taranto
242ba3ad19 Merge pull request #999 from ubavic/fix/unpaired_machine_transactions
fix: transaction history of unpaired machine
2021-12-16 22:12:14 +00:00
Nikola Ubavic
241fc5e538 fix/join_on_devices_table 2021-12-14 22:51:43 +01:00
Sérgio Salgado
442ba37ec5 fix: add discount percentage to fiat profit calculation 2021-12-13 23:01:31 +00:00
Taranto
0ad2ee362a Merge remote-tracking branch 'upstream/release-7.5.0' into chore/merge-release-into-dev 2021-11-24 14:53:50 +00:00
Nikola Ubavic
d92dd1e968 fix: add missing modules
fix: use correct methods
2021-11-18 20:09:15 +01:00
Rafael Taranto
5570f81802 Merge pull request #806 from josepfo/feat/handle-customer-tc-photos
feat: handle T&C photos and UI photos roll
2021-11-11 18:26:51 +00:00
Nikola Ubavic
515ee0d1c5 fix: no customer number showing in transactions 2021-10-08 01:03:33 +02:00
José Oliveira
2f2285e943 refactor: styling improvements and add custom carousel component 2021-10-07 13:54:38 +01:00
José Oliveira
e729de1410 feat: handle T&C photos and UI photos roll 2021-10-07 13:49:43 +01:00
Taranto
abbcda793b chore: re-add feature missing from merge 2021-10-04 07:31:17 +01:00
José Oliveira
56fc312520 feat: filter by txs with fiat lt 0 2021-08-06 12:03:33 +01:00
Taranto
ba4117173e chore: undo $ prepend on queries 2021-07-22 12:15:45 +01:00
csrapr
e6059be8d2 Chore: refactor to use new schema changing queries 2021-07-22 12:15:45 +01:00
Sérgio Salgado
9c428a6f8f fix: uppercasing SQL
fix: remove unnecessary useEffect
fix: transaction polling issue on logout
2021-06-23 15:29:41 +01:00
Liordino Neto
852bf7b089 feat: created the search component
style: added spec styles

fix: fixed font color on search input

style: added box-shadow to the search component

feat: added local search functionality to the search component

feat: integrated search component into the transactions page

feat: allow multiple filter selection on the search component

fix: let the user select only one filter for each type

feat: added chips for the selected filters on the transactions page

feat: added the remove function on the filter chips

style: styled items according to spec

refactor: simplified search component (moved logic to the outside)

feat: added transaction filters to the gql query

feat: added a 'clear all filters' button

feat: added a filters query

feat: added a gql query for the transaction filters

fix: fixed the transactions gql query so it haves the same options as
the transaction filters

feat: added a 'loading' feature to the search box (shown while loading
the filters)

fix: fetch transactions and filters separately in the transactions page

fix: style export

fix: packages

fix: transaction conflicts
2021-06-23 15:29:41 +01:00
José Oliveira
accd6d3e15 refactor: replace if else with ternary operators 2021-06-22 15:33:00 +01:00
José Oliveira
92b6093a07 feat: downloadable tx summary and logs 2021-06-22 15:33:00 +01:00
Sérgio Salgado
de98ed4c2c feat: add missing types and resolvers 2021-03-17 10:43:41 +00:00
Renamed from lib/new-admin/modules/transactions.js (Browse further)