lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/release-8.1' into release-8.5

Browse source
This commit is contained in:
Taranto 2023-03-09 13:37:21 +00:00
commit 14f677a992
11 changed files with 133 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/graphql/types.js
View file

@ -104,6 +104,7 @@ type Trigger {
suspensionDays: Float
threshold: Int
thresholdDays: Int
customInfoRequestId: String
customInfoRequest: CustomInfoRequest
}

6
new-lamassu-admin/src/pages/Commissions/helper.js
View file

@ -145,7 +145,7 @@ const getOverridesFields = (getData, currency, auxElements) => {
},
{
name: 'minimumTx',
display: 'Minimun Tx',
display: 'Minimum Tx',
width: 169,
doubleHeader: 'Cash-in only',
textAlign: 'center',
@ -206,7 +206,7 @@ const mainFields = currency => [
},
{
name: 'minimumTx',
display: 'Minimun Tx',
display: 'Minimum Tx',
width: 169,
size: 'lg',
doubleHeader: 'Cash-in only',
@ -533,7 +533,7 @@ const getListCommissionsFields = (getData, currency, defaults) => {
},
{
name: 'minimumTx',
display: 'Minimun Tx',
display: 'Minimum Tx',
width: 144,
input: NumberInput,
doubleHeader: 'Cash-in only',

2
new-lamassu-admin/src/pages/Machines/MachineComponents/Commissions/helper.js
View file

@ -56,7 +56,7 @@ const getOverridesFields = currency => {
},
{
name: 'minimumTx',
display: 'Minimun Tx',
display: 'Minimum Tx',
width: 155,
doubleHeader: 'Cash-in only',
textAlign: 'right',

12
new-lamassu-admin/src/utils/bill-denominations.js
View file

@ -94,6 +94,18 @@ export default {
},
polymer: false
},
CRC: {
thickness: 0x0d,
lengths: {
1000: [0x82, 0x78],
2000: [0x89, 0x7f],
5000: [0x90, 0x86],
10000: [0x97, 0x8d],
20000: [0x9e, 0x94],
50000: [0xaa, 0x96]
},
polymer: true
},
CZK: {
thickness: 0x0c,
lengths: {

109
package-lock.json generated
View file

@ -6198,6 +6198,7 @@
}
},
"@polkadot/keyring": {
<<<<<<< HEAD
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/keyring/-/keyring-10.3.1.tgz",
"integrity": "sha512-xBkUtyQ766NVS1ccSYbQssWpxAhSf0uwkw9Amj8TFhu++pnZcVm+EmM2VczWqgOkmWepO7MGRjEXeOIw1YUGiw==",
@ -6214,6 +6215,24 @@
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/util": "10.3.1",
=======
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/keyring/-/keyring-10.4.1.tgz",
"integrity": "sha512-urTl0ReOr1A1b2kSF6QnGlVc2IcJpDnTacxwA4kIVn45p4Kysi19ek7odSdLA5yNcDZSB+/4uITZQ6meClS71Q==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/util": "10.4.1",
"@polkadot/util-crypto": "10.4.1"
}
},
"@polkadot/networks": {
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/networks/-/networks-10.4.1.tgz",
"integrity": "sha512-kmSy8iAnYKNWXZBv7bTfI10cSLJzOrFFEdngzohHMjDOG5FKoaX3Pix6MUkcWc2asX0hCyACtNTlcp+MBnS9eQ==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/util": "10.4.1",
>>>>>>> upstream/release-8.1
"@substrate/ss58-registry": "^1.38.0"
}
},
@ -6338,6 +6357,7 @@
}
},
"@polkadot/util": {
<<<<<<< HEAD
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/util/-/util-10.3.1.tgz",
"integrity": "sha512-8j+O7gj7upj1ZwlGxmAaf3+V0xc0VZvqPeBvTFV30Oi1xoMDNH0q2vKst08wARQUUm1Gi0zIlipDMo0n4Sr7tw==",
@ -6347,11 +6367,23 @@
"@polkadot/x-global": "10.3.1",
"@polkadot/x-textdecoder": "10.3.1",
"@polkadot/x-textencoder": "10.3.1",
=======
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/util/-/util-10.4.1.tgz",
"integrity": "sha512-dOlmue4nhbk8msbs/YgoBqVtUzDx5iqhiDnC62GWC8b+JmIlIM4Ddgg1rhBf1KJ6TfEQrzQA0FwLaqCCH5vYmA==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-bigint": "10.4.1",
"@polkadot/x-global": "10.4.1",
"@polkadot/x-textdecoder": "10.4.1",
"@polkadot/x-textencoder": "10.4.1",
>>>>>>> upstream/release-8.1
"@types/bn.js": "^5.1.1",
"bn.js": "^5.2.1"
}
},
"@polkadot/util-crypto": {
<<<<<<< HEAD
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/util-crypto/-/util-crypto-10.3.1.tgz",
"integrity": "sha512-viqLMuNGrbB2lyDIYdXAl3tq/Em/Y7ql2FvCTHJmxXaB5C1NXiWf1SqFAahUJKohL+ke5IL0jr19wZu/f88lIQ==",
@ -6364,16 +6396,33 @@
"@polkadot/wasm-crypto": "^6.4.1",
"@polkadot/x-bigint": "10.3.1",
"@polkadot/x-randomvalues": "10.3.1",
=======
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/util-crypto/-/util-crypto-10.4.1.tgz",
"integrity": "sha512-29vOZLZJl5mNb8lHd2NwP51O7kEV1QOitBX7UsBw66nJOPZQ0imPFPJFGuI6ySPUuck1Lu4vBTC76nE5xpzjAQ==",
"requires": {
"@babel/runtime": "^7.20.13",
"@noble/hashes": "1.2.0",
"@noble/secp256k1": "1.7.1",
"@polkadot/networks": "10.4.1",
"@polkadot/util": "10.4.1",
"@polkadot/wasm-crypto": "^6.4.1",
"@polkadot/x-bigint": "10.4.1",
"@polkadot/x-randomvalues": "10.4.1",
>>>>>>> upstream/release-8.1
"@scure/base": "1.1.1",
"ed2curve": "^0.3.0",
"tweetnacl": "^1.0.3"
},
"dependencies": {
<<<<<<< HEAD
"@noble/hashes": {
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.1.5.tgz",
"integrity": "sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ=="
},
=======
>>>>>>> upstream/release-8.1
"@noble/secp256k1": {
"version": "1.7.1",
"resolved": "https://registry.npmjs.org/@noble/secp256k1/-/secp256k1-1.7.1.tgz",
@ -6439,6 +6488,7 @@
}
},
"@polkadot/x-bigint": {
<<<<<<< HEAD
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-bigint/-/x-bigint-10.3.1.tgz",
"integrity": "sha512-hXtnwy9LXmV43B9pT8gY1zwdNRhpPBEOk1PfL2Ze0Iw2zd+lbljD3GwDP5mkBfIYIw/s15eRTjiUIKfpTRRDXw==",
@ -6454,6 +6504,23 @@
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.3.1",
=======
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-bigint/-/x-bigint-10.4.1.tgz",
"integrity": "sha512-CpTGPwNUDrJcrnfDU/94mfZ16TZoTwWAwTLH0oMUJtrM2mHo+LtWZBlCTG+thhkcGcSRy/rrpzx4ffNsj5Sy1w==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.4.1"
}
},
"@polkadot/x-fetch": {
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-fetch/-/x-fetch-10.4.1.tgz",
"integrity": "sha512-9LDskIW74Iz5Nen6p9xhVw1D6Z3r/K5buchZW2DERKCA3gZ98wUkTnpHDcwEyLGw0Lvq+1Trvm/txaEMWjUT6w==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.4.1",
>>>>>>> upstream/release-8.1
"@types/node-fetch": "^2.6.2",
"node-fetch": "^3.3.0"
},
@ -6471,14 +6538,21 @@
}
},
"@polkadot/x-global": {
<<<<<<< HEAD
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-10.3.1.tgz",
"integrity": "sha512-kPAVYP2H3aTjS7BKqGkYV1I3Mu03dnRyeX+rDebC8xoN+hUC5bhb7dzCtb5F8DdqlvFl67ZxRaVtq2XUssGTKQ==",
=======
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-global/-/x-global-10.4.1.tgz",
"integrity": "sha512-Kdh2Fzl1fpEwU6vL1HMaXJy+fadX79eSy4VAnIx/uyCF3H5Z4WaxzoiNVmHdDZSVaamqtbuKepi1nkE3q1nvlA==",
>>>>>>> upstream/release-8.1
"requires": {
"@babel/runtime": "^7.20.13"
}
},
"@polkadot/x-randomvalues": {
<<<<<<< HEAD
"version": "10.3.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-randomvalues/-/x-randomvalues-10.3.1.tgz",
"integrity": "sha512-9b0hakA4ERcWui7LalqYN+gjYpHpL5OLBhktco62CI9oVNYYKVY6H5+iMO+d3I5U+MecqAqdejl0+L2xhzk3sw==",
@ -6512,6 +6586,41 @@
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.3.1",
=======
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-randomvalues/-/x-randomvalues-10.4.1.tgz",
"integrity": "sha512-dB4OGOiBbJbNQV040Ggh2CujSXtVe9bxXn1g5LuJEw1iioeraoduJ6yEYmh0olfaQjCUXnyWLr8uCPtPpfJ9uQ==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.4.1"
}
},
"@polkadot/x-textdecoder": {
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-textdecoder/-/x-textdecoder-10.4.1.tgz",
"integrity": "sha512-OcAL0napRM4hukgvH6kYGdiczqvbkFYoLBgQFalZChktjL1tDNiF6tzzt4Nn8WQXYYFlfyxp5LoZRtNrcFJq4w==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.4.1"
}
},
"@polkadot/x-textencoder": {
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-textencoder/-/x-textencoder-10.4.1.tgz",
"integrity": "sha512-YBS04HV/QgRppt0XC5n48c89ueH3ErivrcmqFTlkKMcXNzvtpMCTZGCTzG5vU8ozP0tl/4Is5N8agmYHLMu1Cg==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.4.1"
}
},
"@polkadot/x-ws": {
"version": "10.4.1",
"resolved": "https://registry.npmjs.org/@polkadot/x-ws/-/x-ws-10.4.1.tgz",
"integrity": "sha512-acS2kAAvFOrGo5gVLuOY4DKRschGafvruh491O7jE5r7QbZUNG1Q948g6TA/67I4g8N0k096DYFryID4OK9Ufg==",
"requires": {
"@babel/runtime": "^7.20.13",
"@polkadot/x-global": "10.4.1",
>>>>>>> upstream/release-8.1
"@types/websocket": "^1.0.5",
"websocket": "^1.0.34"
}

6
public/asset-manifest.json
View file

@ -1,7 +1,7 @@
{
"files": {
"main.js": "/static/js/main.15b1ade6.chunk.js",
"main.js.map": "/static/js/main.15b1ade6.chunk.js.map",
"main.js": "/static/js/main.1d985014.chunk.js",
"main.js.map": "/static/js/main.1d985014.chunk.js.map",
"runtime-main.js": "/static/js/runtime-main.5b925903.js",
"runtime-main.js.map": "/static/js/runtime-main.5b925903.js.map",
"static/js/2.4b3df17b.chunk.js": "/static/js/2.4b3df17b.chunk.js",
@ -154,6 +154,6 @@
"entrypoints": [
"static/js/runtime-main.5b925903.js",
"static/js/2.4b3df17b.chunk.js",
"static/js/main.15b1ade6.chunk.js"
"static/js/main.1d985014.chunk.js"
]
}

2
public/index.html
View file

@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="robots" content="noindex"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/manifest.json"/><title>Lamassu Admin</title></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root" class="root"></div><script>!function(e){function r(r){for(var n,a,l=r[0],i=r[1],f=r[2],c=0,s=[];c<l.length;c++)a=l[c],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,f||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var i=t[l];0!==o[i]&&(n=!1)}n&&(u.splice(r--,1),e=a(a.s=t[0]))}return e}var n={},o={1:0},u=[];function a(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.m=e,a.c=n,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,r){if(1&r&&(e=a(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(a.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)a.d(t,n,function(r){return e[r]}.bind(null,n));return t},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="/";var l=this["webpackJsonplamassu-admin"]=this["webpackJsonplamassu-admin"]||[],i=l.push.bind(l);l.push=r,l=l.slice();for(var f=0;f<l.length;f++)r(l[f]);var p=i;t()}([])</script><script src="/static/js/2.4b3df17b.chunk.js"></script><script src="/static/js/main.15b1ade6.chunk.js"></script></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><meta name="robots" content="noindex"/><meta name="theme-color" content="#000000"/><link rel="manifest" href="/manifest.json"/><title>Lamassu Admin</title></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root" class="root"></div><script>!function(e){function r(r){for(var n,a,l=r[0],i=r[1],f=r[2],c=0,s=[];c<l.length;c++)a=l[c],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in i)Object.prototype.hasOwnProperty.call(i,n)&&(e[n]=i[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,f||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var i=t[l];0!==o[i]&&(n=!1)}n&&(u.splice(r--,1),e=a(a.s=t[0]))}return e}var n={},o={1:0},u=[];function a(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.m=e,a.c=n,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,r){if(1&r&&(e=a(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(a.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)a.d(t,n,function(r){return e[r]}.bind(null,n));return t},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="/";var l=this["webpackJsonplamassu-admin"]=this["webpackJsonplamassu-admin"]||[],i=l.push.bind(l);l.push=r,l=l.slice();for(var f=0;f<l.length;f++)r(l[f]);var p=i;t()}([])</script><script src="/static/js/2.4b3df17b.chunk.js"></script><script src="/static/js/main.1d985014.chunk.js"></script></body></html>

2
public/static/js/main.15b1ade6.chunk.js
View file

File diff suppressed because one or more lines are too long

1
public/static/js/main.15b1ade6.chunk.js.map
View file

File diff suppressed because one or more lines are too long

2
public/static/js/main.1d985014.chunk.js Normal file
View file

File diff suppressed because one or more lines are too long

1
public/static/js/main.1d985014.chunk.js.map Normal file
View file

File diff suppressed because one or more lines are too long