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

switched 2 inputs

Browse Source
This commit is contained in:
Luca Haid
2024-11-25 10:47:06 +00:00
parent c2afcc7aa1
commit f3a1aef719
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
application/Address/AddressController.php
View File

@@ -561,12 +561,21 @@ class AddressController extends mfBaseController {
}
}
$addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "mergedName" => $search]));
$addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "company" => $search]));
$addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "firstname" => $search]));
$addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "lastname" => $search]));
if (isset($_GET['fibu_primary_account'])) {
$addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "mergedName" => $search, "fibu_primary_account" => true]));
$addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "company" => $search, "fibu_primary_account" => true]));
$addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "firstname" => $search, "fibu_primary_account" => true]));
$addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "lastname" => $search, "fibu_primary_account" => true]));
$addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "street" => $search, "fibu_primary_account" => true]));
} else {
$addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "mergedName" => $search]));
$addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "company" => $search]));
$addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "firstname" => $search]));
$addresses = array_merge($addresses, AddressModel::search(["parents_only" => $po, "addresstype" => [$role], "lastname" => $search]));
}
if(!is_array($addresses) || !count($addresses)) {
return false;
}

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

@@ -445,7 +445,7 @@ Vue.component('warehouse-shipping-note-modal', {
data() {
return {
window: window,
billAddrAutoCompleteUrl: window.TT_CONFIG['BASE_PATH'] + '/Address/Api?do=findAddress',
billAddrAutoCompleteUrl: window.TT_CONFIG['BASE_PATH'] + '/Address/Api?do=findAddress&fibu_primary_account=1',
billAddrId: '',
delAddrName: '',
delAddrLine: '',
@@ -462,7 +462,7 @@ Vue.component('warehouse-shipping-note-modal', {
//language=Vue
template: `
<tt-modal :show="true" @submit="submit" :delete="false" :title="title" @update:show="$emit('close')">
<tt-modal :show="true" @submit="submit" @delete="reqDelete" :delete="id !== 'create'" :title="title" @update:show="$emit('close')">
<div style="width: 99%">
<h4 class="text-center">Liefer- und Rechnungsadresse</h4>
<tt-autocomplete v-model="billAddrId" :api-url="billAddrAutoCompleteUrl" label="Rechnungsadresse" sm row/>
@@ -536,8 +536,14 @@ Vue.component('warehouse-shipping-note-modal', {
}
},
methods: {
openSigningModal() {
async reqDelete() {
const response = await axios.post(window.TT_CONFIG['DELETE_URL'], {id: this.id});
if (response.data.success) {
this.window.notify('success', response.data.message || 'Erfolgreich gelöscht');
this.$emit('close');
} else {
this.window.notify('error', response.data.message || 'Ein Fehler ist aufgetreten');
}
},
async submit() {
const data = {