From 953e07eeefe260ab4684630c348894f87129c77d Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Sat, 16 Apr 2022 10:37:36 +0100
Subject: [PATCH 1/3] Added csv export to lnurlw

---
 .../withdraw/templates/withdraw/csv.html      |  33 ++
 .../withdraw/templates/withdraw/index.html    | 351 ++++++------------
 lnbits/extensions/withdraw/views.py           |  34 ++
 3 files changed, 187 insertions(+), 231 deletions(-)
 create mode 100644 lnbits/extensions/withdraw/templates/withdraw/csv.html

diff --git a/lnbits/extensions/withdraw/templates/withdraw/csv.html b/lnbits/extensions/withdraw/templates/withdraw/csv.html
new file mode 100644
index 000000000..e0323bb27
--- /dev/null
+++ b/lnbits/extensions/withdraw/templates/withdraw/csv.html
@@ -0,0 +1,33 @@
+{% extends "print.html" %} {% block page %}
+
+<div class="row">
+    <div class="" id="vue">
+        {% for page in link %}
+        <page size="A4" id="pdfprint">
+            <table style="width: 100%">
+                {% for threes in page %}
+                <tr style="height: 59.4mm">
+                    {% for one in threes %}
+                    <td style="width: 105mm">{{ theurl }}/?lightning={{one}},</td>
+                    {% endfor %}
+                </tr>
+                {% endfor %}
+            </table>
+        </page>
+        {% endfor %}
+    </div>
+</div>
+{% endblock %} {% block scripts %}
+<script>
+    Vue.component(VueQrcode.name, VueQrcode)
+
+    new Vue({
+        el: '#vue',
+        data: function() {
+            return {
+                theurl: location.protocol + '//' + location.host
+            }
+        }
+    })
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/lnbits/extensions/withdraw/templates/withdraw/index.html b/lnbits/extensions/withdraw/templates/withdraw/index.html
index 4cffbc383..de145855b 100644
--- a/lnbits/extensions/withdraw/templates/withdraw/index.html
+++ b/lnbits/extensions/withdraw/templates/withdraw/index.html
@@ -1,40 +1,28 @@
-{% extends "base.html" %} {% from "macros.jinja" import window_vars with context
-%} {% block scripts %} {{ window_vars(user) }}
+{% extends "base.html" %} {% from "macros.jinja" import window_vars with context %} {% block scripts %} {{ window_vars(user) }}
 <script src="/withdraw/static/js/index.js"></script>
 {% endblock %} {% block page %}
 <div class="row q-col-gutter-md">
-  <div class="col-12 col-md-7 q-gutter-y-md">
-    <q-card>
-      <q-card-section>
-        <q-btn unelevated color="primary" @click="simpleformDialog.show = true"
-          >Quick vouchers</q-btn
-        >
-        <q-btn unelevated color="primary" @click="formDialog.show = true"
-          >Advanced withdraw link(s)</q-btn
-        >
-      </q-card-section>
-    </q-card>
+    <div class="col-12 col-md-7 q-gutter-y-md">
+        <q-card>
+            <q-card-section>
+                <q-btn unelevated color="primary" @click="simpleformDialog.show = true">Quick vouchers</q-btn>
+                <q-btn unelevated color="primary" @click="formDialog.show = true">Advanced withdraw link(s)</q-btn>
+            </q-card-section>
+        </q-card>
 
-    <q-card>
-      <q-card-section>
-        <div class="row items-center no-wrap q-mb-md">
-          <div class="col">
-            <h5 class="text-subtitle1 q-my-none">Withdraw links</h5>
-          </div>
-          <div class="col-auto">
-            <q-btn flat color="grey" @click="exportCSV">Export to CSV</q-btn>
-          </div>
-        </div>
-        <q-table
-          dense
-          flat
-          :data="sortedWithdrawLinks"
-          row-key="id"
-          :columns="withdrawLinksTable.columns"
-          :pagination.sync="withdrawLinksTable.pagination"
-        >
-          {% raw %}
-          <template v-slot:header="props">
+        <q-card>
+            <q-card-section>
+                <div class="row items-center no-wrap q-mb-md">
+                    <div class="col">
+                        <h5 class="text-subtitle1 q-my-none">Withdraw links</h5>
+                    </div>
+                    <div class="col-auto">
+                        <q-btn flat color="grey" @click="exportCSV">Export to CSV</q-btn>
+                    </div>
+                </div>
+                <q-table dense flat :data="sortedWithdrawLinks" row-key="id" :columns="withdrawLinksTable.columns" :pagination.sync="withdrawLinksTable.pagination">
+                    {% raw %}
+                    <template v-slot:header="props">
             <q-tr :props="props">
               <q-th auto-width></q-th>
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
@@ -43,7 +31,7 @@
               <q-th auto-width></q-th>
             </q-tr>
           </template>
