fix: disabled withdraw_pin

withdraw disabled
lnbits · Oct 22, 2024 · 4a26f33 · 4a26f33
1 parent 366963a
commit 4a26f33
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/static/js/tpos.js b/static/js/tpos.js
@@ -255,7 +255,7 @@ window.app = Vue.createApp({
       this.cartTax = 0.0
       this.total = 0.0
     },
-    activeAtmMode() {
+    startAtmMode() {
       if (this.atmPremium > 0) {
         this.exchangeRate = this.exchangeRate / (1 + this.atmPremium)
       }

diff --git a/templates/tpos/tpos.html b/templates/tpos/tpos.html
@@ -219,7 +219,7 @@ <h5>
       </q-page-sticky>
       <q-page-sticky position="top-right" :offset="[18, 162]">
         <q-btn
-          @click="activeAtmMode"
+          @click="startAtmMode"
           v-if="withdrawMaximum > 0 && !atmMode"
           fab
           icon="atm"
@@ -529,11 +529,12 @@ <h5 v-show="!denomIsSats" class="q-mt-none q-mb-sm">
 {% endblock %} {% block scripts %}
 <script>
   const tpos = JSON.parse({{ tpos | tojson | safe }})
-  tpos.items = JSON.parse(tpos.items)
+  tpos.items = tpos.items !== null ? JSON.parse(tpos.items) : []
   tpos.tip_options = tpos.tip_options ? JSON.parse(tpos.tip_options) : []
   if (tpos.withdraw_maximum) {
     tpos.withdraw_premium = Number(tpos.withdraw_maximum / 100)
   }
+  const items = tpos.items
   const options = tpos.tip_options
   const withdraw_maximum = tpos.withdraw_limit
   const withdraw_pin_open = Number('{{ withdraw_pin_open }}')

diff --git a/views.py b/views.py
@@ -31,7 +31,10 @@ async def tpos(request: Request, tpos_id):
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND, detail="TPoS does not exist."
         )
-    withdraw_pin_open = tpos.withdraw_pin or 0
+    withdraw_pin_open = 0
+    if tpos.withdraw_pin_disabled:
+        withdraw_pin_open = tpos.withdraw_pin
+
     tpos_clean = TposClean(**tpos.dict())
     response = tpos_renderer().TemplateResponse(
         "tpos/tpos.html",