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

e2e/paths/ticket-module/13_create_ticket_services.spec.js

@@ -1,8 +1,7 @@
 import selectors from '../../helpers/selectors.js';
 import createNightmare from '../../helpers/nightmare';
 
-// Bug #961 ticket.service fallo en borrado
-xdescribe('Ticket services path', () => {
+describe('Ticket services path', () => {
     const nightmare = createNightmare();
 
     beforeAll(() => {
@@ -57,9 +56,17 @@ xdescribe('Ticket services path', () => {
         expect(result).toEqual('Reduced VAT');
     });
 
-    it('should delete the service and check there are none now', async() => {
+    it('should delete the service', async() => {
         const result = await nightmare
             .waitToClick(selectors.ticketService.fistDeleteServiceButton)
+            .waitToClick(selectors.ticketService.saveServiceButton)
+            .waitForLastSnackbar();
+
+        expect(result).toEqual('Data saved!');
+    });
+
+    it('should confirm the service was sucessfully removed', async() => {
+        const result = await nightmare
             .waitToClick(selectors.ticketBasicData.basicDataButton)
             .wait(selectors.ticketBasicData.clientAutocomplete)
             .click(selectors.ticketService.serviceButton)

modules/item/front/ticket-descriptor/index.spec.js

@@ -1,6 +1,6 @@
 import './index.js';
 
-describe('Item Component vnTicketDescriptor', () => {
+xdescribe('Item Component vnTicketDescriptor', () => {
     let $httpBackend;
     let controller;
 

modules/order/front/create/card.spec.js

@@ -1,6 +1,6 @@
 import './card.js';
 
-describe('Order', () => {
+xdescribe('Order', () => {
     describe('Component vnOrderCreateCard', () => {
         let controller;
         let $httpBackend;

modules/order/front/line/index.spec.js

@@ -1,6 +1,6 @@
 import './index.js';
 
-describe('Order', () => {
+xdescribe('Order', () => {
     describe('Component vnOrderLine', () => {
         let $state;
         let controller;
@@ -17,6 +17,7 @@ describe('Order', () => {
             controller.$scope.popover = {relocate: () => {}};
             controller.$scope.descriptor = {show: () => {}};
             controller.vnApp = {showSuccess: () => {}};
+            controller.card = {reload: () => {}};
         }));
 
         describe('getRows()', () => {
@@ -44,12 +45,19 @@ describe('Order', () => {
             });
         });
 
-        describe('removeRow()', () => {
-            it('should remove a row from rows and add his id to idsRemoved', () => {
-                controller.removeRow(0);
+        describe('deleteRow()', () => {
+            it('should remove a row from rows and add save the data if the response is ACCEPT', () => {
+                expect(controller.rows.length).toBe(1);
+                spyOn(controller.vnApp, 'showSuccess');
+                spyOn(controller, 'getVAT');
+                controller.deleteRow('ACCEPT');
 
+                $httpBackend.expectPOST(`/order/api/OrderRows/removes`).respond();
+                $httpBackend.flush();
+
+                expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
                 expect(controller.rows.length).toBe(0);
-                expect(controller.idsToRemove[0]).toBe(1);
+                expect(controller.idsToRemove).toBe(undefined);
             });
         });
 
@@ -74,16 +82,5 @@ describe('Order', () => {
                 expect(controller.$scope.popover.relocate).toHaveBeenCalledWith();
             });
         });
-
-        describe('save()', () => {
-            it('should make a query to remove the selected rows and call vnApp.showSuccess', () => {
-                spyOn(controller.vnApp, 'showSuccess');
-                $httpBackend.expectPOST(`/order/api/OrderRows/removes`).respond();
-                controller.save();
-                $httpBackend.flush();
-
-                expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
-            });
-        });
     });
 });

modules/ticket/front/expedition/index.html

@@ -35,7 +35,7 @@
                             <span
                                 ng-class="{'link pointer':expedition.itemFk}"
                                 ng-click="$ctrl.showDescriptor($event, expedition.itemFk)">
-                                {{("000000"+expedition.itemFk).slice(-6)}}
+                                {{expedition.itemFk | zeroFill:6}}
                             </span>
                         </vn-td>
                         <vn-td>{{::expedition.namePackage}}</vn-td>