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

added lieferscheine to ticket view in thetool

Browse Source
This commit is contained in:
Luca Haid
2025-04-25 13:16:24 +02:00
parent 45efb5d2fd
commit a076cf6b9c
3 changed files with 92 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Layout/default/Address/View.php
View File

@@ -27,7 +27,7 @@
<a href="<?=self::getUrl("Address","edit", ['id' => $address->id, 's' => $s, 'f' => "view"])?>" class="btn btn-outline-success"><i class="fas fa-edit"></i> Adresse bearbeiten</a>
</div>
<div class="float-right">
<a href="<?=self::getUrl("Address","tickets", ["address_id" => $address->id])?>" class="btn btn-purple mr-1"><i class="far fa-user-headset"></i> Tickets</a>
<a href="<?=self::getUrl("Address","TicketsAndShippingNote", ["address_id" => $address->id])?>" class="btn btn-purple mr-1"><i class="far fa-user-headset"></i> Tickets und LS</a>
<a href="<?=self::getUrl("Address","invoice", ["address_id" => $address->id])?>" class="btn btn-purple mr-1"><i class="far fa-file-invoice-dollar"></i> Rechungsübersicht</a>
</div>
</div>

9
application/Address/AddressController.php
View File

@@ -689,7 +689,7 @@ class AddressController extends mfBaseController {
}
protected function ticketsAction() {
protected function ticketsAndShippingNoteAction() {
$address_id = $this->request->address_id;
$address = new Address($address_id);
@@ -702,8 +702,13 @@ class AddressController extends mfBaseController {
$tickets = $xinon_project->searchSupportTickets('', 0, ['pageSize' => 100,
'filters' => json_encode([['customField6' => ['operator' => '=', 'values' => [$address->customer_number]]]])]);
$shippingNotes = array_map(function ($shippingNote) {
$shippingNote->createByName = (new User($shippingNote->createBy))->getAbbrName();
return $shippingNote;
}, WarehouseShippingNoteModel::getAll(['billingAddressId' => $address->id]));
Helper::renderVue($this,"AddressTickets",
"Tickets von Kunden: " . $address->getCompanyOrName() . '(' . $address->customer_number . ')', ["TICKETS" => $tickets]);
"Tickets und Lieferscheine von Kunden: " . $address->getCompanyOrName() . '(' . $address->customer_number . ')', ["TICKETS" => $tickets,"SHIPPING_NOTES" => $shippingNotes,"ADDRESS" => $address]);
}
protected function sendServicePinAction() {

127
public/js/pages/AddressTickets/AddressTickets.js
View File

@@ -1,55 +1,96 @@
Vue.component('AddressTickets', {
template: `
<tt-card>
<div class="table-responsive">
<table class="table table-striped table-hover">
<thead class="thead-light">
<tr>
<th>Kundennummer</th>
<th>Erstellt am</th>
<th>Betreff</th>
<th>Letztes Update</th>
<th>Aktion</th>
</tr>
</thead>
<tbody>
<tr v-for="ticket in parsedTickets" :key="ticket.id">
<td>{{ ticket.customField7 }}</td>
<td>{{ formatDate(ticket.createdAt) }}</td>
<td>{{ ticket.subject }}</td>
<td>{{ formatDate(ticket.updatedAt) }}</td>
<td>
<a :href="'https://project.xinon.at' + ticket.activitiesHref.replace('api/v3', 'projects/storungen-and-support').replace('activities', 'activity')" class="btn btn-primary btn-sm" target="_blank">
<i class="fas fa-external-link-alt mr-1"></i>
Ticket anzeigen
</a>
</td>
</tr>
</tbody>
</table>
</div>
</tt-card>
`,
<div>
<tt-card class="mb-4">
<h3 class="text-center mb-3">Tickets</h3>
<div class="table-responsive">
<table class="table table-striped table-hover table-sm">
<thead class="thead-light">
<tr>
<th>Kundennummer</th>
<th>Erstellt am</th>
<th>Betreff</th>
<th>Letztes Update</th>
<th>Aktion</th>
</tr>
</thead>
<tbody>
<tr v-for="ticket in tickets" :key="ticket.id">
<td>{{ ticket.customField7 }}</td>
<td>{{ formatDate(ticket.createdAt) }}</td>
<td>{{ ticket.subject }}</td>
<td>{{ formatDate(ticket.updatedAt) }}</td>
<td><a :href="getTicketUrl(ticket)" class="btn btn-primary btn-sm" target="_blank"><i
class="fas fa-external-link-alt mr-1"></i>Anzeigen</a></td>
</tr>
</tbody>
</table>
</div>
</tt-card>
<tt-card>
<h3 class="text-center mb-3">Lieferscheine</h3>
<div class="table-responsive">
<table class="table table-striped table-hover table-sm">
<thead class="thead-light">
<tr>
<th>Art der Arbeit</th>
<th>Lieferadresse</th>
<th>Erstellt von</th>
<th>Erstellt am</th>
<th>Aktion</th>
</tr>
</thead>
<tbody>
<tr v-for="note in shippingNotes" :key="note.id">
<td>{{ note.note }}</td>
<td>
{{ note.deliveryAddressName }}<span v-if="note.deliveryAddressEMail"> ({{ note.deliveryAddressEMail }}
)</span><br>
{{ note.deliveryAddressLine }}<br>
{{ note.deliveryAddressPLZ }}, {{ note.deliveryAddressCity }}
</td>
<td>{{ note.createdByName }}</td>
<td>{{ formatUnix(note.create) }}</td>
<td><a :href="getShippingNoteUrl(note)" class="btn btn-primary btn-sm" target="_blank"><i
class="fas fa-file-alt mr-1"></i>Anzeigen</a></td>
</tr>
</tbody>
</table>
</div>
</tt-card>
</div>
`,
data() {
return {
window: window,
}
return {window: window};
},
computed: {
parsedTickets() {
return this.window.TT_CONFIG.TICKETS.map(ticket => ({
id: ticket.id,
customField7: ticket.customField7,
createdAt: ticket.createdAt,
subject: ticket.subject,
updatedAt: ticket.updatedAt,
activitiesHref: ticket._links.activities.href
tickets() {
return (this.window.TT_CONFIG?.TICKETS || []).map(t => ({
id: t.id,
customField7: t.customField7,
createdAt: t.createdAt,
subject: t.subject,
updatedAt: t.updatedAt,
activitiesHref: t._links?.activities?.href
}));
},
shippingNotes() {
return [...(this.window.TT_CONFIG?.SHIPPING_NOTES || [])].sort((a, b) => a.create - b.create);
}
},
methods: {
formatDate(dateString) {
return this.window.moment(dateString).format('DD.MM.YYYY HH:mm');
formatDate(d) {
return this.window.moment(d).format('DD.MM.YYYY HH:mm');
},
formatUnix(ts) {
return this.window.moment.unix(ts).format('DD.MM.YYYY HH:mm');
},
getTicketUrl(t) {
return `https://project.xinon.at${t.activitiesHref.replace('api/v3', 'projects/storungen-and-support').replace('activities', 'activity')}`;
},
getShippingNoteUrl(n) {
return `${this.window.TT_CONFIG.BASE_PATH}/WarehouseShippingNote/createPDF?id=${n.id}`;
}
}
});