#723 order.summary
This commit is contained in:
Gerard
parent
e91b1ef805
commit
04f0f6d9f5
|
|
@ -36,6 +36,13 @@
|
|||
<vn-td>{{::order.sourceApp}}</vn-td>
|
||||
<vn-td>{{::order.created | date:'dd/MM/yyyy HH:mm'}}</vn-td>
|
||||
<vn-td>{{::order.company.code}}</vn-td>
|
||||
<vn-td>
|
||||
<vn-icon-button
|
||||
ng-click="$ctrl.preview($event, order)"
|
||||
vn-tooltip="Preview"
|
||||
icon="desktop_windows">
|
||||
</vn-icon-button>
|
||||
</vn-td>
|
||||
</vn-tr>
|
||||
</vn-tbody>
|
||||
<vn-empty-rows ng-if="model.data.length === 0" translate>
|
||||
|
|
@ -48,7 +55,13 @@
|
|||
scroll-selector="ui-view">
|
||||
</vn-pagination>
|
||||
</div>
|
||||
<a ui-sref="order.create" vn-bind="+" vn-tooltip="New order" fixed-bottom-right>
|
||||
<a ui-sref="order.create" vn-bind="+" vn-tooltip="New order" fixed-bottom-right>
|
||||
<vn-float-button icon="add"></vn-float-button>
|
||||
</a>
|
||||
<vn-client-descriptor-popover vn-id="descriptor"></vn-client-descriptor-popover>
|
||||
<vn-client-descriptor-popover vn-id="descriptor"></vn-client-descriptor-popover>
|
||||
<vn-dialog class="dialog-summary"
|
||||
vn-id="order-summary-dialog">
|
||||
<tpl-body>
|
||||
<vn-order-summary order="$ctrl.order"></vn-order-summary>
|
||||
</tpl-body>
|
||||
</vn-dialog>
|
||||
|
|
@ -18,26 +18,6 @@ export default class Controller {
|
|||
};
|
||||
}
|
||||
|
||||
/* exprBuilder(param, value) {
|
||||
switch (param) {
|
||||
case 'search':
|
||||
return /^\d+$/.test(value)
|
||||
? {id: value}
|
||||
: {nickname: {regexp: value}};
|
||||
case 'from':
|
||||
return {shipped: {gte: value}};
|
||||
case 'to':
|
||||
return {shipped: {lte: value}};
|
||||
case 'nickname':
|
||||
return {[param]: {regexp: value}};
|
||||
case 'id':
|
||||
case 'clientFk':
|
||||
case 'agencyModeFk':
|
||||
case 'warehouseFk':
|
||||
return {[param]: value};
|
||||
}
|
||||
} */
|
||||
|
||||
showDescriptor(event, clientFk) {
|
||||
this.$scope.descriptor.clientFk = clientFk;
|
||||
this.$scope.descriptor.parent = event.target;
|
||||
|
|
@ -50,11 +30,11 @@ export default class Controller {
|
|||
this.$scope.popover.relocate();
|
||||
}
|
||||
|
||||
preview(event, ticket) {
|
||||
preview(event, order) {
|
||||
event.preventDefault();
|
||||
event.stopImmediatePropagation();
|
||||
this.$scope.dialogSummaryTicket.show();
|
||||
this.ticketSelected = ticket;
|
||||
this.$scope.orderSummaryDialog.show();
|
||||
this.order = order;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@
|
|||
</td>
|
||||
<td number>
|
||||
<span
|
||||
ng-click="$ctrl.showDescriptor($event, row.itemFk)"
|
||||
ng-click="$ctrl.showDescriptor($event, row)"
|
||||
class="link" pointer>
|
||||
{{("000000"+row.itemFk).slice(-6)}}
|
||||
</span>
|
||||
|
|
|
|||
|
|
@ -6,14 +6,13 @@ class Controller {
|
|||
this.$scope = $scope;
|
||||
this.$http = $http;
|
||||
this.$state = $state;
|
||||
this.setSummary();
|
||||
this.order = {};
|
||||
}
|
||||
|
||||
setSummary() {
|
||||
this.$http.get(`/order/api/Orders/${this.$state.params.id}/summary`).then(res => {
|
||||
this.$http.get(`/order/api/Orders/${this.order.id}/summary`).then(res => {
|
||||
if (res && res.data) {
|
||||
this.summary = res.data;
|
||||
console.log(res.data);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
@ -27,26 +26,29 @@ class Controller {
|
|||
return `${address.street} - ${address.city} ${province}`;
|
||||
}
|
||||
|
||||
/* showDescriptor(event, itemFk) {
|
||||
$onChanges() {
|
||||
if (this.order && this.order.id)
|
||||
this.setSummary();
|
||||
}
|
||||
|
||||
showDescriptor(event, item) {
|
||||
this.quicklinks = {
|
||||
btnThree: {
|
||||
icon: 'icon-transaction',
|
||||
state: `item.card.diary({
|
||||
id: ${itemFk},
|
||||
warehouseFk: ${this.ticket.warehouseFk},
|
||||
ticketFk: ${this.ticket.id}
|
||||
id: ${item.id},
|
||||
})`,
|
||||
tooltip: 'Item diary'
|
||||
}
|
||||
};
|
||||
this.$scope.descriptor.itemFk = itemFk;
|
||||
this.$scope.descriptor.itemFk = item.id;
|
||||
this.$scope.descriptor.parent = event.target;
|
||||
this.$scope.descriptor.show();
|
||||
}
|
||||
|
||||
onDescriptorLoad() {
|
||||
this.$scope.popover.relocate();
|
||||
} */
|
||||
}
|
||||
}
|
||||
|
||||
Controller.$inject = ['$scope', '$http', '$state'];
|
||||
|
|
|
|||
|
|
@ -1,29 +1,29 @@
|
|||
import './index';
|
||||
|
||||
describe('Ticket', () => {
|
||||
describe('Component vnTicketSummary', () => {
|
||||
describe('Order', () => {
|
||||
describe('Component vnOrderSummary', () => {
|
||||
let $componentController;
|
||||
let controller;
|
||||
let $httpBackend;
|
||||
|
||||
beforeEach(() => {
|
||||
angular.mock.module('ticket');
|
||||
angular.mock.module('order');
|
||||
});
|
||||
|
||||
beforeEach(angular.mock.inject((_$componentController_, _$httpBackend_) => {
|
||||
$componentController = _$componentController_;
|
||||
$httpBackend = _$httpBackend_;
|
||||
$httpBackend.when('GET', /\/locale\/\w+\/[a-z]{2}\.json/).respond({});
|
||||
controller = $componentController('vnTicketSummary');
|
||||
controller.ticket = {id: 1};
|
||||
controller = $componentController('vnOrderSummary');
|
||||
controller.order = {id: 1};
|
||||
}));
|
||||
|
||||
describe('ticket()', () => {
|
||||
describe('getSummary()', () => {
|
||||
it('should perform a GET query and define summary property', () => {
|
||||
let res = {id: 1, nickname: 'Batman'};
|
||||
$httpBackend.when('GET', `/ticket/api/Tickets/1/summary`).respond(200, res);
|
||||
$httpBackend.expect('GET', `/ticket/api/Tickets/1/summary`);
|
||||
controller.ticket = {id: 1};
|
||||
$httpBackend.when('GET', `/order/api/Orders/1/summary`).respond(200, res);
|
||||
$httpBackend.expect('GET', `/order/api/Orders/1/summary`);
|
||||
controller.setSummary();
|
||||
$httpBackend.flush();
|
||||
|
||||
expect(controller.summary).toBeDefined();
|
||||
|
|
|
|||
Loading…
Reference in New Issue