231801_test_to_master #1519

Merged
alexm merged 490 commits from 231801_test_to_master into master 2023-05-12 06:29:59 +00:00
3 changed files with 29 additions and 1 deletions
Showing only changes of commit 306573b1bf - Show all commits

View File

@ -33,7 +33,9 @@ module.exports = function(Self) {
let newConfig = {
warehouseFk: warehouse.id,
companyFk: company.id,
userFk: ctx.req.accessToken.userId
userFk: ctx.req.accessToken.userId,
buyed: ticketResquest.buyed,
salesPersonCode: salesPersonNickname
};
userConfig = await models.UserConfig.create(newConfig, myOptions);

View File

@ -38,6 +38,20 @@
url="Warehouses">
</vn-autocomplete>
</vn-horizontal>
<vn-horizontal class="vn-px-lg">
<vn-autocomplete
vn-one
label="Comercial"
ng-model="filter.ticketRequest"
data="salesPersonCode">
</vn-autocomplete>
<vn-autocomplete
vn-one
label="Fecha"
ng-model="filter.buyed"
data="buyed">
</vn-autocomplete>
</vn-horizontal>
<section class="vn-px-md">
<vn-horizontal class="manifold-panel vn-pa-md">
<vn-date-picker

View File

@ -91,6 +91,18 @@
ng-model="filter.provinceFk"
url="Provinces">
</vn-autocomplete>
<vn-autocomplete
vn-one
label="Comercial"
ng-model="filter.salesPersonFk"
data="Workers">
</vn-autocomplete>
<vn-autocomplete
vn-one
label="Fecha"
ng-model="filter.buyed"
data="buyed">
</vn-autocomplete>
</vn-horizontal>
<vn-horizontal class="vn-px-lg">
<vn-check