bug fixes and calendar fixes
This commit is contained in:
parent
0ec89a1269
commit
6cd3d138ad
9 changed files with 446 additions and 270 deletions
|
|
@ -101,7 +101,7 @@ const loadingStore = useLoadingStore();
|
|||
const notificationStore = useNotificationStore();
|
||||
const companyStore = useCompanyStore();
|
||||
|
||||
const address = route.query.address || null;
|
||||
const address = (route.query.address || '').trim();
|
||||
const clientName = route.query.client || null;
|
||||
const isNew = computed(() => route.query.new === "true" || false);
|
||||
|
||||
|
|
@ -118,7 +118,7 @@ const selectedAddressObject = computed(() =>
|
|||
);
|
||||
const addresses = computed(() => {
|
||||
if (client.value && client.value.addresses) {
|
||||
return client.value.addresses.map((addr) => DataUtils.calculateFullAddress(addr));
|
||||
return client.value.addresses.map((addr) => DataUtils.calculateFullAddress(addr).trim());
|
||||
}
|
||||
return [];
|
||||
});
|
||||
|
|
@ -144,7 +144,7 @@ const selectedAddressData = computed(() => {
|
|||
return null;
|
||||
}
|
||||
return client.value.addresses.find(
|
||||
(addr) => DataUtils.calculateFullAddress(addr) === selectedAddress.value
|
||||
(addr) => DataUtils.calculateFullAddress(addr).trim() === selectedAddress.value.trim()
|
||||
);
|
||||
});
|
||||
|
||||
|
|
@ -174,10 +174,11 @@ const getClient = async (name) => {
|
|||
// Set initial selected address if provided in route or use first address
|
||||
if (address && client.value.addresses) {
|
||||
const fullAddresses = client.value.addresses.map((addr) =>
|
||||
DataUtils.calculateFullAddress(addr),
|
||||
DataUtils.calculateFullAddress(addr).trim(),
|
||||
);
|
||||
if (fullAddresses.includes(address)) {
|
||||
selectedAddress.value = address;
|
||||
const trimmedAddress = address.trim();
|
||||
if (fullAddresses.includes(trimmedAddress)) {
|
||||
selectedAddress.value = trimmedAddress;
|
||||
} else if (fullAddresses.length > 0) {
|
||||
selectedAddress.value = fullAddresses[0];
|
||||
}
|
||||
|
|
@ -297,7 +298,7 @@ const handleSubmit = async () => {
|
|||
console.log("Created client:", createdClient);
|
||||
notificationStore.addSuccess("Client created successfully!");
|
||||
// Navigate to the created client
|
||||
window.location.hash = '#/client?client=' + encodeURIComponent(createdClient.name || createdClient.customerName);
|
||||
router.push('/client?client=' + encodeURIComponent(createdClient.name));
|
||||
} else {
|
||||
// TODO: Implement save logic
|
||||
notificationStore.addSuccess("Changes saved successfully!");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue