@@ -306,10 +328,10 @@
| Id |
- Shipped |
- Agency |
- Warehouse |
- Address |
+ Shipped |
+ Agency |
+ Warehouse |
+ Address |
@@ -352,28 +374,6 @@
-
-
-
-
-
-
-
-
-
-
+ on-response="$ctrl.removeSales()">
-
\ No newline at end of file
+
+
+
+
+ Send shortage SMS
+
+
+ Recalculate price
+
+
+ Update discount
+
+
+ Add claim
+
+
+ Mark as reserved
+
+
+ Unmark as reserved
+
+
\ No newline at end of file
diff --git a/modules/ticket/front/sale/index.js b/modules/ticket/front/sale/index.js
index 3d7e38f42..bd3fa4813 100644
--- a/modules/ticket/front/sale/index.js
+++ b/modules/ticket/front/sale/index.js
@@ -5,32 +5,6 @@ import './style.scss';
class Controller extends Section {
constructor($element, $) {
super($element, $);
- this.edit = {};
- this.moreOptions = [
- {
- name: 'Send shortage SMS',
- callback: this.showSMSDialog
- }, {
- name: 'Mark as reserved',
- callback: this.markAsReserved,
- show: () => this.isEditable
- }, {
- name: 'Unmark as reserved',
- callback: this.unmarkAsReserved,
- show: () => this.isEditable
- }, {
- name: 'Update discount',
- callback: this.showEditDialog,
- show: () => this.isEditable
- }, {
- name: 'Add claim',
- callback: this.createClaim
- }, {
- name: 'Recalculate price',
- callback: this.calculateSalePrice,
- show: () => this.hasOneSaleSelected()
- },
- ];
this._sales = [];
}
@@ -53,21 +27,17 @@ class Controller extends Section {
this.refreshTotal();
}
- get editedPrice() {
- return this._editedPrice;
+ get ticketState() {
+ if (!this.ticket) return null;
+
+ return this.ticket.ticketState.state.code;
}
- set editedPrice(value) {
- this._editedPrice = value;
- this.updateNewPrice();
+ get total() {
+ return this.subtotal + this.VAT;
}
- refreshTotal() {
- this.loadSubTotal();
- this.loadVAT();
- }
-
- loadSubTotal() {
+ getSubTotal() {
if (!this.$params.id || !this.sales) return;
this.$http.get(`Tickets/${this.$params.id}/subtotal`).then(res => {
this.subtotal = res.data || 0.0;
@@ -75,13 +45,21 @@ class Controller extends Section {
}
getSaleTotal(sale) {
- if (!sale.quantity || !sale.price)
- return;
+ if (sale.quantity == null || sale.price == null)
+ return null;
- return sale.quantity * sale.price * ((100 - sale.discount) / 100);
+ const price = sale.quantity * sale.price;
+ const discount = (sale.discount * price) / 100;
+
+ return price - discount;
}
- loadVAT() {
+ getMana() {
+ this.$http.get(`Tickets/${this.$params.id}/getSalesPersonMana`)
+ .then(res => this.edit.mana = res.data);
+ }
+
+ getVat() {
this.VAT = 0.0;
if (!this.$params.id || !this.sales) return;
this.$http.get(`Tickets/${this.$params.id}/getVAT`).then(res => {
@@ -89,32 +67,9 @@ class Controller extends Section {
});
}
- get total() {
- return this.subtotal + this.VAT;
- }
-
- onMoreOpen() {
- let options = this.moreOptions.filter(option => {
- const hasShowProperty = Object.hasOwnProperty.call(option, 'show');
- const shouldShow = !hasShowProperty || option.show === true ||
- typeof option.show === 'function' && option.show();
-
- return (shouldShow && (option.always || this.isChecked));
- });
- this.$.moreButton.data = options;
- }
-
- onMoreChange(callback) {
- callback.call(this);
- }
-
- get isChecked() {
- if (this.sales) {
- for (let instance of this.sales)
- if (instance.checked) return true;
- }
-
- return false;
+ refreshTotal() {
+ this.getSubTotal();
+ this.getVat();
}
/**
@@ -122,7 +77,7 @@ class Controller extends Section {
*
* @return {Array} Checked instances
*/
- checkedLines() {
+ selectedSales() {
if (!this.sales) return;
return this.sales.filter(sale => {
@@ -130,6 +85,38 @@ class Controller extends Section {
});
}
+ selectedValidSales() {
+ if (!this.sales) return;
+
+ const selectedSales = this.selectedSales();
+ return selectedSales.filter(sale => {
+ return sale.id != undefined;
+ });
+ }
+
+ /**
+ * Returns the total of checked instances
+ *
+ * @return {Number} Total checked instances
+ */
+ selectedSalesCount() {
+ const selectedSales = this.selectedSales();
+ if (selectedSales)
+ return selectedSales.length;
+
+ return 0;
+ }
+
+ hasSelectedSales() {
+ return this.selectedSalesCount() > 0;
+ }
+
+ hasOneSaleSelected() {
+ if (this.selectedSalesCount() === 1)
+ return true;
+ return false;
+ }
+
/**
* Returns new instances
*
@@ -143,99 +130,53 @@ class Controller extends Section {
});
}
- /**
- * Returns an array of indexes
- * from checked instances
- *
- * @return {Array} Indexes of checked instances
- */
- checkedLinesIndex() {
- if (!this.sales) return;
-
- let indexes = [];
- this.sales.forEach((sale, index) => {
- if (sale.checked) indexes.push(index);
- });
-
- return indexes;
+ resetChanges() {
+ if (this.newInstances().length === 0)
+ this.$.watcher.updateOriginalData();
}
- firstCheckedLine() {
- const checkedLines = this.checkedLines();
- if (checkedLines)
- return checkedLines[0];
+ changeState(value) {
+ const params = {ticketFk: this.$params.id, code: value};
+ return this.$http.post('TicketTrackings/changeState', params).then(() => {
+ this.vnApp.showSuccess(this.$t('Data saved!'));
+ this.card.reload();
+ }).finally(() => this.resetChanges());
}
- /**
- * Returns the total of checked instances
- *
- * @return {Number} Total checked instances
- */
- totalCheckedLines() {
- const checkedLines = this.checkedLines();
- if (checkedLines)
- return checkedLines.length;
+ removeSales() {
+ const sales = this.selectedValidSales();
+ const params = {sales: sales, ticketId: this.ticket.id};
+ this.$http.post(`Sales/deleteSales`, params).then(() => {
+ this.removeSelectedSales();
+ this.vnApp.showSuccess(this.$t('Data saved!'));
+ }).finally(() => this.resetChanges());
}
- removeCheckedLines() {
- const sales = this.checkedLines();
-
+ removeSelectedSales() {
+ const sales = this.selectedSales();
sales.forEach(sale => {
const index = this.sales.indexOf(sale);
this.sales.splice(index, 1);
});
- if (this.newInstances().length === 0)
- this.$.watcher.updateOriginalData();
-
this.refreshTotal();
}
- onStateOkClick() {
- let filter = {where: {code: 'OK'}, fields: ['id']};
- let json = encodeURIComponent(JSON.stringify(filter));
- return this.$http.get(`States?filter=${json}`).then(res => {
- this.onStateChange(res.data[0].id);
- });
- }
-
- onStateChange(value) {
- let params = {ticketFk: this.$state.params.id, stateFk: value};
- this.$http.post('TicketTrackings/changeState', params).then(() => {
- this.card.reload();
- this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
- }).finally(() => {
- if (this.newInstances().length === 0)
- this.$.watcher.updateOriginalData();
- });
- }
-
- onRemoveLinesClick(response) {
- if (response === 'accept') {
- let sales = this.checkedLines();
-
- // Remove unsaved instances
- sales.forEach((sale, index) => {
- if (!sale.id) sales.splice(index);
- });
-
- let params = {sales: sales, actualTicketFk: this.ticket.id};
- let query = `Sales/removes`;
- this.$http.post(query, params).then(() => {
- this.removeCheckedLines();
- this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
- });
- }
+ createClaim() {
+ const sales = this.selectedValidSales();
+ const params = {ticketId: this.ticket.id, sales: sales};
+ this.resetChanges();
+ this.$http.post(`Claims/createFromSales`, params)
+ .then(res => this.$state.go('claim.card.basicData', {id: res.data.id}));
}
showTransferPopover(event) {
this.setTransferParams();
- this.$.transfer.parent = event.target;
- this.$.transfer.show();
+ this.$.transfer.show(event);
}
setTransferParams() {
- const checkedSales = JSON.stringify(this.checkedLines());
+ const checkedSales = JSON.stringify(this.selectedValidSales());
const sales = JSON.parse(checkedSales);
this.transfer = {
lastActiveTickets: [],
@@ -258,99 +199,123 @@ class Controller extends Section {
this.$.watcher.updateOriginalData();
const query = `tickets/${this.ticket.id}/transferSales`;
- this.$http.post(query, params).then(res => {
- this.goToTicket(res.data.id);
- });
- }
-
- createClaim() {
- const claim = {
- ticketFk: this.ticket.id,
- clientFk: this.ticket.clientFk,
- ticketCreated: this.ticket.shipped
- };
- const sales = this.checkedLines();
-
- if (this.newInstances().length === 0)
- this.$.watcher.updateOriginalData();
-
- this.$http.post(`Claims/createFromSales`, {claim: claim, sales: sales}).then(res => {
- this.$state.go('claim.card.basicData', {id: res.data.id});
- });
- }
-
- goToTicket(ticketId) {
- this.$state.go('ticket.card.sale', {id: ticketId});
- }
-
- // Slesperson Mana
- getManaSalespersonMana() {
- this.$http.get(`Tickets/${this.$state.params.id}/getSalesPersonMana`).then(res => {
- this.mana = res.data;
- });
+ this.$http.post(query, params)
+ .then(res => this.$state.go('ticket.card.sale', {id: res.data.id}));
}
showEditPricePopover(event, sale) {
if (!this.isEditable) return;
- this.sale = sale;
- this.newPrice = this.sale.price;
+
this.edit = {
- ticketFk: this.ticket.id,
- id: sale.id,
- quantity: sale.quantity
+ price: sale.price,
+ sale: sale
};
- this.$.editPricePopover.parent = event.target;
- this.$.editPricePopover.show();
+ this.$.editPricePopover.show(event);
}
updatePrice() {
- if (this.newPrice && this.newPrice != this.sale.price) {
- const query = `Sales/${this.edit.id}/updatePrice`;
- this.$http.post(query, {newPrice: this.newPrice}).then(res => {
- this.sale.price = res.data.price;
-
- this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
- }).finally(() => {
- if (this.newInstances().length === 0)
- this.$.watcher.updateOriginalData();
- });
+ const sale = this.edit.sale;
+ const newPrice = this.edit.price;
+ if (newPrice != null && newPrice != sale.price) {
+ const query = `Sales/${sale.id}/updatePrice`;
+ this.$http.post(query, {newPrice}).then(res => {
+ sale.price = res.data.price;
+ this.edit = null;
+ this.refreshTotal();
+ this.vnApp.showSuccess(this.$t('Data saved!'));
+ }).finally(() => this.resetChanges());
}
this.$.editPricePopover.hide();
}
- updateNewPrice() {
- this.newPrice = this.sale.quantity * this.newPrice - ((this.sale.discount * (this.sale.quantity * this.newPrice)) / 100);
- }
-
showEditDiscountPopover(event, sale) {
if (this.isLocked) return;
- this.sale = sale;
- this.edit = [{
- ticketFk: this.ticket.id,
- id: sale.id,
- quantity: sale.quantity,
- price: sale.price,
- discount: sale.discount
- }];
- this.$.editPopover.parent = event.target;
- this.$.editPopover.show();
+ this.edit = {
+ discount: sale.discount,
+ sale: sale
+ };
+
+ this.$.editDiscount.show(event);
}
- showEditDialog() {
- this.edit = this.checkedLines();
- this.$.editDialog.show();
+ showEditDiscountDialog(event) {
+ if (this.isLocked) return;
+
+ this.edit = {
+ discount: null,
+ sales: this.selectedValidSales()
+ };
+
+ this.$.editDiscountDialog.show(event);
}
- hideEditDialog() {
- this.$.model.refresh();
- this.$.editDialog.hide();
+ changeDiscount() {
+ const sale = this.edit.sale;
+ const newDiscount = this.edit.discount;
+ if (newDiscount != null && newDiscount != sale.discount)
+ this.updateDiscount([sale]);
+
+ this.$.editDiscount.hide();
}
- hideEditPopover() {
- this.$.model.refresh();
- this.$.editPopover.hide();
+ changeMultipleDiscount() {
+ const sales = this.edit.sales;
+ const newDiscount = this.edit.discount;
+ const hasChanges = sales.some(sale => {
+ return sale.discount != newDiscount;
+ });
+
+ if (newDiscount != null && hasChanges)
+ this.updateDiscount(sales);
+
+ this.$.editDiscountDialog.hide();
+ }
+
+ updateDiscount(sales) {
+ const saleIds = sales.map(sale => {
+ return sale.id;
+ });
+
+ const params = {salesIds: saleIds, newDiscount: this.edit.discount};
+ const query = `Tickets/${this.$params.id}/updateDiscount`;
+ this.$http.post(query, params).then(() => {
+ this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
+
+ for (let sale of sales)
+ sale.discount = this.edit.discount;
+
+ this.edit = null;
+ this.refreshTotal();
+ }).finally(() => this.resetChanges());
+ }
+
+ getNewPrice() {
+ if (this.edit) {
+ const sale = this.edit.sale;
+ let newDiscount = sale.discount;
+ let newPrice = this.edit.price || sale.price;
+
+ if (this.edit.discount != null)
+ newDiscount = this.edit.discount;
+
+ if (this.edit.price != null)
+ newPrice = this.edit.price;
+
+ const price = sale.quantity * newPrice;
+ const discount = (newDiscount * price) / 100;
+
+ return price - discount;
+ }
+
+ return 0;
+ }
+
+ hasReserves() {
+ return this.sales.some(sale => {
+ return sale.reserved == true;
+ });
}
/*
@@ -368,26 +333,13 @@ class Controller extends Section {
}
setReserved(reserved) {
- let selectedSales = this.checkedLines();
- let params = {sales: selectedSales, ticketFk: this.ticket.id, reserved: reserved};
-
- let reservedSales = new Map();
- this.$http.post(`Sales/reserve`, params).then(res => {
- let isReserved = res.config.data.reserved;
-
- res.config.data.sales.forEach(sale => {
- reservedSales.set(sale.id, {reserved: isReserved});
+ const selectedSales = this.selectedValidSales();
+ const params = {ticketId: this.ticket.id, sales: selectedSales, reserved: reserved};
+ this.$http.post(`Sales/reserve`, params).then(() => {
+ selectedSales.forEach(sale => {
+ sale.reserved = reserved;
});
-
- this.sales.forEach(sale => {
- const reservedSale = reservedSales.get(sale.id);
- if (reservedSale)
- sale.reserved = reservedSale.reserved;
- });
- }).finally(() => {
- if (this.newInstances().length === 0)
- this.$.watcher.updateOriginalData();
- });
+ }).finally(() => this.resetChanges());
}
newOrderFromTicket() {
@@ -395,7 +347,7 @@ class Controller extends Section {
const path = this.$state.href('order.card.catalog', {id: res.data});
window.open(path, '_blank');
- this.vnApp.showSuccess(this.$translate.instant('Order created'));
+ this.vnApp.showSuccess(this.$t('Order created'));
});
}
@@ -404,7 +356,7 @@ class Controller extends Section {
const client = this.ticket.client;
const phone = address.mobile || address.phone ||
client.mobile || client.phone;
- const sales = this.checkedLines();
+ const sales = this.selectedValidSales();
const items = sales.map(sale => {
return `${sale.quantity} ${sale.concept}`;
});
@@ -417,7 +369,7 @@ class Controller extends Section {
this.newSMS = {
destinationFk: this.ticket.clientFk,
destination: phone,
- message: this.$translate.instant('Product not available', params)
+ message: this.$t('Product not available', params)
};
this.$.sms.open();
}
@@ -433,8 +385,8 @@ class Controller extends Section {
* Creates a new sale if it's a new instance
* Updates the sale quantity for existing instance
*/
- onChangeQuantity(sale) {
- if (!sale.quantity) return;
+ changeQuantity(sale) {
+ if (!sale.itemFk || !sale.quantity) return;
if (!sale.id)
return this.addSale(sale);
@@ -443,37 +395,30 @@ class Controller extends Section {
}
/*
- * Updates a sale quantity
+ * Changes a sale quantity
*/
updateQuantity(sale) {
- const data = {quantity: parseInt(sale.quantity)};
- const query = `Sales/${sale.id}/updateQuantity`;
- this.$http.post(query, data).then(() => {
- this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
+ const data = {quantity: sale.quantity};
+ this.$http.post(`Sales/${sale.id}/updateQuantity`, data).then(() => {
+ this.refreshTotal();
+ this.vnApp.showSuccess(this.$t('Data saved!'));
}).catch(e => {
this.$.model.refresh();
throw e;
- }).finally(() => {
- if (this.newInstances().length === 0)
- this.$.watcher.updateOriginalData();
- });
+ }).finally(() => this.resetChanges());
}
/*
- * Updates a sale concept
+ * Changes a sale concept
*/
updateConcept(sale) {
const data = {newConcept: sale.concept};
- const query = `Sales/${sale.id}/updateConcept`;
- this.$http.post(query, data).then(() => {
- this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
+ this.$http.post(`Sales/${sale.id}/updateConcept`, data).then(() => {
+ this.vnApp.showSuccess(this.$t('Data saved!'));
}).catch(e => {
this.$.model.refresh();
throw e;
- }).finally(() => {
- if (this.newInstances().length === 0)
- this.$.watcher.updateOriginalData();
- });
+ }).finally(() => this.resetChanges());
}
/*
@@ -489,7 +434,6 @@ class Controller extends Section {
if (!res.data) return;
const newSale = res.data;
-
sale.id = newSale.id;
sale.image = newSale.item.image;
sale.subName = newSale.item.subName;
@@ -499,37 +443,29 @@ class Controller extends Section {
sale.price = newSale.price;
sale.item = newSale.item;
- this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
- }).finally(() => {
- if (this.newInstances().length === 0)
- this.$.watcher.updateOriginalData();
- });
+ this.refreshTotal();
+ this.vnApp.showSuccess(this.$t('Data saved!'));
+ }).finally(() => this.resetChanges());
}
isTicketEditable() {
- this.$http.get(`Tickets/${this.$state.params.id}/isEditable`).then(res => {
- this.isEditable = res.data;
- });
+ this.$http.get(`Tickets/${this.$params.id}/isEditable`)
+ .then(res => this.isEditable = res.data);
}
isTicketLocked() {
- this.$http.get(`Tickets/${this.$state.params.id}/isLocked`).then(res => {
- this.isLocked = res.data;
- });
- }
-
- hasOneSaleSelected() {
- if (this.totalCheckedLines() === 1)
- return true;
- return false;
+ this.$http.get(`Tickets/${this.$params.id}/isLocked`)
+ .then(res => this.isLocked = res.data);
}
calculateSalePrice() {
- const sale = this.checkedLines()[0];
+ const sale = this.selectedValidSales()[0];
+ if (!sale) return;
const query = `Sales/${sale.id}/recalculatePrice`;
- this.$http.post(query).then(res => {
- this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
+ this.$http.post(query).then(() => {
+ this.vnApp.showSuccess(this.$t('Data saved!'));
this.$.model.refresh();
+ this.refreshTotal();
});
}
diff --git a/modules/ticket/front/sale/index.spec.js b/modules/ticket/front/sale/index.spec.js
new file mode 100644
index 000000000..ba08d9733
--- /dev/null
+++ b/modules/ticket/front/sale/index.spec.js
@@ -0,0 +1,728 @@
+import './index.js';
+import watcher from 'core/mocks/watcher';
+import crudModel from 'core/mocks/crud-model';
+
+describe('Ticket', () => {
+ describe('Component vnTicketSale', () => {
+ let controller;
+ let $scope;
+ let $state;
+ let $httpBackend;
+
+ beforeEach(ngModule('ticket'));
+
+ beforeEach(angular.mock.inject(($componentController, $rootScope, _$state_, _$httpBackend_) => {
+ const ticket = {
+ id: 1,
+ clientFk: 101,
+ shipped: 1,
+ created: new Date(),
+ client: {salesPersonFk: 1},
+ address: {mobile: 111111111}
+ };
+ const sales = [
+ {
+ id: 1,
+ concept: 'Item 1',
+ quantity: 5,
+ price: 23.5,
+ discount: 0,
+ }, {
+ id: 4,
+ concept: 'Item 2',
+ quantity: 20,
+ price: 5.5,
+ discount: 0,
+ }
+ ];
+
+ $state = _$state_;
+ $scope = $rootScope.$new();
+ $scope.watcher = watcher;
+ $scope.sms = {open: () => {}};
+ $scope.ticket = ticket;
+ $scope.model = crudModel;
+ $httpBackend = _$httpBackend_;
+ Object.defineProperties($state.params, {
+ id: {
+ value: ticket.id,
+ writable: true
+ },
+ go: {
+ value: () => {},
+ writable: false
+ }
+ });
+ const $element = angular.element('');
+ controller = $componentController('vnTicketSale', {$element, $scope});
+ controller.card = {reload: () => {}};
+ controller._ticket = ticket;
+ controller._sales = sales;
+ }));
+
+ describe('ticket() setter', () => {
+ it('should set the ticket data an then call the isTicketEditable() and isTicketLocked() methods', () => {
+ jest.spyOn(controller, 'isTicketEditable').mockReturnThis();
+ jest.spyOn(controller, 'isTicketLocked').mockReturnThis();
+
+ controller.ticket = {id: 1};
+
+ expect(controller.isTicketEditable).toHaveBeenCalledWith();
+ expect(controller.isTicketLocked).toHaveBeenCalledWith();
+ });
+ });
+
+ describe('sales() setter', () => {
+ it('should set the sales data an then call the refreshTotal() method', () => {
+ jest.spyOn(controller, 'refreshTotal').mockReturnThis();
+
+ controller.sales = [{id: 1}];
+
+ expect(controller.refreshTotal).toHaveBeenCalledWith();
+ });
+ });
+
+ describe('getSubTotal()', () => {
+ it('should make an HTTP GET query and then set the subtotal property', () => {
+ const expectedAmount = 128;
+
+ $httpBackend.expect('GET', 'Tickets/1/subtotal').respond(200, expectedAmount);
+ controller.getSubTotal();
+ $httpBackend.flush();
+
+ expect(controller.subtotal).toEqual(expectedAmount);
+ });
+ });
+
+ describe('getSaleTotal()', () => {
+ it('should return the sale total amount', () => {
+ const sale = {
+ quantity: 10,
+ price: 2,
+ discount: 10
+ };
+
+ const expectedAmount = 18;
+ const result = controller.getSaleTotal(sale);
+
+ expect(result).toEqual(expectedAmount);
+ });
+ });
+
+ describe('getMana()', () => {
+ it('should make an HTTP GET query and return the worker mana', () => {
+ controller.edit = {};
+ const expectedAmount = 250;
+
+ $httpBackend.expect('GET', 'Tickets/1/getSalesPersonMana').respond(200, expectedAmount);
+ controller.getMana();
+ $httpBackend.flush();
+
+ expect(controller.edit.mana).toEqual(expectedAmount);
+ });
+ });
+
+ describe('getVat()', () => {
+ it('should make an HTTP GET query and return the ticket VAT', () => {
+ controller.edit = {};
+ const expectedAmount = 67;
+
+ $httpBackend.expect('GET', 'Tickets/1/getVAT').respond(200, expectedAmount);
+ controller.getVat();
+ $httpBackend.flush();
+
+ expect(controller.VAT).toEqual(expectedAmount);
+ });
+ });
+
+ describe('selectedSales()', () => {
+ it('should return a list of selected sales', () => {
+ controller.sales[1].checked = true;
+
+ const expectedSaleId = 4;
+ const result = controller.selectedSales();
+ const firstSelectedSale = result[0];
+
+ expect(result.length).toEqual(1);
+ expect(firstSelectedSale.id).toEqual(expectedSaleId);
+ });
+ });
+
+ describe('selectedValidSales()', () => {
+ it('should return a list of selected sales having a sale id', () => {
+ const newEmptySale = {quantity: 10, checked: true};
+ controller.sales.push(newEmptySale);
+ controller.sales[0].checked = true;
+
+ const expectedSaleId = 1;
+ const result = controller.selectedValidSales();
+ const firstSelectedSale = result[0];
+
+ expect(result.length).toEqual(1);
+ expect(firstSelectedSale.id).toEqual(expectedSaleId);
+ });
+ });
+
+ describe('selectedSalesCount()', () => {
+ it('should return the number of selected sales', () => {
+ controller.sales[0].checked = true;
+
+ const result = controller.selectedSalesCount();
+
+ expect(result).toEqual(1);
+ });
+ });
+
+ describe('hasSelectedSales()', () => {
+ it('should return truthy if atleast one sale is selected', () => {
+ controller.sales[0].checked = true;
+
+ const result = controller.hasSelectedSales();
+
+ expect(result).toBeTruthy();
+ });
+ });
+
+ describe('hasOneSaleSelected()', () => {
+ it('should return truthy if just one sale is selected', () => {
+ controller.sales[0].checked = true;
+
+ const result = controller.hasOneSaleSelected();
+
+ expect(result).toBeTruthy();
+ });
+
+ it('should return falsy if more than one sale is selected', () => {
+ controller.sales[0].checked = true;
+ controller.sales[1].checked = true;
+
+ const result = controller.hasOneSaleSelected();
+
+ expect(result).toBeFalsy();
+ });
+ });
+
+ describe('newInstances()', () => {
+ it(`should return a list of sales that doesn't have an id`, () => {
+ const newEmptySale = {quantity: 10, checked: true};
+ controller.sales.push(newEmptySale);
+
+ const result = controller.newInstances();
+ const firstNewSale = result[0];
+
+ expect(result.length).toEqual(1);
+ expect(firstNewSale.id).toBeUndefined();
+ expect(firstNewSale.quantity).toEqual(10);
+ });
+ });
+
+ describe('resetChanges()', () => {
+ it(`should not call the watcher updateOriginalData() method`, () => {
+ jest.spyOn(controller.$.watcher, 'updateOriginalData').mockReturnThis();
+
+ const newEmptySale = {quantity: 10};
+ controller.sales.push(newEmptySale);
+ controller.resetChanges();
+
+ expect(controller.$.watcher.updateOriginalData).not.toHaveBeenCalledWith();
+ });
+
+ it(`should call the watcher updateOriginalData() method`, () => {
+ jest.spyOn(controller.$.watcher, 'updateOriginalData').mockReturnThis();
+
+ controller.resetChanges();
+
+ expect(controller.$.watcher.updateOriginalData).toHaveBeenCalledWith();
+ });
+ });
+
+ describe('changeState()', () => {
+ it('should make an HTTP post query, then call the showSuccess(), reload() and resetChanges() methods', () => {
+ jest.spyOn(controller.card, 'reload').mockReturnThis();
+ jest.spyOn(controller.vnApp, 'showSuccess').mockReturnThis();
+ jest.spyOn(controller, 'resetChanges').mockReturnThis();
+
+ const expectedParams = {ticketFk: 1, code: 'OK'};
+ $httpBackend.expect('POST', `TicketTrackings/changeState`, expectedParams).respond(200);
+ controller.changeState('OK');
+ $httpBackend.flush();
+
+ expect(controller.card.reload).toHaveBeenCalledWith();
+ expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
+ expect(controller.resetChanges).toHaveBeenCalledWith();
+ });
+ });
+
+ describe('removeSales()', () => {
+ it('should make an HTTP post query, then call the showSuccess(), removeSelectedSales() and resetChanges() methods', () => {
+ jest.spyOn(controller.vnApp, 'showSuccess').mockReturnThis();
+ jest.spyOn(controller, 'removeSelectedSales').mockReturnThis();
+ jest.spyOn(controller, 'resetChanges').mockReturnThis();
+
+ const firstSale = controller.sales[0];
+ firstSale.checked = true;
+ const expectedParams = {sales: [firstSale], ticketId: 1};
+ $httpBackend.expect('POST', `Sales/deleteSales`, expectedParams).respond(200);
+ controller.removeSales();
+ $httpBackend.flush();
+
+ expect(controller.removeSelectedSales).toHaveBeenCalledWith();
+ expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
+ expect(controller.resetChanges).toHaveBeenCalledWith();
+ });
+ });
+
+ describe('removeSelectedSales()', () => {
+ it('should remove the selected sales from the controller sale property', () => {
+ jest.spyOn(controller, 'refreshTotal').mockReturnThis();
+ jest.spyOn(controller, 'resetChanges').mockReturnThis();
+
+ const firstSale = controller.sales[0];
+ firstSale.checked = true;
+
+ controller.removeSelectedSales();
+
+ const lastSale = controller.sales[0];
+
+ expect(controller.sales.length).toEqual(1);
+ expect(lastSale.id).toEqual(4);
+ expect(controller.refreshTotal).toHaveBeenCalledWith();
+ });
+ });
+
+ describe('createClaim()', () => {
+ it('should perform a query and call windows open', () => {
+ jest.spyOn(controller, 'resetChanges').mockReturnThis();
+ jest.spyOn(controller.$state, 'go').mockReturnThis();
+
+ const newEmptySale = {quantity: 10};
+ controller.sales.push(newEmptySale);
+ const firstSale = controller.sales[0];
+ firstSale.checked = true;
+
+ const expectedParams = {ticketId: 1, sales: [firstSale]};
+ $httpBackend.expect('POST', `Claims/createFromSales`, expectedParams).respond(200, {id: 1});
+ controller.createClaim();
+ $httpBackend.flush();
+
+ expect(controller.resetChanges).toHaveBeenCalledWith();
+ expect(controller.$state.go).toHaveBeenCalledWith('claim.card.basicData', {id: 1});
+ });
+ });
+
+ describe('setTransferParams()', () => {
+ it('should define the transfer object on the controller and its default properties', () => {
+ const firstSale = controller.sales[0];
+ firstSale.checked = true;
+ const expectedResponse = [firstSale];
+
+ $httpBackend.expect('GET', `clients/101/lastActiveTickets?ticketId=1`).respond(expectedResponse);
+ controller.setTransferParams();
+ $httpBackend.flush();
+
+ const lastActiveTickets = controller.transfer.lastActiveTickets;
+
+ expect(controller.transfer).toBeDefined();
+ expect(lastActiveTickets).toBeDefined();
+ expect(lastActiveTickets[0].id).toEqual(1);
+ });
+ });
+
+ describe('transferSales()', () => {
+ it('should transfer sales to a ticket and then call to the $state go() method', () => {
+ jest.spyOn(controller.$state, 'go').mockReturnThis();
+
+ controller.transfer = {
+ sales: [{id: 1, itemFk: 1}, {id: 2, itemFk: 4}]
+ };
+
+ const ticketIdToTransfer = 13;
+ const expectedResponse = {id: ticketIdToTransfer};
+ const params = {
+ ticketId: 13,
+ sales: controller.transfer.sales
+ };
+
+ $httpBackend.expect('POST', `tickets/1/transferSales`, params).respond(expectedResponse);
+ controller.transferSales(ticketIdToTransfer);
+ $httpBackend.flush();
+
+ expect(controller.$state.go).toHaveBeenCalledWith('ticket.card.sale', {id: ticketIdToTransfer});
+ });
+ });
+
+ describe('updatePrice()', () => {
+ it('should make an HTTP POST query, update the sale price and then call to the resetChanges() method', () => {
+ jest.spyOn(controller, 'refreshTotal').mockReturnThis();
+ jest.spyOn(controller.vnApp, 'showSuccess').mockReturnThis();
+ jest.spyOn(controller, 'resetChanges').mockReturnThis();
+
+ const selectedSale = controller.sales[0];
+ selectedSale.checked = true;
+ controller.$.editPricePopover = {hide: jest.fn()};
+ controller.edit = {
+ price: 2,
+ sale: selectedSale
+ };
+ const expectedParams = {newPrice: 2};
+ $httpBackend.expect('POST', `Sales/1/updatePrice`, expectedParams).respond(200, {price: 2});
+ controller.updatePrice();
+ $httpBackend.flush();
+
+ expect(selectedSale.price).toEqual(2);
+ expect(controller.refreshTotal).toHaveBeenCalledWith();
+ expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
+ expect(controller.$.editPricePopover.hide).toHaveBeenCalledWith();
+ expect(controller.resetChanges).toHaveBeenCalledWith();
+ });
+ });
+
+ describe('changeDiscount()', () => {
+ it('should call to the updateDiscount() method and then to the editDiscount hide() method', () => {
+ jest.spyOn(controller, 'updateDiscount').mockReturnThis();
+
+ const selectedSale = controller.sales[0];
+ selectedSale.checked = true;
+ const expectedSale = selectedSale;
+ controller.$.editDiscount = {hide: jest.fn()};
+ controller.edit = {
+ discount: 10,
+ sale: selectedSale
+ };
+
+ controller.changeDiscount();
+
+ expect(controller.updateDiscount).toHaveBeenCalledWith([expectedSale]);
+ expect(controller.$.editDiscount.hide).toHaveBeenCalledWith();
+ });
+ });
+
+ describe('changeMultipleDiscount()', () => {
+ it('should call to the updateDiscount() method and then to the editDiscountDialog hide() method', () => {
+ jest.spyOn(controller, 'updateDiscount').mockReturnThis();
+
+ const firstSelectedSale = controller.sales[0];
+ firstSelectedSale.checked = true;
+
+ const secondSelectedSale = controller.sales[1];
+ secondSelectedSale.checked = true;
+
+ const expectedSales = [firstSelectedSale, secondSelectedSale];
+ controller.$.editDiscountDialog = {hide: jest.fn()};
+ controller.edit = {
+ discount: 10,
+ sales: expectedSales
+ };
+
+ controller.changeMultipleDiscount();
+
+ expect(controller.updateDiscount).toHaveBeenCalledWith(expectedSales);
+ expect(controller.$.editDiscountDialog.hide).toHaveBeenCalledWith();
+ });
+
+ it('should not call to the updateDiscount() method and then to the editDiscountDialog hide() method', () => {
+ jest.spyOn(controller, 'updateDiscount').mockReturnThis();
+
+ const firstSelectedSale = controller.sales[0];
+ firstSelectedSale.checked = true;
+ firstSelectedSale.discount = 10;
+
+ const secondSelectedSale = controller.sales[1];
+ secondSelectedSale.checked = true;
+ secondSelectedSale.discount = 10;
+
+ const expectedSales = [firstSelectedSale, secondSelectedSale];
+ controller.$.editDiscountDialog = {hide: jest.fn()};
+ controller.edit = {
+ discount: 10,
+ sales: expectedSales
+ };
+
+ controller.changeMultipleDiscount();
+
+ expect(controller.updateDiscount).not.toHaveBeenCalledWith(expectedSales);
+ expect(controller.$.editDiscountDialog.hide).toHaveBeenCalledWith();
+ });
+ });
+
+ describe('updateDiscount()', () => {
+ it('should make an HTTP POST query, update the sales discount and then call to the resetChanges() method', () => {
+ jest.spyOn(controller, 'resetChanges').mockReturnThis();
+ jest.spyOn(controller.vnApp, 'showSuccess').mockReturnThis();
+ jest.spyOn(controller, 'refreshTotal').mockReturnThis();
+
+ const expectedDiscount = 10;
+ const firstSelectedSale = controller.sales[0];
+ firstSelectedSale.checked = true;
+
+ const secondSelectedSale = controller.sales[1];
+ secondSelectedSale.checked = true;
+
+ controller.edit = {
+ discount: expectedDiscount
+ };
+
+ const expectedSales = [firstSelectedSale, secondSelectedSale];
+ const expectedSaleIds = [firstSelectedSale.id, secondSelectedSale.id];
+ const expectedParams = {salesIds: expectedSaleIds, newDiscount: expectedDiscount};
+ $httpBackend.expect('POST', `Tickets/1/updateDiscount`, expectedParams).respond(200, {discount: 10});
+ controller.updateDiscount(expectedSales);
+ $httpBackend.flush();
+
+ expect(firstSelectedSale.discount).toEqual(expectedDiscount);
+ expect(secondSelectedSale.discount).toEqual(expectedDiscount);
+ expect(controller.refreshTotal).toHaveBeenCalledWith();
+ expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
+ expect(controller.resetChanges).toHaveBeenCalledWith();
+ });
+ });
+
+ describe('getNewPrice()', () => {
+ it('should return the total price simulation from a price change', () => {
+ const selectedSale = controller.sales[0];
+ selectedSale.checked = true;
+ controller.edit = {
+ price: 2,
+ sale: selectedSale
+ };
+
+ const expectedAmount = 10;
+ const result = controller.getNewPrice();
+
+ expect(result).toEqual(expectedAmount);
+ });
+
+ it('should return the total price simulation from a discount change', () => {
+ const selectedSale = controller.sales[0];
+ selectedSale.checked = true;
+ controller.edit = {
+ discount: 10,
+ sale: selectedSale
+ };
+
+ const expectedAmount = 105.75;
+ const result = controller.getNewPrice();
+
+ expect(result).toEqual(expectedAmount);
+ });
+ });
+
+ describe('hasReserves()', () => {
+ it('should return true for any sale marked as reserved', () => {
+ const selectedSale = controller.sales[0];
+ selectedSale.reserved = true;
+
+ const result = controller.hasReserves();
+
+ expect(result).toBeTruthy();
+ });
+ });
+
+ describe('unmarkAsReserved()', () => {
+ it('should call setReserved with false', () => {
+ jest.spyOn(controller, 'setReserved');
+
+ controller.unmarkAsReserved(false);
+
+ expect(controller.setReserved).toHaveBeenCalledWith(false);
+ });
+ });
+
+ describe('markAsReserved()', () => {
+ it('should call setReserved with true', () => {
+ jest.spyOn(controller, 'setReserved');
+
+ controller.markAsReserved(true);
+
+ expect(controller.setReserved).toHaveBeenCalledWith(true);
+ });
+ });
+
+ describe('setReserved()', () => {
+ it('should call getCheckedLines, $.index.accept and make a query ', () => {
+ const selectedSale = controller.sales[0];
+ selectedSale.checked = true;
+ const expectedParams = {
+ sales: [selectedSale],
+ ticketId: 1,
+ reserved: false
+ };
+
+ $httpBackend.expectPOST(`Sales/reserve`, expectedParams).respond();
+ controller.unmarkAsReserved(false);
+ $httpBackend.flush();
+ });
+ });
+
+ describe('newOrderFromTicket()', () => {
+ it('should make an HTTP post query and then open the new order on a new tab', () => {
+ const expectedParams = {ticketFk: 1};
+ const expectedResponse = {id: 123};
+
+ window.open = jasmine.createSpy('open');
+ controller.$state.href = jasmine.createSpy('href')
+ .and.returnValue('/somePath');
+
+ $httpBackend.expect('POST', `Orders/newFromTicket`, expectedParams).respond(expectedResponse);
+ controller.newOrderFromTicket();
+ $httpBackend.flush();
+
+ expect(window.open).toHaveBeenCalledWith('/somePath', '_blank');
+ });
+ });
+
+ describe('showSMSDialog()', () => {
+ it('should open an SMS dialog with specified data', () => {
+ jest.spyOn(controller.$.sms, 'open');
+
+ const selectedSale = controller.sales[0];
+ selectedSale.checked = true;
+ controller.showSMSDialog();
+
+ expect(controller.$.sms.open).toHaveBeenCalledWith();
+ expect(controller.newSMS.destination).toEqual(111111111);
+ expect(controller.newSMS.message).not.toEqual('');
+ });
+ });
+
+ describe('changeQuantity()', () => {
+ it('should not call addSale() or updateQuantity() methods', () => {
+ jest.spyOn(controller, 'addSale');
+ jest.spyOn(controller, 'updateQuantity');
+
+ const sale = {itemFk: 4};
+ controller.changeQuantity(sale);
+
+ expect(controller.addSale).not.toHaveBeenCalled();
+ expect(controller.updateQuantity).not.toHaveBeenCalled();
+ });
+
+ it('should call addSale() method', () => {
+ jest.spyOn(controller, 'addSale');
+
+ const sale = {itemFk: 4, quantity: 5};
+ controller.changeQuantity(sale);
+
+ expect(controller.addSale).toHaveBeenCalledWith(sale);
+ });
+
+ it('should call updateQuantity() method', () => {
+ jest.spyOn(controller, 'addSale');
+ jest.spyOn(controller, 'updateQuantity');
+
+ const sale = {id: 1, itemFk: 4, quantity: 5};
+ controller.changeQuantity(sale);
+
+ expect(controller.addSale).not.toHaveBeenCalled();
+ expect(controller.updateQuantity).toHaveBeenCalledWith(sale);
+ });
+ });
+
+ describe('updateQuantity()', () => {
+ it('should make a POST query saving sale quantity', () => {
+ jest.spyOn(controller, 'refreshTotal').mockReturnThis();
+ jest.spyOn(controller, 'resetChanges').mockReturnThis();
+
+ const selectedSale = controller.sales[0];
+ selectedSale.checked = true;
+ selectedSale.quantity = 10;
+
+ const expectedParams = {quantity: 10};
+ $httpBackend.expect('POST', `Sales/1/updateQuantity`, expectedParams).respond();
+ controller.updateQuantity(selectedSale);
+ $httpBackend.flush();
+
+ expect(controller.refreshTotal).toHaveBeenCalledWith();
+ expect(controller.resetChanges).toHaveBeenCalledWith();
+ });
+ });
+
+ describe('updateConcept()', () => {
+ it('should make a POST query saving sale concept', () => {
+ jest.spyOn(controller, 'resetChanges').mockReturnThis();
+
+ const selectedSale = controller.sales[0];
+ selectedSale.checked = true;
+ selectedSale.concept = 'My new weapon';
+
+ const expectedParams = {newConcept: 'My new weapon'};
+ $httpBackend.expect('POST', `Sales/1/updateConcept`, expectedParams).respond();
+ controller.updateConcept(selectedSale);
+ $httpBackend.flush();
+
+ expect(controller.resetChanges).toHaveBeenCalledWith();
+ });
+ });
+
+ describe('addSale()', () => {
+ it('should make a POST query adding a new sale', () => {
+ jest.spyOn(controller.vnApp, 'showSuccess').mockReturnThis();
+ jest.spyOn(controller, 'refreshTotal').mockReturnThis();
+ jest.spyOn(controller, 'resetChanges').mockReturnThis();
+
+ const newSale = {itemFk: 4, quantity: 10};
+ const expectedParams = {itemId: 4, quantity: 10};
+ const expectedResult = {
+ id: 30,
+ quantity: 10,
+ discount: 0,
+ price: 0,
+ itemFk: 4,
+ item: {
+ subName: 'Item subName',
+ image: '30.png'
+ }
+ };
+
+ $httpBackend.expect('POST', `tickets/1/addSale`, expectedParams).respond(expectedResult);
+ controller.addSale(newSale);
+ $httpBackend.flush();
+
+ expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
+ expect(controller.refreshTotal).toHaveBeenCalledWith();
+ expect(controller.resetChanges).toHaveBeenCalledWith();
+ });
+ });
+
+ describe('isTicketEditable()', () => {
+ it('should make a HTTP GET query and set the isEditable property on the controller', () => {
+ $httpBackend.expect('GET', `Tickets/1/isEditable`).respond(200, true);
+ controller.isTicketEditable();
+ $httpBackend.flush();
+
+ expect(controller.isEditable).toBeDefined();
+ expect(controller.isEditable).toBeTruthy();
+ });
+ });
+
+ describe('isTicketLocked()', () => {
+ it('should make a HTTP GET query and set the isLocked property on the controller', () => {
+ $httpBackend.expect('GET', `Tickets/1/isLocked`).respond(200, false);
+ controller.isTicketLocked();
+ $httpBackend.flush();
+
+ expect(controller.isLocked).toBeDefined();
+ expect(controller.isLocked).toBeFalsy();
+ });
+ });
+
+ describe('calculateSalePrice()', () => {
+ it('should make an HTTP post query ', () => {
+ jest.spyOn(controller.vnApp, 'showSuccess').mockReturnThis();
+ jest.spyOn(controller.$.model, 'refresh').mockReturnThis();
+ jest.spyOn(controller, 'refreshTotal').mockReturnThis();
+
+ const selectedSale = controller.sales[0];
+ selectedSale.checked = true;
+
+ $httpBackend.expect('POST', `Sales/1/recalculatePrice`).respond(200);
+ controller.calculateSalePrice();
+ $httpBackend.flush();
+
+ expect(controller.vnApp.showSuccess).toHaveBeenCalledWith('Data saved!');
+ expect(controller.$.model.refresh).toHaveBeenCalledWith();
+ expect(controller.refreshTotal).toHaveBeenCalledWith();
+ });
+ });
+ });
+});
diff --git a/modules/ticket/front/sale/locale/es.yml b/modules/ticket/front/sale/locale/es.yml
index 908b76bc6..fd98304b0 100644
--- a/modules/ticket/front/sale/locale/es.yml
+++ b/modules/ticket/front/sale/locale/es.yml
@@ -1,5 +1,6 @@
New price: Nuevo precio
Add item: Añadir artículo
+Add item to basket: Añadir artículo a la cesta
Add turn: Añadir a turno
Delete ticket: Eliminar ticket
Mark as reserved: Marcar como reservado
diff --git a/modules/ticket/front/sale/specs/editDiscount.spec.js b/modules/ticket/front/sale/specs/editDiscount.spec.js
deleted file mode 100644
index 8eccfe74f..000000000
--- a/modules/ticket/front/sale/specs/editDiscount.spec.js
+++ /dev/null
@@ -1,87 +0,0 @@
-import '../editDiscount.js';
-
-describe('Ticket', () => {
- describe('Component vnTicketSaleEditDiscount', () => {
- let controller;
- let $httpBackend;
- let $state;
- let $scope;
-
- beforeEach(ngModule('ticket'));
-
- beforeEach(angular.mock.inject(($componentController, _$state_, _$httpBackend_, $rootScope) => {
- $httpBackend = _$httpBackend_;
- $scope = $rootScope.$new();
- $scope.index = {model: {instances: [{id: 1}, {id: 2}]}, accept: () => {
- return {
- then: () => {}
- };
- }};
- $state = _$state_;
- $state.params.id = 11;
- const $element = angular.element('');
- controller = $componentController('vnTicketSaleEditDiscount', {$element, $scope});
- controller._edit = [{id: 3}];
- controller.onHide = () => {};
- }));
-
- describe('edit() setter', () => {
- it('should set _edit value and call setNewDiscount', () => {
- jest.spyOn(controller, 'setNewDiscount');
- controller.edit = {id: 1};
-
- expect(controller.edit).toEqual({id: 1});
- expect(controller.setNewDiscount).toHaveBeenCalledWith();
- });
- });
-
- describe('bulk() setter', () => {
- it('should set _bulk value and call setNewDiscount', () => {
- jest.spyOn(controller, 'setNewDiscount');
- controller.bulk = true;
-
- expect(controller.bulk).toEqual(true);
- expect(controller.setNewDiscount).toHaveBeenCalledWith();
- });
- });
-
- describe('setNewDiscount()', () => {
- it('should set NewDiscount to edit[0].discount value if it doesnt exists', () => {
- controller.edit = [{discount: 1}];
- controller.setNewDiscount();
-
- expect(controller.newDiscount).toEqual(1);
- });
- });
-
- describe('updateDiscount()', () => {
- it('should make a query if the discount value has been modified or the bulk value is true', () => {
- controller.bulk = true;
- controller.newDiscount = 15;
-
- $httpBackend.expectPOST(`Tickets/11/updateDiscount`).respond();
- controller.updateDiscount();
-
- $httpBackend.flush();
- });
-
- it(`should throw if there's no changes on discount and it isn't bulk`, () => {
- controller.bulk = false;
- controller.newDiscount = 15;
- controller.edit = [{discount: 15}];
- jest.spyOn(controller.vnApp, 'showError');
- controller.updateDiscount();
-
- expect(controller.vnApp.showError).toHaveBeenCalledWith('There are no changes to save');
- });
- });
-
- describe('clearDiscount()', () => {
- it('should set newDiscount to null', () => {
- controller.clearDiscount();
-
- expect(controller.newDiscount).toEqual(null);
- });
- });
- });
-});
diff --git a/modules/ticket/front/sale/specs/index.spec.js b/modules/ticket/front/sale/specs/index.spec.js
deleted file mode 100644
index 1c8fbda53..000000000
--- a/modules/ticket/front/sale/specs/index.spec.js
+++ /dev/null
@@ -1,409 +0,0 @@
-import '../index.js';
-import watcher from 'core/mocks/watcher';
-import crudModel from 'core/mocks/crud-model';
-
-describe('Ticket', () => {
- describe('Component vnTicketSale', () => {
- let controller;
- let $scope;
- let $state;
- let $httpBackend;
-
- const ticket = {
- id: 1,
- clientFk: 101,
- shipped: 1,
- created: new Date(),
- client: {salesPersonFk: 1},
- address: {mobile: 111111111}
- };
- const sales = [
- {
- id: 1,
- concept: 'Item 1',
- quantity: 5,
- price: 23.5,
- discount: 0,
- }, {
- id: 4,
- concept: 'Item 2',
- quantity: 20,
- price: 5.5,
- discount: 0,
- }
- ];
-
- beforeEach(ngModule('ticket'));
-
- beforeEach(angular.mock.inject(($componentController, $rootScope, _$state_, _$httpBackend_) => {
- $state = _$state_;
- $scope = $rootScope.$new();
- $scope.watcher = watcher;
- $scope.sms = {open: () => {}};
- $scope.ticket = ticket;
- $scope.model = crudModel;
- $httpBackend = _$httpBackend_;
- Object.defineProperties($state.params, {
- id: {
- value: ticket.id,
- writable: true
- },
- go: {
- value: () => {},
- writable: false
- }
- });
- const $element = angular.element('');
- controller = $componentController('vnTicketSale', {$element, $scope});
- controller.card = {reload: () => {}};
- controller.ticket = ticket;
- controller.sales = sales;
- }));
-
- describe('createClaim()', () => {
- it('should perform a query and call windows open', () => {
- jest.spyOn(controller.$state, 'go');
-
- const claim = {id: 1};
- const sales = [{id: 1}, {id: 2}];
-
- $httpBackend.whenGET(`Tickets/1/getVAT`).respond(200, 10.5);
- $httpBackend.whenGET(`Tickets/1/subtotal`).respond(200, 227.5);
- $httpBackend.whenGET(`Tickets/1/isEditable`).respond();
- $httpBackend.whenGET(`Tickets/1/isLocked`).respond();
- $httpBackend.when('POST', `Claims/createFromSales`, {claim: claim, sales: sales}).respond(claim);
- $httpBackend.expect('POST', `Claims/createFromSales`).respond(claim);
- controller.createClaim();
- $httpBackend.flush();
-
- expect(controller.subtotal).toEqual(227.5);
- expect(controller.VAT).toEqual(10.5);
- expect(controller.total).toEqual(238);
- expect(controller.$state.go).toHaveBeenCalledWith('claim.card.basicData', {id: 1});
- });
- });
-
- describe('isChecked() getter', () => {
- it('should set isChecked value to true when one of the instances has the value checked to true', () => {
- controller.sales[0].checked = true;
-
- expect(controller.isChecked).toBeTruthy();
- });
- });
-
- describe('checkedLines()', () => {
- it('should make an array of the instances with the property checked true()', () => {
- let sale = controller.sales[0];
- sale.checked = true;
- let expectedResult = [sale];
-
- $httpBackend.whenGET(`Tickets/1/subtotal`).respond(200, 227.5);
- $httpBackend.whenGET(`Tickets/1/getVAT`).respond(200, 10.5);
- $httpBackend.whenGET(`Tickets/1/isEditable`).respond();
- $httpBackend.whenGET(`Tickets/1/isLocked`).respond();
- let result = controller.checkedLines();
- $httpBackend.flush();
-
- expect(result).toEqual(expectedResult);
- });
- });
-
- describe('onStateOkClick()', () => {
- it('should perform a get and then call a function', () => {
- let filter = {where: {code: 'OK'}, fields: ['id']};
- filter = encodeURIComponent(JSON.stringify(filter));
- let res = [{id: 3}];
- jest.spyOn(controller, 'onStateChange').mockReturnThis();
-
- $httpBackend.whenGET(`States?filter=${filter}`).respond(res);
- $httpBackend.expectGET(`Tickets/1/subtotal`).respond(200, 227.5);
- $httpBackend.expectGET(`Tickets/1/getVAT`).respond(200, 10.5);
- $httpBackend.whenGET(`Tickets/1/isEditable`).respond();
- $httpBackend.whenGET(`Tickets/1/isLocked`).respond();
- controller.onStateOkClick();
- $httpBackend.flush();
-
- expect(controller.onStateChange).toHaveBeenCalledWith(3);
- });
- });
-
- describe('onStateChange()', () => {
- it('should perform a post and then call a function', () => {
- $httpBackend.expectPOST(`TicketTrackings/changeState`).respond();
- $httpBackend.whenGET(`Tickets/1/subtotal`).respond(200, 227.5);
- $httpBackend.whenGET(`Tickets/1/getVAT`).respond(200, 10.5);
- $httpBackend.whenGET(`Tickets/1/isEditable`).respond();
- $httpBackend.whenGET(`Tickets/1/isLocked`).respond();
- controller.onStateChange(3);
- $httpBackend.flush();
- });
- });
-
- describe('onRemoveLinesClick()', () => {
- it('should call getCheckedLines, call removeInstances, and make a query', () => {
- controller.sales[0].checked = true;
-
- $httpBackend.whenPOST(`Sales/removes`).respond();
- $httpBackend.whenGET(`Tickets/1/subtotal`).respond(200, 227.5);
- $httpBackend.whenGET(`Tickets/1/getVAT`).respond(200, 10.5);
- $httpBackend.whenGET(`Tickets/1/isEditable`).respond();
- $httpBackend.whenGET(`Tickets/1/isLocked`).respond();
- controller.onRemoveLinesClick('accept');
- $httpBackend.flush();
-
- expect(controller.sales.length).toEqual(1);
- });
- });
-
- describe('unmarkAsReserved()', () => {
- it('should call setReserved with false', () => {
- jest.spyOn(controller, 'setReserved');
-
- controller.unmarkAsReserved(false);
-
- expect(controller.setReserved).toHaveBeenCalledWith(false);
- });
- });
-
- describe('markAsReserved()', () => {
- it('should call setReserved with true', () => {
- jest.spyOn(controller, 'setReserved');
-
- controller.markAsReserved(true);
-
- expect(controller.setReserved).toHaveBeenCalledWith(true);
- });
- });
-
- describe('setReserved()', () => {
- it('should call getCheckedLines, $.index.accept and make a query ', () => {
- const sale = controller.sales[0];
- sale.checked = true;
- let expectedRequest = {
- sales: [sale],
- ticketFk: ticket.id,
- reserved: false
- };
-
- $httpBackend.expectPOST(`Sales/reserve`, expectedRequest).respond();
- $httpBackend.whenGET(`Tickets/1/subtotal`).respond(200, 227.5);
- $httpBackend.whenGET(`Tickets/1/getVAT`).respond(200, 10.5);
- $httpBackend.whenGET(`Tickets/1/isEditable`).respond();
- $httpBackend.whenGET(`Tickets/1/isLocked`).respond();
- controller.unmarkAsReserved(false);
- $httpBackend.flush();
- });
- });
-
- describe('showSMSDialog()', () => {
- it('should open an SMS dialog with specified data', () => {
- jest.spyOn(controller.$.sms, 'open');
-
- controller.sales[0].checked = true;
- controller.showSMSDialog();
-
- expect(controller.$.sms.open).toHaveBeenCalledWith();
- expect(controller.newSMS.destination).toEqual(111111111);
- expect(controller.newSMS.message).not.toEqual('');
- });
- });
-
- describe('onChangeQuantity()', () => {
- it('should not call addSale() or updateQuantity() methods', () => {
- jest.spyOn(controller, 'addSale');
- jest.spyOn(controller, 'updateQuantity');
-
- const sale = {itemFk: 4};
- controller.onChangeQuantity(sale);
-
- expect(controller.addSale).not.toHaveBeenCalled();
- expect(controller.updateQuantity).not.toHaveBeenCalled();
- });
-
- it('should call addSale() method', () => {
- jest.spyOn(controller, 'addSale');
-
- const sale = {itemFk: 4, quantity: 5};
- controller.onChangeQuantity(sale);
-
- expect(controller.addSale).toHaveBeenCalledWith(sale);
- });
-
- it('should call updateQuantity() method', () => {
- jest.spyOn(controller, 'updateQuantity');
- jest.spyOn(controller, 'addSale');
-
- const sale = {id: 1, itemFk: 4, quantity: 5};
- controller.onChangeQuantity(sale);
-
- expect(controller.addSale).not.toHaveBeenCalled();
- expect(controller.updateQuantity).toHaveBeenCalledWith(sale);
- });
- });
-
- describe('updateQuantity()', () => {
- it('should make a POST query saving sale quantity', () => {
- jest.spyOn(controller.$.watcher, 'updateOriginalData');
- const data = {quantity: 10};
- const sale = sales[0];
- sale.quantity = 10;
-
- $httpBackend.when('POST', `Sales/4/updateQuantity`, data).respond();
- $httpBackend.expect('POST', `Sales/4/updateQuantity`, data).respond();
- $httpBackend.whenGET(`Tickets/1/subtotal`).respond(200, 227.5);
- $httpBackend.whenGET(`Tickets/1/getVAT`).respond(200, 10.5);
- $httpBackend.whenGET(`Tickets/1/isEditable`).respond();
- $httpBackend.whenGET(`Tickets/1/isLocked`).respond();
- controller.updateQuantity(sale);
- $httpBackend.flush();
-
- expect(controller.$.watcher.updateOriginalData).toHaveBeenCalledWith();
- });
- });
-
- describe('updateConcept()', () => {
- it('should make a POST query saving sale concept', () => {
- jest.spyOn(controller.$.watcher, 'updateOriginalData');
- const data = {newConcept: 'My new weapon'};
- const sale = sales[0];
- sale.concept = 'My new weapon';
-
- $httpBackend.when('POST', `Sales/4/updateConcept`, data).respond();
- $httpBackend.expect('POST', `Sales/4/updateConcept`, data).respond();
- $httpBackend.whenGET(`Tickets/1/subtotal`).respond(200, 227.5);
- $httpBackend.whenGET(`Tickets/1/getVAT`).respond(200, 10.5);
- $httpBackend.whenGET(`Tickets/1/isEditable`).respond();
- $httpBackend.whenGET(`Tickets/1/isLocked`).respond();
- controller.updateConcept(sale);
- $httpBackend.flush();
-
- expect(controller.$.watcher.updateOriginalData).toHaveBeenCalledWith();
- });
- });
-
- describe('addSale()', () => {
- it('should make a POST query adding a new sale', () => {
- jest.spyOn(controller.$.watcher, 'updateOriginalData');
- const newSale = {itemFk: 4, quantity: 10};
- const params = {itemId: 4, quantity: 10};
-
- const expectedResult = {
- id: 30,
- quantity: 10,
- discount: 0,
- price: 0,
- itemFk: 4,
- item: {
- subName: 'Item subName',
- image: '30.png'
- }
- };
-
- $httpBackend.when('POST', `tickets/1/addSale`, params).respond(expectedResult);
- $httpBackend.expect('POST', `tickets/1/addSale`, params).respond(expectedResult);
- $httpBackend.whenGET(`Tickets/1/subtotal`).respond(200, 227.5);
- $httpBackend.whenGET(`Tickets/1/getVAT`).respond(200, 10.5);
- $httpBackend.whenGET(`Tickets/1/isEditable`).respond();
- $httpBackend.whenGET(`Tickets/1/isLocked`).respond();
- controller.addSale(newSale);
- $httpBackend.flush();
-
- expect(controller.$.watcher.updateOriginalData).toHaveBeenCalledWith();
- });
- });
-
- describe('transferSales()', () => {
- it('should transfer sales to a ticket', () => {
- jest.spyOn(controller, 'goToTicket');
- controller.transfer = {
- sales: [{id: 1, itemFk: 1}, {id: 2, itemFk: 4}]
- };
-
- const expectedResponse = {id: 13};
- const params = {
- ticketId: 13,
- sales: controller.transfer.sales
- };
-
- $httpBackend.when('POST', `tickets/1/transferSales`, params).respond(expectedResponse);
- $httpBackend.expect('POST', `tickets/1/transferSales`, params).respond(expectedResponse);
- $httpBackend.whenGET(`Tickets/1/subtotal`).respond(200, 227.5);
- $httpBackend.whenGET(`Tickets/1/getVAT`).respond(200, 10.5);
- $httpBackend.whenGET(`Tickets/1/isEditable`).respond();
- $httpBackend.whenGET(`Tickets/1/isLocked`).respond();
- controller.transferSales(13);
- $httpBackend.flush();
-
- expect(controller.goToTicket).toHaveBeenCalledWith(13);
- });
- });
-
- describe('setTransferParams()', () => {
- it('should define the transfer object on the controller and its default properties', () => {
- let sale = controller.sales[0];
- sale.checked = true;
- const expectedResponse = [sale];
-
- $httpBackend.when('GET', `clients/101/lastActiveTickets?ticketId=1`).respond(expectedResponse);
- $httpBackend.expect('GET', `clients/101/lastActiveTickets?ticketId=1`).respond(expectedResponse);
- $httpBackend.whenGET(`Tickets/1/subtotal`).respond(200, 227.5);
- $httpBackend.whenGET(`Tickets/1/getVAT`).respond(200, 10.5);
- $httpBackend.whenGET(`Tickets/1/isEditable`).respond();
- $httpBackend.whenGET(`Tickets/1/isLocked`).respond();
- controller.setTransferParams();
- $httpBackend.flush();
-
- const lastActiveTickets = controller.transfer.lastActiveTickets;
-
- expect(controller.transfer).toBeDefined();
- expect(lastActiveTickets).toBeDefined();
- expect(lastActiveTickets[0].id).toEqual(4);
- });
- });
-
- describe('newOrderFromTicket()', () => {
- it('should make an HTTP post query and then open the new order on a new tab', () => {
- const params = {ticketFk: 1};
- const expectedResponse = {id: 123};
-
- window.open = jasmine.createSpy('open');
- controller.$state.href = jasmine.createSpy('href')
- .and.returnValue('/somePath');
-
- $httpBackend.when('POST', `Orders/newFromTicket`, params).respond(expectedResponse);
- $httpBackend.expect('POST', `Orders/newFromTicket`, params).respond(expectedResponse);
- $httpBackend.whenGET(`Tickets/1/subtotal`).respond(200, 227.5);
- $httpBackend.whenGET(`Tickets/1/getVAT`).respond(200, 10.5);
- $httpBackend.whenGET(`Tickets/1/isEditable`).respond();
- $httpBackend.whenGET(`Tickets/1/isLocked`).respond();
- controller.newOrderFromTicket();
- $httpBackend.flush();
-
- expect(window.open).toHaveBeenCalledWith('/somePath', '_blank');
- });
- });
-
- describe('hasOneSaleSelected()', () => {
- it('should return true if just one sale is selected', () => {
- controller.sales[0].checked = true;
-
- expect(controller.hasOneSaleSelected()).toBeTruthy();
- });
- });
-
- describe('calculateSalePrice()', () => {
- it('should make an HTTP post query ', () => {
- controller.sales[0].checked = true;
-
- $httpBackend.when('POST', `Sales/4/recalculatePrice`).respond(200);
- $httpBackend.whenGET(`Tickets/1/subtotal`).respond(200, 227.5);
- $httpBackend.whenGET(`Tickets/1/getVAT`).respond(200, 10.5);
- $httpBackend.whenGET(`Tickets/1/isEditable`).respond();
- $httpBackend.whenGET(`Tickets/1/isLocked`).respond();
-
- controller.calculateSalePrice();
- $httpBackend.flush();
- });
- });
- });
-});
diff --git a/modules/ticket/front/sale/style.scss b/modules/ticket/front/sale/style.scss
index 142c72295..a1c36f271 100644
--- a/modules/ticket/front/sale/style.scss
+++ b/modules/ticket/front/sale/style.scss
@@ -24,7 +24,7 @@ vn-ticket-sale {
}
}
vn-dialog.edit {
- @extend .edit-price;
+ @extend .edit-popover;
&>div{
padding: 0!important;
@@ -81,8 +81,9 @@ vn-ticket-sale {
width: 400px
}
}
-.edit-price {
+.vn-popover .edit-popover {
min-width: 200px;
+ text-align: center;
section.header {
background-color: $color-main;
diff --git a/modules/ticket/front/summary/index.html b/modules/ticket/front/summary/index.html
index 78b941fb1..8b73c9c48 100644
--- a/modules/ticket/front/summary/index.html
+++ b/modules/ticket/front/summary/index.html
@@ -16,7 +16,7 @@
+ value="{{$ctrl.summary.ticketState.state.name}}">
diff --git a/modules/ticket/front/summary/index.js b/modules/ticket/front/summary/index.js
index 864f118d2..980ccd449 100644
--- a/modules/ticket/front/summary/index.js
+++ b/modules/ticket/front/summary/index.js
@@ -31,7 +31,7 @@ class Controller extends Section {
get isEditable() {
try {
- return !this.ticket.state.state.alertLevel;
+ return !this.ticket.ticketState.state.alertLevel;
} catch (e) {}
return true;
diff --git a/modules/worker/back/methods/worker-mana/getCurrentWorkerMana.js b/modules/worker/back/methods/worker-mana/getCurrentWorkerMana.js
index 7be2312e6..fa34af475 100644
--- a/modules/worker/back/methods/worker-mana/getCurrentWorkerMana.js
+++ b/modules/worker/back/methods/worker-mana/getCurrentWorkerMana.js
@@ -14,16 +14,13 @@ module.exports = Self => {
});
Self.getCurrentWorkerMana = async ctx => {
- let currentClientId = ctx.req.accessToken.userId;
- let currentWorker = await Self.app.models.Worker.findOne({
- where: {userFk: currentClientId},
- fields: 'id'
- });
- let currentWorkerMana = await Self.app.models.WorkerMana.findOne({
- where: {workerFk: currentWorker.id},
+ let userId = ctx.req.accessToken.userId;
+
+ let workerMana = await Self.app.models.WorkerMana.findOne({
+ where: {workerFk: userId},
fields: 'amount'
});
- return currentWorkerMana ? currentWorkerMana.amount : 0;
+ return workerMana ? workerMana.amount : 0;
};
};
diff --git a/modules/zone/back/methods/zone/deleteZone.js b/modules/zone/back/methods/zone/deleteZone.js
index d5dd42d7b..baa442491 100644
--- a/modules/zone/back/methods/zone/deleteZone.js
+++ b/modules/zone/back/methods/zone/deleteZone.js
@@ -32,7 +32,7 @@ module.exports = Self => {
zoneFk: id
},
include: {
- relation: 'state',
+ relation: 'ticketState',
scope: {
fields: ['id', 'alertLevel', 'code']
}
@@ -49,7 +49,7 @@ module.exports = Self => {
ticketList.forEach(ticket => {
promises.push(ticket.updateAttributes({zoneFk: null}, options));
- if (ticket.state().alertLevel == 0 && ticket.shipped >= today) {
+ if (ticket.ticketState().alertLevel == 0 && ticket.shipped >= today) {
promises.push(models.TicketTracking.create({
ticketFk: ticket.id,
stateFk: fixingState.id,
diff --git a/modules/zone/front/calendar/index.spec.js b/modules/zone/front/calendar/index.spec.js
index 6ea524020..00645b317 100644
--- a/modules/zone/front/calendar/index.spec.js
+++ b/modules/zone/front/calendar/index.spec.js
@@ -33,6 +33,7 @@ describe('component vnZoneCalendar', () => {
describe('step()', () => {
it('should set the date month to 4 months backwards', () => {
const now = new Date();
+ now.setDate(15);
now.setMonth(now.getMonth() - 4);
controller.step(-1);
@@ -45,6 +46,7 @@ describe('component vnZoneCalendar', () => {
it('should set the date month to 4 months forwards', () => {
const now = new Date();
+ now.setDate(15);
now.setMonth(now.getMonth() + 4);
controller.step(1);
diff --git a/print/templates/reports/claim-pickup-order/locale/es.yml b/print/templates/reports/claim-pickup-order/locale/es.yml
index b37793b70..54990a05c 100644
--- a/print/templates/reports/claim-pickup-order/locale/es.yml
+++ b/print/templates/reports/claim-pickup-order/locale/es.yml
@@ -11,5 +11,5 @@ clientSignature: Firma del cliente
claim: Reclamación {0}
sections:
agency:
- description: 'Para agilizar tu recogida, por favor, pónte en contacto con la oficina
+ description: 'Para agilizar su recogida, por favor, póngase en contacto con la oficina
de integrados.
Tlf: 96 166 77 88 - Ana Gómez (Ext. 2113) (agomezf@integra2.es)'