Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random

2020-10-15 18:57:33 +02:00 · 2020-10-15 18:57:33 +02:00 · c622175192
parent dd6035606f eba892766f
commit c622175192
43 changed files with 603 additions and 32 deletions
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@ -1208,11 +1208,11 @@ INSERT INTO `vn`.`annualAverageInvoiced`(`clientFk`, `invoiced`)
        (104, 500),
        (105, 5000);

-INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`,`isFarmer`,`retAccount`,`commission`, `created`, `postcodeFk`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`)
+INSERT INTO `vn`.`supplier`(`id`, `name`, `nickname`,`account`,`countryFk`,`nif`,`isFarmer`,`retAccount`,`commission`, `created`, `postcodeFk`, `isActive`, `street`, `city`, `provinceFk`, `postCode`, `payMethodFk`, `payDemFk`, `phone`, `payDay`)
    VALUES
-        (1,   'Plants SL',             'Plants nick',   4000000001, 1, 'A11111111', 0, NULL, 0, CURDATE(), 1111, 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1),
-        (2,   'Flower King',           'The king',      4000000002, 1, 'B22222222', 0, NULL, 0, CURDATE(), 2222, 1, 'supplier address 2', 'LONDON',     2, 45671, 1, 2),
-        (442, 'Verdnatura Levante SL', 'Verdnatura',    4000000442, 1, 'C33333333', 0, NULL, 0, CURDATE(), 3333, 1, 'supplier address 3', 'SILLA',      1, 43022, 1, 2);
+        (1,   'Plants SL',             'Plants nick',   4000000001, 1, 'A11111111', 0, NULL, 0, CURDATE(), 1111, 1, 'supplier address 1', 'PONTEVEDRA', 1, 15214, 1, 1, 123456789, 15),
+        (2,   'Flower King',           'The king',      4000000002, 1, 'B22222222', 0, NULL, 0, CURDATE(), 2222, 1, 'supplier address 2', 'LONDON',     2, 45671, 1, 2, 987654321, 10),
+        (442, 'Verdnatura Levante SL', 'Verdnatura',    4000000442, 1, 'C33333333', 0, NULL, 0, CURDATE(), 3333, 1, 'supplier address 3', 'SILLA',      1, 43022, 1, 2, 987123654, 15);

 INSERT INTO `cache`.`cache_calc`(`id`, `cache_id`, `cacheName`, `params`, `last_refresh`, `expires`, `created`, `connection_id`)
    VALUES
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@ -389,6 +389,7 @@ export default {
        moreMenuDeleteStowawayButton: '.vn-menu [name="deleteStowaway"]',
        moreMenuAddToTurn: '.vn-menu [name="addTurn"]',
        moreMenuDeleteTicket: '.vn-menu [name="deleteTicket"]',
+        moreMenuRestoreTicket: '.vn-menu [name="restoreTicket"]',
        moreMenuMakeInvoice: '.vn-menu [name="makeInvoice"]',
        moreMenuChangeShippedHour: '.vn-menu [name="changeShipped"]',
        changeShippedHourDialog: '.vn-dialog.shown',
@ -397,7 +398,7 @@ export default {
        shipButton: 'vn-ticket-descriptor vn-icon[icon="icon-stowaway"]',
        thursdayButton: '.vn-popup.shown vn-tool-bar > vn-button:nth-child(4)',
        saturdayButton: '.vn-popup.shown vn-tool-bar > vn-button:nth-child(6)',
-        acceptDeleteButton: '.vn-dialog.shown button[response="accept"]',
+        acceptDialog: '.vn-dialog.shown button[response="accept"]',
        acceptChangeHourButton: '.vn-dialog.shown button[response="accept"]',
        descriptorDeliveryDate: 'vn-ticket-descriptor slot-body > .attributes > vn-label-value:nth-child(3) > section > span',
        acceptInvoiceOutButton: '.vn-confirm.shown button[response="accept"]',
--- a/e2e/paths/05-ticket/12_descriptor.spec.js
+++ b/e2e/paths/05-ticket/12_descriptor.spec.js
@ -41,26 +41,42 @@ describe('Ticket descriptor path', () => {
        it('should delete the ticket using the descriptor more menu', async() => {
            await page.waitToClick(selectors.ticketDescriptor.moreMenu);
            await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteTicket);
-            await page.waitToClick(selectors.ticketDescriptor.acceptDeleteButton);
+            await page.waitToClick(selectors.ticketDescriptor.acceptDialog);
            const message = await page.waitForSnackbar();

-            expect(message.text).toBe('Ticket deleted');
+            expect(message.text).toBe('Ticket deleted. You can undo this action within the first hour');
        });

        it('should have been relocated to the ticket index', async() => {
            await page.waitForState('ticket.index');
        });

-        it(`should search for the deleted ticket and check it's date`, async() => {
+        it(`should search for the deleted ticket and check the deletedTicket icon and it's date`, async() => {
            await page.write(selectors.ticketsIndex.topbarSearch, '18');
            await page.waitToClick(selectors.globalItems.searchButton);
            await page.waitForState('ticket.card.summary');
+            await page.waitForClassPresent(selectors.ticketDescriptor.isDeletedIcon, 'bright');
            const result = await page.waitToGetProperty(selectors.ticketsIndex.searchResultDate, 'innerText');

            expect(result).toContain(2000);
        });
    });

+    describe('Restore ticket', () => {
+        it('should restore the ticket using the descriptor more menu', async() => {
+            await page.waitToClick(selectors.ticketDescriptor.moreMenu);
+            await page.waitToClick(selectors.ticketDescriptor.moreMenuRestoreTicket);
+            await page.waitToClick(selectors.ticketDescriptor.acceptDialog);
+            const message = await page.waitForSnackbar();
+
+            expect(message.text).toBe('Data saved!');
+        });
+
+        it('should make sure the ticketDeleted icon is no longer bright', async() => {
+            await page.waitForClassNotPresent(selectors.ticketDescriptor.isDeletedIcon, 'bright');
+        });
+    });
+
    describe('add stowaway', () => {
        it('should search for a ticket', async() => {
            await page.accessToSearchResult('16');
--- a/e2e/paths/05-ticket/14_create_ticket.spec.js
+++ b/e2e/paths/05-ticket/14_create_ticket.spec.js
@ -74,7 +74,7 @@ describe('Ticket create path', () => {
    it('should delete the current ticket', async() => {
        await page.waitToClick(selectors.ticketDescriptor.moreMenu);
        await page.waitToClick(selectors.ticketDescriptor.moreMenuDeleteTicket);
-        await page.waitToClick(selectors.ticketDescriptor.acceptDeleteButton);
+        await page.waitToClick(selectors.ticketDescriptor.acceptDialog);
        const message = await page.waitForSnackbar();

        expect(message.type).toBe('success');
--- a/front/core/styles/icons/salixfont.css
+++ b/front/core/styles/icons/salixfont.css
@ -22,6 +22,9 @@
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
 }
+.icon-supplier:before {
+  content: "\e936";
+}
 .icon-latestBuys:before {
  content: "\e95f";
 }
--- a/front/core/styles/icons/salixfont.svg
+++ b/front/core/styles/icons/salixfont.svg
@ -61,7 +61,7 @@
 <glyph unicode="&#xe933;" glyph-name="solclaim" d="M1024 917.333v-938.667h-938.667v68.267h234.667v51.2h38.4c8.533-4.267 17.067-4.267 29.867-4.267h298.667c42.667 0 76.8 34.133 76.8 76.8 0 0 0 0 0 0 29.867 12.8 46.933 38.4 46.933 72.533 0 0 0 0 0 0 29.867 12.8 46.933 38.4 46.933 72.533s-21.333 59.733-46.933 72.533c0 0 0 0 0 0 0 42.667-34.133 76.8-76.8 76.8h-106.667c21.333 21.333 29.867 55.467 17.067 89.6-12.8 25.6-38.4 42.667-68.267 42.667-12.8 0-21.333-4.267-34.133-8.533l-217.6-98.133v29.867h-238.933v396.8h362.667v-209.067h209.067v209.067h366.933zM0 89.6h281.6v51.2h89.6c4.267-4.267 12.8-4.267 17.067-4.267h298.667c21.333 0 34.133 12.8 34.133 34.133s-12.8 34.133-34.133 34.133h-136.533v12.8h183.467c21.333 0 34.133 12.8 34.133 29.867 0 21.333-12.8 29.867-34.133 29.867h-179.2v12.8h234.667c21.333 0 34.133 8.533 34.133 29.867s-12.8 29.867-34.133 29.867h-230.4v12.8h183.467c21.333 0 29.867 12.8 29.867 34.133s-12.8 34.133-34.133 34.133h-230.4l93.867 64c12.8 8.533 21.333 29.867 12.8 46.933s-29.867 25.6-51.2 17.067l-251.733-119.467c-4.267 0-4.267-4.267-8.533-4.267-4.267-4.267-8.533-8.533-12.8-12.8h-8.533v55.467h-281.6v-388.267z" />
 <glyph unicode="&#xe934;" glyph-name="solunion" d="M759.467 870.4v-136.533h-601.6c0 0-128-341.333 106.667-341.333s469.333 0 469.333 0 34.133 0 34.133-34.133-8.533-98.133-8.533-98.133h-541.867c0 0-247.467 29.867-204.8 320 0 0 8.533 140.8 72.533 298.667 0 0 21.333-8.533 85.333-8.533h588.8zM853.333 25.6c64 0 85.333-8.533 85.333-8.533 64 153.6 72.533 298.667 72.533 298.667 42.667 290.133-204.8 320-204.8 320h-541.867c0 0-8.533-64-8.533-98.133s34.133-34.133 34.133-34.133 238.933 0 469.333 0 106.667-341.333 106.667-341.333h-601.6v-136.533h588.8z" />
 <glyph unicode="&#xe935;" glyph-name="splur" d="M640 960l145.067-145.067-183.467-183.467 89.6-89.6 183.467 183.467 149.333-149.333v384h-384zM384 960h-384v-384l145.067 145.067 302.933-302.933v-482.133h128v537.6l-337.067 341.333 145.067 145.067z" />
-<glyph unicode="&#xe936;" glyph-name="supplier" d="M1011.2 503.467c0 0 0 0 0 0s0 0 0 0c0 4.267 0 4.267 0 4.267s0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0-4.267 0c0 0 0 0 0 0s0 0-4.267 0c0 0 0 0 0 0s0 0 0 0 0 0 0 0h-145.067l4.267 4.267c4.267 4.267 8.533 8.533 8.533 17.067v409.6c0 0 0 0 0 0s0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0-4.267 0c0 0 0 0 0 0s0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0h-392.533c-4.267 0-8.533 0-12.8-4.267l-221.867-132.267c0 0 0 0 0 0s0 0 0 0 0 0-4.267-4.267c0 0 0 0 0 0s0 0 0-4.267c0 0 0 0 0 0s0 0 0-4.267c0 0 0 0 0 0s0 0 0-4.267c0 0 0 0 0 0v-153.6c-4.267 0-8.533 0-12.8-4.267l-196.267-153.6c0 0 0 0 0 0s0 0 0 0 0 0-4.267-4.267c0 0 0 0 0 0s0 0 0-4.267c0 0 0 0 0 0s0 0 0-4.267c0 0 0 0 0 0s0 0 0-4.267c0 0 0 0 0 0v-392.533c0-12.8 8.533-21.333 21.333-21.333h349.867v-85.333c0-12.8 8.533-21.333 21.333-21.333h392.533c0 0 4.267 0 4.267 0s0 0 0 0 0 0 4.267 0c0 0 0 0 0 0s0 0 0 0 0 0 0 0 0 0 0 0l196.267 153.6c4.267 4.267 8.533 8.533 8.533 17.067l-8.533 396.8c0 0 0 0 0 0zM968.533 302.933l-76.8-59.733v153.6l76.8 59.733v-153.6zM55.467 435.2h162.133v-162.133h-162.133v162.133zM776.533 917.333l-42.667-34.133c0 0 0 0-4.267 0h-153.6l38.4 34.133h162.133zM802.133 384l-17.067-12.8h-145.067c0 0 4.267 0 4.267 0s0 0 0 0 0 0 4.267 0c0 0 0 0 0 0s0 0 4.267 0c0 0 0 0 0 0s0 0 0 0l64 51.2h136.533l-51.2-38.4zM273.067 580.267h162.133v-162.133h-162.133v162.133zM665.6 439.467v153.6l55.467 42.667v-153.6c0 0 0 0 0 0l-55.467-42.667zM665.6 618.667v157.867l51.2 42.667v-157.867l-51.2-42.667zM622.933 601.6h-162.133v162.133h162.133v-162.133zM622.933 580.267v-162.133h-162.133v162.133h162.133zM742.4 499.2v153.6l76.8 59.733v-153.6l-76.8-59.733zM814.933 738.133l-76.8-59.733v157.867l76.8 59.733v-157.867zM704 861.867l-42.667-34.133-25.6-21.333h-145.067l64 55.467h149.333zM435.2 601.6h-162.133v162.133h162.133v-162.133zM238.933 375.467c4.267 0 8.533-4.267 12.8-4.267h145.067l-4.267-4.267c0 0 0 0 0 0s0 0 0 0 0 0-4.267-4.267c0 0 0 0 0 0s0 0 0-4.267c0 0 0 0 0 0s0 0 0-4.267c0 0 0 0 0 0s0 0 0-4.267c0 0 0 0 0 0v-76.8h-149.333v102.4zM426.667 328.533h162.133v-162.133h-162.133v162.133zM610.133 328.533h162.133v-162.133h-162.133v162.133zM772.267 145.067v-166.4h-162.133v162.133h162.133zM814.933 341.333l25.6 21.333 29.867 21.333v-153.6l-55.467-42.667v153.6zM925.867 482.133l-42.667-34.133h-136.533l42.667 34.133h136.533zM452.267 917.333h123.733l-38.4-34.133h-128l42.667 34.133zM384 861.867h132.267l-64-55.467h-136.533l68.267 55.467zM230.4 584.533v-25.6h-34.133l34.133 25.6zM166.4 533.333h64v-55.467h-132.267l68.267 55.467zM55.467 251.733h162.133v-162.133h-162.133v162.133zM238.933 89.6v162.133h140.8v-162.133h-140.8zM426.667 145.067h162.133v-166.4h-162.133v166.4zM814.933 157.867l55.467 42.667v-153.6c0 0 0 0 0 0l-55.467-42.667v153.6zM891.733 59.733v153.6l76.8 59.733v-153.6l-76.8-59.733z" />
+<glyph unicode="&#xe936;" glyph-name="supplier" d="M608 755.2c0-113.108-90.259-204.8-201.6-204.8s-201.6 91.692-201.6 204.8c0 113.108 90.259 204.8 201.6 204.8s201.6-91.692 201.6-204.8zM534.4 342.4c-9.6 0-19.2 3.2-28.8 9.6-16 9.6-25.6 25.6-28.8 41.6l-12.8 54.4c-3.2 19.2 0 35.2 9.6 51.2-25.6 3.2-51.2 6.4-73.6 6.4-128-6.4-400-73.6-400-211.2v-144h582.4l-48 192zM832 192l-51.2-12.8-16 64-57.6-16 35.2-134.4c22.4-3.2 41.6-16 54.4-35.2l163.2 41.6-44.8 176-38.4-12.8-60.8-6.4 16-64zM758.4 256l51.2 12.8 60.8 16-38.4 153.6-38.4-6.4 16-54.4-41.6-9.6-16 54.4-89.6-22.4 38.4-156.8 57.6 12.8zM1014.4 108.8l-227.2-57.6c-12.8 19.2-35.2 35.2-60.8 38.4l-92.8 364.8c-3.2 16-19.2 22.4-35.2 19.2l-70.4-16 12.8-54.4 41.6 12.8 83.2-342.4c-19.2-16-25.6-35.2-25.6-57.6 0-41.6 35.2-76.8 76.8-76.8 38.4 0 70.4 25.6 73.6 60.8l227.2 57.6-3.2 51.2z" />
 <glyph unicode="&#xe937;" glyph-name="tags" d="M729.6 960c-42.667 0-89.6 0-132.267 0-21.333 0-38.4-8.533-51.2-21.333-140.8-140.8-281.6-281.6-422.4-422.4-25.6-25.6-25.6-51.2 0-76.8 93.867-93.867 187.733-187.733 281.6-281.6 25.6-25.6 51.2-25.6 76.8 0 140.8 140.8 281.6 281.6 422.4 422.4 17.067 12.8 21.333 29.867 21.333 51.2 0 93.867 0 183.467 0 277.333 0 34.133-17.067 51.2-51.2 51.2-51.2 0-98.133 0-145.067 0zM682.667 763.733c0 25.6 17.067 46.933 42.667 46.933s46.933-21.333 46.933-46.933c0-25.6-21.333-46.933-46.933-46.933-21.333 0-42.667 21.333-42.667 46.933zM878.933 482.133c4.267-12.8 0-21.333-8.533-29.867-34.133-51.2-64-98.133-98.133-149.333-76.8-115.2-153.6-234.667-230.4-349.867-12.8-17.067-21.333-21.333-38.4-8.533-115.2 76.8-226.133 149.333-337.067 226.133-17.067 8.533-17.067 21.333-8.533 38.4 12.8 21.333 29.867 46.933 42.667 68.267 8.533 12.8 8.533 12.8 17.067 0 55.467-55.467 115.2-115.2 170.667-170.667 8.533-8.533 17.067-17.067 29.867-21.333 29.867-12.8 55.467-4.267 76.8 21.333 123.733 123.733 247.467 247.467 371.2 371.2 4.267 4.267 4.267 8.533 8.533 12.8 0-8.533 0-8.533 4.267-8.533z" />
 <glyph unicode="&#xe938;" glyph-name="tax" d="M448 192c0 174.933 145.067 320 320 320 76.8 0 145.067-25.6 196.267-68.267v324.267c4.267 51.2-38.4 98.133-93.867 98.133h-204.8c-21.333 55.467-72.533 93.867-136.533 93.867s-115.2-38.4-136.533-98.133h-209.067c-55.467 0-98.133-42.667-98.133-93.867v-674.133c0-51.2 42.667-98.133 98.133-98.133h332.8c-42.667 55.467-68.267 123.733-68.267 196.267zM529.067 861.867c29.867 0 46.933-21.333 46.933-46.933 0-29.867-25.6-46.933-46.933-46.933-29.867 0-46.933 21.333-46.933 46.933-4.267 29.867 17.067 46.933 46.933 46.933zM708.267 247.467c-8.533 0-12.8 4.267-17.067 8.533s-8.533 8.533-8.533 17.067v17.067c0 8.533 0 12.8 4.267 17.067s8.533 8.533 17.067 8.533c8.533 0 12.8-4.267 17.067-8.533s4.267-12.8 4.267-17.067v-12.8c4.267-21.333-4.267-29.867-17.067-29.867zM870.4 132.267c4.267-4.267 4.267-12.8 4.267-17.067v-21.333c0-12.8-8.533-21.333-21.333-21.333-8.533 0-12.8 4.267-17.067 8.533s-8.533 12.8-8.533 17.067v17.067c0 8.533 4.267 12.8 8.533 17.067s8.533 8.533 17.067 8.533c8.533 0 12.8-4.267 17.067-8.533zM768 448c-140.8 0-256-115.2-256-256s115.2-256 256-256 256 115.2 256 256-115.2 256-256 256zM635.733 273.067v17.067c0 21.333 4.267 34.133 17.067 46.933s29.867 17.067 51.2 17.067c21.333 0 38.4-4.267 51.2-17.067s17.067-29.867 17.067-46.933v-17.067c0-21.333-4.267-34.133-17.067-46.933s-29.867-17.067-51.2-17.067c-21.333 0-38.4 4.267-51.2 17.067-8.533 12.8-17.067 29.867-17.067 46.933zM721.067 59.733l-34.133 17.067 153.6 243.2 34.133-17.067-153.6-243.2zM925.867 98.133c0-21.333-4.267-34.133-17.067-46.933s-29.867-17.067-51.2-17.067c-21.333 0-38.4 4.267-51.2 17.067s-21.333 25.6-21.333 46.933v17.067c0 21.333 4.267 34.133 17.067 46.933s29.867 17.067 51.2 17.067c21.333 0 38.4-4.267 51.2-17.067s17.067-29.867 17.067-46.933v-17.067z" />
 <glyph unicode="&#xe939;" glyph-name="ticket" d="M200.533 311.467c12.8 38.4 25.6 76.8 38.4 115.2 8.533 25.6 17.067 55.467 29.867 81.067 29.867 81.067 55.467 166.4 85.333 247.467 21.333 55.467 38.4 110.933 59.733 166.4 4.267 12.8 8.533 21.333 12.8 34.133 0 4.267 4.267 4.267 8.533 4.267 59.733-12.8 115.2-21.333 174.933-34.133 81.067-17.067 157.867-34.133 238.933-46.933 55.467-12.8 110.933-21.333 170.667-34.133 4.267-4.267 4.267-4.267 4.267-12.8-29.867-89.6-59.733-179.2-89.6-264.533-21.333-64-42.667-128-64-187.733-25.6-68.267-46.933-140.8-76.8-209.067-17.067-51.2-38.4-98.133-59.733-145.067-12.8-25.6-25.6-51.2-46.933-68.267-17.067-17.067-34.133-21.333-59.733-12.8-59.733 17.067-93.867 59.733-106.667 119.467-4.267 25.6-8.533 51.2-8.533 76.8 0 12.8 0 25.6 0 38.4s-8.533 21.333-17.067 25.6c-76.8 29.867-153.6 64-234.667 93.867-25.6 0-42.667 4.267-59.733 12.8zM554.667 550.4c-17.067 0-29.867-4.267-29.867-17.067-4.267-12.8 4.267-25.6 17.067-29.867 59.733-21.333 123.733-42.667 183.467-59.733 12.8-4.267 25.6 0 29.867 8.533 8.533 17.067 4.267 29.867-12.8 38.4-46.933 17.067-98.133 34.133-145.067 46.933-17.067 4.267-34.133 8.533-42.667 12.8zM477.867 375.467c-4.267 0-8.533 0-12.8-4.267-8.533-4.267-12.8-12.8-12.8-21.333 0-12.8 8.533-21.333 21.333-25.6 59.733-21.333 119.467-38.4 183.467-59.733 17.067-4.267 29.867 0 34.133 12.8s-4.267 25.6-17.067 29.867c-42.667 12.8-85.333 29.867-132.267 42.667-25.6 12.8-46.933 21.333-64 25.6zM806.4 631.467c21.333 0 29.867 4.267 34.133 21.333 4.267 8.533-8.533 21.333-21.333 25.6-21.333 4.267-42.667 12.8-68.267 17.067-38.4 12.8-76.8 21.333-119.467 34.133-17.067 4.267-34.133-8.533-29.867-25.6 0-12.8 12.8-17.067 25.6-21.333 42.667-12.8 89.6-25.6 132.267-38.4 17.067-4.267 34.133-8.533 46.933-12.8zM516.267 746.667c0 12.8-12.8 25.6-25.6 25.6-17.067 0-25.6-8.533-25.6-21.333s12.8-25.6 29.867-25.6c12.8-4.267 21.333 4.267 21.333 21.333zM426.667 541.867c12.8 0 25.6 8.533 25.6 21.333s-12.8 25.6-25.6 25.6c-17.067 0-29.867-8.533-25.6-21.333-4.267-12.8 4.267-25.6 25.6-25.6zM354.133 422.4c-17.067 0-25.6-8.533-25.6-25.6s12.8-25.6 29.867-25.6c12.8 0 25.6 8.533 25.6 21.333-4.267 17.067-17.067 29.867-29.867 29.867zM4.267 341.333c25.6-12.8 55.467-21.333 81.067-34.133 59.733-25.6 119.467-46.933 174.933-72.533 51.2-21.333 102.4-42.667 157.867-64 8.533-4.267 17.067-8.533 25.6-12.8s12.8-8.533 12.8-17.067c0-42.667 4.267-89.6 21.333-128 8.533-17.067 17.067-38.4 25.6-55.467-12.8 4.267-29.867 8.533-42.667 17.067-46.933 17.067-93.867 38.4-145.067 55.467-42.667 17.067-85.333 38.4-128 55.467-29.867 12.8-59.733 25.6-89.6 38.4s-55.467 38.4-72.533 64c-21.333 42.667-25.6 85.333-25.6 132.267 0 4.267 4.267 12.8 4.267 21.333z" />
@ -102,7 +102,7 @@
 <glyph unicode="&#xe95c;" glyph-name="anonymous" d="M230.4 605.867c12.8 46.933 29.867 93.867 46.933 140.8 8.533 34.133 21.333 64 29.867 98.133 4.267 12.8 8.533 12.8 21.333 12.8 38.4-12.8 72.533-21.333 110.933-25.6 12.8-4.267 29.867 0 46.933 0 34.133 4.267 68.267 8.533 102.4 12.8s72.533 12.8 106.667 17.067c4.267 0 8.533 0 12.8 0s8.533 0 12.8-8.533c12.8-46.933 29.867-93.867 42.667-136.533 12.8-38.4 25.6-76.8 34.133-115.2-192 4.267-379.733 4.267-567.467 4.267zM456.533 247.467c34.133 8.533 64 12.8 98.133 4.267 8.533 0 12.8 0 12.8 8.533 17.067 34.133 42.667 59.733 76.8 72.533 38.4 17.067 76.8 21.333 115.2 8.533 34.133-8.533 59.733-29.867 81.067-55.467 25.6-34.133 38.4-72.533 34.133-119.467-8.533-51.2-34.133-89.6-76.8-115.2-51.2-34.133-132.267-29.867-179.2 12.8-42.667 34.133-59.733 76.8-64 128 0 8.533-4.267 12.8-12.8 17.067-21.333 4.267-42.667 4.267-64 0-8.533-4.267-8.533-4.267-8.533-12.8 0-21.333-4.267-46.933-12.8-68.267-12.8-29.867-34.133-55.467-64-72.533-55.467-38.4-136.533-34.133-183.467 8.533-42.667 34.133-64 76.8-59.733 128 0 59.733 29.867 106.667 85.333 136.533s115.2 25.6 170.667-12.8c12.8-8.533 21.333-17.067 34.133-29.867 0-8.533 8.533-21.333 17.067-38.4zM307.2 302.933c-64 0-115.2-51.2-115.2-110.933 0-64 46.933-115.2 110.933-115.2s115.2 46.933 115.2 110.933c4.267 64-46.933 115.2-110.933 115.2zM712.533 302.933c-64 0-115.2-51.2-115.2-110.933 0-64 46.933-115.2 110.933-115.2 59.733 0 115.2 46.933 115.2 110.933 0 59.733-46.933 115.2-110.933 115.2zM1024 409.6c-341.333 0-682.667 0-1024 0 0 0 0 0 0 0 17.067 8.533 29.867 17.067 46.933 21.333 42.667 12.8 85.333 29.867 132.267 42.667 34.133 8.533 68.267 17.067 102.4 21.333 89.6 17.067 183.467 21.333 277.333 17.067 55.467-4.267 110.933-8.533 166.4-17.067 38.4-4.267 72.533-12.8 110.933-21.333s72.533-21.333 110.933-34.133c21.333-4.267 51.2-17.067 76.8-29.867 0 0 0 0 0 0z" />
 <glyph unicode="&#xe95d;" glyph-name="zone" d="M243.2 448c-12.8 17.067-25.6 34.133-38.4 51.2-34.133 46.933-68.267 98.133-89.6 153.6-17.067 34.133-25.6 72.533-17.067 110.933 8.533 51.2 38.4 89.6 85.333 110.933 59.733 25.6 132.267 8.533 174.933-34.133 34.133-38.4 42.667-81.067 34.133-132.267-8.533-46.933-29.867-85.333-51.2-123.733-29.867-46.933-59.733-89.6-89.6-132.267-4.267 0-4.267 0-8.533-4.267zM247.467 823.467c-46.933 0-89.6-38.4-89.6-89.6 0-46.933 38.4-89.6 85.333-89.6s89.6 38.4 89.6 85.333c0 55.467-38.4 93.867-85.333 93.867zM490.667 379.733l-17.067 25.6 12.8 8.533-34.133 183.467c0 0 0 8.533-8.533 8.533l-42.667 4.267c0 0-68.267-110.933-157.867-217.6 4.267 4.267-93.867 110.933-132.267 187.733l-110.933-51.2c0 0-4.267 0-4.267-8.533l25.6-145.067 34.133-21.333-8.533-21.333-17.067 8.533 59.733-332.8 213.333 102.4 238.933-21.333-51.2 290.133zM149.333 285.867c-12.8 4.267-29.867 12.8-42.667 17.067 4.267 8.533 4.267 17.067 8.533 21.333 17.067 0 29.867-4.267 42.667-12.8-4.267-8.533-4.267-17.067-8.533-25.6zM256 268.8c-17.067 0-34.133 4.267-46.933 4.267 0 8.533 4.267 17.067 4.267 25.6 12.8 0 29.867-4.267 42.667-4.267 0-8.533 0-17.067 0-25.6zM315.733 277.333c-4.267 8.533-4.267 12.8-8.533 21.333 17.067 8.533 29.867 17.067 42.667 21.333 4.267-8.533 8.533-12.8 8.533-21.333-12.8-8.533-25.6-12.8-42.667-21.333zM405.333 328.533c-4.267 8.533-8.533 12.8-12.8 21.333 12.8 8.533 25.6 17.067 38.4 25.6 4.267-4.267 8.533-12.8 12.8-21.333-8.533-8.533-21.333-17.067-38.4-25.6zM972.8 460.8l-29.867 25.6 12.8 21.333 12.8-8.533-34.133 187.733c0 0 0 8.533-8.533 8.533l-226.133 17.067-209.067-93.867c0 0-8.533-4.267-4.267-12.8l29.867-170.667 21.333-12.8-17.067-17.067 55.467-307.2 213.333 102.4 234.667-21.333-51.2 281.6zM580.267 465.067c-4.267 4.267-8.533 12.8-12.8 17.067 12.8 12.8 21.333 21.333 29.867 34.133 4.267-4.267 12.8-12.8 17.067-17.067-12.8-8.533-25.6-21.333-34.133-34.133zM657.067 541.867c-4.267 4.267-8.533 12.8-12.8 21.333 12.8 8.533 25.6 17.067 38.4 25.6 8.533-8.533 12.8-17.067 12.8-21.333-12.8-8.533-25.6-17.067-38.4-25.6zM797.867 571.733c-12.8 4.267-25.6 4.267-42.667 4.267 0 8.533 0 17.067 0 25.6 17.067 0 34.133 0 51.2-4.267-4.267-8.533-4.267-17.067-8.533-25.6zM891.733 520.533c-12.8 8.533-25.6 17.067-38.4 25.6 4.267 8.533 8.533 12.8 12.8 21.333 12.8-8.533 25.6-17.067 38.4-25.6-4.267-8.533-8.533-12.8-12.8-21.333z" />
 <glyph unicode="&#xe95e;" glyph-name="inventory" d="M273.067 226.133c4.267 0 8.533 4.267 8.533 8.533v85.333h98.133v-221.867h-217.6v221.867h98.133v-81.067c0-8.533 8.533-12.8 12.8-12.8zM512 226.133c4.267 0 8.533 4.267 8.533 8.533v85.333h98.133v-221.867h-217.6v221.867h98.133v-81.067c0-8.533 8.533-12.8 12.8-12.8zM750.933 226.133c4.267 0 8.533 4.267 8.533 8.533v85.333h98.133v-221.867h-217.6v221.867h98.133v-81.067c4.267-8.533 8.533-12.8 12.8-12.8zM644.267 780.8h98.133v-81.067c0-4.267 4.267-8.533 8.533-8.533s8.533 4.267 8.533 8.533v81.067h98.133v-221.867h-217.6v221.867h4.267zM401.067 780.8h98.133v-81.067c0-4.267 4.267-8.533 8.533-8.533s8.533 4.267 8.533 8.533v81.067h98.133v-221.867h-213.333v221.867zM162.133 780.8h98.133v-81.067c0-4.267 4.267-8.533 8.533-8.533s8.533 4.267 8.533 8.533v81.067h98.133v-221.867h-213.333v221.867zM153.6 537.6h780.8v-38.4h-844.8v38.4zM68.267-42.667h-42.667v981.333h42.667v-908.8zM89.6 38.4v38.4h844.8v-38.4zM998.4-42.667h-42.667v981.333h42.667z" />
-<glyph unicode="&#xe95f;" glyph-name="latestBuys" d="M183.467 750.933h712.533v-38.4h-768v38.4zM89.6 64c8.533 0 12.8 0 21.333-4.267v900.267h-42.667v-900.267c8.533 4.267 12.8 4.267 21.333 4.267zM955.733 512v448h-42.667v-413.867c17.067-12.8 29.867-21.333 42.667-34.133zM145.067-8.533c0-30.633-24.833-55.467-55.467-55.467s-55.467 24.833-55.467 55.467c0 30.633 24.833 55.467 55.467 55.467s55.467-24.833 55.467-55.467zM418.133 426.667h-290.133v-38.4h273.067c4.267 17.067 8.533 29.867 17.067 38.4zM392.533 106.667h-264.533v-38.4h281.6c-8.533 12.8-12.8 25.6-17.067 38.4zM725.333 247.467c-12.8 0-21.333-8.533-21.333-21.333s8.533-21.333 21.333-21.333c12.8 0 21.333 8.533 21.333 21.333 0 8.533-12.8 21.333-21.333 21.333zM721.067 541.867c-166.4 0-298.667-136.533-298.667-302.933s132.267-302.933 298.667-302.933c166.4 0 298.667 136.533 298.667 302.933 0 170.667-132.267 302.933-298.667 302.933zM725.333 34.133c-98.133 0-174.933 72.533-187.733 162.133h-34.133l51.2 64 59.733-64h-38.4c8.533-68.267 72.533-123.733 149.333-123.733 81.067 0 149.333 64 149.333 145.067s-68.267 145.067-149.333 145.067c-68.267 0-128-46.933-145.067-110.933l-21.333 29.867-17.067-12.8c8.533 29.867 25.6 55.467 46.933 76.8l-25.6 21.333c-4.267 4.267-4.267 12.8 0 17.067l12.8 12.8c4.267 4.267 12.8 4.267 17.067 0l25.6-25.6c21.333 12.8 51.2 25.6 76.8 25.6v29.867h-8.533c-8.533 0-12.8 4.267-12.8 12.8v17.067c0 8.533 4.267 12.8 12.8 12.8h59.733c8.533 0 12.8-4.267 12.8-12.8v-17.067c0-8.533-4.267-12.8-12.8-12.8h-8.533v-21.333c29.867-4.267 55.467-12.8 81.067-29.867l34.133 29.867c4.267 4.267 12.8 4.267 17.067 0l12.8-12.8c4.267-4.267 4.267-12.8 0-17.067l-25.6-25.6c29.867-34.133 51.2-76.8 51.2-128 4.267-102.4-81.067-187.733-183.467-187.733zM772.267 226.133c0-25.6-21.333-46.933-46.933-46.933s-46.933 21.333-46.933 46.933c0 25.6 21.333 46.933 46.933 46.933 8.533 0 17.067-4.267 21.333-4.267l46.933 46.933 21.333-21.333-46.933-46.933c4.267-4.267 4.267-12.8 4.267-21.333z" />
+<glyph unicode="&#xe95f;" glyph-name="latestBuy" d="M183.467 750.933h712.533v-38.4h-768v38.4zM89.6 64c8.533 0 12.8 0 21.333-4.267v900.267h-42.667v-900.267c8.533 4.267 12.8 4.267 21.333 4.267zM955.733 512v448h-42.667v-413.867c17.067-12.8 29.867-21.333 42.667-34.133zM145.067-8.533c0-30.633-24.833-55.467-55.467-55.467s-55.467 24.833-55.467 55.467c0 30.633 24.833 55.467 55.467 55.467s55.467-24.833 55.467-55.467zM418.133 426.667h-290.133v-38.4h273.067c4.267 17.067 8.533 29.867 17.067 38.4zM392.533 106.667h-264.533v-38.4h281.6c-8.533 12.8-12.8 25.6-17.067 38.4zM725.333 247.467c-12.8 0-21.333-8.533-21.333-21.333s8.533-21.333 21.333-21.333c12.8 0 21.333 8.533 21.333 21.333 0 8.533-12.8 21.333-21.333 21.333zM721.067 541.867c-166.4 0-298.667-136.533-298.667-302.933s132.267-302.933 298.667-302.933c166.4 0 298.667 136.533 298.667 302.933 0 170.667-132.267 302.933-298.667 302.933zM725.333 34.133c-98.133 0-174.933 72.533-187.733 162.133h-34.133l51.2 64 59.733-64h-38.4c8.533-68.267 72.533-123.733 149.333-123.733 81.067 0 149.333 64 149.333 145.067s-68.267 145.067-149.333 145.067c-68.267 0-128-46.933-145.067-110.933l-21.333 29.867-17.067-12.8c8.533 29.867 25.6 55.467 46.933 76.8l-25.6 21.333c-4.267 4.267-4.267 12.8 0 17.067l12.8 12.8c4.267 4.267 12.8 4.267 17.067 0l25.6-25.6c21.333 12.8 51.2 25.6 76.8 25.6v29.867h-8.533c-8.533 0-12.8 4.267-12.8 12.8v17.067c0 8.533 4.267 12.8 12.8 12.8h59.733c8.533 0 12.8-4.267 12.8-12.8v-17.067c0-8.533-4.267-12.8-12.8-12.8h-8.533v-21.333c29.867-4.267 55.467-12.8 81.067-29.867l34.133 29.867c4.267 4.267 12.8 4.267 17.067 0l12.8-12.8c4.267-4.267 4.267-12.8 0-17.067l-25.6-25.6c29.867-34.133 51.2-76.8 51.2-128 4.267-102.4-81.067-187.733-183.467-187.733zM772.267 226.133c0-25.6-21.333-46.933-46.933-46.933s-46.933 21.333-46.933 46.933c0 25.6 21.333 46.933 46.933 46.933 8.533 0 17.067-4.267 21.333-4.267l46.933 46.933 21.333-21.333-46.933-46.933c4.267-4.267 4.267-12.8 4.267-21.333z" />
 <glyph unicode="&#xe968;" glyph-name="wiki" d="M793.6 733.867c0 0 4.267 0 4.267 0l76.8 12.8v-42.667c0-34.133-21.333-68.267-46.933-72.533 0 0-4.267 0-4.267 0l-76.8-12.8v42.667c0 34.133 21.333 64 46.933 72.533zM742.4 597.333l38.4 4.267c12.8 0 25.6-12.8 25.6-29.867v-21.333l-38.4-4.267c-12.8 0-25.6 12.8-25.6 29.867v21.333zM618.667 699.733l68.267 8.533c25.6 4.267 42.667-21.333 42.667-55.467v-38.4l-68.267-8.533c-25.6-4.267-42.667 21.333-42.667 55.467v38.4zM665.6 588.8c4.267 0 4.267 0 0 0l59.733 4.267v-29.867c0-25.6-17.067-46.933-34.133-55.467 0 0-4.267 0-4.267 0l-55.467-8.533v29.867c4.267 29.867 17.067 51.2 34.133 59.733zM443.733 648.533c0 0-4.267 0-4.267 0-119.467 85.333-273.067 46.933-277.333 46.933s-8.533 0-12.8 8.533c0 4.267 0 8.533 8.533 12.8 0 0 42.667 12.8 98.133 8.533 51.2 0 128-12.8 196.267-59.733 4.267-4.267 4.267-8.533 4.267-12.8-4.267-4.267-8.533-4.267-12.8-4.267zM443.733 512c0 0-4.267 0-4.267 0-119.467 85.333-273.067 46.933-277.333 46.933s-8.533 0-12.8 8.533c0 4.267 0 8.533 8.533 12.8 0 0 42.667 12.8 98.133 8.533 51.2 0 128-12.8 196.267-59.733 4.267-4.267 4.267-8.533 4.267-12.8-4.267 0-8.533-4.267-12.8-4.267zM443.733 379.733c0 0-4.267 0-4.267 0-119.467 85.333-273.067 46.933-277.333 46.933s-8.533 0-12.8 8.533c0 4.267 0 8.533 8.533 12.8 0 0 42.667 12.8 98.133 8.533 51.2 0 128-12.8 196.267-59.733 4.267-4.267 4.267-8.533 4.267-12.8-4.267 0-8.533-4.267-12.8-4.267zM443.733 247.467c0 0-4.267 0-4.267 0-119.467 85.333-273.067 46.933-277.333 46.933s-8.533 0-12.8 8.533c0 4.267 0 8.533 8.533 12.8 0 0 42.667 12.8 98.133 8.533 51.2 0 128-12.8 196.267-59.733 4.267-4.267 4.267-8.533 4.267-12.8-4.267 0-8.533-4.267-12.8-4.267zM588.8 379.733c-4.267 0-4.267 0-8.533 4.267s0 8.533 4.267 12.8c68.267 46.933 140.8 59.733 196.267 59.733s93.867-8.533 98.133-8.533c4.267 0 8.533-8.533 8.533-12.8s-8.533-8.533-12.8-8.533v0c0 0-153.6 38.4-277.333-46.933-4.267 4.267-4.267 0-8.533 0zM588.8 247.467c-4.267 0-4.267 0-8.533 4.267s0 8.533 4.267 12.8c68.267 46.933 140.8 59.733 196.267 59.733s93.867-8.533 98.133-8.533c4.267 0 8.533-8.533 8.533-12.8s-8.533-8.533-12.8-8.533v0c0 0-153.6 38.4-277.333-46.933-4.267 4.267-4.267 0-8.533 0zM985.6 738.133v64l-8.533 4.267c-4.267 0-81.067 29.867-179.2 29.867-106.667 0-200.533-34.133-277.333-98.133-76.8 64-170.667 98.133-277.333 98.133-102.4 0-174.933-29.867-179.2-29.867l-12.8-4.267v-59.733c-34.133-4.267-51.2-17.067-51.2-34.133v-614.4h452.267c17.067-12.8 38.4-21.333 64-21.333s46.933 8.533 64 21.333h443.733v614.4c0 17.067-17.067 25.6-38.4 29.867v0zM512 145.067c-38.4 17.067-166.4 64-298.667 64-51.2 0-98.133-8.533-136.533-21.333v597.333c21.333 8.533 85.333 25.6 162.133 25.6 98.133 0 183.467-29.867 256-89.6v-358.4l17.067 17.067v-234.667zM955.733 183.467c-42.667 17.067-89.6 25.6-140.8 25.6-128 0-251.733-51.2-290.133-64v238.933l17.067-17.067v349.867c68.267 59.733 153.6 89.6 256 89.6 76.8 0 136.533-17.067 162.133-25.6v-597.333z" />
 <glyph unicode="&#xe96c;" glyph-name="attach" d="M960 866.133c-42.667 42.667-98.133 64-157.867 64s-115.2-21.333-157.867-64l-593.067-593.067c-34.133-34.133-55.467-85.333-51.2-136.533 0-42.667 17.067-81.067 46.933-110.933 34.133-38.4 81.067-59.733 132.267-59.733 46.933 0 93.867 17.067 128 51.2l541.867 546.133c25.6 25.6 42.667 64 42.667 98.133s-12.8 68.267-38.4 93.867c-25.6 25.6-59.733 38.4-98.133 38.4-34.133 0-72.533-17.067-98.133-42.667l-354.133-354.133c-4.267 0-4.267-4.267-4.267-12.8s4.267-12.8 8.533-17.067 25.6-8.533 34.133 0l354.133 354.133c12.8 17.067 38.4 25.6 59.733 25.6 25.6 0 51.2-12.8 68.267-34.133 8.533-12.8 17.067-25.6 17.067-42.667 4.267-25.6-4.267-55.467-25.6-72.533l-541.867-541.867c-25.6-25.6-55.467-38.4-93.867-38.4-34.133 0-68.267 12.8-93.867 38.4s-38.4 59.733-38.4 93.867c0 34.133 12.8 68.267 38.4 93.867l588.8 584.533c34.133 34.133 76.8 51.2 123.733 51.2s89.6-17.067 123.733-51.2c34.133-34.133 51.2-76.8 51.2-123.733s-17.067-89.6-51.2-123.733l-401.067-401.067c-4.267-4.267-8.533-12.8-8.533-17.067 0-8.533 4.267-12.8 8.533-17.067 8.533-8.533 25.6-8.533 34.133 0l401.067 401.067c89.6 89.6 89.6 230.4 4.267 320z" />
 <glyph unicode="&#xe96d;" glyph-name="zone2" d="M98.133 17.067c-4.267 29.867-12.8 64-17.067 93.867-17.067 98.133-34.133 192-51.2 290.133-12.8 46.933-21.333 98.133-29.867 149.333 0 4.267 0 8.533 4.267 8.533 42.667 21.333 85.333 42.667 128 59.733 0 0 0 0 4.267 0 4.267-8.533 8.533-12.8 12.8-21.333-21.333-8.533-42.667-21.333-64-29.867-17.067-8.533-34.133-17.067-51.2-21.333-4.267 0-4.267-4.267-4.267-8.533 8.533-42.667 17.067-85.333 25.6-132.267 0-4.267 4.267-4.267 4.267-8.533 8.533-4.267 17.067-8.533 25.6-17.067 0-4.267-4.267-12.8-8.533-17.067-4.267 4.267-12.8 4.267-17.067 8.533 17.067-102.4 38.4-209.067 55.467-311.467 17.067 8.533 29.867 12.8 42.667 21.333 51.2 25.6 102.4 51.2 153.6 72.533 4.267 0 8.533 0 17.067 0 68.267-4.267 136.533-12.8 204.8-17.067 0 0 4.267 0 8.533 0-4.267 17.067-4.267 34.133-8.533 51.2-12.8 68.267-25.6 136.533-38.4 204.8 0 8.533-4.267 17.067-12.8 25.6-4.267 4.267-4.267 8.533-8.533 12.8 12.8 4.267 8.533 17.067 8.533 25.6-8.533 51.2-17.067 106.667-29.867 157.867 0 4.267 0 4.267-8.533 4.267-17.067 0-38.4 4.267-55.467 4.267 4.267 8.533 8.533 17.067 12.8 21.333 0 0 4.267 4.267 8.533 4.267 17.067 0 34.133-4.267 46.933-4.267 4.267 0 8.533 0 12.8 0 68.267 29.867 132.267 64 200.533 93.867 4.267 4.267 8.533 8.533 12.8 8.533 68.267-4.267 136.533-8.533 204.8-17.067 8.533 0 17.067 0 29.867-4.267 4.267 0 8.533-4.267 8.533-8.533 12.8-64 25.6-132.267 34.133-196.267 17.067-102.4 38.4-204.8 55.467-311.467 0-8.533 4.267-17.067 4.267-25.6-17.067 0-34.133 4.267-51.2 4.267-42.667 4.267-89.6 8.533-132.267 12.8-17.067 0-38.4 4.267-55.467 4.267-4.267 0-12.8 0-17.067-4.267-68.267-29.867-132.267-64-200.533-93.867 0 0-4.267 0-8.533 0-76.8 8.533-149.333 12.8-226.133 21.333-4.267 0-8.533 0-12.8 0-72.533-34.133-140.8-68.267-213.333-102.4 0-4.267 0-8.533-4.267-8.533zM989.867 217.6c0 4.267 0 4.267 0 8.533-8.533 34.133-12.8 72.533-21.333 106.667-8.533 46.933-17.067 89.6-25.6 136.533 0 8.533-4.267 12.8-8.533 17.067-8.533 4.267-12.8 12.8-21.333 17.067 4.267 8.533 8.533 12.8 12.8 17.067 4.267-4.267 8.533-4.267 12.8-8.533-4.267 12.8-4.267 21.333-4.267 34.133-8.533 46.933-17.067 93.867-25.6 145.067 0 4.267-4.267 8.533-8.533 8.533-68.267 4.267-136.533 12.8-209.067 17.067-4.267 0-8.533 0-12.8-4.267-64-29.867-123.733-59.733-187.733-85.333-4.267-4.267-8.533-4.267-4.267-12.8 4.267-29.867 12.8-64 17.067-93.867 4.267-21.333 8.533-42.667 12.8-59.733 12.8-4.267 12.8-12.8 21.333-21.333-12.8-4.267-12.8-12.8-12.8-25.6 12.8-68.267 25.6-132.267 38.4-200.533 4.267-25.6 8.533-51.2 12.8-76.8 4.267 0 4.267 0 8.533 4.267 59.733 29.867 119.467 59.733 183.467 89.6-4.267 4.267 0 4.267 4.267 4.267 51.2-4.267 106.667-8.533 157.867-12.8 21.333 0 38.4-4.267 59.733-4.267zM260.267 469.333c-12.8 17.067-25.6 34.133-38.4 46.933-29.867 46.933-59.733 93.867-85.333 145.067-12.8 29.867-21.333 64-17.067 102.4 8.533 51.2 34.133 85.333 81.067 102.4 55.467 21.333 123.733 8.533 162.133-34.133 34.133-34.133 42.667-76.8 34.133-123.733-8.533-42.667-25.6-76.8-46.933-115.2-25.6-42.667-55.467-81.067-85.333-123.733 0 4.267-4.267 0-4.267 0zM260.267 819.2c-46.933 0-81.067-34.133-81.067-81.067s38.4-81.067 81.067-81.067c46.933 0 81.067 38.4 85.333 81.067 0 42.667-38.4 81.067-85.333 81.067zM358.4 349.867c4.267-8.533 4.267-12.8 8.533-21.333-12.8-4.267-25.6-12.8-38.4-17.067-4.267 8.533-4.267 12.8-8.533 21.333 12.8 4.267 25.6 12.8 38.4 17.067zM226.133 302.933c0 8.533 4.267 17.067 4.267 21.333 12.8 0 25.6-4.267 38.4-4.267 0-8.533 0-12.8 0-25.6-12.8 8.533-29.867 8.533-42.667 8.533zM413.867 354.133c-4.267 8.533-8.533 12.8-12.8 21.333 12.8 8.533 21.333 17.067 34.133 25.6 4.267-4.267 8.533-12.8 12.8-17.067-12.8-12.8-21.333-21.333-34.133-29.867zM179.2 341.333c-4.267-8.533-4.267-12.8-8.533-21.333-12.8 4.267-25.6 8.533-38.4 17.067 4.267 8.533 4.267 12.8 8.533 21.333 12.8-8.533 25.6-12.8 38.4-17.067zM682.667 580.267c-12.8-8.533-21.333-17.067-34.133-21.333-4.267 4.267-8.533 12.8-12.8 17.067 12.8 8.533 25.6 17.067 38.4 25.6 4.267-8.533 4.267-17.067 8.533-21.333zM878.933 558.933c-4.267-8.533-8.533-12.8-12.8-21.333-12.8 8.533-25.6 17.067-34.133 21.333 4.267 8.533 8.533 12.8 8.533 21.333 12.8-8.533 25.6-17.067 38.4-21.333zM571.733 486.4c-4.267 4.267-8.533 12.8-12.8 17.067 8.533 8.533 21.333 21.333 29.867 29.867 4.267-4.267 8.533-12.8 12.8-17.067-8.533-8.533-17.067-21.333-29.867-29.867zM785.067 610.133c-4.267-8.533-4.267-17.067-8.533-21.333-12.8 0-25.6 4.267-38.4 4.267 0 8.533 0 12.8 0 21.333 17.067 0 29.867-4.267 46.933-4.267z" />
--- a/front/core/styles/icons/salixfont.ttf
+++ b/front/core/styles/icons/salixfont.ttf
--- a/front/core/styles/icons/salixfont.woff
+++ b/front/core/styles/icons/salixfont.woff
--- a/front/module-import.js
+++ b/front/module-import.js
@ -19,5 +19,6 @@ export default function moduleImport(moduleName) {
    case 'route'        : return import('route/front');
    case 'entry'        : return import('entry/front');
    case 'account'      : return import('account/front');
+    case 'supplier'     : return import('supplier/front');
    }
 }
--- a/front/salix/locale/es.yml
+++ b/front/salix/locale/es.yml
@ -45,6 +45,7 @@ Locator: Localizador
 Invoices out: Facturas emitidas
 Entries: Entradas
 Users: Usuarios
+Suppliers: Proveedores

 # Common

--- a/loopback/locale/en.json
+++ b/loopback/locale/en.json
@ -56,7 +56,6 @@
 	"Value has an invalid format": "Value has an invalid format",
 	"The postcode doesn't exist. Please enter a correct one": "The postcode doesn't exist. Please enter a correct one",
 	"Can't create stowaway for this ticket": "Can't create stowaway for this ticket",
-	"Has deleted the ticket id": "Has deleted the ticket id [#{{id}}]({{{url}}})",
 	"Swift / BIC can't be empty": "Swift / BIC can't be empty",
 	"MESSAGE_BOUGHT_UNITS": "Bought {{quantity}} units of {{concept}} (#{{itemId}}) for the ticket id [#{{ticketId}}]({{{url}}})",
 	"MESSAGE_INSURANCE_CHANGE": "I have changed the insurence credit of client [{{clientName}} (#{{clientId}})]({{{url}}}) to *{{credit}} €*",
@ -68,7 +67,9 @@
 	"Incoterms is required for a non UEE member": "Incoterms is required for a non UEE member",
 	"Client checked as validated despite of duplication": "Client checked as validated despite of duplication from client id {{clientId}}",
 	"Landing cannot be lesser than shipment": "Landing cannot be lesser than shipment",
-	"NOT_ZONE_WITH_THIS_PARAMETERS": "NOT_ZONE_WITH_THIS_PARAMETERS",
+	"NOT_ZONE_WITH_THIS_PARAMETERS": "There's no zone available for this day",
 	"Created absence": "The worker <strong>{{author}}</strong> has added an absence of type '{{absenceType}}' to <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> for day {{dated}}.",
-	"Deleted absence": "The worker <strong>{{author}}</strong> has deleted an absence of type '{{absenceType}}' to <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> for day {{dated}}."
+	"Deleted absence": "The worker <strong>{{author}}</strong> has deleted an absence of type '{{absenceType}}' to <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> for day {{dated}}.",
+	"I have deleted the ticket id": "I have deleted the ticket id [#{{id}}]({{{url}}})",
+	"I have restored the ticket id": "I have restored the ticket id [#{{id}}]({{{url}}})"
 }
--- a/loopback/locale/es.json
+++ b/loopback/locale/es.json
@ -114,7 +114,6 @@
 	"You can't create a claim for a removed ticket": "No puedes crear una reclamación para un ticket eliminado",
 	"You cannot delete a ticket that part of it is being prepared": "No puedes eliminar un ticket en el que una parte que está siendo preparada",
 	"You must delete all the buy requests first": "Debes eliminar todas las peticiones de compra primero",
-	"Has deleted the ticket id": "Ha eliminado el ticket id [#{{id}}]({{{url}}})",
 	"You should specify a date": "Debes especificar una fecha",
 	"You should specify at least a start or end date": "Debes especificar al menos una fecha de inicio o de fín",
 	"Start date should be lower than end date": "La fecha de inicio debe ser menor que la fecha de fín",
@ -146,5 +145,8 @@
 	"User already exists": "User already exists",
 	"Absence change notification on the labour calendar": "Notificacion de cambio de ausencia en el calendario laboral",
 	"Created absence": "El empleado <strong>{{author}}</strong> ha añadido una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> para el día {{dated}}.",
-	"Deleted absence": "El empleado <strong>{{author}}</strong> ha eliminado una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> del día {{dated}}."
+	"Deleted absence": "El empleado <strong>{{author}}</strong> ha eliminado una ausencia de tipo '{{absenceType}}' a <a href='{{{workerUrl}}}'><strong>{{employee}}</strong></a> del día {{dated}}.",
+	"I have deleted the ticket id": "He eliminado el ticket id [#{{id}}]({{{url}}})",
+	"I have restored the ticket id": "He restaurado el ticket id [#{{id}}]({{{url}}})",
+	"You can only restore a ticket within the first hour after deletion": "Únicamente puedes restaurar el ticket dentro de la primera hora después de su eliminación"
 }
--- a/modules/entry/front/summary/index.html
+++ b/modules/entry/front/summary/index.html
@ -143,6 +143,9 @@
                            </vn-fetched-tags>
                        </td>
                    </tr>
+                    <tr class="empty-row">
+                        <td colspan="10"></td>
+                    </tr>
                </tbody>
            </table>
        </vn-auto>
--- a/modules/entry/front/summary/style.scss
+++ b/modules/entry/front/summary/style.scss
@ -8,8 +8,18 @@ vn-entry-summary .summary {
        background-color: lighten($color-marginal, 10%);
    }

-    tbody {
-        border: 2px solid $color-marginal;
+    tbody tr:nth-child(1) {
+        border-top: 1px solid $color-marginal;
+    }
+
+    tbody tr:nth-child(1),
+    tbody tr:nth-child(2) {
+        border-left: 1px solid $color-marginal;
+        border-right: 1px solid $color-marginal
+    }
+
+    tbody tr:nth-child(3) {
+        height: inherit
    }

    tr {
--- a/modules/item/back/methods/item/getWasteDetail.js
+++ b/modules/item/back/methods/item/getWasteDetail.js
@ -1,6 +1,6 @@
 module.exports = Self => {
    Self.remoteMethod('getWasteDetail', {
-        description: 'Returns the ',
+        description: 'Returns the details of losses by worker',
        accessType: 'READ',
        accepts: [],
        returns: {
--- a/modules/item/back/model-config.json
+++ b/modules/item/back/model-config.json
@ -76,8 +76,5 @@
    },
    "TaxType": {
        "dataSource": "vn"
-    },
-    "Supplier": {
-        "dataSource": "vn"
    }
 }
--- a/modules/supplier/back/methods/supplier/filter.js
+++ b/modules/supplier/back/methods/supplier/filter.js
@ -0,0 +1,106 @@
+
+const ParameterizedSQL = require('loopback-connector').ParameterizedSQL;
+const buildFilter = require('vn-loopback/util/filter').buildFilter;
+const mergeFilters = require('vn-loopback/util/filter').mergeFilters;
+
+module.exports = Self => {
+    Self.remoteMethodCtx('filter', {
+        description: 'Find all instances of the model matched by filter from the data source.',
+        accessType: 'READ',
+        accepts: [
+            {
+                arg: 'filter',
+                type: 'Object',
+                description: 'Filter defining where, order, offset, and limit - must be a JSON-encoded string',
+                http: {source: 'query'}
+            }, {
+                arg: 'search',
+                type: 'String',
+                description: 'Searchs the supplier by id',
+                http: {source: 'query'}
+            }, {
+                arg: 'id',
+                type: 'Integer',
+                description: 'The supplier id',
+                http: {source: 'query'}
+            }, {
+                arg: 'nickname',
+                type: 'String',
+                description: 'The supplier name to filter',
+                http: {source: 'query'}
+            }, {
+                arg: 'provinceFk',
+                type: 'Number',
+                description: 'The province id to filter',
+                http: {source: 'query'}
+            }, {
+                arg: 'countryFk',
+                type: 'Number',
+                description: 'The country id to filter',
+                http: {source: 'query'}
+            }, {
+                arg: 'nif',
+                type: 'String',
+                description: 'The supplier nif to filter',
+                http: {source: 'query'}
+            }
+        ],
+        returns: {
+            type: ['Object'],
+            root: true
+        },
+        http: {
+            path: `/filter`,
+            verb: 'GET'
+        }
+    });
+
+    Self.filter = async(ctx, filter) => {
+        let conn = Self.dataSource.connector;
+        let where = buildFilter(ctx.args, (param, value) => {
+            switch (param) {
+            case 'search':
+                return {'s.id': value};
+            case 'nickname':
+                param = `s.${param}`;
+                return {[param]: {like: `%${value}%`}};
+            case 'id':
+            case 'provinceFk':
+            case 'countryFk':
+            case 'nif':
+                param = `s.${param}`;
+                return {[param]: value};
+            }
+        });
+        filter = mergeFilters(ctx.args.filter, {where});
+
+        let stmts = [];
+        let stmt;
+        stmt = new ParameterizedSQL(
+            `SELECT 
+                    s.id,
+                    s.name AS socialName,
+                    s.nickname AS alias,
+                    s.account,
+                    s.provinceFk,
+                    s.nif,
+                    s.payDemFk,
+                    s.payDay,
+                    s.phone,
+                    s.city,
+                    pm.name AS payMethod,
+                    pd.payDem AS payDem
+                FROM vn.supplier s
+                    JOIN vn.payMethod pm ON pm.id = s.payMethodFk
+                    JOIN vn.payDem pd ON pd.id = s.payDemFk`
+        );
+
+        stmt.merge(conn.makeSuffix(filter));
+        let itemsIndex = stmts.push(stmt) - 1;
+
+        let sql = ParameterizedSQL.join(stmts, ';');
+        let result = await conn.executeStmt(sql);
+        return itemsIndex === 0 ? result : result[itemsIndex];
+    };
+};
+
--- a/modules/supplier/back/methods/supplier/specs/filter.spec.js
+++ b/modules/supplier/back/methods/supplier/specs/filter.spec.js
@ -0,0 +1,28 @@
+const app = require('vn-loopback/server/server');
+
+describe('Supplier filter()', () => {
+    it('should return the supplier matching "search"', async() => {
+        let ctx = {
+            args: {
+                search: 1
+            }
+        };
+
+        let result = await app.models.Supplier.filter(ctx);
+
+        expect(result.length).toEqual(1);
+        expect(result[0].id).toEqual(1);
+    });
+
+    it('should return the supplier matching the province', async() => {
+        let ctx = {
+            args: {
+                provinceFk: 1
+            }
+        };
+
+        let result = await app.models.Supplier.filter(ctx);
+
+        expect(result.length).toEqual(2);
+    });
+});
--- a/modules/supplier/back/model-config.json
+++ b/modules/supplier/back/model-config.json
@ -0,0 +1,5 @@
+{
+    "Supplier": {
+        "dataSource": "vn"
+    }
+}
--- a/modules/supplier/back/models/supplier.js
+++ b/modules/supplier/back/models/supplier.js
@ -0,0 +1,3 @@
+module.exports = Self => {
+    require('../methods/supplier/filter')(Self);
+};
--- a/modules/supplier/back/models/supplier.json
+++ b/modules/supplier/back/models/supplier.json
--- a/modules/supplier/front/index.js
+++ b/modules/supplier/front/index.js
@ -0,0 +1,5 @@
+export * from './module';
+
+import './main';
+import './index/';
+import './search-panel';
--- a/modules/supplier/front/index/index.html
+++ b/modules/supplier/front/index/index.html
@ -0,0 +1,61 @@
+
+<vn-auto-search
+model="model">
+</vn-auto-search>
+<vn-data-viewer
+model="model"
+class="vn-w-sm">
+<vn-card>
+<div class="vn-list separated">
+<a
+    ng-repeat="supplier in model.data track by supplier.id"
+    ui-sref="supplier.card.summary(::{id: supplier.id})"
+    translate-attr="{title: 'View supplier'}"
+    class="vn-item search-result">
+    <vn-item-section>
+        <h6>{{::supplier.socialName}}</h6>
+        <vn-label-value
+            label="Id" 
+            value="{{::supplier.id}}">
+        </vn-label-value>
+        <vn-label-value
+            label="Tax number" 
+            value="{{::supplier.nif}}">
+      </vn-label-value>
+        <vn-label-value
+            label="Alias" 
+            value="{{::supplier.alias}}">
+        </vn-label-value>
+        <vn-label-value
+            label="Pay method" 
+            value="{{::supplier.payMethod}}">
+        </vn-label-value>
+        <vn-label-value
+            label="Payment deadline" 
+            value="{{::supplier.payDem}}">
+        </vn-label-value>
+        <vn-label-value
+            label="Pay day" 
+            value="{{::supplier.payDay}}">
+        </vn-label-value>
+        <vn-label-value
+            label="Account" 
+            value="{{::supplier.account}}">
+        </vn-label-value>
+    </vn-item-section>
+    <vn-item-section side>
+        <vn-icon-button
+            ng-click="$ctrl.openSummary(supplier, $event)"
+            vn-tooltip="Preview"
+            icon="desktop_windows">
+        </vn-icon-button>
+    </vn-item-section>
+</a>
+</div>
+</vn-card>
+</vn-data-viewer>
+<vn-popup vn-id="dialog-summary-client">
+<vn-supplier-summary
+    supplier="$ctrl.supplierSelected">
+</vn-supplier-summary>
+</vn-popup>
--- a/modules/supplier/front/index/index.js
+++ b/modules/supplier/front/index/index.js
@ -0,0 +1,9 @@
+import ngModule from '../module';
+import Section from 'salix/components/section';
+
+export default class Controller extends Section {}
+
+ngModule.vnComponent('vnSupplierIndex', {
+    template: require('./index.html'),
+    controller: Controller
+});
--- a/modules/supplier/front/index/locale/es.yml
+++ b/modules/supplier/front/index/locale/es.yml
@ -0,0 +1,5 @@
+Payment deadline: Plazo de pago
+Pay day: Dia de pago
+Account: Cuenta
+Pay method: Metodo de pago
+Tax number: Nif
--- a/modules/supplier/front/main/index.html
+++ b/modules/supplier/front/main/index.html
@ -0,0 +1,18 @@
+<vn-crud-model
+    vn-id="model"
+    url="Suppliers/filter"
+    limit="20"
+    auto-load="true">
+</vn-crud-model>
+<vn-portal slot="topbar">
+    <vn-searchbar
+        vn-focus
+        panel="vn-supplier-search-panel"
+        info="Search suppliers by id"
+        model="model">
+    </vn-searchbar>
+</vn-portal>
+<vn-portal slot="menu">
+    <vn-left-menu></vn-left-menu>
+</vn-portal>
+<ui-view></ui-view>
--- a/modules/supplier/front/main/index.js
+++ b/modules/supplier/front/main/index.js
@ -0,0 +1,9 @@
+import ngModule from '../module';
+import ModuleMain from 'salix/components/module-main';
+
+export default class Supplier extends ModuleMain {}
+
+ngModule.vnComponent('vnSupplier', {
+    controller: Supplier,
+    template: require('./index.html')
+});
--- a/modules/supplier/front/module.js
+++ b/modules/supplier/front/module.js
@ -0,0 +1,3 @@
+import {ng} from 'core/vendor';
+
+export default ng.module('supplier', ['salix']);
--- a/modules/supplier/front/routes.json
+++ b/modules/supplier/front/routes.json
@ -0,0 +1,27 @@
+{
+    "module": "supplier",
+    "name": "Suppliers",
+    "icon" : "icon-supplier",
+    "validations" : true,
+    "menus": {
+        "main": [
+            {"state": "supplier.index", "icon": "icon-supplier"}
+        ],
+        "card": [
+        ]
+    },
+    "routes": [
+        {
+            "url": "/supplier",
+            "state": "supplier",
+            "abstract": true,
+            "component": "vn-supplier",
+            "description": "Suppliers"
+        }, {
+            "url": "/index?q",
+            "state": "supplier.index",
+            "component": "vn-supplier-index",
+            "description": "Suppliers"
+        }
+    ]
+}
--- a/modules/supplier/front/search-panel/index.html
+++ b/modules/supplier/front/search-panel/index.html
@ -0,0 +1,46 @@
+<div class="search-panel">
+    <form ng-submit="$ctrl.onSearch()">
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="General search"
+                ng-model="filter.search"
+                info="Search suppliers by id"
+                vn-focus>
+            </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-textfield
+                vn-one
+                label="Alias"
+                ng-model="filter.nickname">
+            </vn-textfield>
+            <vn-textfield
+                vn-one
+                label="Tax number"
+                ng-model="filter.nif">
+            </vn-textfield>
+        </vn-horizontal>
+        <vn-horizontal>
+            <vn-autocomplete
+                vn-one
+                label="Province"
+                ng-model="filter.provinceFk"
+                url="Provinces"
+                show-field="name"
+                value-field="id">
+            </vn-autocomplete>
+            <vn-autocomplete
+                vn-one
+                label="Country"
+                ng-model="filter.countryFk"
+                url="countries"
+                show-field="country"
+                value-field="id">
+            </vn-autocomplete>
+        </vn-horizontal>
+        <vn-horizontal class="vn-mt-lg">
+            <vn-submit label="Search"></vn-submit>
+        </vn-horizontal>
+    </form>
+</div>
--- a/modules/supplier/front/search-panel/index.js
+++ b/modules/supplier/front/search-panel/index.js
@ -0,0 +1,7 @@
+import ngModule from '../module';
+import SearchPanel from 'core/components/searchbar/search-panel';
+
+ngModule.vnComponent('vnSupplierSearchPanel', {
+    template: require('./index.html'),
+    controller: SearchPanel
+});
--- a/modules/supplier/front/search-panel/locale/es.yml
+++ b/modules/supplier/front/search-panel/locale/es.yml
@ -0,0 +1,3 @@
+Province: Provincia
+Country: País
+Tax number: Nif
--- a/modules/ticket/back/methods/ticket/restore.js
+++ b/modules/ticket/back/methods/ticket/restore.js
@ -0,0 +1,56 @@
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('restore', {
+        description: 'Restores a ticket within the first hour of deletion',
+        accessType: 'WRITE',
+        accepts: [{
+            arg: 'id',
+            type: 'Number',
+            required: true,
+            description: 'The ticket id',
+            http: {source: 'path'}
+        }],
+        returns: {
+            type: 'string',
+            root: true
+        },
+        http: {
+            path: `/:id/restore`,
+            verb: 'post'
+        }
+    });
+
+    Self.restore = async(ctx, id) => {
+        const models = Self.app.models;
+        const $t = ctx.req.__; // $translate
+        const ticket = await models.Ticket.findById(id, {
+            include: [{
+                relation: 'client',
+                scope: {
+                    fields: ['id', 'salesPersonFk']
+                }
+            }]
+        });
+
+        const now = new Date();
+        const maxDate = new Date(ticket.updated);
+        maxDate.setHours(maxDate.getHours() + 1);
+
+        if (now > maxDate)
+            throw new UserError(`You can only restore a ticket within the first hour after deletion`);
+
+        // Send notification to salesPerson
+        const salesPersonId = ticket.client().salesPersonFk;
+        if (salesPersonId) {
+            const origin = ctx.req.headers.origin;
+            const message = $t(`I have restored the ticket id`, {
+                id: id,
+                url: `${origin}/#!/ticket/${id}/summary`
+            });
+            await models.Chat.sendCheckingPresence(ctx, salesPersonId, message);
+        }
+
+        return ticket.updateAttribute('isDeleted', false);
+    };
+};
--- a/modules/ticket/back/methods/ticket/setDeleted.js
+++ b/modules/ticket/back/methods/ticket/setDeleted.js
@ -102,7 +102,7 @@ module.exports = Self => {
            }]
        });

-        // Change state to "fixing" if contains an stowaway and removed the link between them
+        // Change state to "fixing" if contains an stowaway and remove the link between them
        let otherTicketId;
        if (ticket.stowaway())
            otherTicketId = ticket.stowaway().shipFk;
@ -121,7 +121,7 @@ module.exports = Self => {
        const salesPersonUser = ticket.client().salesPersonUser();
        if (salesPersonUser) {
            const origin = ctx.req.headers.origin;
-            const message = $t(`Has deleted the ticket id`, {
+            const message = $t(`I have deleted the ticket id`, {
                id: id,
                url: `${origin}/#!/ticket/${id}/summary`
            });
--- a/modules/ticket/back/methods/ticket/specs/restore.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/restore.spec.js
@ -0,0 +1,71 @@
+const app = require('vn-loopback/server/server');
+const models = app.models;
+
+describe('ticket restore()', () => {
+    const employeeUser = 110;
+    const ctx = {
+        req: {
+            accessToken: {userId: employeeUser},
+            headers: {
+                origin: 'http://localhost:5000'
+            },
+            __: () => {}
+        }
+    };
+    let createdTicket;
+
+    beforeEach(async done => {
+        try {
+            const sampleTicket = await models.Ticket.findById(11);
+            sampleTicket.id = undefined;
+
+            createdTicket = await models.Ticket.create(sampleTicket);
+        } catch (error) {
+            console.error(error);
+        }
+
+        done();
+    });
+
+    afterEach(async done => {
+        try {
+            await models.Ticket.destroyById(createdTicket.id);
+        } catch (error) {
+            console.error(error);
+        }
+
+        done();
+    });
+
+    it('should throw an error if the given ticket has past the deletion time', async() => {
+        let error;
+
+        const now = new Date();
+        now.setHours(now.getHours() - 1);
+
+        try {
+            const ticket = await models.Ticket.findById(createdTicket.id);
+            await ticket.updateAttributes({isDeleted: true, updated: now});
+            await app.models.Ticket.restore(ctx, createdTicket.id);
+        } catch (e) {
+            error = e;
+        }
+
+        expect(error.message).toContain('You can only restore a ticket within the first hour after deletion');
+    });
+
+    it('should restore the ticket making its state no longer deleted', async() => {
+        const now = new Date();
+        const ticketBeforeUpdate = await models.Ticket.findById(createdTicket.id);
+        await ticketBeforeUpdate.updateAttributes({isDeleted: true, updated: now});
+
+        const ticketAfterUpdate = await models.Ticket.findById(createdTicket.id);
+
+        expect(ticketAfterUpdate.isDeleted).toBeTruthy();
+
+        await models.Ticket.restore(ctx, createdTicket.id);
+        const ticketAfterRestore = await models.Ticket.findById(createdTicket.id);
+
+        expect(ticketAfterRestore.isDeleted).toBeFalsy();
+    });
+});
--- a/modules/ticket/back/models/ticket.js
+++ b/modules/ticket/back/models/ticket.js
@ -14,6 +14,7 @@ module.exports = Self => {
    require('../methods/ticket/new')(Self);
    require('../methods/ticket/isEditable')(Self);
    require('../methods/ticket/setDeleted')(Self);
+    require('../methods/ticket/restore')(Self);
    require('../methods/ticket/getVAT')(Self);
    require('../methods/ticket/getSales')(Self);
    require('../methods/ticket/getSalesPersonMana')(Self);
--- a/modules/ticket/back/models/ticket.json
+++ b/modules/ticket/back/models/ticket.json
@ -34,8 +34,11 @@
        "packages": {
            "type": "Number"
        },
-        "created": {
-            "type": "Date"
+        "updated": {
+            "type": "Date", 
+            "mysql": {
+                "columnName": "created"
+            }
        },
        "isDeleted": {
            "type": "boolean"
--- a/modules/ticket/front/descriptor/index.html
+++ b/modules/ticket/front/descriptor/index.html
@ -28,6 +28,13 @@
            translate>
            Delete ticket
        </vn-item>
+        <vn-item
+            ng-click="restoreConfirmation.show()"
+            ng-show="$ctrl.canRestoreTicket"
+            name="restoreTicket"
+            translate>
+            Restore ticket
+        </vn-item>
        <vn-item
            ng-click="$ctrl.showChangeShipped()"
            ng-show="$ctrl.isEditable"
@ -239,6 +246,12 @@
    question="You are going to delete this ticket"
    message="This ticket will be removed from current route! Continue anyway?">
 </vn-confirm>
+<vn-confirm
+    vn-id="restoreConfirmation"
+    on-accept="$ctrl.restoreTicket()"
+    question="You are going to restore this ticket"
+    message="Are you sure you want to restore this ticket?">
+</vn-confirm>
 <vn-confirm
    vn-id="deleteStowaway"
    on-accept="$ctrl.deleteStowaway()"
--- a/modules/ticket/front/descriptor/index.js
+++ b/modules/ticket/front/descriptor/index.js
@ -44,6 +44,15 @@ class Controller extends Descriptor {
        return null;
    }

+    get canRestoreTicket() {
+        const isDeleted = this.ticket.isDeleted;
+        const now = new Date();
+        const maxDate = new Date(this.ticket.updated);
+        maxDate.setHours(maxDate.getHours() + 1);
+
+        return isDeleted && (now <= maxDate);
+    }
+
    isTicketEditable() {
        if (!this.ticket) return;
        this.$http.get(`Tickets/${this.id}/isEditable`).then(res => {
@ -86,7 +95,15 @@ class Controller extends Descriptor {
        return this.$http.post(`Tickets/${this.id}/setDeleted`)
            .then(() => {
                this.$state.go('ticket.index');
-                this.vnApp.showSuccess(this.$t('Ticket deleted'));
+                this.vnApp.showSuccess(this.$t('Ticket deleted. You can undo this action within the first hour'));
+            });
+    }
+
+    restoreTicket() {
+        return this.$http.post(`Tickets/${this.id}/restore`)
+            .then(() => {
+                this.vnApp.showSuccess(this.$t('Data saved!'));
+                this.cardReload();
            });
    }

@ -124,7 +141,7 @@ class Controller extends Descriptor {
    sendImportSms() {
        const params = {
            ticketId: this.id,
-            created: this.ticket.created
+            created: this.ticket.updated
        };
        this.showSMSDialog({
            message: this.$params.message || this.$t('Minimum is needed', params)
--- a/modules/ticket/front/descriptor/index.spec.js
+++ b/modules/ticket/front/descriptor/index.spec.js
@ -37,6 +37,29 @@ describe('Ticket Component vnTicketDescriptor', () => {
        controller = $componentController('vnTicketDescriptor', {$element: null}, {ticket});
    }));

+    describe('canRestoreTicket() getter', () => {
+        it('should return true for a ticket deleted within the last hour', () => {
+            controller.ticket.isDeleted = true;
+            controller.ticket.updated = new Date();
+
+            const result = controller.canRestoreTicket;
+
+            expect(result).toBeTruthy();
+        });
+
+        it('should return false for a ticket deleted more than one hour ago', () => {
+            const pastHour = new Date();
+            pastHour.setHours(pastHour.getHours() - 2);
+
+            controller.ticket.isDeleted = true;
+            controller.ticket.updated = pastHour;
+
+            const result = controller.canRestoreTicket;
+
+            expect(result).toBeFalsy();
+        });
+    });
+
    describe('addTurn()', () => {
        it('should make a query and call $.addTurn.hide() and vnApp.showSuccess()', () => {
            controller.$.addTurn = {hide: () => {}};
@ -64,6 +87,20 @@ describe('Ticket Component vnTicketDescriptor', () => {
        });
    });

+    describe('restoreTicket()', () => {
+        it('should make a query to restore the ticket and call vnApp.showSuccess()', () => {
+            jest.spyOn(controller, 'cardReload');
+            jest.spyOn(controller.vnApp, 'showSuccess');
+
+            $httpBackend.expectPOST(`Tickets/${ticket.id}/restore`).respond();
+            controller.restoreTicket();
+            $httpBackend.flush();
+
+            expect(controller.cardReload).toHaveBeenCalled();
+            expect(controller.vnApp.showSuccess).toHaveBeenCalled();
+        });
+    });
+
    describe('showDeliveryNote()', () => {
        it('should open a new window showing a delivery note PDF document', () => {
            jest.spyOn(controller.vnReport, 'show');
--- a/modules/ticket/front/descriptor/locale/es.yml
+++ b/modules/ticket/front/descriptor/locale/es.yml
@ -24,8 +24,11 @@ You are going to regenerate the invoice: Vas a regenerar la factura
 Are you sure you want to regenerate the invoice?: ¿Seguro que quieres regenerar la factura?
 Invoice sent for a regeneration, will be available in a few minutes: La factura ha sido enviada para ser regenerada, estará disponible en unos minutos
 Shipped hour updated: Hora de envio modificada
-Deleted ticket: Ticket eliminado 
+Deleted ticket: Ticket eliminado
 Recalculate components: Recalcular componentes
 Are you sure you want to recalculate the components?: ¿Seguro que quieres recalcular los componentes?
 SMS Minimum import: 'SMS Importe minimo'
-SMS Pending payment: 'SMS Pago pendiente'
+SMS Pending payment: 'SMS Pago pendiente'
+Restore ticket: Restaurar ticket
+You are going to restore this ticket: Vas a restaurar este ticket
+Are you sure you want to restore this ticket?: ¿Seguro que quieres restaurar el ticket?
--- a/modules/ticket/front/locale/es.yml
+++ b/modules/ticket/front/locale/es.yml
@ -59,7 +59,7 @@ Freezed: Congelado
 Risk: Riesgo
 Invoice: Factura
 You are going to delete this ticket: Vas a eliminar este ticket
-Ticket deleted: Ticket borrado
+Ticket deleted. You can undo this action within the first hour: Ticket eliminado. Puedes deshacer esta acción durante la primera hora
 Search ticket by id or alias: Buscar tickets por identificador o alias
 ticket: ticket

--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@ -363,7 +363,7 @@ class Controller extends Section {
        const notAvailables = items.join(', ');
        const params = {
            ticketFk: this.ticket.id,
-            created: this.ticket.created,
+            created: this.ticket.updated,
            notAvailables
        };
        this.newSMS = {