export-database #767

Merged
carlosjr merged 2 commits from 3304-export_database into dev 2021-11-09 08:20:04 +00:00
3 changed files with 3 additions and 3 deletions
Showing only changes of commit 63b90a4246 - Show all commits

View File

@ -28,7 +28,7 @@
url="Workers/activeWithRole"
search-function="{firstName: $search}"
value-field="id"
where="{role: 'salesPerson'}"
where="{role: {inq: ['salesPerson', 'officeBoss']}}"
label="Salesperson">
<tpl-item>{{firstName}} {{name}}</tpl-item>
</vn-autocomplete>

View File

@ -20,7 +20,7 @@
url="Workers/activeWithRole"
search-function="{firstName: $search}"
value-field="id"
wwhere="{role: {inq: ['logistic', 'buyer']}}"
where="{role: {inq: ['logistic', 'buyer']}}"
label="Atender">
<tpl-item>{{nickname}}</tpl-item>
</vn-autocomplete>

View File

@ -172,11 +172,11 @@ module.exports = Self => {
LEFT JOIN zoneEstimatedDelivery zed ON zed.zoneFk = t.zoneFk`);
stmt.merge(conn.makeWhere(filter.where));
stmt.merge(`GROUP BY id`);
stmt.merge(conn.makePagination(filter));
stmts.push(stmt);
stmt = new ParameterizedSQL(`SELECT * FROM tmp.filter`);
stmt.merge(`GROUP BY id`);
stmt.merge(conn.makeOrderBy(filter.order));
const ordersIndex = stmts.push(stmt) - 1;