Merge pull request 'refs #6230 remove basic-data columns' (!1937) from 6230-basicItem into dev
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
Reviewed-on: #1937 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
This commit is contained in:
commit
f75362a6d7
|
@ -0,0 +1,4 @@
|
||||||
|
REVOKE UPDATE ON TABLE `vn`.`item` FROM `employee`;
|
||||||
|
|
||||||
|
|
||||||
|
GRANT UPDATE(id, equivalent, stems, minPrice, isToPrint, family, box, category, doPhoto, image, inkFk, intrastatFk, hasMinPrice, created, comment, typeFk, generic, producerFk, description, density, relevancy, expenseFk, isActive, subName, tag5, value5, tag6, value6, tag7, value7, tag8, value8, tag9, value9, tag10, value10, minimum, upToDown, supplyResponseFk, hasKgPrice, isFloramondo, isFragile, numberOfItemsPerCask, embalageCode, quality, stemMultiplier, itemPackingTypeFk, packingOut, genericFk, packingShelve, isLaid, lastUsed, weightByPiece, weightByPiece, editorFk, recycledPlastic, nonRecycledPlastic, minQuantity) ON TABLE vn.item TO employee;
|
|
@ -27,11 +27,8 @@ describe('Item Edit basic data path', () => {
|
||||||
|
|
||||||
it(`should edit the item basic data and confirm the item data was edited`, async() => {
|
it(`should edit the item basic data and confirm the item data was edited`, async() => {
|
||||||
const values = {
|
const values = {
|
||||||
name: 'Rose of Purity',
|
|
||||||
longName: 'RS Rose of Purity',
|
|
||||||
type: 'Anthurium',
|
type: 'Anthurium',
|
||||||
intrastat: 'Coral y materiales similares',
|
intrastat: 'Coral y materiales similares',
|
||||||
origin: 'Spain',
|
|
||||||
relevancy: 1,
|
relevancy: 1,
|
||||||
generic: 'Pallet',
|
generic: 'Pallet',
|
||||||
isActive: false,
|
isActive: false,
|
||||||
|
|
|
@ -18,22 +18,6 @@
|
||||||
</vn-crud-model>
|
</vn-crud-model>
|
||||||
<form name="form" ng-submit="watcher.submit()" ng-cloak class="vn-w-md">
|
<form name="form" ng-submit="watcher.submit()" ng-cloak class="vn-w-md">
|
||||||
<vn-card class="vn-pa-lg">
|
<vn-card class="vn-pa-lg">
|
||||||
<vn-horizontal>
|
|
||||||
<vn-textfield
|
|
||||||
label="Name"
|
|
||||||
ng-model="$ctrl.item.name"
|
|
||||||
vn-name="name"
|
|
||||||
rule
|
|
||||||
vn-focus>
|
|
||||||
</vn-textfield>
|
|
||||||
<vn-textfield
|
|
||||||
label="Full name"
|
|
||||||
ng-model="$ctrl.item.longName"
|
|
||||||
vn-name="longName"
|
|
||||||
rule
|
|
||||||
info="Full name calculates based on tags 1-3. Is not recommended to change it manually">
|
|
||||||
</vn-textfield>
|
|
||||||
</vn-horizontal>
|
|
||||||
<vn-horizontal>
|
<vn-horizontal>
|
||||||
<vn-autocomplete
|
<vn-autocomplete
|
||||||
url="ItemTypes"
|
url="ItemTypes"
|
||||||
|
@ -52,6 +36,34 @@
|
||||||
</div>
|
</div>
|
||||||
</tpl-item>
|
</tpl-item>
|
||||||
</vn-autocomplete>
|
</vn-autocomplete>
|
||||||
|
<vn-textfield
|
||||||
|
label="Reference"
|
||||||
|
ng-model="$ctrl.item.comment"
|
||||||
|
vn-name="comment"
|
||||||
|
rule>
|
||||||
|
</vn-textfield>
|
||||||
|
<vn-input-number
|
||||||
|
min="0"
|
||||||
|
label="Relevancy"
|
||||||
|
ng-model="$ctrl.item.relevancy"
|
||||||
|
vn-name="relevancy"
|
||||||
|
rule>
|
||||||
|
</vn-input-number>
|
||||||
|
</vn-horizontal>
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-input-number
|
||||||
|
min="0"
|
||||||
|
label="stems"
|
||||||
|
ng-model="$ctrl.item.stems"
|
||||||
|
vn-name="stems"
|
||||||
|
rule>
|
||||||
|
</vn-input-number>
|
||||||
|
<vn-input-number
|
||||||
|
min="0"
|
||||||
|
label="Multiplier"
|
||||||
|
ng-model="$ctrl.item.stemMultiplier"
|
||||||
|
vn-name="stemMultiplier">
|
||||||
|
</vn-input-number>
|
||||||
<vn-autocomplete
|
<vn-autocomplete
|
||||||
label="Generic"
|
label="Generic"
|
||||||
url="Items/withName"
|
url="Items/withName"
|
||||||
|
@ -105,63 +117,10 @@
|
||||||
url="Expenses"
|
url="Expenses"
|
||||||
label="Expense"
|
label="Expense"
|
||||||
ng-model="$ctrl.item.expenseFk"
|
ng-model="$ctrl.item.expenseFk"
|
||||||
vn-name="expense"
|
vn-name="expence"
|
||||||
initial-data="$ctrl.item.expense">
|
initial-data="$ctrl.item.expense">
|
||||||
</vn-autocomplete>
|
</vn-autocomplete>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
<vn-horizontal>
|
|
||||||
<vn-autocomplete
|
|
||||||
data="originsData"
|
|
||||||
label="Origin"
|
|
||||||
show-field="name"
|
|
||||||
value-field="id"
|
|
||||||
ng-model="$ctrl.item.originFk"
|
|
||||||
vn-name="origin"
|
|
||||||
initial-data="$ctrl.item.origin">
|
|
||||||
</vn-autocomplete>
|
|
||||||
<vn-input-number
|
|
||||||
min="0"
|
|
||||||
label="Size"
|
|
||||||
ng-model="$ctrl.item.size"
|
|
||||||
vn-name="size"
|
|
||||||
rule>
|
|
||||||
</vn-input-number>
|
|
||||||
<vn-textfield
|
|
||||||
label="Reference"
|
|
||||||
ng-model="$ctrl.item.comment"
|
|
||||||
vn-name="comment"
|
|
||||||
rule>
|
|
||||||
</vn-textfield>
|
|
||||||
<vn-input-number
|
|
||||||
min="0"
|
|
||||||
label="Relevancy"
|
|
||||||
ng-model="$ctrl.item.relevancy"
|
|
||||||
vn-name="relevancy"
|
|
||||||
rule>
|
|
||||||
</vn-input-number>
|
|
||||||
</vn-horizontal>
|
|
||||||
<vn-horizontal>
|
|
||||||
<vn-input-number
|
|
||||||
min="0"
|
|
||||||
label="stems"
|
|
||||||
ng-model="$ctrl.item.stems"
|
|
||||||
vn-name="stems"
|
|
||||||
rule>
|
|
||||||
</vn-input-number>
|
|
||||||
<vn-input-number
|
|
||||||
min="0"
|
|
||||||
label="Multiplier"
|
|
||||||
ng-model="$ctrl.item.stemMultiplier"
|
|
||||||
vn-name="stemMultiplier">
|
|
||||||
</vn-input-number>
|
|
||||||
<vn-input-number
|
|
||||||
min="1"
|
|
||||||
label="Minimum sales quantity"
|
|
||||||
ng-model="$ctrl.item.minQuantity"
|
|
||||||
vn-name="minQuantity"
|
|
||||||
rule>
|
|
||||||
</vn-input-number>
|
|
||||||
</vn-horizontal>
|
|
||||||
<vn-horizontal>
|
<vn-horizontal>
|
||||||
<vn-input-number
|
<vn-input-number
|
||||||
min="0"
|
min="0"
|
||||||
|
@ -192,14 +151,6 @@
|
||||||
rule>
|
rule>
|
||||||
</vn-input-number>
|
</vn-input-number>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
<vn-horizontal>
|
|
||||||
<vn-textarea
|
|
||||||
label="Description"
|
|
||||||
ng-model="$ctrl.item.description"
|
|
||||||
vn-name="description"
|
|
||||||
rule>
|
|
||||||
</vn-textarea>
|
|
||||||
</vn-horizontal>
|
|
||||||
<vn-horizontal>
|
<vn-horizontal>
|
||||||
<vn-check
|
<vn-check
|
||||||
label="Active"
|
label="Active"
|
||||||
|
@ -224,6 +175,14 @@
|
||||||
info="This item does need a photo">
|
info="This item does need a photo">
|
||||||
</vn-check>
|
</vn-check>
|
||||||
</vn-horizontal>
|
</vn-horizontal>
|
||||||
|
<vn-horizontal>
|
||||||
|
<vn-textarea
|
||||||
|
label="Description"
|
||||||
|
ng-model="$ctrl.item.description"
|
||||||
|
vn-name="description"
|
||||||
|
rule>
|
||||||
|
</vn-textarea>
|
||||||
|
</vn-horizontal>
|
||||||
</vn-card>
|
</vn-card>
|
||||||
<vn-button-bar>
|
<vn-button-bar>
|
||||||
<vn-submit
|
<vn-submit
|
||||||
|
|
Loading…
Reference in New Issue