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

This commit is contained in:
Jorge Padawan 2021-01-12 11:10:05 +01:00
commit 6bc7602d53
21 changed files with 392 additions and 34 deletions

View File

@ -73,6 +73,21 @@ ui-view > .vn-summary {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
position: relative;
span {
display: block;
}
a {
color: $color-font;
}
}
h4 span:after {
font-family: 'Material Icons';
content: 'open_in_new';
position: absolute;
right: 5px;
text-transform: none;
color: $color-spacer
}
& > * {
margin: $spacing-sm;

View File

@ -52,6 +52,7 @@ Suppliers: Proveedores
Summary: Vista previa
Basic data: Datos básicos
List: Listado
Go to: Ir a
# Misc

View File

@ -1,6 +1,7 @@
<vn-card class="summary">
<h5>
<a ng-if="::summary.id"
<a
ng-if="::summary.id"
vn-tooltip="Go to the user"
ui-sref="account.card.summary({id: {{::summary.id}}})"
name="goToSummary">
@ -10,7 +11,18 @@
</h5>
<vn-horizontal class="vn-pa-md">
<vn-one>
<h4 translate>Basic data</h4>
<h4 ng-show="$ctrl.isHr">
<a
ui-sref="account.card.basicData({id:summary.id})"
target="_self">
<span translate vn-tooltip="Go to">Basic Data</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isHr">
Basic Data
</h4>
<vn-label-value
label="Id"
value="{{summary.id}}">

View File

@ -18,6 +18,9 @@ class Controller extends Summary {
this.$http.get(`Accounts/${value.id}`, {filter})
.then(res => this.$.summary = res.data);
}
get isHr() {
return this.aclService.hasAny(['hr']);
}
get user() {
return this._user;

View File

@ -4,7 +4,8 @@
</vn-crud-model>
<vn-card class="summary">
<h5>
<a ng-if="::$ctrl.summary.claim.id"
<a
ng-if="::$ctrl.summary.claim.id"
vn-tooltip="Go to the claim"
ui-sref="claim.card.summary({id: {{::$ctrl.summary.claim.id}}})"
name="goToSummary">
@ -54,7 +55,18 @@
</vn-range>
</vn-one>
<vn-auto>
<h4 translate>Detail</h4>
<h4 ng-show="$ctrl.isSalesPerson">
<a
ui-sref="claim.card.detail({id:$ctrl.claim.id})"
target="_self">
<span translate vn-tooltip="Go to">Detail</span>
</a>
</h4>
<h4
ng-show="!$ctrl.isSalesPerson"
translate>
Detail
</h4>
<vn-data-viewer data="::$ctrl.summary.salesClaimed">
<vn-table>
<vn-thead>
@ -105,7 +117,18 @@
</vn-horizontal>
</vn-auto>
<vn-auto>
<h4 translate>Development</h4>
<h4 ng-show="$ctrl.isClaimManager">
<a
ui-sref="claim.card.development({id:$ctrl.claim.id})"
target="_self">
<span translate vn-tooltip="Go to">Development</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isClaimManager">
Development
</h4>
<vn-data-viewer data="::$ctrl.summary.developments">
<vn-table>
<vn-thead>
@ -136,7 +159,18 @@
</vn-data-viewer>
</vn-auto>
<vn-auto>
<h4 translate>Action</h4>
<h4 ng-show="$ctrl.isClaimManager">
<a
ui-sref="claim.card.action({id:$ctrl.claim.id})"
target="_self">
<span translate vn-tooltip="Go to">Action</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isClaimManager">
Action
</h4>
<vn-data-viewer data="::$ctrl.summary.actions">
<vn-table>
<vn-thead>

View File

@ -13,6 +13,14 @@ class Controller extends Summary {
this.getSummary();
}
get isSalesPerson() {
return this.aclService.hasAny(['salesPerson']);
}
get isClaimManager() {
return this.aclService.hasAny(['claimManager']);
}
get claim() {
return this._claim;
}

View File

@ -12,7 +12,18 @@
</h5>
<vn-horizontal>
<vn-one>
<h4 translate>Basic data</h4>
<h4 ng-show="$ctrl.isEmployee">
<a
ui-sref="client.card.basicData({id:$ctrl.client.id})"
target="_self">
<span translate vn-tooltip="Go to">Basic data</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isEmployee">
Basic data
</h4>
<vn-label-value label="Id"
value="{{$ctrl.summary.id}}">
</vn-label-value>
@ -43,7 +54,18 @@
</vn-label-value>
</vn-one>
<vn-one>
<h4 translate>Fiscal address</h4>
<h4 ng-show="$ctrl.isEmployee">
<a
ui-sref="client.card.fiscalData({id:$ctrl.client.id})"
target="_self">
<span translate vn-tooltip="Go to">Fiscal address</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isEmployee">
Fiscal address
</h4>
<vn-label-value label="Social name"
value="{{$ctrl.summary.socialName}}">
</vn-label-value>
@ -67,7 +89,18 @@
</vn-label-value>
</vn-one>
<vn-one>
<h4 translate>Fiscal data</h4>
<h4 ng-show="$ctrl.isEmployee">
<a
ui-sref="client.card.fiscalData({id:$ctrl.client.id})"
target="_self">
<span translate vn-tooltip="Go to">Fiscal data</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isEmployee">
Fiscal data
</h4>
<vn-vertical>
<vn-check
label="Is equalizated"
@ -107,7 +140,18 @@
</vn-vertical>
</vn-one>
<vn-one>
<h4 translate>Billing data</h4>
<h4 ng-show="$ctrl.isEmployee">
<a
ui-sref="client.card.billingData({id:$ctrl.client.id})"
target="_self">
<span translate vn-tooltip="Go to">Billing data</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isEmployee">
Billing data
</h4>
<vn-label-value label="Pay method"
value="{{$ctrl.summary.payMethod.name}}">
</vn-label-value>
@ -136,7 +180,18 @@
</vn-vertical>
</vn-one>
<vn-one>
<h4 translate>Default address</h4>
<h4 ng-show="$ctrl.isEmployee">
<a
ui-sref="client.card.address.index({id:$ctrl.client.id})"
target="_self">
<span translate vn-tooltip="Go to">Address</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isEmployee">
Address
</h4>
<vn-label-value label="Name"
value="{{$ctrl.summary.defaultAddress.nickname}}">
</vn-label-value>
@ -148,7 +203,17 @@
</vn-label-value>
</vn-one>
<vn-one>
<h4 translate>Web access</h4>
<h4 ng-show="$ctrl.isEmployee">
<a
ui-sref="client.card.webAccess({id:$ctrl.client.id})"
target="_self">
<span translate vn-tooltip="Go to">Web access</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isEmployee">Web access
</h4>
<vn-label-value label="User"
value="{{$ctrl.summary.account.name}}">
</vn-label-value>

View File

@ -18,6 +18,9 @@ class Controller extends Summary {
}
});
}
get isEmployee() {
return this.aclService.hasAny(['employee']);
}
sumRisk() {
let total = 0;

View File

@ -7,6 +7,7 @@ Secured credit: Crédito asegurado
Average invoiced: Consumo medio
Sales person: Comercial
Recovery: Recobro
Basic data: Datos básicos
Balance due: Saldo vencido
Rate: Tarifa
Business data: Datos comerciales

View File

@ -25,7 +25,18 @@
</vn-horizontal>
</vn-one>
<vn-one name="basicData">
<h4 translate>Basic data</h4>
<h4 ng-show="$ctrl.isBuyer">
<a
ui-sref="item.card.basicData({id:$ctrl.item.id})"
target="_self">
<span translate vn-tooltip="Go to">Basic data</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isBuyer">
Basic data
</h4>
<vn-label-value label="Name"
value="{{$ctrl.summary.item.name}}">
</vn-label-value>
@ -53,7 +64,18 @@
</vn-label-value>
</vn-one>
<vn-one name="otherData">
<h4 translate>Other data</h4>
<h4 ng-show="$ctrl.isBuyer">
<a
ui-sref="item.card.basicData({id:$ctrl.item.id})"
target="_self">
<span translate vn-tooltip="Go to">Other data</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isBuyer">
Other data
</h4>
<vn-label-value label="Intrastat code"
value="{{$ctrl.summary.item.intrastat.id}}">
</vn-label-value>
@ -77,7 +99,18 @@
</vn-label-value>
</vn-one>
<vn-one name="tags">
<h4 translate>Tags</h4>
<h4 ng-show="$ctrl.isBuyer || $ctrl.isReplenisher">
<a
ui-sref="item.card.tags({id:$ctrl.item.id})"
target="_self">
<span translate vn-tooltip="Go to">Tags</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isBuyer || !$ctrl.isReplenisher">
Tags
</h4>
<vn-label-value
label="{{tag.priority}} {{tag.tag.name}}"
ng-repeat="tag in $ctrl.summary.tags track by tag.id"
@ -85,21 +118,54 @@
</vn-label-value>
</vn-one>
<vn-one name="tax">
<h4 translate>Tax</h4>
<h4 ng-show="$ctrl.isBuyer || $ctrl.isAdministrative">
<a
ui-sref="item.card.tax({id:$ctrl.item.id})"
target="_self">
<span translate vn-tooltip="Go to">Tax</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isBuyer || !$ctrl.isAdministrative">
Tax
</h4>
<vn-label-value label="{{tax.country.country}}"
ng-repeat="tax in $ctrl.summary.item.taxes"
value="{{tax.taxClass.description}}">
</vn-label-value>
</vn-one>
<vn-one name="niche">
<h4 translate>Niche</h4>
<h4 ng-show="$ctrl.isBuyer || $ctrl.isReplenisher">
<a
ui-sref="item.card.niche({id:$ctrl.item.id})"
target="_self">
<span translate vn-tooltip="Go to">Niche</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isBuyer || !$ctrl.isReplenisher">
Niche
</h4>
<vn-label-value label="{{niche.warehouse.name}}"
ng-repeat="niche in $ctrl.summary.niches"
value="{{niche.code}}">
</vn-label-value>
</vn-one>
<vn-one name="botanical">
<h4 translate>Botanical</h4>
<h4 ng-show="$ctrl.isBuyer">
<a
ui-sref="item.card.botanical({id:$ctrl.item.id})"
target="_self">
<span translate vn-tooltip="Go to">Botanical</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isBuyer">
Botanical
</h4>
<vn-label-value label="Botanical"
value="{{$ctrl.summary.botanical.botanical}}">
</vn-label-value>
@ -111,7 +177,18 @@
</vn-label-value>
</vn-one>
<vn-one name="barcode">
<h4 translate>Barcode</h4>
<h4 ng-show="$ctrl.isBuyer || $ctrl.isReplenisher">
<a
ui-sref="item.card.itemBarcode({id:$ctrl.item.id})"
target="_self">
<span translate vn-tooltip="Go to">Barcode</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isBuyer || !$ctrl.isReplenisher">
Barcode
</h4>
<p ng-repeat="barcode in $ctrl.summary.item.itemBarcode track by $index">
<b>{{barcode.code}}</b>
</p>

View File

@ -13,6 +13,22 @@ class Controller extends Summary {
if (this.item && this.item.id)
this.getSummary();
}
get isBuyer() {
return this.aclService.hasAny(['buyer']);
}
get isReplenisher() {
return this.aclService.hasAny(['replenisher']);
}
get isAdministrative() {
return this.aclService.hasAny(['administrative']);
}
get isEmployee() {
return this.aclService.hasAny(['employee']);
}
}
ngModule.vnComponent('vnItemSummary', {

View File

@ -61,7 +61,18 @@
</vn-textarea>
</vn-one>
<vn-auto>
<h4 translate>Ticket</h4>
<h4 ng-show="$ctrl.isDelivery">
<a
ui-sref="route.card.tickets({id:$ctrl.route.id})"
target="_self">
<span translate vn-tooltip="Go to">Ticket</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isDelivery">
Ticket
</h4>
<vn-table model="model">
<vn-thead>
<vn-tr>

View File

@ -16,6 +16,10 @@ class Controller extends Summary {
});
}
get isDelivery() {
return this.aclService.hasAny(['delivery']);
}
get route() {
return this._route;
}

