From d946348fec610ff7588613ea52304438f137bb16 Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Mon, 13 Feb 2023 23:24:37 +0000 Subject: [PATCH] Adjust prices, add negative protocoin warning --- apiserver/apiserver/api/views.py | 7 +++++-- webclient/src/Home.js | 11 +++++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/apiserver/apiserver/api/views.py b/apiserver/apiserver/api/views.py index 62fc35e..3c36a17 100644 --- a/apiserver/apiserver/api/views.py +++ b/apiserver/apiserver/api/views.py @@ -1312,6 +1312,9 @@ class ProtocoinViewSet(Base): logger.error(msg) return Response(200) + # status 0 = complete + # status 3 = cancelled + is_completed = request.data['job_status'] == '0' is_print = request.data['source'] == '1' @@ -1335,8 +1338,8 @@ class ProtocoinViewSet(Base): logger.error(msg) return Response(200) - INK_PROTOCOIN_PER_ML = 0.20 - DEFAULT_PAPER_PROTOCOIN_PER_M = 0.25 + INK_PROTOCOIN_PER_ML = 0.75 + DEFAULT_PAPER_PROTOCOIN_PER_M = 0.50 PROTOCOIN_PER_PRINT = 2.0 total_cost = PROTOCOIN_PER_PRINT diff --git a/webclient/src/Home.js b/webclient/src/Home.js index d23558e..cd1398a 100644 --- a/webclient/src/Home.js +++ b/webclient/src/Home.js @@ -22,6 +22,11 @@ function MemberInfo(props) { return (
+ {member.protocoin < 0 && + Your Protocoin balance is negative! +

Visit the Paymaster page or pay a Director to buy Protocoin.

+
} + stats && stats.track && stats.track[x] ? moment.unix(stats.track[x]['time']).tz('America/Edmonton').fromNow() : ''; const getTrackName = (x) => stats && stats.track && stats.track[x] && stats.track[x]['first_name'] ? stats.track[x]['first_name'] : 'Unknown'; - const alarmStat = () => stats && stats.alarm && moment().unix() - stats.alarm['time'] < 300 ? stats.alarm['data'] < 270 ? 'Armed' : 'Disarmed' : 'Unknown'; + //const alarmStat = () => stats && stats.alarm && moment().unix() - stats.alarm['time'] < 300 ? stats.alarm['data'] < 270 ? 'Armed' : 'Disarmed' : 'Unknown'; + const alarmStat = () => 'Unknown'; - const doorOpenStat = () => alarmStat() === 'Disarmed' && stats.alarm['data'] > 360 ? ', door open' : ''; + //const doorOpenStat = () => alarmStat() === 'Disarmed' && stats.alarm['data'] > 360 ? ', door open' : ''; + const doorOpenStat = () => ''; const show_signup = stats?.at_protospace;