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

client/client/src/address-edit/address-edit.html

@@ -15,7 +15,11 @@
         <vn-title>Address</vn-title>
         <vn-horizontal>
             <vn-check vn-one label="Enabled" field="$ctrl.address.isActive"></vn-check>
-            <vn-check vn-one label="Is equalizated" field="$ctrl.address.isEqualizated" vn-acl="administrative"></vn-check> 
+            <vn-check
+                vn-one label="Is equalizated"
+                field="$ctrl.address.isEqualizated"
+                vn-acl="administrative, salesAssistant">
+            </vn-check> 
         </vn-horizontal>
         <vn-horizontal>
             <vn-textfield vn-one label="Consignee" field="$ctrl.address.nickname" vn-focus></vn-textfield>

client/client/src/billing-data/billing-data.html

@@ -10,30 +10,50 @@
         <vn-title>Pay method</vn-title>
         <vn-horizontal>
             <vn-autocomplete vn-two
-                vn-acl="administrative"
+                vn-acl="administrative, salesAssistant"
                 field="$ctrl.client.payMethodFk"
                 url="/client/api/PayMethods"
                 select-fields="ibanRequired"
                 initial-data="$ctrl.client.payMethod"
                 label="Pay method">
             </vn-autocomplete>
-            <vn-textfield vn-two label="IBAN" field="$ctrl.client.iban" vn-acl="administrative"></vn-textfield>
+            <vn-textfield
-            <vn-textfield vn-one label="Due day" field="$ctrl.client.dueDay" vn-acl="administrative"></vn-textfield>
+                vn-two label="IBAN"
+                field="$ctrl.client.iban"
+                vn-acl="administrative, salesAssistant">
+            </vn-textfield>
+            <vn-textfield
+                vn-one label="Due day"
+                field="$ctrl.client.dueDay"
+                vn-acl="administrative, salesAssistant">
+            </vn-textfield>
         </vn-horizontal>
         <vn-horizontal margin-medium-bottom>
             <vn-one>
-                <vn-check label="Received core VNH" field="$ctrl.client.hasCoreVnh" vn-acl="administrative"></vn-check>
+                <vn-check
+                    label="Received core VNH"
+                    field="$ctrl.client.hasCoreVnh"
+                    vn-acl="administrative, salesAssistant">
+                </vn-check>
             </vn-one>
             <vn-one>
-                <vn-check label="Received core VNL" field="$ctrl.client.hasCoreVnl" vn-acl="administrative"></vn-check>
+                <vn-check
+                    label="Received core VNL"
+                    field="$ctrl.client.hasCoreVnl"
+                    vn-acl="administrative, salesAssistant">
+                </vn-check>
             </vn-one>
             <vn-one>
-                <vn-check label="Received B2B VNL" field="$ctrl.client.hasSepaVnl" vn-acl="administrative"></vn-check>
+                <vn-check
+                    label="Received B2B VNL"
+                    field="$ctrl.client.hasSepaVnl"
+                    vn-acl="administrative, salesAssistant">
+                </vn-check>
             </vn-one>
         </vn-horizontal>
     </vn-card>
     <vn-button-bar>
-        <vn-submit label="Save" vn-acl="administrative"></vn-submit>
+        <vn-submit label="Save" vn-acl="administrative, salesAssistant"></vn-submit>
     </vn-button-bar>
 </form>
 <vn-confirm

client/client/src/descriptor/descriptor.spec.js