View File

@ -10,7 +10,18 @@
</h5>
<vn-horizontal>
<vn-one>
<h4 translate>Basic data</h4>
<h4 ng-show="$ctrl.isAdministrative">
<a
ui-sref="supplier.card.basicData({id:$ctrl.supplier.id})"
target="_self">
<span translate vn-tooltip="Go to">Basic data</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isAdministrative">
Basic data
</h4>
<vn-vertical>
<vn-label-value
label="Id"
@ -37,7 +48,18 @@
</vn-vertical>
</vn-one>
<vn-one>
<h4 translate>Billing data</h4>
<h4 ng-show="$ctrl.isAdministrative">
<a
ui-sref="supplier.card.billingData({id:$ctrl.supplier.id})"
target="_self">
<span translate vn-tooltip="Go to">Billing data</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isAdministrative">
Billing data
</h4>
<vn-label-value
label="Pay method"
value="{{::$ctrl.summary.payMethod.name}}">
@ -63,7 +85,18 @@
</vn-horizontal>
<vn-horizontal>
<vn-one>
<h4 translate>Fiscal data</h4>
<h4 ng-show="$ctrl.isAdministrative">
<a
ui-sref="supplier.card.fiscalData({id:$ctrl.supplier.id})"
target="_self">
<span translate vn-tooltip="Go to">Fiscal data</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isAdministrative">
Fiscal data
</h4>
<vn-label-value
label="Sage tax type"
value="{{::$ctrl.summary.sageTaxType.vat}}">
@ -82,7 +115,18 @@
</vn-horizontal>
<vn-horizontal>
<vn-one>
<h4 translate>Fiscal address</h4>
<h4 ng-show="$ctrl.isAdministrative">
<a
ui-sref="supplier.card.fiscalData({id:$ctrl.supplier.id})"
target="_self">
<span translate vn-tooltip="Go to">Fiscal address</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isAdministrative">
Fiscal address
</h4>
<vn-label-value
label="Social name"
value="{{::$ctrl.summary.name}}">