-          <template v-slot:body="props">
+                    <template v-slot:body="props">
             <q-tr :props="props">
               <q-td auto-width>
                 <q-btn
@@ -69,6 +57,17 @@
                   target="_blank"
                   ><q-tooltip> embeddable image </q-tooltip></q-btn
                 >
+                <q-btn
+                  unelevated
+                  dense
+                  size="xs"
+                  icon="reorder"
+                  :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
+                  type="a"
+                  :href="'/csv/' + props.row.id"
+                  target="_blank"
+                  ><q-tooltip> csv list </q-tooltip></q-btn
+                >
                 <q-btn
                   unelevated
                   dense
@@ -101,129 +100,64 @@
                 ></q-btn>
               </q-td>
             </q-tr>
-          </template>
-          {% endraw %}
-        </q-table>
-      </q-card-section>
-    </q-card>
-  </div>
+          </template> {% endraw %}
+                </q-table>
+            </q-card-section>
+        </q-card>
+    </div>
 
-  <div class="col-12 col-md-5 q-gutter-y-md">
-    <q-card>
-      <q-card-section>
-        <h6 class="text-subtitle1 q-my-none">
-          {{SITE_TITLE}} LNURL-withdraw extension
-        </h6>
-      </q-card-section>
-      <q-card-section class="q-pa-none">
-        <q-separator></q-separator>
-        <q-list>
-          {% include "withdraw/_api_docs.html" %}
-          <q-separator></q-separator>
-          {% include "withdraw/_lnurl.html" %}
-        </q-list>
-      </q-card-section>
-    </q-card>
-  </div>
+    <div class="col-12 col-md-5 q-gutter-y-md">
+        <q-card>
+            <q-card-section>
+                <h6 class="text-subtitle1 q-my-none">
+                    {{SITE_TITLE}} LNURL-withdraw extension
+                </h6>
+            </q-card-section>
+            <q-card-section class="q-pa-none">
+                <q-separator></q-separator>
+                <q-list>
+                    {% include "withdraw/_api_docs.html" %}
+                    <q-separator></q-separator>
+                    {% include "withdraw/_lnurl.html" %}
+                </q-list>
+            </q-card-section>
+        </q-card>
+    </div>
 
