Merge branch 'main' into improved-pwa

This commit is contained in:
Lee Salminen
2022-07-05 15:10:57 -06:00
34 changed files with 489 additions and 305 deletions
@@ -69,8 +69,8 @@
<code></code>
<h5 class="text-caption q-mt-sm q-mb-none">Curl example</h5>
<code
>curl -X DELETE {{ request.base_url }}tpos/api/v1/tposs/&lt;tpos_id&gt; -H
"X-Api-Key: &lt;admin_key&gt;"
>curl -X DELETE {{ request.base_url
}}tpos/api/v1/tposs/&lt;tpos_id&gt; -H "X-Api-Key: &lt;admin_key&gt;"
</code>
</q-card-section>
</q-card>
@@ -54,7 +54,8 @@
></q-btn>
</q-td>
<q-td v-for="col in props.cols" :key="col.name" :props="props">
{{ (col.name == 'tip_options' ? JSON.parse(col.value).join(", ") : col.value) }}
{{ (col.name == 'tip_options' ? JSON.parse(col.value).join(", ")
: col.value) }}
</q-td>
<q-td auto-width>
<q-btn
@@ -360,15 +361,15 @@
{
name: 'tip_wallet',
align: 'left',
label: "Tip Wallet",
field: "tip_wallet",
label: 'Tip Wallet',
field: 'tip_wallet'
},
{
name: 'tip_options',
align: 'left',
label: "Tip Options %",
field: "tip_options",
},
label: 'Tip Options %',
field: 'tip_options'
}
],
pagination: {
rowsPerPage: 10
@@ -403,8 +404,12 @@
var data = {
name: this.formDialog.data.name,
currency: this.formDialog.data.currency,
tip_options: (this.formDialog.data.tip_options ? JSON.stringify(this.formDialog.data.tip_options.map(str => parseInt(str))) : JSON.stringify([])),
tip_wallet: this.formDialog.data.tip_wallet || "",
tip_options: this.formDialog.data.tip_options
? JSON.stringify(
this.formDialog.data.tip_options.map(str => parseInt(str))
)
: JSON.stringify([]),
tip_wallet: this.formDialog.data.tip_wallet || ''
}
var self = this