#4226-remove-density #1066

Merged
joan merged 5 commits from #4226-remove-density into dev 2022-10-03 07:42:08 +00:00
1 changed files with 37 additions and 25 deletions
Showing only changes of commit f0a9441e1f - Show all commits

View File

@ -2,36 +2,36 @@
url="ClaimEnds/filter" url="ClaimEnds/filter"
link="{claimFk: $ctrl.$params.id}" link="{claimFk: $ctrl.$params.id}"
data="$ctrl.salesClaimed" data="$ctrl.salesClaimed"
auto-load="true" auto-load="true"
on-save="$ctrl.onSave()"> on-save="$ctrl.onSave()">
</vn-crud-model> </vn-crud-model>
<vn-crud-model <vn-crud-model
auto-load="true" auto-load="true"
url="ClaimDestinations" url="ClaimDestinations"
data="claimDestinations"> data="claimDestinations">
</vn-crud-model> </vn-crud-model>
<vn-card class="vn-mb-md vn-pa-lg vn-w-lg" style="text-align: right" <vn-card class="vn-mb-md vn-pa-lg vn-w-lg" style="text-align: right"
ng-if="$ctrl.salesClaimed.length > 0"> ng-if="$ctrl.salesClaimed.length > 0">
<vn-label-value label="Total claimed" <vn-label-value label="Total claimed"
value="{{$ctrl.claimedTotal | currency: 'EUR':2}}"> value="{{$ctrl.claimedTotal | currency: 'EUR':2}}">
</vn-label-value> </vn-label-value>
</vn-card> </vn-card>
<vn-card class="vn-pa-lg vn-w-lg"> <vn-card class="vn-pa-lg vn-w-lg">
<smart-table <smart-table
model="model" model="model"
options="$ctrl.smartTableOptions" options="$ctrl.smartTableOptions"
expr-builder="$ctrl.exprBuilder(param, value)"> expr-builder="$ctrl.exprBuilder(param, value)">
<slot-actions> <slot-actions>
<section class="header"> <section class="header">
<vn-tool-bar class="vn-mb-md"> <vn-tool-bar class="vn-mb-md">
<vn-button <vn-button
label="Import claim" label="Import claim"
disabled="$ctrl.claim.claimStateFk == $ctrl.resolvedStateId" disabled="$ctrl.claim.claimStateFk == $ctrl.resolvedStateId"
vn-http-click="$ctrl.importToNewRefundTicket()" vn-http-click="$ctrl.importToNewRefundTicket()"
translate-attr="{title: 'Imports claim details'}"> translate-attr="{title: 'Imports claim details'}">
</vn-button> </vn-button>
<vn-button <vn-button
label="Change destination" label="Change destination"
disabled="$ctrl.checked.length == 0" disabled="$ctrl.checked.length == 0"
ng-click="changeDestination.show()"> ng-click="changeDestination.show()">
</vn-button> </vn-button>
@ -47,7 +47,7 @@
</vn-range> </vn-range>
</vn-tool-bar> </vn-tool-bar>
<vn-check class="right" <vn-check class="right"
vn-one vn-one
label="Is paid with mana" label="Is paid with mana"
ng-model="$ctrl.claim.isChargedToMana" ng-model="$ctrl.claim.isChargedToMana"
on-change="$ctrl.save({isChargedToMana: value})"> on-change="$ctrl.save({isChargedToMana: value})">
@ -66,12 +66,24 @@
</th> </th>
<th number field="itemFk">Id</th> <th number field="itemFk">Id</th>
<th number field="ticketFk">Ticket</th> <th number field="ticketFk">Ticket</th>
<th field="claimDestinationFk">Destination</th> <th field="claimDestinationFk">
<th expand field="landed">Landed</th> <span translate>Destination</span>
<th number field="quantity">Quantity</th> </th>
<th field="concept">Description</th> <th expand field="landed">
<th number field="price">Price</th> <span translate>Landed</span>
<th number field="discount">Disc.</th> </th>
<th number field="quantity">
<span translate>Quantity</span>
</th>
<th field="concept">
<span translate>Description</span>
</th>
<th number field="price">
<span translate>Price</span>
</th>
<th number field="discount">
<span translate>Disc.</span>
</th>
<th number field="total">Total</th> <th number field="total">Total</th>
</tr> </tr>
</thead> </thead>
@ -80,13 +92,13 @@
ng-repeat="saleClaimed in $ctrl.salesClaimed" ng-repeat="saleClaimed in $ctrl.salesClaimed"
vn-repeat-last on-last="$ctrl.focusLastInput()"> vn-repeat-last on-last="$ctrl.focusLastInput()">
<td> <td>
<vn-check <vn-check
ng-model="saleClaimed.$checked" ng-model="saleClaimed.$checked"
vn-click-stop> vn-click-stop>
</vn-check> </vn-check>
</td> </td>
<td number> <td number>
<vn-span <vn-span
ng-click="itemDescriptor.show($event, saleClaimed.itemFk)" ng-click="itemDescriptor.show($event, saleClaimed.itemFk)"
class="link"> class="link">
{{::saleClaimed.itemFk | zeroFill:6}} {{::saleClaimed.itemFk | zeroFill:6}}
@ -94,7 +106,7 @@
</td> </td>
<td number> <td number>
<vn-span <vn-span
class="link" class="link"
ng-click="ticketDescriptor.show($event, saleClaimed.ticketFk)"> ng-click="ticketDescriptor.show($event, saleClaimed.ticketFk)">
{{::saleClaimed.ticketFk}} {{::saleClaimed.ticketFk}}
</vn-span> </vn-span>
@ -129,7 +141,7 @@
</slot-table> </slot-table>
</smart-table> </smart-table>
<button-bar class="vn-pa-md"> <button-bar class="vn-pa-md">
<vn-button <vn-button
label="Regularize" label="Regularize"
disabled="$ctrl.claim.claimStateFk == $ctrl.resolvedStateId" disabled="$ctrl.claim.claimStateFk == $ctrl.resolvedStateId"
vn-http-click="$ctrl.regularize()"> vn-http-click="$ctrl.regularize()">
@ -140,17 +152,17 @@
vn-id="item-descriptor" vn-id="item-descriptor"
warehouse-fk="$ctrl.vnConfig.warehouseFk"> warehouse-fk="$ctrl.vnConfig.warehouseFk">
</vn-item-descriptor-popover> </vn-item-descriptor-popover>
<vn-ticket-descriptor-popover <vn-ticket-descriptor-popover
vn-id="ticket-descriptor"> vn-id="ticket-descriptor">
</vn-ticket-descriptor-popover> </vn-ticket-descriptor-popover>
<vn-confirm <vn-confirm
vn-id="update-greuge" vn-id="update-greuge"
question="Insert greuges on client card" question="Insert greuges on client card"
message="Do you want to insert greuges?" message="Do you want to insert greuges?"
on-accept="$ctrl.onUpdateGreugeAccept()"> on-accept="$ctrl.onUpdateGreugeAccept()">
</vn-confirm> </vn-confirm>
<!-- Dialog of change destionation --> <!-- Dialog of change destionation -->
<vn-dialog <vn-dialog
vn-id="changeDestination" vn-id="changeDestination"
on-accept="$ctrl.onResponse()"> on-accept="$ctrl.onResponse()">
@ -173,4 +185,4 @@
<input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/> <input type="button" response="cancel" translate-attr="{value: 'Cancel'}"/>
<button response="accept" translate>Save</button> <button response="accept" translate>Save</button>
</tpl-buttons> </tpl-buttons>
</vn-dialog> </vn-dialog>