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

5660-changeRolDeliveryAssistant #1607

Merged
carlossa merged 36 commits from 5660-changeRolDeliveryAssistant into dev 2023-09-20 11:04:32 +00:00
Conversation 0 Commits 36 Files Changed 22 +36 -36
21 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9870cc7b14 - Show all commits

2
db/changes/232601/00-deliveryAssistantACL.sql
View File

@ -1,7 +1,7 @@
-- Auto-generated SQL script #202306121356
UPDATE `account`.`role`
SET `description` = 'Asistente de envios'
WHERE `name` = 'deliveryAssist';
WHERE `name` = 'deliveryAssistant';

4
db/changes/232601/00-useSpecificsAcls.sql
View File

@ -3,11 +3,11 @@ INSERT INTO `salix`.`ACL` (`model`, `property`, `accessType`, `permission`, `pri
('Ticket', 'editDiscount', 'WRITE', 'ALLOW', 'ROLE', 'claimManager'),
('Ticket', 'editDiscount', 'WRITE', 'ALLOW', 'ROLE', 'salesPerson'),
('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'salesAssistant'),
('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'deliveryAssist'),
('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'deliveryAssistant'),
('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'buyer'),
('Ticket', 'isRoleAdvanced', '*', 'ALLOW', 'ROLE', 'claimManager'),
('Ticket', 'deleteTicketWithPartPrepared', 'WRITE', 'ALLOW', 'ROLE', 'salesAssistant'),
('Ticket', 'editZone', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssist'),
('Ticket', 'editZone', 'WRITE', 'ALLOW', 'ROLE', 'deliveryAssistant'),
('State', 'editableStates', 'READ', 'ALLOW', 'ROLE', 'employee'),
('State', 'seeEditableStates', 'READ', 'ALLOW', 'ROLE', 'administrative'),
('State', 'seeEditableStates', 'READ', 'ALLOW', 'ROLE', 'production'),

4
db/dump/dumpedFixtures.sql
View File

File diff suppressed because one or more lines are too long

2
e2e/paths/02-client/01_create_client.spec.js
View File

@ -8,7 +8,7 @@ describe('Client create path', () => {
beforeAll(async() => {
browser = await getBrowser();
page = browser.page;
await page.loginAndModule(' deliveryAssist', 'client');
await page.loginAndModule(' deliveryAssistant', 'client');
});
afterAll(async() => {

2
e2e/paths/03-worker/06_create.spec.js
View File

@ -45,7 +45,7 @@ describe('Worker create path', () => {
// should create a new worker and go to worker basic data'
await page.pickDate(selectors.workerCreate.birth, new Date(1962, 8, 5));
await page.autocompleteSearch(selectors.workerCreate.boss, 'deliveryAssist');
await page.autocompleteSearch(selectors.workerCreate.boss, 'deliveryAssistant');
await page.waitToClick(selectors.workerCreate.createButton);
message = await page.waitForSnackbar();
await page.waitForState('worker.card.basicData');

2
e2e/paths/11-zone/01_basic-data.spec.js
View File

@ -9,7 +9,7 @@ describe('Zone basic data path', () => {
browser = await getBrowser();
page = browser.page;
await page.loginAndModule('deliveryAssist',
await page.loginAndModule('deliveryAssistant',
'zone'); // turns up the zone module name and route aint the same lol
await page.accessToSearchResult('10');
await page.accessToSection('zone.card.basicData');

2
e2e/paths/11-zone/02_descriptor.spec.js
View File

@ -8,7 +8,7 @@ describe('Zone descriptor path', () => {
beforeAll(async() => {
browser = await getBrowser();
page = browser.page;
await page.loginAndModule('deliveryAssist', 'zone');
await page.loginAndModule('deliveryAssistant', 'zone');
await page.accessToSearchResult('13');
});

2
modules/client/front/address/create/index.html
View File

@ -68,7 +68,7 @@
icon="add_circle"
vn-tooltip="New postcode"
ng-click="postcode.open()"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
vn-acl-action="remove">
</vn-icon-button>
</append>

2
modules/client/front/address/edit/index.html
View File

@ -81,7 +81,7 @@
icon="add_circle"
vn-tooltip="New postcode"
ng-click="postcode.open()"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
vn-acl-action="remove">
</vn-icon-button>
</append>

2
modules/client/front/create/index.html
View File

@ -76,7 +76,7 @@
icon="add_circle"
vn-tooltip="New postcode"
ng-click="postcode.open()"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
vn-acl-action="remove">
</vn-icon-button>
</append>

2
modules/client/front/fiscal-data/index.html
View File

@ -92,7 +92,7 @@
icon="add_circle"
vn-tooltip="New postcode"
ng-click="postcode.open()"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
vn-acl-action="remove">
</vn-icon-button>
</append>

4
modules/client/front/postcode/index.html
View File

@ -27,7 +27,7 @@
icon="add_circle"
vn-tooltip="New city"
ng-click="city.open($event)"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
vn-acl-action="remove">
</vn-icon-button>
</append>
@ -45,7 +45,7 @@
icon="add_circle"
vn-tooltip="New province"
ng-click="province.open($event)"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
vn-acl-action="remove">
</vn-icon-button>
</append>

4
modules/route/front/descriptor/index.html
View File

@ -15,14 +15,14 @@
</vn-item>
<vn-item
ng-click="updateVolumeConfirmation.show()"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
vn-acl-action="remove"
translate>
Update volume
</vn-item>
<vn-item
ng-click="$ctrl.deleteCurrentRoute()"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
vn-acl-action="remove"
translate>
Delete route

2
modules/route/front/tickets/index.html
View File

@ -37,7 +37,7 @@
icon="format_list_numbered">
</vn-button>
<vn-button
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
vn-acl-action="remove"
disabled="!$ctrl.isChecked"
icon="sms"

2
modules/supplier/front/address/create/index.html
View File

@ -50,7 +50,7 @@
icon="add_circle"
vn-tooltip="New postcode"
ng-click="postcode.open()"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
vn-acl-action="remove">
</vn-icon-button>
</append>

2
modules/supplier/front/address/edit/index.html
View File

@ -48,7 +48,7 @@
icon="add_circle"
vn-tooltip="New postcode"
ng-click="postcode.open()"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
vn-acl-action="remove">
</vn-icon-button>
</append>

2
modules/supplier/front/fiscal-data/index.html
View File

@ -150,7 +150,7 @@
icon="add_circle"
vn-tooltip="New postcode"
ng-click="postcode.open()"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
vn-acl-action="remove">
</vn-icon-button>
</append>

2
modules/worker/front/create/index.html
View File

@ -72,7 +72,7 @@
icon="add_circle"
vn-tooltip="New postcode"
ng-click="postcode.open()"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
vn-acl-action="remove">
</vn-icon-button>
</append>

22
modules/zone/front/basic-data/index.html
View File

@ -14,7 +14,7 @@
<vn-textfield
label="Name"
ng-model="$ctrl.zone.name"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
rule>
</vn-textfield>
</vn-horizontal>
@ -26,7 +26,7 @@
show-field="name"
value-field="id"
label="Agency"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
rule>
</vn-autocomplete>
<vn-input-number
@ -34,7 +34,7 @@
label="Max m³"
ng-model="$ctrl.zone.itemMaxSize"
min="0"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
rule>
</vn-input-number>
<vn-input-number
@ -42,7 +42,7 @@
label="Maximum m³"
ng-model="$ctrl.zone.m3Max"
min="0"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
rule>
</vn-input-number>
</vn-horizontal>
@ -52,13 +52,13 @@
ng-model="$ctrl.zone.travelingDays"
min="0"
step="1"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
rule>
</vn-input-number>
<vn-input-time
label="Closing"
ng-model="$ctrl.zone.hour"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
rule>
</vn-input-time>
</vn-horizontal>
@ -68,14 +68,14 @@
ng-model="$ctrl.zone.price"
min="0"
step="0.01"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
rule>
</vn-input-number>
<vn-input-number
label="Bonus"
ng-model="$ctrl.zone.bonus"
step="0.01"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
rule>
</vn-input-number>
</vn-horizontal>
@ -86,14 +86,14 @@
ng-model="$ctrl.zone.inflation"
min="0"
step="0.01"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
rule>
</vn-input-number>
<vn-check
vn-one
label="Volumetric"
ng-model="$ctrl.zone.isVolumetric"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
rule>
</vn-check>
</vn-horizontal>
@ -101,7 +101,7 @@
<vn-button-bar>
<vn-submit
disabled="!watcher.dataChanged()"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
label="Save">
</vn-submit>
<vn-button

4
modules/zone/front/index/index.html
View File

@ -32,7 +32,7 @@
vn-click-stop="clone.show(zone)"
vn-tooltip="Clone"
icon="icon-clone"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
vn-acl-action="remove">
</vn-icon-button>
<vn-icon-button
@ -62,7 +62,7 @@
fixed-bottom-right>
<vn-float-button
icon="add"
vn-acl="deliveryAssist"
vn-acl="deliveryAssistant"
vn-acl-action="remove">
</vn-float-button>
</a>

2
modules/zone/front/location/index.html
View File

@ -16,7 +16,7 @@
root-label="Locations"
fetch-func="$ctrl.onFetch($item)"
sort-func="$ctrl.onSort($a, $b)">
<vn-check acl-role="deliveryAssist"
<vn-check acl-role="deliveryAssistant"
ng-model="item.selected"
on-change="$ctrl.onSelection(value, item)"
triple-state="true"