-  <q-dialog v-model="formDialog.show" position="top" @hide="closeFormDialog">
-    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-      <q-form @submit="sendFormData" class="q-gutter-md">
-        <q-select
-          filled
-          dense
-          emit-value
-          v-model="formDialog.data.wallet"
-          :options="g.user.walletOptions"
-          label="Wallet *"
-        >
-        </q-select>
-        <q-input
-          filled
-          dense
-          v-model.trim="formDialog.data.title"
-          type="text"
-          label="Link title *"
-        ></q-input>
-        <q-input
-          filled
-          dense
-          v-model.number="formDialog.data.min_withdrawable"
-          type="number"
-          min="10"
-          label="Min withdrawable (sat, at least 10) *"
-        ></q-input>
-        <q-input
-          filled
-          dense
-          v-model.number="formDialog.data.max_withdrawable"
-          type="number"
-          min="10"
-          label="Max withdrawable (sat, at least 10) *"
-        ></q-input>
-        <q-input
-          filled
-          dense
-          v-model.number="formDialog.data.uses"
-          type="number"
-          :default="1"
-          label="Amount of uses *"
-        ></q-input>
-        <div class="row q-col-gutter-none">
-          <div class="col-8">
-            <q-input
-              filled
-              dense
-              v-model.number="formDialog.data.wait_time"
-              type="number"
-              :default="1"
-              label="Time between withdrawals *"
-            >
-            </q-input>
-          </div>
-          <div class="col-4 q-pl-xs">
-            <q-select
-              filled
-              dense
-              v-model="formDialog.secondMultiplier"
-              :options="formDialog.secondMultiplierOptions"
-            >
-            </q-select>
-          </div>
-        </div>
-        <q-list>
-          <q-item tag="label" class="rounded-borders">
-            <q-item-section avatar>
-              <q-checkbox
-                v-model="formDialog.data.is_unique"
-                color="primary"
-              ></q-checkbox>
-            </q-item-section>
-            <q-item-section>
-              <q-item-label
-                >Use unique withdraw QR codes to reduce
-                `assmilking`</q-item-label
-              >
-              <q-item-label caption
-                >This is recommended if you are sharing the links on social
-                media or print QR codes.</q-item-label
-              >
-            </q-item-section>
-          </q-item>
-        </q-list>
-        <div class="row q-mt-lg">
-          <q-btn
-            v-if="formDialog.data.id"
-            unelevated
-            color="primary"
-            type="submit"
-            >Update withdraw link</q-btn
-          >
-          <q-btn
-            v-else
-            unelevated
-            color="primary"
-            :disable="
+    <q-dialog v-model="formDialog.show" position="top" @hide="closeFormDialog">
+        <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+            <q-form @submit="sendFormData" class="q-gutter-md">
+                <q-select filled dense emit-value v-model="formDialog.data.wallet" :options="g.user.walletOptions" label="Wallet *">
+                </q-select>
+                <q-input filled dense v-model.trim="formDialog.data.title" type="text" label="Link title *"></q-input>
+                <q-input filled dense v-model.number="formDialog.data.min_withdrawable" type="number" min="10" label="Min withdrawable (sat, at least 10) *"></q-input>
+                <q-input filled dense v-model.number="formDialog.data.max_withdrawable" type="number" min="10" label="Max withdrawable (sat, at least 10) *"></q-input>
+                <q-input filled dense v-model.number="formDialog.data.uses" type="number" :default="1" label="Amount of uses *"></q-input>
+                <div class="row q-col-gutter-none">
+                    <div class="col-8">
+                        <q-input filled dense v-model.number="formDialog.data.wait_time" type="number" :default="1" label="Time between withdrawals *">
+                        </q-input>
+                    </div>
+                    <div class="col-4 q-pl-xs">
+                        <q-select filled dense v-model="formDialog.secondMultiplier" :options="formDialog.secondMultiplierOptions">
+                        </q-select>
+                    </div>
+                </div>
+                <q-list>
+                    <q-item tag="label" class="rounded-borders">
+                        <q-item-section avatar>
+                            <q-checkbox v-model="formDialog.data.is_unique" color="primary"></q-checkbox>
+                        </q-item-section>
+                        <q-item-section>
+                            <q-item-label>Use unique withdraw QR codes to reduce `assmilking`
+                            </q-item-label>
+                            <q-item-label caption>This is recommended if you are sharing the links on social media or print QR codes.</q-item-label>
+                        </q-item-section>
+                    </q-item>
+                </q-list>
+                <div class="row q-mt-lg">
+                    <q-btn v-if="formDialog.data.id" unelevated color="primary" type="submit">Update withdraw link</q-btn>
+                    <q-btn v-else unelevated color="primary" :disable="
                 formDialog.data.wallet == null ||
                 formDialog.data.title == null ||
                 (formDialog.data.min_withdrawable == null || formDialog.data.min_withdrawable < 1) ||
@@ -233,88 +167,43 @@
                   formDialog.data.max_withdrawable < formDialog.data.min_withdrawable
                 ) ||
                 formDialog.data.uses == null ||
-                formDialog.data.wait_time == null"
-            type="submit"
-            >Create withdraw link</q-btn
-          >
-          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
-            >Cancel</q-btn
-          >
-        </div>
-      </q-form>
-    </q-card>
-  </q-dialog>
+                formDialog.data.wait_time == null" type="submit">Create withdraw link</q-btn>
+                    <q-btn v-close-popup flat color="grey" class="q-ml-auto">Cancel</q-btn>
+                </div>
+            </q-form>
+        </q-card>
+    </q-dialog>
 
