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

refs #4547 informe y email generados #1114

Merged
alexandre merged 6 commits from 4547-informe-compensacion into dev 2022-11-09 12:34:36 +00:00
Conversation 0 Commits 6 Files Changed 18 +130 -81
2 changed files with 130 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8d8d217fe7 - Show all commits

94
modules/client/front/balance/index/index.html
View File

@ -1,17 +1,40 @@
<vn-crud-model vn-id="model" url="Receipts/filter" limit="20" data="$ctrl.balances">
<vn-crud-model
vn-id="model"
url="Receipts/filter"
limit="20"
data="$ctrl.balances">
</vn-crud-model>
<vn-crud-model vn-id="riskModel" url="ClientRisks" filter="$ctrl.filter" data="$ctrl.clientRisks">
<vn-crud-model
vn-id="riskModel"
url="ClientRisks"
filter="$ctrl.filter"
data="$ctrl.clientRisks">
</vn-crud-model>
<vn-crud-model auto-load="true" url="Companies" data="companies" order="code">
<vn-crud-model
auto-load="true"
url="Companies"
data="companies"
order="code">
</vn-crud-model>
<vn-side-menu side="right">
<div class="vn-pa-md">
<vn-autocomplete vn-one vn-id="company" ng-model="$ctrl.companyId" data="companies" show-field="code"
value-field="id" label="Company">
<vn-autocomplete
vn-one
vn-id="company"
ng-model="$ctrl.companyId"
data="companies"
show-field="code"
value-field="id"
label="Company">
</vn-autocomplete>
<div class="totalBox" style="text-align: center;" ng-if="$ctrl.clientRisks.length">
<div
class="totalBox"
style="text-align: center;"
ng-if="$ctrl.clientRisks.length">
<h6 translate>Total by company</h6>
<vn-label-value ng-repeat="riskByCompany in $ctrl.clientRisks" label="{{riskByCompany.company.code}}"
<vn-label-value
ng-repeat="riskByCompany in $ctrl.clientRisks"
label="{{riskByCompany.company.code}}"
value="{{riskByCompany.amount | currency: 'EUR':2}}">
</vn-label-value>
</div>
@ -48,26 +71,33 @@
</span>
</vn-td>
<vn-td>
<span vn-click-stop="workerDescriptor.show($event, balance.workerFk)" class="link">
<span
vn-click-stop="workerDescriptor.show($event, balance.workerFk)"
class="link">
{{::balance.userName}}
</span>
</vn-td>
<vn-td-editable disabled="balance.isInvoice || !$ctrl.isAdministrative" expand>
<text>
<div ng-show="::balance.description">
<span ng-if="balance.isInvoice"
<span
ng-if="balance.isInvoice"
title="{{'BILL' | translate: {ref: balance.description} }}"
vn-click-stop="$ctrl.showInvoiceOutDescriptor($event, balance)" class="link">
vn-click-stop="$ctrl.showInvoiceOutDescriptor($event, balance)"
class="link">
{{'BILL' | translate: {ref: balance.description} }}
</span>
<span ng-if="!balance.isInvoice" title="{{::balance.description}}">
<span
ng-if="!balance.isInvoice"
title="{{::balance.description}}">
{{balance.description}}
</span>
</div>
</text>
<field>
<vn-textfield vn-acl="administrative" class="dense" vn-focus
ng-model="balance.description" on-change="$ctrl.changeDescription(balance)">
ng-model="balance.description"
on-change="$ctrl.changeDescription(balance)">
</vn-textfield>
</field>
</vn-td-editable>
@ -76,22 +106,31 @@
<vn-td number expand>{{::balance.credit | currency: 'EUR':2}}</vn-td>
<vn-td number expand>{{balance.balance | currency: 'EUR':2}}</vn-td>
<vn-td center shrink>
<vn-check ng-model="balance.isConciliate" disabled="true">
<vn-check
ng-model="balance.isConciliate"
disabled="true">
</vn-check>
</vn-td>
<vn-td center shrink>
<a ng-show="balance.hasPdf" target="_blank"
<a ng-show="balance.hasPdf"
target="_blank"
href="api/InvoiceOuts/{{::balance.id}}/download?access_token={{::$ctrl.vnToken.token}}">
<vn-icon-button icon="cloud_download" title="{{'Download PDF' | translate}}">
<vn-icon-button
icon="cloud_download"
title="{{'Download PDF' | translate}}">
</vn-icon-button>
</a>
</vn-td>
<vn-td center shrink ng-if="!balance.isInvoice">
<vn-icon-button vn-dialog="send_compensation" icon="outgoing_mail"
<vn-icon-button
vn-dialog="send_compensation"
icon="outgoing_mail"
title="{{'Send compensation' | translate}}">
</vn-icon-button>
</vn-td>
<vn-confirm vn-id="send_compensation" on-accept="$ctrl.sendEmail(balance)"
<vn-confirm
vn-id="send_compensation"
on-accept="$ctrl.sendEmail(balance)"
question="¿Desea informar de la compensacion al cliente por correo?"
joan commented 2022-11-04 06:31:11 +00:00
Outdated
Review
Copy Link

Falta una traducción aquí. No pueden haber frases en español en el código.

Falta una traducción aquí. No pueden haber frases en español en el código.
message="Send compensation">
</vn-confirm>
@ -101,13 +140,24 @@
</vn-card>
</vn-data-viewer>
</div>
<vn-float-button vn-acl="salesAssistant" vn-acl-action="remove" icon="add" vn-tooltip="New payment" vn-bind="+"
fixed-bottom-right ng-click="balanceCreate.show()">
<vn-float-button
vn-acl="salesAssistant"
vn-acl-action="remove"
icon="add"
vn-tooltip="New payment"
vn-bind="+"
fixed-bottom-right
ng-click="balanceCreate.show()">
</vn-float-button>
<vn-client-balance-create vn-id="balance-create" on-accept="$ctrl.getData()" company-fk="$ctrl.companyId"
<vn-client-balance-create
vn-id="balance-create"
on-accept="$ctrl.getData()"
company-fk="$ctrl.companyId"
client-fk="$ctrl.$params.id">
</vn-client-balance-create>
<vn-worker-descriptor-popover vn-id="workerDescriptor">
<vn-worker-descriptor-popover
vn-id="workerDescriptor">
</vn-worker-descriptor-popover>
<vn-invoice-out-descriptor-popover vn-id="invoiceOutDescriptor">
<vn-invoice-out-descriptor-popover
vn-id="invoiceOutDescriptor">
</vn-invoice-out-descriptor-popover>

1
modules/client/front/balance/index/index.js
View File

@ -45,7 +45,6 @@ class Controller extends Section {
return this.aclService.hasAny(['administrative']);
}
getData() {
return this.$.model.applyFilter(null, {
clientId: this.$params.id,