Commit graph

2906 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
41c7e2a8c1 Merge pull request #1003 from RafaelTaranto/chore/update-lib-version
chore: downgrade lib for apollo compatibility
2021-12-16 12:52:39 +00:00
Taranto
c7dedf313e chore: downgrade lib for apollo compatibility 2021-12-16 12:51:34 +00:00
Rafael Taranto
bdd070f276 Merge pull request #993 from chaotixkilla/fix-transactions-page-issues
Fix transactions page UI
2021-12-16 11:47:50 +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
Rafael Taranto
13b42b0753 Merge pull request #996 from chaotixkilla/fix-release-fiat-profit-records
[Release] Fix fiat profit calculation
2021-12-16 11:47:21 +00:00
Rafael Taranto
06740324f0 Merge pull request #992 from josepfo/feat/photos-files-new-page
feat: add photos list and carousel
2021-12-16 11:46:48 +00:00
Rafael Taranto
41ddb4458e Merge pull request #998 from chaotixkilla/fix-qr-code-whitespace
Fix QRCode whitespace
2021-12-16 11:45:45 +00:00
Rafael Taranto
1b2b8d2f7f Merge pull request #1001 from SiIky/fix/LAM-193/wizard-no-exchange-error
fix: crash on setup wizard when choosing "No exchange"
2021-12-16 11:42:44 +00:00
André Sá
b19afbf4b1 fix: crash on setup wizard when choosing "No exchange" 2021-12-15 13:01:20 +00:00
Sérgio Salgado
5eb342a640 fix: add qrcode whitespace 2021-12-14 20:18:32 +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
57dc166c15 fix: image upper border radius andcarousel photos order 2021-12-13 21:21:42 +00:00
Sérgio Salgado
8234da2e45 fix: transactions page not up to spec 2021-12-13 19:30:39 +00:00
José Oliveira
c93e1028a4 feat: add photos list and carousel 2021-12-13 18:29:06 +00:00
Rafael Taranto
99100bae8f Merge pull request #989 from ubavic/fix/release/cashbox_history_multiple_edit_lines
fix: release: cashbox history multiple edit lines
2021-12-13 13:01:17 +00:00
Rafael Taranto
9553bf8fc9 Merge pull request #988 from ubavic/fix/cahsbox_history_multiple_edit_lines
fix: cahsbox history multiple edit lines
2021-12-13 13:01:13 +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
5c5d956d2c Merge pull request #986 from josepfo/fix/minimum-transfer-style-on-overrides
fix: minimum tx value size
2021-12-11 19:10:28 +00:00
Rafael Taranto
4b860a0cb7 Merge pull request #984 from josepfo/fix/id-scan-editable-fields
fix: id scan editable fields and date format
2021-12-11 19:09:40 +00:00
Rafael Taranto
757a230d12 Merge pull request #879 from josepfo/feat/query-performance-analyzer
feat: analyze relevant queries performance
2021-12-11 19:09:16 +00:00
Rafael Taranto
f7e2eb6974 Merge pull request #983 from ubavic/fix/confirm_dialog_undefined_on_exit
Fix: confirm dialog title undefined on exit
2021-12-11 19:08:50 +00:00
Rafael Taranto
3cbfedd26f Merge pull request #980 from chaotixkilla/refactor-backport-create-batch-function
Backport bill batching function with machine updates
2021-12-11 19:08:07 +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
Rafael Taranto
de8ac644bd Merge pull request #987 from chaotixkilla/fix-customer-notes-default-value
Fix customer notes default value
2021-12-11 19:07:13 +00:00
Nikola Ubavic
7655f9ca20 fix: disable edit button 2021-12-10 21:21:28 +01:00
Nikola Ubavic
5d46ed5723 fix: multiple edit fields 2021-12-10 21:21:25 +01:00
Nikola Ubavic
0d7640ee1a fix: disable edit button 2021-12-10 21:14:25 +01: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
José Oliveira
ec536277cd fix: minimum tx value size 2021-12-10 17:09:36 +00:00
Sérgio Salgado
864a83d5e0 fix: remove logs
fix: move variable to constants
2021-12-10 16:26:59 +00:00
Sérgio Salgado
929afb4c98 chore: change hardcoded field values 2021-12-10 15:42:55 +00:00
Sérgio Salgado
cddb8e5bee chore: change hardcoded field values 2021-12-10 15:42:13 +00:00
Nikola Ubavic
2ecc079cb3 fix: multiple edit fields 2021-12-10 16:15:27 +01:00
Rafael Taranto
e0529efb92 Merge pull request #811 from chaotixkilla/feat-customer-custom-notes
Customer custom notes
2021-12-10 10:41:36 +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
Nikola Ubavic
712b31e3ff fix: revert explicit cast 2021-12-09 21:13:21 +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
939a67a52b fix: add void delete function to custom requirements 2021-12-09 19:24:09 +00:00
Rafael Taranto
ac3e27f6de Merge pull request #979 from SiIky/fix/LAM-32/low_cassette_colors
fix: change color in dashboard according to notification settings
2021-12-09 11:34:48 +00:00