added date filter
This commit is contained in:
@@ -337,6 +337,16 @@ class PreorderlogisticsController extends mfBaseController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Date filter for sent date (Versanddatum range)
|
||||||
|
if (!empty($filter['sent_date']) && is_array($filter['sent_date'])) {
|
||||||
|
if (!empty($filter['sent_date']['from'])) {
|
||||||
|
$new_filter['add-where'] .= " AND Preorderlogistics.sent >= " . intval($filter['sent_date']['from']);
|
||||||
|
}
|
||||||
|
if (!empty($filter['sent_date']['to'])) {
|
||||||
|
$new_filter['add-where'] .= " AND Preorderlogistics.sent <= " . intval($filter['sent_date']['to']);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$new_filter["status_code"] = 140;
|
$new_filter["status_code"] = 140;
|
||||||
$new_filter["deleted"] = 0;
|
$new_filter["deleted"] = 0;
|
||||||
$new_filter["unit_count<="] = 2;
|
$new_filter["unit_count<="] = 2;
|
||||||
|
|||||||
@@ -10,4 +10,33 @@
|
|||||||
|
|
||||||
.col-form-label {
|
.col-form-label {
|
||||||
padding-top: 0 !important
|
padding-top: 0 !important
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Filter panel styles */
|
||||||
|
.filter-panel {
|
||||||
|
padding: 1rem !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.filter-panel .header-title {
|
||||||
|
font-size: 1.1rem;
|
||||||
|
margin-bottom: 0.75rem !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.filter-panel .row.g-2 > [class*="col-"] {
|
||||||
|
padding-left: 0.5rem;
|
||||||
|
padding-right: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.filter-panel .form-group {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.filter-actions {
|
||||||
|
display: flex;
|
||||||
|
gap: 0.5rem;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.filter-actions .btn {
|
||||||
|
margin-right: 0;
|
||||||
}
|
}
|
||||||
@@ -2,35 +2,38 @@ Vue.component('preorder-logistics', {
|
|||||||
template: `
|
template: `
|
||||||
<tt-card>
|
<tt-card>
|
||||||
<div class="card mb-3">
|
<div class="card mb-3">
|
||||||
<div class="card-body">
|
<div class="card-body filter-panel">
|
||||||
<h4 class="header-title mb-3">Filter</h4>
|
<h4 class="header-title mb-2">Filter</h4>
|
||||||
<div class="row">
|
<div class="row g-2 align-items-end">
|
||||||
<div class="col-md-3">
|
<div class="col-lg-2 col-md-4">
|
||||||
<tt-select label="Kampagne" :options="campaigns" v-model="filters.preordercampaign_id" sm multiple/>
|
<tt-select label="Kampagne" :options="campaigns" v-model="filters.preordercampaign_id" sm multiple/>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3">
|
<div class="col-lg-2 col-md-4">
|
||||||
<tt-select label="FCP" :options="fcps" v-model="filters.fcp" sm multiple searchable/>
|
<tt-select label="FCP" :options="fcps" v-model="filters.fcp" sm multiple searchable/>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-lg-2 col-md-4">
|
||||||
<tt-select label="Versandstatus" :options="sentStatusOptions" v-model="filters.sent" sm/>
|
<tt-select label="Versandstatus" :options="sentStatusOptions" v-model="filters.sent" sm/>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-lg-2 col-md-4">
|
||||||
<tt-input label="Bestellcode" v-model="filters.ucode" sm/>
|
<tt-input label="Bestellcode" v-model="filters.ucode" sm/>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-2">
|
<div class="col-lg-2 col-md-4">
|
||||||
<tt-input label="OAID" v-model="filters.oaid" sm/>
|
<tt-input label="OAID" v-model="filters.oaid" sm/>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-lg-2 col-md-4">
|
||||||
|
<tt-date-picker label="Versanddatum" v-model="filters.sent_date" sm :time-picker="false"/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row mt-2">
|
<div class="row g-2 mt-1 align-items-end">
|
||||||
<div class="col-md-6">
|
<div class="col-lg-4 col-md-6">
|
||||||
<tt-input label="Anschlussadresse" v-model="filters.address" sm/>
|
<tt-input label="Anschlussadresse" v-model="filters.address" sm/>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-6">
|
<div class="col-lg-4 col-md-6">
|
||||||
<tt-input label="Kunde" v-model="filters.kunde" sm/>
|
<tt-input label="Kunde" v-model="filters.kunde" sm/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row mt-3">
|
<div class="row mt-2">
|
||||||
<div class="col">
|
<div class="col filter-actions">
|
||||||
<tt-button text="Filter anwenden" @click="applyFilters" icon="fas fa-filter"
|
<tt-button text="Filter anwenden" @click="applyFilters" icon="fas fa-filter"
|
||||||
additional-class="btn-primary"/>
|
additional-class="btn-primary"/>
|
||||||
<tt-button text="Filter zurücksetzen" @click="resetFilters" icon="fas fa-undo"
|
<tt-button text="Filter zurücksetzen" @click="resetFilters" icon="fas fa-undo"
|
||||||
@@ -91,7 +94,8 @@ Vue.component('preorder-logistics', {
|
|||||||
sent: 'no',
|
sent: 'no',
|
||||||
address: '',
|
address: '',
|
||||||
kunde: '',
|
kunde: '',
|
||||||
fcp: []
|
fcp: [],
|
||||||
|
sent_date: null
|
||||||
},
|
},
|
||||||
tableConfig: {
|
tableConfig: {
|
||||||
key: 'preorderlogistics',
|
key: 'preorderlogistics',
|
||||||
@@ -155,7 +159,7 @@ Vue.component('preorder-logistics', {
|
|||||||
},
|
},
|
||||||
resetFilters() {
|
resetFilters() {
|
||||||
this.filters = {
|
this.filters = {
|
||||||
preordercampaign_id: '', ucode: '', oaid: '', sent: 'no', address: '', kunde: '', fcp: []
|
preordercampaign_id: '', ucode: '', oaid: '', sent: 'no', address: '', kunde: '', fcp: [], sent_date: null
|
||||||
};
|
};
|
||||||
this.applyFilters();
|
this.applyFilters();
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user