-  <q-dialog
-    v-model="simpleformDialog.show"
-    position="top"
-    @hide="simplecloseFormDialog"
-  >
-    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-      <q-form @submit="simplesendFormData" class="q-gutter-md">
-        <q-select
-          filled
-          dense
-          emit-value
-          v-model="simpleformDialog.data.wallet"
-          :options="g.user.walletOptions"
-          label="Wallet *"
-        >
-        </q-select>
-        <q-input
-          filled
-          dense
-          v-model.number="simpleformDialog.data.max_withdrawable"
-          type="number"
-          min="10"
-          label="Withdraw amount per voucher (sat, at least 10)"
-        ></q-input>
-        <q-input
-          filled
-          dense
-          v-model.number="simpleformDialog.data.uses"
-          type="number"
-          :default="1"
-          label="Number of vouchers"
-        ></q-input>
+    <q-dialog v-model="simpleformDialog.show" position="top" @hide="simplecloseFormDialog">
+        <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
+            <q-form @submit="simplesendFormData" class="q-gutter-md">
+                <q-select filled dense emit-value v-model="simpleformDialog.data.wallet" :options="g.user.walletOptions" label="Wallet *">
+                </q-select>
+                <q-input filled dense v-model.number="simpleformDialog.data.max_withdrawable" type="number" min="10" label="Withdraw amount per voucher (sat, at least 10)"></q-input>
+                <q-input filled dense v-model.number="simpleformDialog.data.uses" type="number" :default="1" label="Number of vouchers"></q-input>
 
-        <div class="row q-mt-lg">
-          <q-btn
-            unelevated
-            color="primary"
-            :disable="
+                <div class="row q-mt-lg">
+                    <q-btn unelevated color="primary" :disable="
                 simpleformDialog.data.wallet == null ||
 
                   simpleformDialog.data.max_withdrawable == null ||
                   simpleformDialog.data.max_withdrawable < 1 ||
-                simpleformDialog.data.uses == null"
-            type="submit"
-            >Create vouchers</q-btn
-          >
-          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
-            >Cancel</q-btn
-          >
-        </div>
-      </q-form>
-    </q-card>
-  </q-dialog>
+                simpleformDialog.data.uses == null" type="submit">Create vouchers</q-btn>
+                    <q-btn v-close-popup flat color="grey" class="q-ml-auto">Cancel</q-btn>
+                </div>
+            </q-form>
+        </q-card>
+    </q-dialog>
 
