diff --git a/.env.development b/.env.development index 3916f6ee..8bce66d4 100755 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.9" +APP_VERSION="0.5.12" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/.env.example.production b/.env.example.production index 606e946d..aa8d2e81 100755 --- a/.env.example.production +++ b/.env.example.production @@ -1,4 +1,4 @@ -APP_VERSION="0.5.9" +APP_VERSION="0.5.12" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/insiemesipuo.app/.env.development b/_ALL_SITES/insiemesipuo.app/.env.development index cb43446f..8755c7d7 100755 --- a/_ALL_SITES/insiemesipuo.app/.env.development +++ b/_ALL_SITES/insiemesipuo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.9" +APP_VERSION="0.5.12" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/popolodelnuovomondo.app/.env.development b/_ALL_SITES/popolodelnuovomondo.app/.env.development index 7994338f..fcb98d5a 100755 --- a/_ALL_SITES/popolodelnuovomondo.app/.env.development +++ b/_ALL_SITES/popolodelnuovomondo.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.9" +APP_VERSION="0.5.12" SERVICE_WORKER_FILE="service-worker.js" APP_ID="12" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.development b/_ALL_SITES/riso.app/.env.development index dd695e43..1e9d8aa4 100755 --- a/_ALL_SITES/riso.app/.env.development +++ b/_ALL_SITES/riso.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.9" +APP_VERSION="0.5.12" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/riso.app/.env.test b/_ALL_SITES/riso.app/.env.test index 177a5c20..e74d42f4 100755 --- a/_ALL_SITES/riso.app/.env.test +++ b/_ALL_SITES/riso.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.5.9" +APP_VERSION="0.5.12" SERVICE_WORKER_FILE="service-worker.js" APP_ID="13" DIRECTORY_LOCAL=newfreeplanet diff --git a/_ALL_SITES/terradellavisione.app/.env.development b/_ALL_SITES/terradellavisione.app/.env.development index 739a748d..c1a07d7e 100755 --- a/_ALL_SITES/terradellavisione.app/.env.development +++ b/_ALL_SITES/terradellavisione.app/.env.development @@ -1,4 +1,4 @@ -APP_VERSION="0.5.9" +APP_VERSION="0.5.12" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL="newfreeplanet" diff --git a/_ALL_SITES/terradellavisione.app/.env.test b/_ALL_SITES/terradellavisione.app/.env.test index 1bcb1184..40ee5748 100755 --- a/_ALL_SITES/terradellavisione.app/.env.test +++ b/_ALL_SITES/terradellavisione.app/.env.test @@ -1,4 +1,4 @@ -APP_VERSION="0.5.9" +APP_VERSION="0.5.12" SERVICE_WORKER_FILE="service-worker.js" APP_ID="14" DIRECTORY_LOCAL=newfreeplanet diff --git a/src/components/CGridTableRec/CGridTableRec.ts b/src/components/CGridTableRec/CGridTableRec.ts index eed18584..3929d3b9 100755 --- a/src/components/CGridTableRec/CGridTableRec.ts +++ b/src/components/CGridTableRec/CGridTableRec.ts @@ -362,11 +362,11 @@ export default defineComponent({ }) $router.beforeResolve((to: any) => { - // console.log('beforeResolve', visupagedialog.value, 'to', to) + console.log('beforeResolve', visupagedialog.value, 'to', to) if (visupagedialog.value && !to.meta.newpage) { - visupagedialog.value = false - return false + // visupagedialog.value = false + // return false } }) diff --git a/src/components/CGridTableRec/CGridTableRec.vue b/src/components/CGridTableRec/CGridTableRec.vue index cdddc0a8..433d2364 100755 --- a/src/components/CGridTableRec/CGridTableRec.vue +++ b/src/components/CGridTableRec/CGridTableRec.vue @@ -741,7 +741,7 @@ - + -
{{ t('movement.pendingtransaction') }}
-
+
- {{ index + 1 }} + {{ index + 1 }}° 1) + const qty = ref('') const causal = ref('') const bothcircuits = ref([]) @@ -51,6 +51,7 @@ export default defineComponent({ const arrayMarkerLabel = ref([]) const qtyRef = ref(null) + const causalRef = ref(null) watch(() => circuitsel.value, (newval, oldval) => { tools.setCookie(tools.CIRCUIT_USE, newval) @@ -165,6 +166,7 @@ export default defineComponent({ arrayMarkerLabel, remainingCoins, qtyRef, + causalRef, maxsendable, circuitStore, numstep, diff --git a/src/components/CSendCoins/CSendCoins.vue b/src/components/CSendCoins/CSendCoins.vue index 23f06da2..e212f240 100755 --- a/src/components/CSendCoins/CSendCoins.vue +++ b/src/components/CSendCoins/CSendCoins.vue @@ -37,13 +37,13 @@