From a7100aae25276aeab822b5d5bb03066013531e58 Mon Sep 17 00:00:00 2001 From: odin-h <150337574+odin-h@users.noreply.github.com> Date: Thu, 23 May 2024 18:06:12 +0200 Subject: [PATCH 1/3] feat(proof): fetch and insert proof data to 'add single price' page when using 'add the price' button --- src/views/AddPriceSingle.vue | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/views/AddPriceSingle.vue b/src/views/AddPriceSingle.vue index cfa5817f92..52575b7bf2 100644 --- a/src/views/AddPriceSingle.vue +++ b/src/views/AddPriceSingle.vue @@ -412,18 +412,28 @@ export default { showUserRecentProofs() { this.userRecentProofsDialog = true }, - handleProofSelected(proofId) { - this.addPriceSingleForm.proof_id = proofId + handleProofSelected(proof) { + this.addPriceSingleForm.proof_id = proof.id + this.addPriceSingleForm.date = new Date(proof.created).toISOString().split('T')[0] + this.proofImagePreview = this.getProofUrl(proof) this.proofSelectedSuccessMessage = true this.proofSelectedMessage = true }, handleRecentProofSelected(selectedProof) { - this.handleProofSelected(selectedProof.id) + this.handleProofSelected(selectedProof) this.proofImagePreview = this.getProofUrl(selectedProof) }, getProofUrl(proof) { return `${import.meta.env.VITE_OPEN_PRICES_APP_URL}/img/${proof.file_path}` }, + getProofById(proofId) { + this.loading = true; + api.getProofById(proofId) + .then(proof => { + this.handleProofSelected(proof); + this.loading = false; + }); + }, newProof(source) { if (source === 'gallery') { ExifReader.load(this.proofImage[0]).then((tags) => { From 3000bb30a842b3b51453295958f4e5465934ae4f Mon Sep 17 00:00:00 2001 From: odin-h <150337574+odin-h@users.noreply.github.com> Date: Tue, 28 May 2024 19:09:25 +0200 Subject: [PATCH 2/3] Forgot to change function --- src/views/AddPriceSingle.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/AddPriceSingle.vue b/src/views/AddPriceSingle.vue index 52575b7bf2..7335b4dab1 100644 --- a/src/views/AddPriceSingle.vue +++ b/src/views/AddPriceSingle.vue @@ -383,7 +383,7 @@ export default { this.setProductCode(this.$route.query.code) } } else if (this.$route.query.proof) { - this.handleProofSelected(this.$route.query.proof) + this.getProofById(this.$route.query.proof); } this.initPriceSingleForm() }, From 045528b3458c9278b0ef11a5a03c25d1586cb864 Mon Sep 17 00:00:00 2001 From: Raphael Odini Date: Wed, 5 Jun 2024 15:48:18 +0200 Subject: [PATCH 3/3] final cleanup --- src/components/PriceAddButton.vue | 2 +- src/views/AddPriceSingle.vue | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/components/PriceAddButton.vue b/src/components/PriceAddButton.vue index 8624fea621..1dad0d4d69 100644 --- a/src/components/PriceAddButton.vue +++ b/src/components/PriceAddButton.vue @@ -28,7 +28,7 @@ export default { computed: { getAddUrl() { if (this.proofId) { - return `${this.ADD_PRICE_BASE_URL}?proof=${this.proofId}` + return `${this.ADD_PRICE_BASE_URL}?proof_id=${this.proofId}` } return `${this.ADD_PRICE_BASE_URL}?code=${this.productCode}` } diff --git a/src/views/AddPriceSingle.vue b/src/views/AddPriceSingle.vue index 7335b4dab1..8c07b7cc1b 100644 --- a/src/views/AddPriceSingle.vue +++ b/src/views/AddPriceSingle.vue @@ -382,8 +382,8 @@ export default { else { this.setProductCode(this.$route.query.code) } - } else if (this.$route.query.proof) { - this.getProofById(this.$route.query.proof); + } else if (this.$route.query.proof_id) { + this.getProofById(this.$route.query.proof_id) } this.initPriceSingleForm() }, @@ -415,6 +415,7 @@ export default { handleProofSelected(proof) { this.addPriceSingleForm.proof_id = proof.id this.addPriceSingleForm.date = new Date(proof.created).toISOString().split('T')[0] + // this.proofDateSuccessMessage = true this.proofImagePreview = this.getProofUrl(proof) this.proofSelectedSuccessMessage = true this.proofSelectedMessage = true @@ -427,12 +428,12 @@ export default { return `${import.meta.env.VITE_OPEN_PRICES_APP_URL}/img/${proof.file_path}` }, getProofById(proofId) { - this.loading = true; + this.loading = true api.getProofById(proofId) .then(proof => { - this.handleProofSelected(proof); - this.loading = false; - }); + this.handleProofSelected(proof) + this.loading = false + }) }, newProof(source) { if (source === 'gallery') {