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

2148 commits

Author SHA1 Message Date
Taranto
e9b2280fc3 Merge remote-tracking branch 'upstream/release-7.5.0' into chore/merge-release-into-dev-21-16-12 2021-12-16 13:38:43 +00:00
Rafael Taranto
b9f9f574fa Merge pull request #995 from chaotixkilla/fix-fiat-profit-records 
Fix fiat profit calculation
 2021-12-16 11:47:26 +00:00
Neal
b956bf95fa feat: send change to bech32 addresses 2021-12-14 17:55:06 -05:00
Nikola Ubavic
241fc5e538 fix/join_on_devices_table 2021-12-14 22:51:43 +01:00
André Sá
3213513f54 refactor: rename cash box/cassette batch operations type 2021-12-14 12:39:50 +00:00
Sérgio Salgado
ce92dc1d15 fix: add discount percentage to fiat profit calculation 2021-12-13 23:09:02 +00:00
Sérgio Salgado
442ba37ec5 fix: add discount percentage to fiat profit calculation 2021-12-13 23:01:31 +00:00
José Oliveira
c93e1028a4 feat: add photos list and carousel 2021-12-13 18:29:06 +00:00
Rafael Taranto
e16009c818 Merge pull request #985 from chaotixkilla/fix-backport-alerts-disabled 
Backport alerts disabled
 2021-12-11 19:13:01 +00:00
Rafael Taranto
8fdc6fbb0d Merge pull request #964 from chaotixkilla/refactor-create-batch-function 
Create a bill batching function with machine updates
 2021-12-11 19:08:02 +00:00
Sérgio Salgado
01841c03ba fix: missing comma in migration file 
fix: default value for customer notes
fix: remove custom requirements divider when there are no requirements set
 2021-12-10 18:18:57 +00:00
Sérgio Salgado
d0cc85157f fix: notification alerts 2021-12-10 00:03:32 +00:00
Sérgio Salgado
ec90776d2a feat: create a new batching function which pairs with machine value updates 
refactor: abstract amount of cassettes from the cassette wizard

fix: dashboard cassettes
 2021-12-09 23:48:21 +00:00
Sérgio Salgado
b559434cbd chore: simplify conditional 2021-12-09 23:13:11 +00:00
Sérgio Salgado
f16be1d263 fix: empty cashbox conditional 2021-12-09 23:06:24 +00:00
Sérgio Salgado
616d2d2915 refactor: backport new batching function 2021-12-09 22:34:38 +00:00
Sérgio Salgado
eb8737872d feat: revamp customer notes feature 2021-12-09 22:31:53 +00:00
Sérgio Salgado
dcd3259484 feat: customer notes migration 
feat: customer notes backend operations

feat: add customer note mutation
feat: add editing capabilities to PropertyCard
feat: connect customer notes backend to frontend
fix: customer note form and static content styling

fix: SQL uppercasing

fix: set default value for notes content
fix: SQL after dev rebase
refactor: move get current user token to separate method
 2021-12-09 22:31:51 +00:00
Rafael Taranto
f14674c4f3 Merge pull request #970 from ubavic/fix/zero_conf 
fix: none 0conf
 2021-12-09 21:44:57 +00:00
Nikola Ubavic
446d2f3220 fix: authorize tx under zeroConfLimit 2021-12-09 21:49:42 +01:00
Rafael Taranto
4da13b404b Merge pull request #908 from chaotixkilla/feat-integrate-arbitrary-compliance 
Integrate arbitrary compliance
 2021-12-09 19:39:13 +00:00
Rafael Taranto
ce2a79a341 Merge pull request #965 from chaotixkilla/fix-jsonrpc-export-and-blockchain-dir 
Fix self-hosted wallet RPC calls
 2021-12-09 19:36:02 +00:00
Sérgio Salgado
036e47bad4 feat: add custom requirements UI to the profile page 2021-12-08 22:17:19 +00:00
csrapr
ba8cac60f8 Chore: Add basic screen and toggle 
Chore: form skeleton

Feat: wizard step 1 and 2

Feat: toggle button group for formik

Feat: select input type Form and styling

Feat: text entry page

Feat: Choice list and CSS

Fix: scroll to bottom on Add choice button click

Feat: format data at end of wizard

Feat: wizard toggle button and background blur

Feat: data table for custom info requests

Feat: editing and deleting custom info request

Feat: add icons

Fix: Wizard changes

Feat: custom requests migrations

Feat: fetch custom info requests

Feat: add mutations

Feat: add custom request option in trigger wizard

Feat: show customrequests on table

Feat: Triggers page code refactor

