diff --git a/modules/claim/front/summary/index.html b/modules/claim/front/summary/index.html index b9e9f0744..6a505426d 100644 --- a/modules/claim/front/summary/index.html +++ b/modules/claim/front/summary/index.html @@ -10,7 +10,7 @@ value="{{$ctrl.summary.claim.created | dateTime: 'dd/MM/yyyy'}}"> + value="{{$ctrl.summary.claim.claimState.description}}"> @@ -65,14 +65,14 @@ {{("000000"+saleClaimed.sale.itemFk).slice(-6)}} - {{saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}} - {{saleClaimed.sale.quantity}} - {{saleClaimed.quantity}} - {{saleClaimed.sale.concept}} - {{saleClaimed.sale.price | currency:'€':2}} - {{saleClaimed.sale.discount}} % + {{::saleClaimed.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}} + {{::saleClaimed.sale.quantity}} + {{::saleClaimed.quantity}} + {{::saleClaimed.sale.concept}} + {{::saleClaimed.sale.price | currency:'€':2}} + {{::saleClaimed.sale.discount}} % - {{(saleClaimed.sale.quantity * saleClaimed.sale.price) - + {{::(saleClaimed.sale.quantity * saleClaimed.sale.price) - ((saleClaimed.sale.discount * (saleClaimed.sale.quantity * saleClaimed.sale.price))/100) | currency:'€':2 }} @@ -100,11 +100,11 @@ - {{development.claimReason.description}} - {{development.claimResult.description}} - {{development.claimResponsible.description}} - {{development.worker.firstName}} - {{development.claimRedelivery.description}} + {{::development.claimReason.description}} + {{::development.claimResult.description}} + {{::development.claimResponsible.description}} + {{::development.worker.firstName}} + {{::development.claimRedelivery.description}} @@ -138,15 +138,15 @@ {{("000000"+action.sale.itemFk).slice(-6)}} - {{action.sale.id}} - {{action.claimBeggining.description}} - {{action.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}} - {{action.sale.quantity}} - {{action.sale.concept}} - {{action.sale.price}} - {{action.sale.discount}} % + {{::action.sale.id}} + {{::action.claimBeggining.description}} + {{::action.sale.ticket.landed | dateTime: 'dd/MM/yyyy'}} + {{::action.sale.quantity}} + {{::action.sale.concept}} + {{::action.sale.price}} + {{::action.sale.discount}} % - {{(action.sale.quantity * action.sale.price) - + {{::(action.sale.quantity * action.sale.price) - ((action.sale.discount * (action.sale.quantity * action.sale.price))/100) | currency:'€':2 }} diff --git a/modules/order/front/index/index.js b/modules/order/front/index/index.js index c3ac7a736..3a49a5197 100644 --- a/modules/order/front/index/index.js +++ b/modules/order/front/index/index.js @@ -1,5 +1,4 @@ import ngModule from '../module'; -import './style.scss'; export default class Controller { constructor($scope) { diff --git a/modules/order/front/index/style.scss b/modules/order/front/index/style.scss deleted file mode 100644 index f83e955ed..000000000 --- a/modules/order/front/index/style.scss +++ /dev/null @@ -1,7 +0,0 @@ -vn-order-index { - vn-dialog.summary { - div { - min-width: 900px; - } - } -} \ No newline at end of file diff --git a/modules/order/front/summary/index.html b/modules/order/front/summary/index.html index a48bd6934..45009c009 100644 --- a/modules/order/front/summary/index.html +++ b/modules/order/front/summary/index.html @@ -6,43 +6,43 @@ + value="{{$ctrl.summary.id}}"> + value="{{$ctrl.summary.address.nickname}}"> + value="{{$ctrl.summary.isConfirmed}}"> + value="{{$ctrl.summary.sourceApp}}"> + value="{{$ctrl.summary.created | date: 'dd/MM/yyyy HH:mm'}}"> + value="{{$ctrl.summary.confirmed | date: 'dd/MM/yyyy'}}"> + value="{{$ctrl.formattedAddress}}"> + value="{{$ctrl.summary.address.phone}}"> + value="{{$ctrl.summary.note}}">
-

Subtotal {{::$ctrl.summary.subTotal | currency:' €':2}}

-

VAT {{::$ctrl.summary.VAT | currency:' €':2}}

-

Total {{::$ctrl.summary.total | currency:' €':2}}

+

Subtotal {{$ctrl.summary.subTotal | currency:' €':2}}

+

VAT {{$ctrl.summary.VAT | currency:' €':2}}

+

Total {{$ctrl.summary.total | currency:' €':2}}

diff --git a/modules/order/front/summary/style.scss b/modules/order/front/summary/style.scss index ca61ee97c..eed3d5370 100644 --- a/modules/order/front/summary/style.scss +++ b/modules/order/front/summary/style.scss @@ -1,3 +1,9 @@ +vn-dialog { + vn-order-summary vn-one { + min-width: 10em; + } +} + .ticketSummary { .ticketSummary__data { vn-one { diff --git a/modules/ticket/front/summary/index.html b/modules/ticket/front/summary/index.html index 9631af22e..46b5858b1 100644 --- a/modules/ticket/front/summary/index.html +++ b/modules/ticket/front/summary/index.html @@ -6,48 +6,48 @@ + value="{{$ctrl.summary.state.state.name}}"> + value="{{$ctrl.summary.client.salesPerson.firstName}} {{$ctrl.summary.client.salesPerson.name}}"> + value="{{$ctrl.summary.agencyMode.name}}"> + value="{{$ctrl.summary.warehouse.name}}"> + value="{{$ctrl.summary.packages}}"> + value="{{$ctrl.summary.shipped | date: 'dd/MM/yyyy HH:mm'}}"> + value="{{$ctrl.summary.landed | date: 'dd/MM/yyyy'}}"> + value="{{$ctrl.summary.routeFk}}"> + value="{{$ctrl.formattedAddress}}"> + value="{{$ctrl.summary.address.phone}}"> - +
-

Subtotal {{::$ctrl.summary.subTotal | currency:' €':2}}

-

VAT {{::$ctrl.summary.VAT | currency:' €':2}}

-

Total {{::$ctrl.summary.total | currency:' €':2}}

+

Subtotal {{$ctrl.summary.subTotal | currency:' €':2}}

+

VAT {{$ctrl.summary.VAT | currency:' €':2}}

+

Total {{$ctrl.summary.total | currency:' €':2}}