View File

@ -10,6 +10,10 @@ class Controller extends Summary {
this.getSummary();
}
get isAdministrative() {
return this.aclService.hasAny(['administrative']);
}
getSummary() {
return this.$http.get(`Suppliers/${this.supplier.id}/getSummary`).then(response => {
this.summary = response.data;

View File

@ -1,6 +1,7 @@
<vn-card class="summary">
<h5>
<a ng-if="::$ctrl.summary.id"
<a
ng-if="::$ctrl.summary.id"
vn-tooltip="Go to the ticket"
ui-sref="ticket.card.summary({id: {{::$ctrl.summary.id}}})"
name="goToSummary">
@ -103,7 +104,13 @@
<p><vn-label><strong>Total</strong></vn-label> <strong>{{$ctrl.summary.total | currency: 'EUR':2}}</strong></p>
</vn-one>
<vn-auto name="sales">
<h4 translate>Sale</h4>
<h4>
<a
ui-sref="ticket.card.sale({id:$ctrl.ticket.id})"
target="_self">
<span translate vn-tooltip="Go to">Sale</span>
</a>
</h4>
<vn-table>
<vn-thead>
<vn-tr>
@ -158,7 +165,13 @@
</vn-table>
</vn-auto>
<vn-one ng-if="$ctrl.summary.packagings.length != 0">
<h4 translate>Packages</h4>
<h4>
<a
ui-sref="ticket.card.package({id:$ctrl.ticket.id})"
target="_self">
<span translate vn-tooltip="Go to">Packages</span>
</a>
</h4>
<vn-table model="model">
<vn-thead>
<vn-tr>
@ -177,7 +190,13 @@
</vn-table>
</vn-one>
<vn-one class="services" ng-if="$ctrl.summary.services.length != 0">
<h4 translate>Service</h4>
<h4>
<a
ui-sref="ticket.card.service({id:$ctrl.ticket.id})"
target="_self">
<span translate vn-tooltip="Go to">Service</span>
</a>
</h4>
<vn-table model="model">
<vn-thead>
<vn-tr>
@ -202,7 +221,13 @@
</vn-horizontal>
<vn-horizontal>
<vn-auto ng-if="$ctrl.summary.requests.length != 0">
<h4 translate>Purchase request</h4>
<h4>
<a
ui-sref="ticket.card.request.index({id:$ctrl.ticket.id})"
target="_self">
<span translate vn-tooltip="Go to">Purchase request</span>
</a>
</h4>
<vn-table model="model">
<vn-thead>
<vn-tr>

View File

@ -1,6 +1,7 @@
<vn-card class="summary">
<h5>
<a ng-if="::$ctrl.travelData.id"
<a
ng-if="::$ctrl.travelData.id"
vn-tooltip="Go to the travel"
ui-sref="travel.card.summary({id: {{::$ctrl.travelData.id}}})"
name="goToSummary">
@ -132,7 +133,18 @@
</vn-table>
</vn-auto>
<vn-auto ng-if="$ctrl.travelThermographs.length != 0">
<h4 translate>Thermographs</h4>
<h4 ng-show="$ctrl.isBuyer">
<a
ui-sref="travel.card.thermograph.index({id:$ctrl.travelData.id})"
target="_self">
<span translate vn-tooltip="Go to">Thermograph</span>
</a>
</h4>
<h4
translate
ng-show="!$ctrl.isBuyer">
Thermograph
</h4>
<vn-table>
<vn-thead>
<vn-tr>

View File

@ -56,6 +56,10 @@ class Controller extends Summary {
return total;
}
get isBuyer() {
return this.aclService.hasAny(['buyer']);
}
}
ngModule.vnComponent('vnTravelSummary', {

View File

@ -10,7 +10,17 @@
</h5>
<vn-horizontal class="vn-pa-md">
<vn-one>
<h4 translate>Basic data</h4>
<h4 ng-show="$ctrl.isHr">
<a
ui-sref="worker.card.basicData({id:$ctrl.worker.id})">
<span translate vn-tooltip="Go to">Basic data</span>
</a>
</h4>
<h4
translates
ng-show="!$ctrl.isHr">
Basic data
</h4>
<vn-label-value label="Id"
value="{{worker.id}}">
</vn-label-value>

View File

@ -52,6 +52,10 @@ class Controller extends Summary {
this.$.worker = res.data;
});
}
get isHr() {
return this.aclService.hasAny(['hr']);
}
}
ngModule.vnComponent('vnWorkerSummary', {

View File

@ -1,6 +1,7 @@
<vn-card class="summary">
<h5>
<a ng-if="::$ctrl.summary.id"
<a
ng-if="::$ctrl.summary.id"
vn-tooltip="Go to the zone"
ui-sref="zone.card.summary({id: {{::$ctrl.summary.id}}})"
name="goToSummary">
@ -36,7 +37,11 @@
</vn-horizontal>
<vn-horizontal class="vn-pa-md">
<vn-auto>
<h4 translate>Warehouses</h4>
<h4>
<a ui-sref="zone.card.warehouses({id:$ctrl.zone.id})">
<span translate vn-tooltip="Go to">Warehouse</span>
</a>
</h4>
<vn-table model="model" auto-load="false">
<vn-thead>
<vn-tr>