Feat: integrate custom info requests on Customer graphql type

Feat: Show custom info requests on user page

Fix: use normal table instead of datatable

Feat: modal for custom information request details

Feat: poller returns custom request information details

Feat: send customer custom info requests to machine

Chore: add field CustomInfoRequestsData on customer updates

Feat: customer custom info request data saving

Chore: variable name changes and lots of fixes

Feat: remove default value in query, sort request on customer profile

Signed-off-by: csrapr <26280794+csrapr@users.noreply.github.com>

Fix: return promise when array of ids is empty

Feat: TitleSection can receive more than one button
 2021-12-08 18:28:51 +00:00
José Oliveira
0dff055b05 refactor: improve TODOs readability 2021-12-06 19:44:16 +00:00
José Oliveira
d2bb684b00 fix: ambigous total spent 2021-12-06 19:44:13 +00:00
José Oliveira
77858b55bc fix: remove useless prop on feature button and add refactor reminder 2021-12-06 19:34:09 +00:00
José Oliveira
b77b732bcb fix: latest customer data selection and button margin 2021-12-06 19:25:05 +00:00
José Oliveira
68c635ce38 fix: use gql upload lib and remove logs 2021-12-06 19:25:04 +00:00
José Oliveira
3e4f4a4962 fix: apollo server image upload 2021-12-06 19:25:03 +00:00
José Oliveira
9baa16c824 fix: formik bugs and gql upload 2021-12-06 19:25:01 +00:00
André Sá
7c926675f9 fix: show the correct status for each machine 2021-12-06 19:07:34 +00:00
José Oliveira
3de7ae2fe9 feat: add edit, delete and image input 2021-12-06 18:31:31 +00:00
Rafael Taranto
f235eb93b9 Merge pull request #963 from chaotixkilla/fix-fiat-balance-overrides 
Fix fiat balance percentage notification overrides being ignored
 2021-12-06 11:09:32 +00:00
Rafael Taranto
947f7ff302 Merge pull request #962 from ubavic/fix/getCustomersList 
fix: list of customers in compliance is empty
 2021-12-06 11:08:01 +00:00
naconner
7ce1ae691a chore: update geth, bchn (#972) 2021-12-04 12:25:21 -05:00
Nikola Ubavic
574b0c9fea fix: resolve for none 0conf 2021-12-03 15:24:51 +01:00
Rafael Taranto
210acd1b02 Merge pull request #958 from ubavic/fix/machine_unpair_dev 
fix: machine unpair (dev)
 2021-12-02 15:00:25 +00:00
Rafael Taranto
8ff163ed27 Merge pull request #957 from ubavic/fix/machine_unpair_release 
fix: machine unpair (release)
 2021-12-02 15:00:23 +00:00
Sérgio Salgado
15e0182ba1 fix: remove duplicated createBatch() calls 
fix: rename cassetteMaxCapacity to snake uppercase
fix: notification module retrieving the wrong override fields
 2021-12-02 14:37:11 +00:00
Nikola Ubavic
bcad921edd chore: accept suggestion 2021-12-01 18:04:26 +01:00
Nikola Ubavic
4e82ff700f Merge branch 'fix/machine_unpair_dev' of github.com:ubavic/lamassu-server into fix/machine_unpair_dev 2021-12-01 17:55:26 +01:00
Nikola Ubavic
c93763a3a6 chore: accept sugesttion 2021-12-01 17:54:32 +01:00
Rafael Taranto
74ccf18db7 Merge pull request #967 from ubavic/fix/recordTrade_is_void 
fix: recordTrade is void
 2021-12-01 10:36:19 +00:00
Rafael Taranto
e8edd05a64 Merge pull request #960 from chaotixkilla/fix-notification-override-alerts 
Fix notification overrides ignoring cassettes 3 and 4
 2021-12-01 10:35:19 +00:00
Nikola Ubavic
7c80eb257e fix/recordTrade_is_void 2021-11-30 21:05:12 +01:00
Sérgio Salgado
50c07c5e8f fix: json-rpc exporting and undefined blockchain dir 2021-11-30 19:35:38 +00:00
Nikola Ubavic
c48d24ed19 fix: remove duplicate column 2021-11-29 19:01:36 +01:00
Sérgio Salgado
cf0b61137d fix: add cassettes 3 and 4 to the notification overrides 2021-11-29 17:40:17 +00:00
Nikola Ubavić
f7d0dd3af4 chore: extra space 
Co-authored-by: chaotixkilla <chaotixkilla@users.noreply.github.com>
 2021-11-29 14:33:25 +01:00