@@ -17,7 +17,7 @@ describe('Descriptor', () => {
         }));
 
         describe('_getClientDebt()', () => {
-            it(`should call _getClientDebt() and define the client.debt value on the controller`, () => {
+            it(`should call _getClientDebt() and define the clientDebt value on the controller`, () => {
                 controller.client = {};
                 let response = {debt: 100};
                 $httpBackend.whenGET(`/client/api/Clients/101/getDebt`).respond(response);
@@ -25,7 +25,7 @@ describe('Descriptor', () => {
                 controller._getClientDebt(101);
                 $httpBackend.flush();
 
-                expect(controller.client.debt).toEqual(100);
+                expect(controller.clientDebt).toEqual(100);
             });
         });
 

client/client/src/fiscal-data/fiscal-data.html

@@ -14,21 +14,21 @@
                 vn-focus
                 label="Social name"
                 field="$ctrl.client.socialName"
-                vn-acl="administrative, salesPerson"
+                vn-acl="administrative, salesAssistant, salesPerson"
                 acl-conditional-to-salesPerson="{{!$ctrl.client.isTaxDataChecked}}">
             </vn-textfield>
             <vn-textfield
                 vn-one
                 label="Tax number"
                 field="$ctrl.client.fi"
-                vn-acl="administrative, salesPerson"
+                vn-acl="administrative, salesAssistant, salesPerson"
                 acl-conditional-to-salesPerson="{{!$ctrl.client.isTaxDataChecked}}">
             </vn-textfield>
             <vn-check
                 vn-one
                 label="Is equalizated"
                 field="$ctrl.client.isEqualizated"
-                vn-acl="administrative, salesPerson"
+                vn-acl="administrative, salesAssistant, salesPerson"
                 acl-conditional-to-salesPerson="{{!$ctrl.client.isTaxDataChecked}}">
             </vn-check>
         </vn-horizontal>
@@ -37,14 +37,14 @@
                 vn-two
                 label="Street"
                 field="$ctrl.client.street"
-                vn-acl="administrative, salesPerson"
+                vn-acl="administrative, salesAssistant, salesPerson"
                 acl-conditional-to-salesPerson="{{!$ctrl.client.isTaxDataChecked}}">
             </vn-textfield>
             <vn-textfield
                 vn-one
                 label="City"
                 field="$ctrl.client.city"
-                vn-acl="administrative, salesPerson"
+                vn-acl="administrative, salesAssistant, salesPerson"
                 acl-conditional-to-salesPerson="{{!$ctrl.client.isTaxDataChecked}}">
             </vn-textfield> 
         </vn-horizontal>
@@ -53,7 +53,7 @@
                 vn-one
                 label="Postcode"
                 field="$ctrl.client.postcode"
-                vn-acl="administrative, salesPerson"
+                vn-acl="administrative, salesAssistant, salesPerson"
                 acl-conditional-to-salesPerson="{{!$ctrl.client.isTaxDataChecked}}">
             </vn-textfield>
             <vn-autocomplete
@@ -64,7 +64,7 @@
                 show-field="name"
                 value-field="id"
                 label="Province"
-                vn-acl="administrative, salesPerson"
+                vn-acl="administrative, salesAssistant, salesPerson"
                 acl-conditional-to-salesPerson="{{!$ctrl.client.isTaxDataChecked}}">
             </vn-autocomplete>
             <vn-autocomplete
@@ -75,7 +75,7 @@
                 show-field="country"
                 value-field="id"
                 label="Country"
-                vn-acl="administrative, salesPerson"
+                vn-acl="administrative, salesAssistant, salesPerson"
                 acl-conditional-to-salesPerson="{{!$ctrl.client.isTaxDataChecked}}">
             </vn-autocomplete>
         </vn-horizontal>
@@ -84,21 +84,21 @@
                 vn-one
                 label="Active"
                 field="$ctrl.client.isActive"
-                vn-acl="administrative, salesPerson"
+                vn-acl="administrative, salesAssistant, salesPerson"
                 acl-conditional-to-salesPerson="{{!$ctrl.client.isTaxDataChecked}}">
             </vn-check>
             <vn-check
                 vn-one
                 label="Invoice by address"
                 field="$ctrl.client.hasToInvoiceByAddress"
-                vn-acl="administrative, salesPerson"
+                vn-acl="administrative, salesAssistant, salesPerson"
                 acl-conditional-to-salesPerson="{{!$ctrl.client.isTaxDataChecked}}">
             </vn-check>
             <vn-check
                 vn-one
                 label="Verified data"
                 field="$ctrl.client.isTaxDataChecked"
-                vn-acl="administrative">
+                vn-acl="administrative, salesAssistant, salesAssistant">
             </vn-check>
         </vn-horizontal>
         <vn-horizontal>
@@ -106,21 +106,21 @@
                 vn-one
                 label="Has to invoice"
                 field="$ctrl.client.hasToInvoice"
-                vn-acl="administrative, salesPerson"
+                vn-acl="administrative, salesAssistant, salesPerson"
                 acl-conditional-to-salesPerson="{{!$ctrl.client.isTaxDataChecked}}">
             </vn-check>
             <vn-check
                 vn-one
                 label="Invoice by mail"
                 field="$ctrl.client.isToBeMailed"
-                vn-acl="administrative, salesPerson"
+                vn-acl="administrative, salesAssistant, salesPerson"
                 acl-conditional-to-salesPerson="{{!$ctrl.client.isTaxDataChecked}}">
             </vn-check>
             <vn-check
                 vn-one
                 label="Vies"
                 field="$ctrl.client.isVies"
-                vn-acl="administrative, salesPerson"
+                vn-acl="administrative, salesAssistant, salesPerson"
                 acl-conditional-to-salesPerson="{{!$ctrl.client.isTaxDataChecked}}">
             </vn-check>
         </vn-horizontal>
@@ -128,7 +128,7 @@
     <vn-button-bar>
         <vn-submit
             label="Save"
-            vn-acl="administrative, salesPerson"
+            vn-acl="administrative, salesAssistant, salesPerson"
             acl-conditional-to-salesPerson="{{!$ctrl.client.isTaxDataChecked}}">
         </vn-submit>
     </vn-button-bar>

client/item/src/descriptor/item-descriptor.html

@@ -18,7 +18,7 @@
                 <vn-float-button
                     icon="edit" 
                     style="position: absolute; margin: 1em; bottom: 0; right: 0;" 
-                    vn-visible-by="administrative">
+                    vn-visible-by="administrative, salesAssistant">
                 </vn-float-button>
             </a>
         </vn-auto>

e2e/paths/client-module/12_lock_of_verified_data.spec.js

@@ -280,4 +280,193 @@ describe('lock verified data path', () => {
             });
         });
     });
+
+    describe('as salesAssistant', () => {
+        beforeAll(() => {
+            return nightmare
+            .waitToClick(selectors.globalItems.logOutButton)
+            .waitForLogin('salesAssistant');
+        });
+
+        it('should navigate to clients index', () => {
+            return nightmare
+            .waitToClick(selectors.globalItems.applicationsMenuButton)
+            .wait(selectors.globalItems.applicationsMenuVisible)
+            .waitToClick(selectors.globalItems.clientsButton)
+            .wait(selectors.clientsIndex.createClientButton)
+            .parsedUrl()
+            .then(url => {
+                expect(url.hash).toEqual('#!/clients');
+            });
+        });
+
+        it('should search again for the user Petter Parker', () => {
+            return nightmare
+            .wait(selectors.clientsIndex.searchResult)
+            .type(selectors.clientsIndex.searchClientInput, 'Petter Parker')
+            .click(selectors.clientsIndex.searchButton)
+            .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1)
+            .countSearchResults(selectors.clientsIndex.searchResult)
+            .then(result => {
+                expect(result).toEqual(1);
+            });
+        });
+
+        it(`should click on the search result to access to the Petter Parkers fiscal data`, () => {
+            return nightmare
+            .waitForTextInElement(selectors.clientsIndex.searchResult, 'Petter Parker')
+            .waitToClick(selectors.clientsIndex.searchResult)
+            .waitToClick(selectors.clientFiscalData.fiscalDataButton)
+            .waitForURL('fiscal-data')
+            .parsedUrl()
+            .then(url => {
+                expect(url.hash).toContain('fiscal-data');
+            });
+        });
+
+        it(`should click on the fiscal data button`, () => {
+            return nightmare
+            .waitToClick(selectors.clientFiscalData.fiscalDataButton)
+            .waitForURL('fiscal-data')
+            .parsedUrl()
+            .then(url => {
+                expect(url.hash).toContain('fiscal-data');
+            });
+        });
+
+        it('should confirm verified data button is enabled for salesAssistant', () => {
+            return nightmare
+            .wait(selectors.clientFiscalData.verifiedDataCheckboxInput)
+            .evaluate(selector => {
+                return document.querySelector(selector).className;
+            }, 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-main-block > vn-horizontal > vn-one > vn-vertical > vn-client-fiscal-data > form > vn-card > div > vn-horizontal:nth-child(5) > vn-check:nth-child(3) > label')
+            .then(result => {
+                expect(result).not.toContain('is-disabled');
+            });
+        });
+
+        it('should uncheck the Verified data checkbox', () => {
+            return nightmare
+            .waitToClick(selectors.clientFiscalData.verifiedDataCheckboxInput)
+            .waitToClick(selectors.clientFiscalData.saveButton)
+            .waitForSnackbar()
+            .then(result => {
+                expect(result).toEqual('Data saved!');
+            });
+        });
+
+        it('should confirm Verified data checkbox is unchecked', () => {
+            return nightmare
+            .waitToClick(selectors.clientBasicData.basicDataButton)
+            .wait(selectors.clientBasicData.nameInput)
+            .waitToClick(selectors.clientFiscalData.fiscalDataButton)
+            .wait(selectors.clientFiscalData.verifiedDataCheckboxInput)
+            .evaluate(selector => {
+                return document.querySelector(selector).checked;
+            }, selectors.clientFiscalData.verifiedDataCheckboxInput)
+            .then(value => {
+                expect(value).toBeFalsy();
+            });
+        });
+
+        it('should again edit the social name', () => {
+            return nightmare
+            .wait(selectors.clientFiscalData.socialNameInput)
+            .clearInput(selectors.clientFiscalData.socialNameInput)
+            .type(selectors.clientFiscalData.socialNameInput, 'salesAssistant was here')
+            .click(selectors.clientFiscalData.saveButton)
+            .waitForSnackbar()
+            .then(result => {
+                expect(result).toEqual('Data saved!');
+            });
+        });
+
+        it('should confirm the social name have been edited once and for all', () => {
+            return nightmare
+            .waitToClick(selectors.clientBasicData.basicDataButton)
+            .wait(selectors.clientBasicData.nameInput)
+            .waitToClick(selectors.clientFiscalData.fiscalDataButton)
+            .wait(selectors.clientFiscalData.socialNameInput)
+            .getInputValue(selectors.clientFiscalData.socialNameInput)
+            .then(result => {
+                expect(result).toEqual('salesAssistant was here');
+            });
+        });
+    });
+
+    describe('as salesPerson third run', () => {
+        beforeAll(() => {
+            return nightmare
+            .waitToClick(selectors.globalItems.logOutButton)
+            .waitForLogin('salesPerson');
+        });
+
+        it('should again click on the Clients button of the top bar menu', () => {
+            return nightmare
+            .waitToClick(selectors.globalItems.applicationsMenuButton)
+            .wait(selectors.globalItems.applicationsMenuVisible)
+            .waitToClick(selectors.globalItems.clientsButton)
+            .wait(selectors.clientsIndex.createClientButton)
+            .parsedUrl()
+            .then(url => {
+                expect(url.hash).toEqual('#!/clients');
+            });
+        });
+
+        it('should once again search for the user Petter Parker', () => {
+            return nightmare
+            .wait(selectors.clientsIndex.searchResult)
+            .type(selectors.clientsIndex.searchClientInput, 'Petter Parker')
+            .click(selectors.clientsIndex.searchButton)
+            .waitForNumberOfElements(selectors.clientsIndex.searchResult, 1)
+            .countSearchResults(selectors.clientsIndex.searchResult)
+            .then(result => {
+                expect(result).toEqual(1);
+            });
+        });
+
+        it(`should click on the search result to access to the client's fiscal data`, () => {
+            return nightmare
+            .waitForTextInElement(selectors.clientsIndex.searchResult, 'Petter Parker')
+            .waitToClick(selectors.clientsIndex.searchResult)
+            .waitToClick(selectors.clientFiscalData.fiscalDataButton)
+            .waitForURL('fiscal-data')
+            .parsedUrl()
+            .then(url => {
+                expect(url.hash).toContain('fiscal-data');
+            });
+        });
+
+        it(`should click on the fiscal data button to start editing`, () => {
+            return nightmare
+            .waitToClick(selectors.clientFiscalData.fiscalDataButton)
+            .waitForURL('fiscal-data')
+            .parsedUrl()
+            .then(url => {
+                expect(url.hash).toContain('fiscal-data');
+            });
+        });
+
+        it('should confirm verified data button is enabled once again', () => {
+            return nightmare
+            .wait(selectors.clientFiscalData.verifiedDataCheckboxInput)
+            .evaluate(selector => {
+                return document.querySelector(selector).className;
+            }, 'body > vn-app > vn-vertical > vn-vertical > vn-client-card > vn-main-block > vn-horizontal > vn-one > vn-vertical > vn-client-fiscal-data > form > vn-card > div > vn-horizontal:nth-child(5) > vn-check:nth-child(3) > label')
+            .then(result => {
+                expect(result).toContain('is-disabled');
+            });
+        });
+
+        it('should confirm the form is enabled for salesPerson', () => {
+            return nightmare
+            .wait(selectors.clientFiscalData.socialNameInput)
+            .evaluate(selector => {
+                return document.querySelector(selector).className;
+            }, 'vn-textfield[field="$ctrl.client.socialName"] > div')
+            .then(result => {
+                expect(result).not.toContain('is-disabled');
+            });
+        });
+    });
 });

gulpfile.js

@@ -63,11 +63,11 @@ gulp.task('services-only', async () => {
 /**
  * Runs the e2e tests, restoring the fixtures first.
  */
-gulp.task('e2e', ['docker-rebuild'], async () => {
+gulp.task('e2e', ['docker'], async () => {
     await runSequenceP('e2e-only');
 });
 
-gulp.task('smokes', ['docker-rebuild'], async () => {
+gulp.task('smokes', ['docker'], async () => {
     await runSequenceP('smokes-only');
 });
 
@@ -416,7 +416,7 @@ gulp.task('docker', async () => {
  * Does the minium effort to start the docker, if it doesn't exists calls
  * the 'docker-run' task, if it is started does nothing. Keep in mind that when
  * you do not rebuild the docker you may be using an outdated version of it.
- * See the 'docker-rebuild' task for more info.
+ * See the 'docker' task for more info.
  */
 gulp.task('docker-start', async () => {
     let state;