Merge pull request #67 from lnbits/atm_pin_toggle

Atm pin toggle

crud.py

@@ -21,8 +21,8 @@ async def create_tpos(wallet_id: str, data: CreateTposData) -> TPoS:
     tpos_id = urlsafe_short_hash()
     await db.execute(
         """
-        INSERT INTO tpos.pos (id, wallet, name, currency, tip_options, tip_wallet, withdrawlimit, withdrawpin, withdrawamt, withdrawtime, withdrawbtwn)
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        INSERT INTO tpos.pos (id, wallet, name, currency, tip_options, tip_wallet, withdrawlimit, withdrawpin, withdrawamt, withdrawtime, withdrawbtwn, withdrawtimeopt, withdrawpindisabled)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         """,
         (
             tpos_id,
@@ -36,6 +36,8 @@ async def create_tpos(wallet_id: str, data: CreateTposData) -> TPoS:
             0,
             0,
             data.withdrawbtwn,
+            data.withdrawtimeopt,
+            data.withdrawpindisabled,
         ),
     )
     tpos = await get_tpos(tpos_id)
@@ -53,7 +55,9 @@ async def start_lnurlcharge(tpos_id: str):
     assert tpos, f"TPoS with {tpos_id} not found!"
 
     now = await get_current_timestamp()
-    withdraw_time_seconds = tpos.withdrawbtwn * 60
+    withdraw_time_seconds = (
+        tpos.withdrawbtwn * 60 if tpos.withdrawtimeopt != "secs" else tpos.withdrawbtwn
+    )
     assert (
         now - tpos.withdrawtime > withdraw_time_seconds
     ), f"Last withdraw was made too recently, please try again in {int(withdraw_time_seconds - (now - tpos.withdrawtime))} secs"
@@ -105,7 +109,9 @@ async def update_tpos_withdraw(data: TPoS, tpos_id: str) -> TPoS:
     # Calculate the time between withdrawals in seconds
     now = await get_current_timestamp()
     time_elapsed = now - data.withdrawtime
-    withdraw_time_seconds = data.withdrawbtwn * 60
+    withdraw_time_seconds = (
+        data.withdrawbtwn * 60 if data.withdrawtimeopt != "secs" else data.withdrawbtwn
+    )
 
     logger.debug(f"Time between: {time_elapsed} seconds")
 

migrations.py

@@ -106,3 +106,12 @@ async def m007_atm_premium(db):
     Add a premium % to ATM withdraws
     """
     await db.execute("ALTER TABLE tpos.pos ADD COLUMN withdrawpremium FLOAT;")
+
+
+
+async def m008_atm_time_option_and_pin_toggle(db):
+    """
+    Add a time mins/sec and pin toggle
+    """
+    await db.execute("ALTER TABLE tpos.pos ADD COLUMN withdrawtimeopt TEXT DEFAULT 'mins';")
+    await db.execute("ALTER TABLE tpos.pos ADD COLUMN withdrawpindisabled BOOL NOT NULL DEFAULT false;")

models.py

@@ -18,8 +18,10 @@ class CreateTposData(BaseModel):
     withdrawpin: int = Field(None, ge=1)
     withdrawamt: int = Field(None, ge=0)
     withdrawtime: int = Field(0)
+    withdrawtimeopt: Optional[str]
     withdrawbtwn: int = Field(10, ge=1)
     withdrawpremium: float = Field(None)
+    withdrawpindisabled: bool = Field(False)
 
 
 class TPoS(BaseModel):
@@ -33,8 +35,10 @@ class TPoS(BaseModel):
     withdrawpin: Optional[int]
     withdrawamt: int
     withdrawtime: int
+    withdrawtimeopt: Optional[str]
     withdrawbtwn: int
     withdrawpremium: Optional[float]
+    withdrawpindisabled: Optional[bool]
     items: Optional[str]
 
     @classmethod
@@ -54,8 +58,10 @@ class TPoSClean(BaseModel):
     withdrawlimit: Optional[int]
     withdrawamt: int
     withdrawtime: int
+    withdrawtimeopt: Optional[str]
     withdrawbtwn: int
     withdrawpremium: Optional[float]
+    withdrawpindisabled: Optional[bool]
     items: Optional[str]
 
     @classmethod