Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'WarehouseShippingNote/fix-addr-editing' into 'master'

Browse Source 
fixed address changing

See merge request fronk/thetool!1358
This commit is contained in:
Luca Haid
2025-05-19 10:57:53 +00:00
parent 8df3c2013f 22f3c0200e
commit b20274180e
1 changed files with 47 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
public/js/pages/WarehouseShippingNote/WarehouseShippingNoteModal.js
View File

@@ -7,6 +7,7 @@ Vue.component('warehouse-shipping-note-modal', {
return {
window: window,
loading: false,
addressEditMode: false,
billAddrAutoCompleteUrl: window.TT_CONFIG['BASE_PATH'] + '/Address/Api?do=findAddress&fibu_primary_account=1',
geoAutocompleteUrl: window.TT_CONFIG['BASE_PATH'] + '/WarehouseShippingNote/geoAutocomplete',
shippingNote: {
@@ -35,8 +36,7 @@ Vue.component('warehouse-shipping-note-modal', {
customOrdering: 'article',
fields: {
article: {
style: 'display: grid; grid-template-columns: 4fr 1fr; grid-gap: 10px;',
type: 'autocomplete',
type: 'input-article',
label: 'Artikel',
apiUrl: '/WarehouseArticle/autoComplete',
customFieldReference: 'WarehouseArticle',
@@ -111,7 +111,50 @@ Vue.component('warehouse-shipping-note-modal', {
<tt-input v-model="shippingNote.deliveryAddressName" label="Name" sm row/>
<tt-input v-model="shippingNote.deliveryAddressEMail" label="E-Mail" sm row/>
<div class="mb-1" v-if="shippingNote.deliveryAddressLine">{{ shippingNote.deliveryAddressLine }}<br>{{ shippingNote.deliveryAddressPLZ }} {{ shippingNote.deliveryAddressCity }}</div>
<div v-if="!addressEditMode" class="d-flex align-items-start">
<div class="mb-1">
<div v-if="shippingNote.deliveryAddressLine">
{{ shippingNote.deliveryAddressLine }}<br>
{{ shippingNote.deliveryAddressPLZ }} {{ shippingNote.deliveryAddressCity }}
</div>
</div>
<button @click="addressEditMode = true" class="btn btn-sm btn-link ml-2">
<i class="fas fa-edit"></i>
</button>
</div>
<!-- Edit form -->
<div v-if="addressEditMode" class="address-edit-form mt-2">
<div style="display:grid; grid-template-columns: 3fr 1.5fr 1.5fr 1fr; gap: 10px">
<tt-input
label="Adresse"
type="text"
placeholder="Adresse"
v-model="shippingNote.deliveryAddressLine"
sm
></tt-input>
<tt-input
label="PLZ"
type="text"
placeholder="PLZ"
v-model="shippingNote.deliveryAddressPLZ"
sm
no-form-group
></tt-input>
<tt-input
label="Stadt"
type="text"
placeholder="Stadt"
v-model="shippingNote.deliveryAddressCity"
sm
no-form-group
></tt-input>
<button @click="addressEditMode = false" class="btn btn-sm btn-link">
<i class="fas fa-times"></i>
</button>
</div>
<template v-if="window.TT_CONFIG['WAREHOUSE_ADMIN'] == true">
<hr>
@@ -134,13 +177,7 @@ Vue.component('warehouse-shipping-note-modal', {
<hr>
<h4 class="text-center">Positionen</h4>
<tt-positions-manager :config="positionsConfig" v-model="shippingNote.positions" sm row ref="positionsManager">
<template #article-prepend>
<tt-button
style="max-width: 32px" sm
text="" @click="$emit('open-article-modal')" additional-class="btn-outline-primary" icon="fa fa-search"/>
</template>
</tt-positions-manager>
<tt-positions-manager :config="positionsConfig" v-model="shippingNote.positions" sm row ref="positionsManager"/>
</template>
<div v-else class="text-danger text-center font-weight-bolder font-16">Bitte Lieferadresse eingeben oder nach Kunden suchen</div>