Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(API): send the page url on every POST #1035

Merged
merged 1 commit into from
Nov 13, 2024
Merged

refactor(API): send the page url on every POST #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/ProofInputRow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ export default {
})
.then((proofImageCompressed) => {
api
.createProof(proofImageCompressed, this.proofForm)
.createProof(proofImageCompressed, this.proofForm, this.$route.path)
.then((data) => {
this.loading = false
if (data.id) {
Expand Down
11 changes: 5 additions & 6 deletions src/services/api.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const OP_DEFAULT_HEADERS = {
}
const OP_DEFAULT_PARAMS = {
'app_name': constants.APP_USER_AGENT
// 'app_version' // hack to store price/proof create source
}

function buildURLParams(params = {}) {
Expand Down Expand Up @@ -68,10 +69,8 @@ export default {
})
.then((response) => response.json())
},
createProof(image, inputData) {
console.log('createProof', inputData)
createProof(image, inputData, source = null) {
const data = filterBodyWithAllowedKeys(inputData, PROOF_CREATE_FIELDS)
console.log('createProof', data)
const store = useAppStore()
let formData = new FormData()
formData.append('file', image, image.name)
Expand All @@ -92,7 +91,7 @@ export default {
formData.append('receipt_price_total', data.receipt_price_total)
}
}
const url = `${import.meta.env.VITE_OPEN_PRICES_API_URL}/proofs/upload?${buildURLParams()}`
const url = `${import.meta.env.VITE_OPEN_PRICES_API_URL}/proofs/upload?${buildURLParams({'app_version': source})}`
return fetch(url, {
method: 'POST',
headers: {
Expand Down Expand Up @@ -156,11 +155,11 @@ export default {
// .then((response) => response.json())
},

createPrice(inputData) {
createPrice(inputData, source = null) {
const data = filterBodyWithAllowedKeys(inputData, PRICE_CREATE_FIELDS)
const store = useAppStore()
store.user.last_product_mode_used = data.product_code ? 'barcode' : 'category'
const url = `${import.meta.env.VITE_OPEN_PRICES_API_URL}/prices?${buildURLParams()}`
const url = `${import.meta.env.VITE_OPEN_PRICES_API_URL}/prices?${buildURLParams({'app_version': source})}`
return fetch(url, {
method: 'POST',
headers: Object.assign({}, OP_DEFAULT_HEADERS, {
Expand Down
2 changes: 1 addition & 1 deletion src/views/AddPriceMultiple.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ export default {
}
// create price
api
.createPrice(Object.assign({}, this.addPriceMultipleForm, this.productPriceForm))
.createPrice(Object.assign({}, this.addPriceMultipleForm, this.productPriceForm), this.$route.path)
.then((data) => {
if (data['detail']) {
alert(`Error: with input ${data['detail'][0]['input']}`)
Expand Down
2 changes: 1 addition & 1 deletion src/views/AddPriceSingle.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export default {
}
// create price
api
.createPrice(this.addPriceSingleForm)
.createPrice(this.addPriceSingleForm, this.$route.path)
.then((data) => {
if (data['detail']) {
alert(`Error: with input ${data['detail'][0]['input']}`)
Expand Down
4 changes: 2 additions & 2 deletions src/views/ContributionAssistant.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ export default {
error: reject
})
})
proof = await api.createProof(proofImageCompressed, Object.assign({type: 'PRICE_TAG'}, this.locationForm, this.proofMetadataForm))
proof = await api.createProof(proofImageCompressed, Object.assign({type: 'PRICE_TAG'}, this.locationForm, this.proofMetadataForm), this.$route.path)
}

for (let i = 0; i < this.productPriceForms.length; i++) {
Expand Down Expand Up @@ -257,7 +257,7 @@ export default {
delete priceData.product_code
delete priceData.product
}
await api.createPrice(priceData) // TODO: error handling
await api.createPrice(priceData, this.$route.path) // TODO: error handling
this.productPriceForms[i].processed = true
}
this.addPricesLoading = false
Expand Down
Loading