-  <q-dialog v-model="qrCodeDialog.show" position="top">
-    <q-card v-if="qrCodeDialog.data" class="q-pa-lg lnbits__dialog-card">
-      <q-responsive :ratio="1" class="q-mx-xl q-mb-md">
-        <qrcode
-          :value="qrCodeDialog.data.url + '/?lightning=' + qrCodeDialog.data.lnurl"
-          :options="{width: 800}"
-          class="rounded-borders"
-        ></qrcode>
-        {% raw %}
-      </q-responsive>
-      <p style="word-break: break-all">
-        <strong>ID:</strong> {{ qrCodeDialog.data.id }}<br />
-        <strong>Unique:</strong> {{ qrCodeDialog.data.is_unique }}<span
-          v-if="qrCodeDialog.data.is_unique"
-          class="text-deep-purple"
-        >
+    <q-dialog v-model="qrCodeDialog.show" position="top">
+        <q-card v-if="qrCodeDialog.data" class="q-pa-lg lnbits__dialog-card">
+            <q-responsive :ratio="1" class="q-mx-xl q-mb-md">
+                <qrcode :value="qrCodeDialog.data.url + '/?lightning=' + qrCodeDialog.data.lnurl" :options="{width: 800}" class="rounded-borders"></qrcode>
+                {% raw %}
+            </q-responsive>
+            <p style="word-break: break-all">
+                <strong>ID:</strong> {{ qrCodeDialog.data.id }}<br />
+                <strong>Unique:</strong> {{ qrCodeDialog.data.is_unique }}<span v-if="qrCodeDialog.data.is_unique" class="text-deep-purple">
           (QR code will change after each withdrawal)</span
         ><br />
         <strong>Max. withdrawable:</strong> {{
@@ -356,4 +245,4 @@
     </q-card>
   </q-dialog>
 </div>
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/lnbits/extensions/withdraw/views.py b/lnbits/extensions/withdraw/views.py
index c409919aa..81aeef98c 100644
--- a/lnbits/extensions/withdraw/views.py
+++ b/lnbits/extensions/withdraw/views.py
@@ -102,3 +102,37 @@ async def print_qr(request: Request, link_id):
     return withdraw_renderer().TemplateResponse(
         "withdraw/print_qr.html", {"request": request, "link": linked, "unique": True}
     )
+
+@withdraw_ext.get("/csv/{link_id}", response_class=HTMLResponse)
+async def print_qr(request: Request, link_id):
+    link = await get_withdraw_link(link_id)
+    if not link:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND, detail="Withdraw link does not exist."
+        )
+        # response.status_code = HTTPStatus.NOT_FOUND
+        # return "Withdraw link does not exist."
+
+    if link.uses == 0:
+
+        return withdraw_renderer().TemplateResponse(
+            "withdraw/csv.html",
+            {"request": request, "link": link.dict(), "unique": False},
+        )
+    links = []
+    count = 0
+
+    for x in link.usescsv.split(","):
+        linkk = await get_withdraw_link(link_id, count)
+        if not linkk:
+            raise HTTPException(
+                status_code=HTTPStatus.NOT_FOUND, detail="Withdraw link does not exist."
+            )
+        links.append(str(linkk.lnurl(request)))
+        count = count + 1
+    page_link = list(chunks(links, 2))
+    linked = list(chunks(page_link, 5))
+
+    return withdraw_renderer().TemplateResponse(
+        "withdraw/csv.html", {"request": request, "link": linked, "unique": True}
+    )
\ No newline at end of file

From 6fdd1fb24b745eb6a034e01c8b4c8a18863c0819 Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Sat, 16 Apr 2022 10:47:58 +0100
Subject: [PATCH 2/3] updated link

---
 .../withdraw/templates/withdraw/csv.html      | 25 ++-----------------
 .../withdraw/templates/withdraw/index.html    |  2 +-
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/lnbits/extensions/withdraw/templates/withdraw/csv.html b/lnbits/extensions/withdraw/templates/withdraw/csv.html
index e0323bb27..a8bb5394e 100644
--- a/lnbits/extensions/withdraw/templates/withdraw/csv.html
+++ b/lnbits/extensions/withdraw/templates/withdraw/csv.html
@@ -1,32 +1,11 @@
-{% extends "print.html" %} {% block page %}
-
-<div class="row">
-    <div class="" id="vue">
-        {% for page in link %}
-        <page size="A4" id="pdfprint">
-            <table style="width: 100%">
-                {% for threes in page %}
-                <tr style="height: 59.4mm">
-                    {% for one in threes %}
-                    <td style="width: 105mm">{{ theurl }}/?lightning={{one}},</td>
-                    {% endfor %}
-                </tr>
-                {% endfor %}
-            </table>
-        </page>
-        {% endfor %}
-    </div>
-</div>
-{% endblock %} {% block scripts %}
+{% extends "print.html" %} {% block page %} {% for page in link %} {% for threes in page %} {% for one in threes %} {{one}}, {% endfor %} {% endfor %} {% endfor %} {% endblock %} {% block scripts %}
 <script>
     Vue.component(VueQrcode.name, VueQrcode)
 
     new Vue({
         el: '#vue',
         data: function() {
-            return {
-                theurl: location.protocol + '//' + location.host
-            }
+            return {}
         }
     })
 </script>
diff --git a/lnbits/extensions/withdraw/templates/withdraw/index.html b/lnbits/extensions/withdraw/templates/withdraw/index.html
index de145855b..13673028d 100644
--- a/lnbits/extensions/withdraw/templates/withdraw/index.html
+++ b/lnbits/extensions/withdraw/templates/withdraw/index.html
@@ -64,7 +64,7 @@
                   icon="reorder"
                   :color="($q.dark.isActive) ? 'grey-7' : 'grey-5'"
                   type="a"
-                  :href="'/csv/' + props.row.id"
+                  :href="'/withdraw/csv/' + props.row.id"
                   target="_blank"
                   ><q-tooltip> csv list </q-tooltip></q-btn
                 >

From 9818ba4677cc11609080599a632125151c2e963f Mon Sep 17 00:00:00 2001
From: benarc <ben@arc.wales>
Date: Sat, 16 Apr 2022 10:50:12 +0100
Subject: [PATCH 3/3] removed qrcode library

---
 lnbits/extensions/withdraw/templates/withdraw/csv.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lnbits/extensions/withdraw/templates/withdraw/csv.html b/lnbits/extensions/withdraw/templates/withdraw/csv.html
index a8bb5394e..d8f8c4d0d 100644
--- a/lnbits/extensions/withdraw/templates/withdraw/csv.html
+++ b/lnbits/extensions/withdraw/templates/withdraw/csv.html
@@ -1,7 +1,5 @@
 {% extends "print.html" %} {% block page %} {% for page in link %} {% for threes in page %} {% for one in threes %} {{one}}, {% endfor %} {% endfor %} {% endfor %} {% endblock %} {% block scripts %}
 <script>
-    Vue.component(VueQrcode.name, VueQrcode)
-
     new Vue({
         el: '#vue',
         data: function() {