Bugzilla – Attachment 181791 Details for
Bug 38010
Migrate vendors to Vue
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 38010: (QA follow-up) Fix issues on vendor edit page
Bug-38010-QA-follow-up-Fix-issues-on-vendor-edit-p.patch (text/plain), 8.61 KB, created by
Jonathan Druart
on 2025-04-30 21:04:10 UTC
(
hide
)
Description:
Bug 38010: (QA follow-up) Fix issues on vendor edit page
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2025-04-30 21:04:10 UTC
Size:
8.61 KB
patch
obsolete
>From 9aedf1b648a8ca9de3ef2fd5a8c274188bce17e7 Mon Sep 17 00:00:00 2001 >From: Matt Blenkinsop <matt.blenkinsop@openfifth.co.uk> >Date: Tue, 22 Apr 2025 14:08:42 +0100 >Subject: [PATCH] Bug 38010: (QA follow-up) Fix issues on vendor edit page > >This commit addresses the following: >- Prevents form submission when hitting enter in the alias field >- validation for the discount field >- restores delete functionality to interfaces >- fixes the broken edit button on the list view > >Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu> >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > .../vue/components/Vendors/VendorDetails.vue | 8 +++-- > .../vue/components/Vendors/VendorFormAdd.vue | 31 +++++++++++++++++-- > .../components/Vendors/VendorInterfaces.vue | 2 +- > .../js/vue/components/Vendors/VendorList.vue | 2 +- > .../Vendors/VendorOrderingInformation.vue | 18 +++++++++++ > 5 files changed, 54 insertions(+), 7 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorDetails.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorDetails.vue >index c6f8ce0023a..9ae5bc3327d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorDetails.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorDetails.vue >@@ -143,7 +143,11 @@ > </li> > <li> > <label for="vendor_aliases">{{ $__("Aliases") }}:</label> >- <input id="vendor_aliases" v-model="newAlias" /> >+ <input >+ id="vendor_aliases" >+ class="noEnterSubmit" >+ v-model="newAlias" >+ /> > <span class="aliasAction" @click="addAlias()" > ><i class="fa fa-plus"></i> {{ $__("Add") }}</span > > >@@ -201,7 +205,7 @@ export default { > }, > removeAlias(e) { > const aliasIndex = this.vendor.aliases >- .map(e => e.alias) >+ .map(a => a.alias) > .indexOf(e.alias); > this.vendor.aliases.splice(aliasIndex, 1); > }, >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorFormAdd.vue >index 7f31ea051d7..6ea4c6c007f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorFormAdd.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorFormAdd.vue >@@ -10,7 +10,11 @@ > <VendorDetails :vendor="vendor" /> > <VendorContacts :vendor="vendor" /> > <VendorInterfaces :vendor="vendor" /> >- <VendorOrderingInformation :vendor="vendor" /> >+ <VendorOrderingInformation >+ :vendor="vendor" >+ :verifyDiscountValue="verifyDiscountValue" >+ :discountValid="discountValid" >+ /> > <fieldset class="action"> > <ButtonSubmit /> > <router-link >@@ -27,7 +31,7 @@ > > <script> > import ButtonSubmit from "../ButtonSubmit.vue"; >-import { setMessage } from "../../messages"; >+import { setMessage, setWarning } from "../../messages"; > import { APIClient } from "../../fetch/api-client.js"; > import VendorDetails from "./VendorDetails.vue"; > import VendorContacts from "./VendorContacts.vue"; >@@ -66,6 +70,7 @@ export default { > interfaces: [], > }, > initialized: false, >+ discountValid: true, > }; > }, > beforeRouteEnter(to, from, next) { >@@ -89,6 +94,15 @@ export default { > vendor.address3 && (physical += vendor.address3 + "\n"); > vendor.address4 && (physical += vendor.address4 + "\n"); > this.vendor.physical = physical; >+ >+ if (!this.vendor.discount) this.vendor.discount = 0.0; >+ const decimalPlaces = >+ this.vendor.discount.toString().split(".")[1]?.length || >+ 0; >+ if (!decimalPlaces) { >+ this.vendor.discount = this.vendor.discount.toFixed(1); >+ } >+ > this.initialized = true; > }, > error => {} >@@ -96,7 +110,7 @@ export default { > }, > onSubmit(e) { > e.preventDefault(); >- >+ const errors = []; > const vendor = JSON.parse(JSON.stringify(this.vendor)); > > const vendorId = vendor.id; >@@ -114,6 +128,9 @@ export default { > delete vendor.physical; > delete vendor.subscriptions_count; > >+ if (!this.discountValid) >+ errors.push(this.$__("Invalid discount value")); >+ > vendor.contacts = this.checkContactOrInterface( > vendor.contacts.map( > ({ id, booksellerid, ...requiredProperties }) => >@@ -127,6 +144,9 @@ export default { > ) > ); > >+ setWarning(errors.join("<br>")); >+ if (errors.length) return false; >+ > const client = APIClient.acquisition; > if (vendorId) { > client.vendors.update(vendor, vendorId).then( >@@ -157,6 +177,11 @@ export default { > return acc; > }, []); > }, >+ verifyDiscountValue(e) { >+ this.discountValid = /^[\-]?\d{0,2}(\.\d{0,3})*$/.test( >+ this.vendor.discount >+ ); >+ }, > }, > components: { > ButtonSubmit, >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorInterfaces.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorInterfaces.vue >index 40f3ff86606..7bac4ee687e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorInterfaces.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorInterfaces.vue >@@ -127,7 +127,7 @@ > /> > </li> > </ol> >- <span class="btn btn-default" @click.prevent="deleteContact(i)" >+ <span class="btn btn-default" @click.prevent="deleteInterface(i)" > ><font-awesome-icon icon="trash" /> > {{ $__("Delete interface") }}</span > > >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue >index 2fc5ec1cd2d..a23208ea877 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue >@@ -148,7 +148,7 @@ export default { > doEdit({ id }, dt, event) { > this.$router.push({ > name: "VendorFormAddEdit", >- params: { vendor_id: id }, >+ params: { id: id }, > }); > }, > doDelete(vendor, dt, event) { >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorOrderingInformation.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorOrderingInformation.vue >index 7c9a8e8fa4b..beb9769bf67 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorOrderingInformation.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorOrderingInformation.vue >@@ -192,8 +192,14 @@ > id="discount" > name="discount" > v-model="vendor.discount" >+ @change="verifyDiscountValue(e)" > /> > % >+ <span class="error" v-if="!discountValid"> >+ {{ >+ $__("Please enter a decimal number in the format: 0.0") >+ }} >+ </span> > </li> > <li> > <label for="deliverytime">{{ $__("Delivery time") }}: </label> >@@ -228,6 +234,8 @@ export default { > props: { > vendor: Object, > display: Boolean, >+ verifyDiscountValue: Function, >+ discountValid: Boolean, > }, > setup() { > const vendorStore = inject("vendorStore"); >@@ -245,6 +253,16 @@ export default { > const multiplier = 10 ** decimalPlaces; > return Math.round(taxRate * multiplier) / (multiplier / 100); > }, >+ formatDiscount() { >+ if (!this.vendor.discount) return 0.0; >+ const decimalPlaces = >+ this.vendor.discount.toString().split(".")[1]?.length || 0; >+ if (decimalPlaces) { >+ return this.vendor.discount; >+ } else { >+ return this.vendor.discount.toFixed(1); >+ } >+ }, > }, > }; > </script> >-- >2.34.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 38010
:
174119
|
174120
|
174121
|
174122
|
174123
|
174124
|
174125
|
174126
|
174128
|
174129
|
174130
|
174131
|
174132
|
174133
|
174134
|
174135
|
174136
|
174137
|
174138
|
174139
|
174140
|
174141
|
174142
|
174143
|
174144
|
174145
|
174146
|
174147
|
174148
|
174151
|
174152
|
174153
|
174154
|
174155
|
174156
|
174157
|
174158
|
174159
|
174160
|
174161
|
174162
|
174163
|
174164
|
174165
|
174166
|
174167
|
174168
|
174169
|
174170
|
174171
|
174172
|
174173
|
174174
|
174175
|
174176
|
174177
|
174178
|
174179
|
174194
|
174196
|
174197
|
174198
|
174199
|
174200
|
174201
|
174202
|
174203
|
174204
|
174205
|
174206
|
174207
|
174208
|
174209
|
174210
|
174211
|
174212
|
174213
|
174214
|
174215
|
174216
|
174217
|
174218
|
174220
|
174221
|
174222
|
174223
|
174224
|
174225
|
174226
|
174248
|
174266
|
174267
|
174269
|
174270
|
174273
|
174327
|
174328
|
174329
|
174330
|
174331
|
174332
|
174333
|
174334
|
174335
|
174336
|
174337
|
174338
|
174339
|
174340
|
174341
|
174342
|
174343
|
174344
|
174345
|
174346
|
174347
|
174348
|
174349
|
174350
|
174351
|
174352
|
174353
|
174354
|
174355
|
174356
|
174357
|
174358
|
174359
|
174360
|
174603
|
175098
|
175099
|
175100
|
175101
|
175102
|
175103
|
175104
|
175105
|
175106
|
175107
|
175108
|
175109
|
175110
|
175111
|
175112
|
175113
|
175114
|
175115
|
175116
|
175117
|
175118
|
175119
|
175120
|
175121
|
175122
|
175123
|
175124
|
175125
|
175126
|
175127
|
175128
|
175129
|
175130
|
175131
|
175133
|
175134
|
175135
|
175136
|
175137
|
175167
|
175168
|
175170
|
175240
|
175241
|
175242
|
175243
|
175248
|
175249
|
175266
|
175791
|
175799
|
176547
|
178182
|
178183
|
178184
|
178185
|
178186
|
178187
|
178188
|
178189
|
178190
|
178191
|
178192
|
178193
|
178194
|
178195
|
178196
|
178197
|
178198
|
178199
|
178200
|
178201
|
178202
|
178203
|
178204
|
178205
|
178206
|
178207
|
178208
|
178209
|
178210
|
178211
|
178212
|
178213
|
178214
|
178215
|
178216
|
178217
|
178218
|
178219
|
178220
|
178221
|
178222
|
178223
|
178224
|
178225
|
178226
|
178227
|
178228
|
178229
|
178230
|
178231
|
178232
|
178233
|
178234
|
178235
|
178236
|
178237
|
178238
|
178239
|
178240
|
178241
|
178242
|
181579
|
181585
|
181727
|
181728
|
181729
|
181730
|
181731
|
181732
|
181733
|
181734
|
181735
|
181736
|
181737
|
181738
|
181739
|
181740
|
181741
|
181742
|
181743
|
181744
|
181745
|
181746
|
181747
|
181748
|
181749
|
181750
|
181751
|
181752
|
181753
|
181754
|
181755
|
181756
|
181757
|
181758
|
181759
|
181760
|
181761
|
181762
|
181763
|
181764
|
181765
|
181766
|
181767
|
181768
|
181769
|
181770
|
181771
|
181772
|
181773
|
181774
|
181775
|
181776
|
181777
|
181778
|
181779
|
181780
|
181781
|
181782
|
181783
|
181784
|
181785
|
181786
|
181787
|
181788
|
181789
|
181790
| 181791 |
181792
|
181793
|
181794
|
181795
|
181796
|
181797
|
181798
|
181799
|
181800
|
181801
|
181802
|
181803
|
181804
|
181805
|
181806
|
181807
|
181808
|
181809
|
181810
|
181811
|
181812
|
181813
|
181814
|
181815
|
181816
|
181817
|
181818
|
181819
|
181820
|
181821
|
181891
|
181898
|
181901
|
181963
|
181964
|
182053
|
182351
|
182438