verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

structuredb step 2

This commit is contained in:
Bernat 2019-01-10 07:26:10 +01:00
parent 594bf3609d
commit 85b4f46479
16 changed files with 95 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
e2e/helpers/selectors.js
View File

@ -80,7 +80,6 @@ export default {
receivedCoreVNLCheckbox: `vn-check[label='Received core VNL'] > label > input`,
receivedB2BVNLCheckbox: `vn-check[label='Received B2B VNL'] > label > input`,
swiftBicAutocomplete: 'vn-client-billing-data vn-autocomplete[field="$ctrl.client.bankEntityFk"]',
firstSwiftBicOption: `vn-client-billing-data vn-autocomplete[field="$ctrl.client.bankEntityFk"] vn-drop-down ul > li:nth-child(1)`,
clearswiftBicButton: `vn-client-billing-data vn-autocomplete[field="$ctrl.client.bankEntityFk"] > div > div > div > vn-icon > i`,
newBankEntityButton: 'vn-client-billing-data vn-icon-button[vn-tooltip="New bank entity"] > button',
newBankEntityName: 'vn-client-billing-data > vn-dialog vn-textfield[label="Name"] input',
@ -208,22 +207,16 @@ export default {
itemTags: {
goToItemIndexButton: 'vn-item-descriptor [ui-sref="item.index"]',
tagsButton: `vn-left-menu a[ui-sref="item.card.tags"]`,
firstRemoveTagButton: `vn-item-tags vn-horizontal:nth-child(2) vn-icon-button[icon="delete"]`,
firstTagAutocomplete: `vn-item-tags vn-horizontal:nth-child(2) > vn-autocomplete[field="itemTag.tagFk"]`,
firstValueInput: `vn-item-tags vn-horizontal:nth-child(2) > vn-textfield[label="Value"] input`,
firstRelevancyInput: `vn-horizontal:nth-child(2) > vn-textfield[label="Relevancy"] input`,
secondTagAutocomplete: `vn-item-tags vn-horizontal:nth-child(3) > vn-autocomplete[field="itemTag.tagFk"]`,
secondValueInput: `vn-item-tags vn-horizontal:nth-child(3) > vn-textfield[label="Value"] input`,
secondRelevancyInput: `vn-horizontal:nth-child(3) > vn-textfield[label="Relevancy"] input`,
thirdTagAutocomplete: `vn-item-tags vn-horizontal:nth-child(4) > vn-autocomplete[field="itemTag.tagFk"]`,
thirdValueInput: `vn-item-tags vn-horizontal:nth-child(4) > vn-textfield[label="Value"] input`,
thirdRelevancyInput: `vn-horizontal:nth-child(4) > vn-textfield[label="Relevancy"] input`,
fourthTagAutocomplete: `vn-item-tags vn-horizontal:nth-child(5) > vn-autocomplete[field="itemTag.tagFk"]`,
fourthValueInput: `vn-item-tags vn-horizontal:nth-child(5) > vn-textfield[label="Value"] input`,
fourthRelevancyInput: `vn-horizontal:nth-child(5) > vn-textfield[label="Relevancy"] input`,
fourthRemoveTagButton: `vn-item-tags vn-horizontal:nth-child(5) vn-icon-button[icon="delete"]`,
fifthTagAutocomplete: `vn-item-tags vn-horizontal:nth-child(6) > vn-autocomplete[field="itemTag.tagFk"]`,
fifthValueInput: `vn-item-tags vn-horizontal:nth-child(6) > vn-textfield[label="Value"] input`,
fifthRelevancyInput: `vn-horizontal:nth-child(6) > vn-textfield[label="Relevancy"] input`,
sixthTagAutocomplete: `vn-item-tags vn-horizontal:nth-child(7) > vn-autocomplete[field="itemTag.tagFk"]`,
sixthValueInput: `vn-item-tags vn-horizontal:nth-child(7) > vn-textfield[label="Value"] input`,
sixthRelevancyInput: `vn-horizontal:nth-child(7) > vn-textfield[label="Relevancy"] input`,
seventhTagAutocomplete: `vn-item-tags vn-horizontal:nth-child(8) > vn-autocomplete[field="itemTag.tagFk"]`,
seventhValueInput: `vn-item-tags vn-horizontal:nth-child(8) > vn-textfield[label="Value"] input`,
seventhRelevancyInput: `vn-horizontal:nth-child(8) > vn-textfield[label="Relevancy"] input`,

2
e2e/paths/client-module/03_edit_fiscal_data.spec.js
View File

@ -90,7 +90,7 @@ describe('Client Edit fiscalData path', () => {
.waitForLastSnackbar();
expect(result).toEqual('Cannot check VIES and Equalization Tax');
});
}, 15000);
it('should receive an error if the fiscal id contains A or B at the beginning', async() => {
const result = await nightmare

2
e2e/paths/item-module/02_edit_item_basic_data.spec.js
View File

@ -7,7 +7,7 @@ describe('Item Edit basic data path', () => {
beforeAll(() => {
nightmare
.loginAndModule('buyer', 'item')
.accessToSearchResult('Gem of Mind')
.accessToSearchResult('Object2 Gem2 3')
.accessToSection('item.card.data');
});

2
e2e/paths/item-module/03_edit_item_tax.spec.js
View File

@ -7,7 +7,7 @@ describe('Item edit tax path', () => {
beforeAll(() => {
nightmare
.loginAndModule('buyer', 'item')
.accessToSearchResult('Gem of Time')
.accessToSearchResult('Object1 Gem1 5')
.accessToSection('item.card.tax');
});

74
e2e/paths/item-module/04_create_item_tags.spec.js
View File

@ -7,88 +7,43 @@ describe('Item create tags path', () => {
beforeAll(() => {
nightmare
.loginAndModule('buyer', 'item')
.accessToSearchResult('Gem of Time')
.accessToSearchResult('Object1 Gem1 5')
.accessToSection('item.card.tags');
});
it(`should create a new tag and delete a former one`, async() => {
const result = await nightmare
.waitToClick(selectors.itemTags.firstRemoveTagButton)
.waitToClick(selectors.itemTags.fourthRemoveTagButton)
.waitToClick(selectors.itemTags.addItemTagButton)
.autocompleteSearch(selectors.itemTags.seventhTagAutocomplete, 'Ancho de la base')
.type(selectors.itemTags.seventhValueInput, '50')
.clearInput(selectors.itemTags.seventhRelevancyInput)
.type(selectors.itemTags.seventhRelevancyInput, '1')
.type(selectors.itemTags.seventhRelevancyInput, '4')
.click(selectors.itemTags.submitItemTagsButton)
.waitForLastSnackbar();
expect(result).toEqual('Data saved!');
});
it(`should confirm the first row data is the expected one`, async() => {
it(`should confirm the fourth row data is the expected one`, async() => {
let result = await nightmare
.click(selectors.itemBasicData.basicDataButton)
.wait(selectors.itemBasicData.nameInput)
.click(selectors.itemTags.tagsButton)
.wait('vn-item-tags')
.waitToGetProperty(`${selectors.itemTags.firstTagAutocomplete} input`, 'value');
.waitToGetProperty(`${selectors.itemTags.fourthTagAutocomplete} input`, 'value');
expect(result).toEqual('Ancho de la base');
result = await nightmare
.waitToGetProperty(selectors.itemTags.firstValueInput, 'value');
.waitToGetProperty(selectors.itemTags.fourthValueInput, 'value');
expect(result).toEqual('50');
result = await nightmare
.waitToGetProperty(selectors.itemTags.firstRelevancyInput, 'value');
expect(result).toEqual('1');
});
it(`should confirm the second row data is the expected one`, async() => {
let tag = await nightmare
.waitToGetProperty(`${selectors.itemTags.secondTagAutocomplete} input`, 'value');
let value = await nightmare
.waitToGetProperty(selectors.itemTags.secondValueInput, 'value');
let relevancy = await nightmare
.waitToGetProperty(selectors.itemTags.secondRelevancyInput, 'value');
expect(tag).toEqual('Variedad');
expect(value).toEqual('Gem1');
expect(relevancy).toEqual('2');
});
it(`should confirm the third row data is the expected one`, async() => {
let tag = await nightmare
.waitToGetProperty(`${selectors.itemTags.thirdTagAutocomplete} input`, 'value');
let value = await nightmare
.waitToGetProperty(selectors.itemTags.thirdValueInput, 'value');
let relevancy = await nightmare
.waitToGetProperty(selectors.itemTags.thirdRelevancyInput, 'value');
expect(tag).toEqual('Longitud(cm)');
expect(value).toEqual('5');
expect(relevancy).toEqual('3');
});
it(`should confirm the fourth row data is the expected one`, async() => {
let tag = await nightmare
.waitToGetProperty(`${selectors.itemTags.fourthTagAutocomplete} input`, 'value');
let value = await nightmare
.waitToGetProperty(selectors.itemTags.fourthValueInput, 'value');
let relevancy = await nightmare
.waitToGetProperty(selectors.itemTags.fourthRelevancyInput, 'value');
expect(tag).toEqual('Proveedor');
expect(value).toEqual('Marvel1');
expect(relevancy).toEqual('4');
expect(result).toEqual('4');
});
it(`should confirm the fifth row data is the expected one`, async() => {
@ -105,4 +60,19 @@ describe('Item create tags path', () => {
expect(value).toEqual('Yellow');
expect(relevancy).toEqual('5');
});
it(`should confirm the sixth row data is the expected one`, async() => {
let tag = await nightmare
.waitToGetProperty(`${selectors.itemTags.sixthTagAutocomplete} input`, 'value');
let value = await nightmare
.waitToGetProperty(selectors.itemTags.sixthValueInput, 'value');
let relevancy = await nightmare
.waitToGetProperty(selectors.itemTags.sixthRelevancyInput, 'value');
expect(tag).toEqual('Categoria');
expect(value).toEqual('A1');
expect(relevancy).toEqual('6');
});
});

2
e2e/paths/item-module/05_create_item_niche.spec.js
View File

@ -7,7 +7,7 @@ describe('Item create niche path', () => {
beforeAll(() => {
nightmare
.loginAndModule('buyer', 'item')
.accessToSearchResult('Gem of Time')
.accessToSearchResult('Object1 Gem1 5')
.accessToSection('item.card.niche');
});

18
e2e/paths/item-module/06_create_item_botanical.spec.js
View File

@ -7,11 +7,11 @@ describe('Item Create botanical path', () => {
beforeAll(() => {
nightmare
.loginAndModule('buyer', 'item')
.accessToSearchResult('Mjolnir')
.accessToSearchResult('Object5 Weapon 50')
.accessToSection('item.card.botanical');
});
it(`should create a new botanical for the item Mjolnir`, async() => {
it(`should create a new botanical for the item`, async() => {
const result = await nightmare
.wait(selectors.itemBotanical.botanicalInput)
.type(selectors.itemBotanical.botanicalInput, 'Cicuta maculata')
@ -23,7 +23,7 @@ describe('Item Create botanical path', () => {
expect(result).toEqual('Data saved!');
});
it(`should confirm the botanical for item Mjolnir was created`, async() => {
it(`should confirm the botanical for the item was created`, async() => {
const result = await nightmare
.click(selectors.itemBasicData.basicDataButton)
.wait(selectors.itemBasicData.nameInput)
@ -34,7 +34,7 @@ describe('Item Create botanical path', () => {
expect(result).toEqual('Cicuta maculata');
});
it(`should confirm the Genus for item Mjolnir was created`, async() => {
it(`should confirm the Genus for the item was created`, async() => {
const result = await nightmare
.waitForTextInInput(`${selectors.itemBotanical.genusAutocomplete} input`, 'Abelia')
.waitToGetProperty(`${selectors.itemBotanical.genusAutocomplete} input`, 'value');
@ -42,14 +42,14 @@ describe('Item Create botanical path', () => {
expect(result).toEqual('Abelia');
});
it(`should confirm the Species for item Mjolnir was created`, async() => {
it(`should confirm the Species for the item was created`, async() => {
const result = await nightmare
.waitToGetProperty(`${selectors.itemBotanical.speciesAutocomplete} input`, 'value');
expect(result).toEqual('dealbata');
});
it(`should edit botanical for the item Mjolnir`, async() => {
it(`should edit botanical for the item`, async() => {
const result = await nightmare
.clearInput(selectors.itemBotanical.botanicalInput)
.type(selectors.itemBotanical.botanicalInput, 'Herp Derp')
@ -61,7 +61,7 @@ describe('Item Create botanical path', () => {
expect(result).toEqual('Data saved!');
});
it(`should confirm the botanical for item Mjolnir was edited`, async() => {
it(`should confirm the botanical for the item was edited`, async() => {
const result = await nightmare
.click(selectors.itemBasicData.basicDataButton)
.wait(selectors.itemBasicData.nameInput)
@ -72,7 +72,7 @@ describe('Item Create botanical path', () => {
expect(result).toEqual('Herp Derp');
});
it(`should confirm the Genus for item Mjolnir was edited`, async() => {
it(`should confirm the Genus for the item was edited`, async() => {
const result = await nightmare
.waitForTextInInput(`${selectors.itemBotanical.genusAutocomplete} input`, 'Abies')
.waitToGetProperty(`${selectors.itemBotanical.genusAutocomplete} input`, 'value');
@ -80,7 +80,7 @@ describe('Item Create botanical path', () => {
expect(result).toEqual('Abies');
});
it(`should confirm the Species for item Mjolnir was edited`, async() => {
it(`should confirm the Species for the item was edited`, async() => {
const result = await nightmare
.waitToGetProperty(`${selectors.itemBotanical.speciesAutocomplete} input`, 'value');

6
e2e/paths/item-module/07_create_item_barcode.spec.js
View File

@ -7,11 +7,11 @@ describe('Item Create barcodes path', () => {
beforeAll(() => {
nightmare
.loginAndModule('buyer', 'item')
.accessToSearchResult('Gem of Time')
.accessToSearchResult('Object1 Gem1 5')
.accessToSection('item.card.itemBarcode');
});
it(`should click create a new code and delete a former one`, async () => {
it(`should click create a new code and delete a former one`, async() => {
const result = await nightmare
.waitToClick(selectors.itemBarcodes.firstCodeRemoveButton)
.waitToClick(selectors.itemBarcodes.addBarcodeButton)
@ -23,7 +23,7 @@ describe('Item Create barcodes path', () => {
expect(result).toEqual('Data saved!');
});
it(`should confirm the barcode 5 is created and it is now the third barcode as the first was deleted`, async () => {
it(`should confirm the barcode 5 is created and it is now the third barcode as the first was deleted`, async() => {
const result = await nightmare
.click(selectors.itemBasicData.basicDataButton)
.wait(selectors.itemBasicData.nameInput)

12
e2e/paths/item-module/09_regularize_item.spec.js
View File

@ -8,10 +8,10 @@ describe('Item regularize path', () => {
.loginAndModule('employee', 'item');
});
it('should search for the item Mjolnir', async() => {
it('should search for the item', async() => {
const resultCount = await nightmare
.wait(selectors.itemsIndex.searchItemInput)
.type(selectors.itemsIndex.searchItemInput, 'Mjolnir')
.type(selectors.itemsIndex.searchItemInput, 'Object5 Weapon 50')
.click(selectors.itemsIndex.searchButton)
.waitForNumberOfElements(selectors.itemsIndex.searchResult, 1)
.countElement(selectors.itemsIndex.searchResult);
@ -21,7 +21,7 @@ describe('Item regularize path', () => {
it(`should click on the search result to access to the item tax`, async() => {
const url = await nightmare
.waitForTextInElement(selectors.itemsIndex.searchResult, 'Mjolnir')
.waitForTextInElement(selectors.itemsIndex.searchResult, 'Object5 Weapon 50')
.waitToClick(selectors.itemsIndex.searchResult)
.waitForURL('/summary')
.parsedUrl();
@ -100,10 +100,10 @@ describe('Item regularize path', () => {
expect(url.hash).toEqual('#!/item/index');
});
it('should search for the item Mjolnir once again', async() => {
it('should search for the item once again', async() => {
const resultCount = await nightmare
.wait(selectors.itemsIndex.searchItemInput)
.type(selectors.itemsIndex.searchItemInput, 'Mjolnir')
.type(selectors.itemsIndex.searchItemInput, 'Object5 Weapon 50')
.click(selectors.itemsIndex.searchButton)
.waitForNumberOfElements(selectors.itemsIndex.searchResult, 1)
.countElement(selectors.itemsIndex.searchResult);
@ -113,7 +113,7 @@ describe('Item regularize path', () => {
it(`should click on the search result to access to the item tax`, async() => {
const url = await nightmare
.waitForTextInElement(selectors.itemsIndex.searchResult, 'Mjolnir')
.waitForTextInElement(selectors.itemsIndex.searchResult, 'Object5 Weapon 50')
.waitToClick(selectors.itemsIndex.searchResult)
.waitForURL('/summary')
.parsedUrl();

12
e2e/paths/ticket-module/03_list_sale.spec.js
View File

@ -11,42 +11,42 @@ describe('Ticket List sale path', () => {
.accessToSection('ticket.card.sale');
});
it('should confirm the first ticket sale contains the colour', async () => {
it('should confirm the first ticket sale contains the colour', async() => {
const value = await nightmare
.waitToGetProperty(selectors.ticketSales.firstSaleColour, 'innerText');
expect(value).toContain('Red');
});
it('should confirm the first ticket sale contains the lenght', async () => {
it('should confirm the first ticket sale contains the lenght', async() => {
const value = await nightmare
.waitToGetProperty(selectors.ticketSales.firstSaleText, 'innerText');
expect(value).toContain('3');
});
it('should confirm the first ticket sale contains the price', async () => {
it('should confirm the first ticket sale contains the price', async() => {
const value = await nightmare
.waitToGetProperty(selectors.ticketSales.firstSalePrice, 'innerText');
expect(value).toContain('1.30');
});
it('should confirm the first ticket sale contains the discount', async () => {
it('should confirm the first ticket sale contains the discount', async() => {
const value = await nightmare
.waitToGetProperty(selectors.ticketSales.firstSaleDiscount, 'innerText');
expect(value).toContain('0 %');
});
it('should confirm the first ticket sale contains the total import', async () => {
it('should confirm the first ticket sale contains the total import', async() => {
const value = await nightmare
.waitToGetProperty(selectors.ticketSales.firstSaleImport, 'innerText');
expect(value).toContain('19.50');
});
it('should navigate to the catalog by pressing the new item button', async () => {
it('should navigate to the catalog by pressing the new item button', async() => {
const url = await nightmare
.waitToClick(selectors.ticketSales.newItemButton)
.waitForURL('/catalog')

2
e2e/paths/ticket-module/07_edit_sale.spec.js
View File

@ -317,7 +317,7 @@ describe('Ticket Edit sale path', () => {
.wait(selectors.ticketSales.firstSaleText)
.waitToGetProperty(selectors.ticketSales.firstSaleText, 'innerText');
expect(result).toContain(`Mark I`);
expect(result).toContain(`Object4 Armor2 2`);
});
it('should go back to the original ticket sales section', async() => {

4
modules/client/back/methods/client/specs/activeWorkersWithRole.spec.js
View File

@ -1,7 +1,7 @@
const app = require(`${serviceRoot}/server/server`);
describe('Client activeWorkersWithRole', () => {
it('should return the sales people as result', async () => {
it('should return the sales people as result', async() => {
let filter = {where: {role: 'salesPerson'}};
let result = await app.models.Client.activeWorkersWithRole(filter);
@ -11,7 +11,7 @@ describe('Client activeWorkersWithRole', () => {
expect(isSalesPerson).toBeTruthy();
});
it('should return the buyers as result', async () => {
it('should return the buyers as result', async() => {
let filter = {where: {role: 'buyer'}};
let result = await app.models.Client.activeWorkersWithRole(filter);

2
modules/item/back/methods/item/specs/filter.spec.js
View File

@ -12,7 +12,7 @@ describe('item filter()', () => {
expect(result.length).toEqual(1);
expect(result[0].id).toEqual(2);
expect(result[0].name).toEqual('Gem of Mind');
expect(result[0].name).toEqual('Object2 Gem2 3');
expect(result[0].type).toEqual('Anthurium');
});
});

6
modules/ticket/back/methods/sale-tracking/specs/listSaleTracking.spec.js
View File

@ -1,14 +1,14 @@
const app = require(`${serviceRoot}/server/server`);
describe('ticket listSaleTracking()', () => {
it('should call the listSaleTracking method and return the response', async () => {
it('should call the listSaleTracking method and return the response', async() => {
let filter = {where: {ticketFk: 1}};
let result = await app.models.SaleTracking.listSaleTracking(filter);
expect(result[0].concept).toEqual('Gem of Time');
expect(result[0].concept).toEqual('Object1 Gem1 5');
});
it(`should call the listSaleTracking method and return zero if doesn't have lines`, async () => {
it(`should call the listSaleTracking method and return zero if doesn't have lines`, async() => {
let filter = {where: {ticketFk: 2}};
let result = await app.models.SaleTracking.listSaleTracking(filter);

4
modules/ticket/back/methods/sale/specs/getClaimableFromTicket.spec.js
View File

@ -1,10 +1,10 @@
const app = require(`${serviceRoot}/server/server`);
describe('sale getClaimableFromTicket()', () => {
it('should return the claimable sales of a given ticket', async () => {
it('should return the claimable sales of a given ticket', async() => {
let claimableFromTicket = await app.models.Sale.getClaimableFromTicket(16);
expect(claimableFromTicket[0].concept).toBe('Gem of Time');
expect(claimableFromTicket[0].concept).toBe('Object1 Gem1 5');
expect(claimableFromTicket.length).toBe(3);
});
});

58
services/db/install/dump/fixtures.sql
View File

@ -498,14 +498,14 @@ INSERT INTO `vn`.`intrastat`(`id`, `description`, `taxClassFk`, `taxCodeFk`)
INSERT INTO `vn`.`item`(`id`, `name`,`typeFk`,`size`,`inkFk`,`category`,`stems`,`originFk`,`description`,`producerFk`,`intrastatFk`,`isOnOffer`,`expenceFk`,`isBargain`,`comment`,`relevancy`,`image`,`taxClassFk`,`longName`,`subName`,`tag5`,`value5`,`tag6`,`value6`,`tag7`,`value7`,`tag8`,`value8`)
VALUES
(1 , 'Gem of Time', 2, 70, 'AMA', 'EXT', 1 , 1, 'One of the infinity gems', 1, 06021010, 0, 2000000000, 0, NULL, 0, 66540, 1, 'Gem of Time', NULL, 'Medida', '70', 'Color', 'Amarillo' , 'Categoria', 'EXT', 'Tallos', '1'),
(2 , 'Gem of Mind', 2, 70, 'AZL', 'EXT', 1 , 2, 'One of the infinity gems', 1, 06021010, 0, 2000000000, 0, NULL, 0, 65540, 1, 'Gem of Mind', NULL, 'Medida', '70', 'Color', 'Azul' , 'Categoria', 'EXT', 'Tallos', '1'),
(3 , 'Iron Patriot', 1, 60, 'AMR', 'EXT', 1 , 3, 'Rhodeys armor', 1, 05080000, 0, 4751000000, 0, NULL, 0, 61692, 1, 'Iron Patriot', NULL, 'Medida', '60', 'Color', 'Rosa/Amarillo', 'Categoria', 'EXT', 'Tallos', '1'),
(4 , 'Mark I', 1, 60, 'AMR', 'EXT', 1 , 1, 'Iron Mans first armor', 1, 05080000, 1, 4751000000, 0, NULL, 0, 66090, 2, 'Mark I', NULL, 'Medida', '60', 'Color', 'Rosa/Amarillo', 'Categoria', 'EXT', 'Tallos', '1'),
(5 , 'Mjolnir', 3, 30, 'GRE', 'EXT', 1 , 2, 'Thors hammer!', 2, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, 'Mjolnir', NULL, 'Medida', '30', 'Color', 'Azul' , 'Categoria', 'EXT', 'Tallos', '1'),
(6 , 'Broken Box', 5, 30, 'GRE', 'EXT', 1 , 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, 'Legendary Box', NULL, 'Medida', '30', 'Color', 'Gris' , NULL, NULL, NULL, NULL),
(7 , 'Legendary Box', 5, 90, 'AZL', 'EXT', 1 , 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, 'Broken Box', NULL, 'Medida', '90', 'Color', 'Gris' , NULL, NULL, NULL, NULL),
(71, 'ShippingCost', 4, NULL, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 1, 4751000000, 0, NULL, 0, NULL, 2, 'ShippingCost', NULL, NULL , NULL, NULL , NULL , NULL, NULL, NULL, NULL);
(1 , 'Object1 Gem1 5', 2, 70, 'AMA', 'EXT', 1 , 1, 'One of the infinity gems', 1, 06021010, 0, 2000000000, 0, NULL, 0, 66540, 1, 'Object1 Gem1 5', NULL, 'Medida', '70', 'Color', 'Amarillo' , 'Categoria', 'EXT', 'Tallos', '1'),
(2 , 'Object2 Gem2 3', 2, 70, 'AZL', 'EXT', 1 , 2, 'One of the infinity gems', 1, 06021010, 0, 2000000000, 0, NULL, 0, 65540, 1, 'Object2 Gem2 3', NULL, 'Medida', '70', 'Color', 'Azul' , 'Categoria', 'EXT', 'Tallos', '1'),
(3 , 'Object3 Armor 3', 1, 60, 'AMR', 'EXT', 1 , 3, 'Rhodeys armor', 1, 05080000, 0, 4751000000, 0, NULL, 0, 61692, 1, 'Object3 Armor 3', NULL, 'Medida', '60', 'Color', 'Rosa/Amarillo', 'Categoria', 'EXT', 'Tallos', '1'),
(4 , 'Object4 Armor2 2', 1, 60, 'AMR', 'EXT', 1 , 1, 'Iron Mans first armor', 1, 05080000, 1, 4751000000, 0, NULL, 0, 66090, 2, 'Object4 Armor2 2', NULL, 'Medida', '60', 'Color', 'Rosa/Amarillo', 'Categoria', 'EXT', 'Tallos', '1'),
(5 , 'Object5 Weapon 50', 3, 30, 'GRE', 'EXT', 1 , 2, 'Thors hammer!', 2, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, 'Object5 Weapon 50', NULL, 'Medida', '30', 'Color', 'Azul' , 'Categoria', 'EXT', 'Tallos', '1'),
(6 , 'Broken Box', 5, 30, 'GRE', 'EXT', 1 , 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, 'Broken Box', NULL, 'Medida', '30', 'Color', 'Gris' , NULL, NULL, NULL, NULL),
(7 , 'Legendary Box', 5, 90, 'AZL', 'EXT', 1 , 2, NULL, NULL, 06021010, 0, 4751000000, 0, NULL, 0, 67350, 2, 'Legendary Box', NULL, 'Medida', '90', 'Color', 'Gris' , NULL, NULL, NULL, NULL),
(71, 'ShippingCost', 4, NULL, NULL, NULL, NULL, 1, NULL, NULL, 06021010, 1, 4751000000, 0, NULL, 0, NULL, 2, 'ShippingCost', NULL, NULL , NULL, NULL , NULL , NULL, NULL, NULL, NULL);
INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `checked`, `workerFk`)
VALUES
@ -529,19 +529,19 @@ INSERT INTO `vn`.`ticketPackaging`(`id`, `ticketFk`, `packagingFk`, `quantity`,
INSERT INTO `vn`.`sale`(`id`, `itemFk`, `ticketFk`, `concept`, `quantity`, `price`, `discount`, `reserved`, `isPicked`, `created`)
VALUES
(1, 1, 1 , 'Gem of Time', 5, 9.10, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -15 DAY)),
(2, 2, 1 , 'Gem of Mind', 10, 1.07, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -15 DAY)),
(3, 1, 1 , 'Gem of Time', 2, 9.10, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -15 DAY)),
(4, 4, 1 , 'Mark I' , 20, 3.06, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -15 DAY)),
(5, 1, 2 , 'Gem of Time', 10, 9.10, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -10 DAY)),
(6, 1, 3 , 'Gem of Time', 15, 6.50, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -5 DAY)),
(7, 2, 11, 'Gem of Mind', 15, 1.30, 0, 0, 0, CURDATE()),
(8, 4, 11, 'Mark I' , 10, 3.26, 0, 0, 0, CURDATE()),
(9, 1, 16, 'Gem of Time', 5, 9.10, 0, 0, 0, CURDATE()),
(10, 2, 16, 'Gem of Mind', 10, 1.07, 0, 0, 0, CURDATE()),
(11, 1, 16, 'Gem of Time', 2, 9.10, 0, 0, 0, CURDATE()),
(12, 4, 16, 'Mark I' , 20, 3.06, 0, 0, 0, CURDATE()),
(13, 2, 8, 'Gem of Mind', 15, 1.30, 0, 0, 0, CURDATE());
(1, 1, 1 , 'Object1 Gem1 5', 5, 9.10, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -15 DAY)),
(2, 2, 1 , 'Object2 Gem2 3', 10, 1.07, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -15 DAY)),
(3, 1, 1 , 'Object1 Gem1 5', 2, 9.10, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -15 DAY)),
(4, 4, 1 , 'Object4 Armor2 2' , 20, 3.06, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -15 DAY)),
(5, 1, 2 , 'Object1 Gem1 5', 10, 9.10, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -10 DAY)),
(6, 1, 3 , 'Object1 Gem1 5', 15, 6.50, 0, 0, 0, DATE_ADD(CURDATE(), INTERVAL -5 DAY)),
(7, 2, 11, 'Object2 Gem2 3', 15, 1.30, 0, 0, 0, CURDATE()),
(8, 4, 11, 'Object4 Armor2 2' , 10, 3.26, 0, 0, 0, CURDATE()),
(9, 1, 16, 'Object1 Gem1 5', 5, 9.10, 0, 0, 0, CURDATE()),
(10, 2, 16, 'Object2 Gem2 3', 10, 1.07, 0, 0, 0, CURDATE()),
(11, 1, 16, 'Object1 Gem1 5', 2, 9.10, 0, 0, 0, CURDATE()),
(12, 4, 16, 'Object4 Armor2 2' , 20, 3.06, 0, 0, 0, CURDATE()),
(13, 2, 8, 'Object2 Gem2 3', 15, 1.30, 0, 0, 0, CURDATE());
INSERT INTO `vn`.`saleChecked`(`saleFk`, `isChecked`)
VALUES
@ -677,7 +677,7 @@ INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
(19, 3, 1 , 'Green' , 5),
(20, 3, 67, 'EXT' , 6),
(21, 3, 23, '0' , 7),
(22, 4, 56, 'Object3', 1),
(22, 4, 56, 'Object4', 1),
(23, 4, 58, 'Armor2' , 2),
(24, 4, 4, '2' , 3),
(25, 4, 36, 'Stark' , 4),
@ -1026,7 +1026,13 @@ INSERT INTO `vn2008`.`workerTeam`(`id`, `team`, `user`)
INSERT INTO `vn`.`ticketRequest`(`id`, `description`, `requesterFk`, `atenderFk`, `quantity`, `price`, `isOk`, `saleFk`, `ticketFk`, `created`)
VALUES
(1, 'Gem of Time', 18, 35, 5, 9.10, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL -15 DAY)),
(2, 'Gem of Mind', 18, 35, 10, 1.07, 0, NULL, 1, DATE_ADD(CURDATE(), INTERVAL -15 DAY)),
(3, 'Mark I', 18, 35, 20, 3.06, 0, NULL, 1, DATE_ADD(CURDATE(), INTERVAL -15 DAY)),
(4, 'Gem of Mind', 18, 35, 15, 1.30, NULL, NULL, 11, CURDATE());
(1, 'Object1 Gem1 5', 18, 35, 5, 9.10, 1, 1, 1, DATE_ADD(CURDATE(), INTERVAL -15 DAY)),
(2, 'Object2 Gem2 3', 18, 35, 10, 1.07, 0, NULL, 1, DATE_ADD(CURDATE(), INTERVAL -15 DAY)),
(3, 'Object4 Armor2 2', 18, 35, 20, 3.06, 0, NULL, 1, DATE_ADD(CURDATE(), INTERVAL -15 DAY)),
(4, 'Object2 Gem2 3', 18, 35, 15, 1.30, NULL, NULL, 11, CURDATE());
delete from `account`.`roleRole` where role =52 and inheritsFrom = 35;
delete from `account`.`roleInherit` where role =52 and inheritsFrom = 35;