Merge branch 'dev' of https://git.verdnatura.es/salix into dev
This commit is contained in:
commit
9e6aaf8ac6
|
|
@ -29,4 +29,5 @@ import './combo/combo';
|
|||
import './card/card';
|
||||
import './switch/switch';
|
||||
import './float-button/float-button';
|
||||
import './step-control/step-control';
|
||||
import './label-value/label-value';
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
<section class="step-control">
|
||||
<section class="steps">
|
||||
<section class="step" ng-repeat="step in $ctrl.steps track by $index">
|
||||
<section class="circle"
|
||||
vn-tooltip="{{::step.name}}"
|
||||
tooltip-position="down"
|
||||
ng-click="$ctrl.currentState = step.state"
|
||||
ng-class="{active: step.state == $ctrl.currentState}">
|
||||
</section>
|
||||
</section>
|
||||
</section>
|
||||
<section class="buttons">
|
||||
<section class="step">
|
||||
<vn-button
|
||||
ng-if="$ctrl.canMovePrevious()"
|
||||
label="Previous"
|
||||
ng-click="$ctrl.onPreviousClick()">
|
||||
</vn-button>
|
||||
</section>
|
||||
<section class="step">
|
||||
<vn-button
|
||||
ng-if="$ctrl.canMoveNext()"
|
||||
label="Next"
|
||||
ng-click="$ctrl.onNextClick()">
|
||||
</vn-button>
|
||||
<vn-submit
|
||||
ng-if="$ctrl.canFinalize()"
|
||||
label="Finalize"
|
||||
ng-click="$ctrl.onStepEnd()">
|
||||
</vn-submit>
|
||||
</section>
|
||||
</section>
|
||||
</section>
|
||||
|
|
@ -0,0 +1,71 @@
|
|||
import ngModule from '../../module';
|
||||
import './style.scss';
|
||||
|
||||
export default class StepControl {
|
||||
constructor($state) {
|
||||
this.$state = $state;
|
||||
}
|
||||
|
||||
set currentState(state) {
|
||||
let isAllowed = true;
|
||||
|
||||
if (this.onStepChange)
|
||||
isAllowed = this.onStepChange({state});
|
||||
|
||||
if (isAllowed)
|
||||
this.$state.go(state);
|
||||
}
|
||||
|
||||
get totalSteps() {
|
||||
return this.steps.length;
|
||||
}
|
||||
|
||||
get currentState() {
|
||||
return this.$state.current.name;
|
||||
}
|
||||
|
||||
get currentStepIndex() {
|
||||
for (let i = 0; i < this.steps.length; i++) {
|
||||
if (this.steps[i].state == this.$state.current.name)
|
||||
return i;
|
||||
}
|
||||
}
|
||||
|
||||
onPreviousClick() {
|
||||
let state = this.steps[this.currentStepIndex - 1].state;
|
||||
|
||||
this.currentState = state;
|
||||
}
|
||||
|
||||
onNextClick() {
|
||||
let state = this.steps[this.currentStepIndex + 1].state;
|
||||
|
||||
this.currentState = state;
|
||||
}
|
||||
|
||||
canMovePrevious() {
|
||||
return this.steps[0].state != this.currentState;
|
||||
}
|
||||
|
||||
canFinalize() {
|
||||
let lastStep = this.steps[this.totalSteps - 1];
|
||||
return lastStep.state == this.currentState;
|
||||
}
|
||||
|
||||
canMoveNext() {
|
||||
let lastStep = this.steps[this.totalSteps - 1];
|
||||
return lastStep.state != this.currentState;
|
||||
}
|
||||
}
|
||||
|
||||
StepControl.$inject = ['$state'];
|
||||
|
||||
ngModule.component('vnStepControl', {
|
||||
template: require('./step-control.html'),
|
||||
controller: StepControl,
|
||||
bindings: {
|
||||
steps: '<',
|
||||
onStepChange: '&?',
|
||||
onStepEnd: '&?'
|
||||
}
|
||||
});
|
||||
|
|
@ -0,0 +1,49 @@
|
|||
import './step-control.js';
|
||||
|
||||
describe('Component vnStepControl', () => {
|
||||
let $componentController;
|
||||
let controller;
|
||||
let $state;
|
||||
|
||||
beforeEach(() => {
|
||||
angular.mock.module('ticket');
|
||||
});
|
||||
|
||||
beforeEach(angular.mock.inject((_$componentController_, _$state_) => {
|
||||
$componentController = _$componentController_;
|
||||
$state = _$state_;
|
||||
controller = $componentController('vnStepControl', {$state: $state});
|
||||
}));
|
||||
|
||||
describe('currentState()', () => {
|
||||
it(`should call the onStepChange method then return false and never call the go method`, () => {
|
||||
controller.onStepChange = jasmine.createSpy(controller, 'onStepChange').and.returnValue(false);
|
||||
spyOn(controller.$state, 'go');
|
||||
|
||||
controller.currentState = "something";
|
||||
|
||||
expect(controller.onStepChange).toHaveBeenCalledWith({state: 'something'});
|
||||
expect(controller.$state.go).not.toHaveBeenCalledWith("something");
|
||||
});
|
||||
|
||||
it(`should call the onStepChange method then return true and finally call the go method`, () => {
|
||||
controller.onStepChange = jasmine.createSpy(controller, 'onStepChange').and.returnValue(true);
|
||||
spyOn(controller.$state, 'go');
|
||||
|
||||
controller.currentState = "something";
|
||||
|
||||
expect(controller.onStepChange).toHaveBeenCalledWith({state: 'something'});
|
||||
expect(controller.$state.go).toHaveBeenCalledWith("something");
|
||||
});
|
||||
});
|
||||
|
||||
describe('currentStepIndex()', () => {
|
||||
it('should get the current state index from an Array of states', () => {
|
||||
controller.$state.current.name = 'iam_a_current_state';
|
||||
controller.steps = [{state: 'iam_not_current_state'}, {state: 'iam_a_current_state'}];
|
||||
|
||||
let result = controller.currentStepIndex;
|
||||
expect(result).toEqual(1);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
@ -0,0 +1,58 @@
|
|||
vn-step-control {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
|
||||
.step-control {
|
||||
border-top: 2px solid rgb(255,152,0);
|
||||
margin-bottom: 15px;
|
||||
|
||||
& > .steps {
|
||||
display: flex;
|
||||
flex-direction: row
|
||||
}
|
||||
|
||||
& > .steps > .step {
|
||||
justify-content: center;
|
||||
min-width: 125px;
|
||||
display: flex;
|
||||
flex: auto
|
||||
}
|
||||
|
||||
& > .steps > .step .circle {
|
||||
border: 2px solid rgb(255,152,0);
|
||||
background-color: #FFF;
|
||||
align-content: center;
|
||||
margin-top: -9.5px;
|
||||
-moz-border-radius: 50%;
|
||||
-webkit-border-radius: 50%;
|
||||
border-radius: 50%;
|
||||
cursor: pointer;
|
||||
height: 15px;
|
||||
width: 15px
|
||||
}
|
||||
|
||||
& > .steps > .step .circle.active {
|
||||
background-color: rgb(255,152,0);
|
||||
}
|
||||
|
||||
& > .buttons {
|
||||
display: flex;
|
||||
flex: auto;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
margin-top: 10px
|
||||
}
|
||||
|
||||
& > .buttons > .step {
|
||||
display: flex
|
||||
}
|
||||
|
||||
& > .buttons > .step > .mdl-button {
|
||||
line-height: 32px;
|
||||
font-size: 12px;
|
||||
padding: 0 12px;
|
||||
height: 32px
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -8,3 +8,6 @@ Search: Search
|
|||
Show More: Show More
|
||||
No more results: No more results
|
||||
Hide: Hide
|
||||
Next: Next
|
||||
Finalize: Finalize
|
||||
Previous: Back
|
||||
|
|
@ -8,3 +8,6 @@ Search: Buscar
|
|||
Show More: Ver más
|
||||
No more results: No hay más resultados
|
||||
Hide: Ocultar
|
||||
Next: Siguiente
|
||||
Finalize: Finalizar
|
||||
Previous: Anterior
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
<form name="form" ng-submit="$ctrl.onSubmit()" ng-cloak>
|
||||
<form name="form">
|
||||
<vn-card pad-large>
|
||||
<vn-title>Basic data</vn-title>
|
||||
<vn-horizontal>
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
initial-data="$ctrl.ticket.addressFk">
|
||||
</vn-autocomplete>
|
||||
<vn-autocomplete vn-one
|
||||
url="/api/AgencyModes/"
|
||||
url="/api/AgencyModes"
|
||||
label="Agency"
|
||||
show-field="name"
|
||||
value-field="id"
|
||||
|
|
@ -48,7 +48,4 @@
|
|||
</vn-autocomplete>
|
||||
</vn-horizontal>
|
||||
</vn-card>
|
||||
<vn-button-bar>
|
||||
<vn-submit label="Next"></vn-submit>
|
||||
</vn-button-bar>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -1,22 +1,17 @@
|
|||
import ngModule from '../../module';
|
||||
|
||||
class Controller {
|
||||
constructor($scope, $timeout, $state) {
|
||||
constructor($scope) {
|
||||
this.$scope = $scope;
|
||||
this.$timeout = $timeout;
|
||||
this.$state = $state;
|
||||
}
|
||||
onSubmit() {
|
||||
this.$state.go('ticket.card.data.stepTwo');
|
||||
}
|
||||
}
|
||||
|
||||
Controller.$inject = ['$scope', '$timeout', '$state'];
|
||||
Controller.$inject = ['$scope'];
|
||||
|
||||
ngModule.component('vnTicketDataStepOne', {
|
||||
template: require('./step-one.html'),
|
||||
controller: Controller,
|
||||
bindings: {
|
||||
ticket: '<'
|
||||
},
|
||||
controller: Controller
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
<form name="form">
|
||||
<vn-card pad-large>
|
||||
<vn-title>Step tree</vn-title>
|
||||
<vn-horizontal>
|
||||
Ticket id {{$ctrl.ticket.id}}
|
||||
</vn-horizontal>
|
||||
</vn-card>
|
||||
</form>
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
import ngModule from '../../module';
|
||||
|
||||
class Controller {
|
||||
constructor($scope) {
|
||||
this.$scope = $scope;
|
||||
}
|
||||
}
|
||||
|
||||
ngModule.component('vnTicketDataStepThree', {
|
||||
template: require('./step-three.html'),
|
||||
controller: Controller,
|
||||
bindings: {
|
||||
ticket: '<'
|
||||
}
|
||||
});
|
||||
|
|
@ -0,0 +1,29 @@
|
|||
<form name="form">
|
||||
<vn-card pad-large>
|
||||
<vn-title>Price gap</vn-title>
|
||||
<vn-horizontal>
|
||||
<table class="vn-grid">
|
||||
<thead>
|
||||
<tr>
|
||||
<th number translate>Item</th>
|
||||
<th translate style="text-align:center">Description</th>
|
||||
<th number translate>Quantity</th>
|
||||
<th number translate>Price</th>
|
||||
<th number translate>New price</th>
|
||||
<th number translate>Price gap</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr ng-repeat="sale in $ctrl.ticket.sales track by sale.id">
|
||||
<td number>{{("000000"+sale.itemFk).slice(-6)}}</td>
|
||||
<td><vn-fetched-tags sale="sale"/></td>
|
||||
<td number>{{::sale.quantity}}</td>
|
||||
<td number>{{::sale.price | currency:'€':2}}</td>
|
||||
<td number>-</td>
|
||||
<td number>-</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</vn-horizontal>
|
||||
</vn-card>
|
||||
</form>
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
import ngModule from '../../module';
|
||||
|
||||
class Controller {
|
||||
constructor($http, $scope) {
|
||||
this.$http = $http;
|
||||
this.$scope = $scope;
|
||||
}
|
||||
|
||||
$onChanges(data) {
|
||||
if (!this.ticket || !this.ticket.id) return;
|
||||
|
||||
let query = `/ticket/api/sales/${this.ticket.id}/priceGap`;
|
||||
this.$http.get(query).then(res => {
|
||||
if (res.data)
|
||||
this.ticket.sales = res.data;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Controller.$inject = ['$http', '$scope'];
|
||||
|
||||
ngModule.component('vnTicketDataStepTwo', {
|
||||
template: require('./step-two.html'),
|
||||
controller: Controller,
|
||||
bindings: {
|
||||
ticket: '<'
|
||||
}
|
||||
});
|
||||
|
|
@ -151,6 +151,13 @@ INSERT INTO `vn`.`client`(`id`,`name`,`fi`,`socialName`,`contact`,`street`,`city
|
|||
(109, 'Bruce Banner', '16104829E', 'Hulk', 'Black widow', 'Somewhere in New York', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'BruceBanner@verdnatura.es', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1,'0000-00-00', 1, NULL, 1, 1, 0, 1, NULL, 0, 0, 19, 0, 1),
|
||||
(110, 'Jessica Jones', '58282869H', 'Jessica Jones', 'Luke Cage', 'NYCC 2015 Poster', 'Silla', 46460, 1111111111, 222222222, 333333333, 1, 'JessicaJones@verdnatura.es', NULL, 0, 1234567890, 0, 1, 1, 300, 1, 1,NULL, 10, 5,CURDATE(), 1, 5, 1, 1, 1,'0000-00-00', 1, NULL, 1, 1, 0, 1, NULL, 0, 0, NULL, 0, 1);
|
||||
|
||||
INSERT INTO `vn`.`clientManaCache`(`clientFk`, `mana`, `dated`)
|
||||
VALUES
|
||||
( 101, 50, CURDATE()),
|
||||
( 102, 100, CURDATE()),
|
||||
( 103, 0, CURDATE()),
|
||||
( 104, -30, CURDATE());
|
||||
|
||||
INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `provinceFk`, `phone`, `mobile`, `isActive`, `isDefaultAddress`, `clientFk`, `agencyModeFk`, `longitude`, `latitude`, `isEqualizated`)
|
||||
VALUES
|
||||
(101, '01', 'Somewhere in Thailand', 'Silla', 46460, 1, NULL, NULL, 1, 0, 109, 2, NULL, NULL, 0),
|
||||
|
|
@ -537,7 +544,7 @@ INSERT INTO `bi`.`rotacion`(`Id_Article`, `warehouse_id`, `total`, `rotacion`, `
|
|||
|
||||
INSERT INTO `vn`.`annualAverageInvoiced`(`clientFk`, `invoiced`)
|
||||
VALUES
|
||||
( 101, 0),
|
||||
( 101, 1500),
|
||||
( 102, 100),
|
||||
( 103, 1000),
|
||||
( 104, 500),
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
USE `vn`;
|
||||
DROP procedure IF EXISTS `ticketVolume`;
|
||||
|
||||
DELIMITER $$
|
||||
USE `vn`$$
|
||||
CREATE DEFINER=`root`@`%` PROCEDURE `ticketVolume`(IN vTicketId INT)
|
||||
BEGIN
|
||||
DECLARE vWarehouseId INTEGER;
|
||||
DECLARE vShippedDate DATE;
|
||||
|
||||
DROP TEMPORARY TABLE IF EXISTS ticketVolume;
|
||||
SELECT warehouseFk, shipped INTO vWarehouseId,vShippedDate FROM vn.ticket WHERE id = vTicketId;
|
||||
|
||||
CREATE TEMPORARY TABLE IF NOT EXISTS ticketVolume ENGINE MEMORY
|
||||
|
||||
SELECT itemFk, saleFk, quantity, concept, VolUd as m3_uni, volume as m3, volume * quantity as volumeTimesQuantity, @m3:= @m3 + ifnull(volume,0) as m3_total
|
||||
FROM
|
||||
(
|
||||
SELECT round(r.cm3 / 1000000,3) as VolUd ,s.quantity, round(r.cm3 * s.quantity / 1000000,3) as volume,
|
||||
s.itemFk, s.id AS saleFk, s.concept, @m3:= 0, @vol:=0, t.agencyModeFk
|
||||
FROM sale s
|
||||
JOIN vn.ticket t on t.id = s.ticketFk
|
||||
JOIN bi.rotacion r ON r.Id_Article = s.itemFk AND r.warehouse_id = t.warehouseFk
|
||||
WHERE s.ticketFk = vTicketId
|
||||
) sub;
|
||||
END$$
|
||||
|
||||
DELIMITER ;
|
||||
|
||||
|
|
@ -11,7 +11,7 @@ describe('client getAverageInvoiced()', () => {
|
|||
it('should call the getAverageInvoiced method', done => {
|
||||
model.getAverageInvoiced(101)
|
||||
.then(response => {
|
||||
expect(response.invoiced).toEqual(0);
|
||||
expect(response.invoiced).toEqual(1500);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ describe('client getMana()', () => {
|
|||
it('should call the getMana method', done => {
|
||||
model.getMana(101)
|
||||
.then(response => {
|
||||
expect(response.mana).toEqual(0);
|
||||
expect(response.mana).toEqual(30.02);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
module.exports = function(Self) {
|
||||
require('../methods/sale/filter')(Self);
|
||||
require('../methods/sale/priceGap')(Self);
|
||||
require('../methods/sale/saleComponentFilter.js')(Self);
|
||||
require('../methods/sale/price-gap')(Self);
|
||||
};
|
||||
|
|
|
|||
|
|
@ -51,6 +51,11 @@
|
|||
"type": "hasOne",
|
||||
"model": "SaleChecked",
|
||||
"foreignKey": "saleFk"
|
||||
},
|
||||
"components": {
|
||||
"type": "hasMany",
|
||||
"model": "SaleComponent",
|
||||
"foreignKey": "saleFk"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
module.exports = Self => {
|
||||
Self.installMethod('filter', filterParams);
|
||||
|
||||
function filterParams(params) {
|
||||
return {
|
||||
where: {
|
||||
ticketFk: params.ticketFk
|
||||
},
|
||||
skip: (params.page - 1) * params.size,
|
||||
limit: params.size,
|
||||
order: params.order || 'concept ASC',
|
||||
include: [{
|
||||
relation: "item",
|
||||
scope: {
|
||||
include: {
|
||||
relation: "itemTag",
|
||||
scope: {
|
||||
fields: ["tagFk", "value"],
|
||||
include: {
|
||||
relation: "tag",
|
||||
scope: {
|
||||
fields: ["name"]
|
||||
}
|
||||
},
|
||||
limit: 6
|
||||
}
|
||||
},
|
||||
fields: ["itemFk", "name"]
|
||||
}
|
||||
},
|
||||
{
|
||||
relation: "isChecked",
|
||||
scope: {
|
||||
fields: ["isChecked"]
|
||||
}
|
||||
}]
|
||||
};
|
||||
}
|
||||
};
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
module.exports = function(Self) {
|
||||
require('../methods/sale/filter.js')(Self);
|
||||
require('../methods/sale/saleComponentFilter.js')(Self);
|
||||
};
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
{
|
||||
"name": "Sale",
|
||||
"base": "VnModel",
|
||||
"options": {
|
||||
"mysql": {
|
||||
"table": "sale"
|
||||
}
|
||||
},
|
||||
"properties": {
|
||||
"id": {
|
||||
"id": true,
|
||||
"type": "Number",
|
||||
"description": "Identifier"
|
||||
},
|
||||
"concept": {
|
||||
"type": "String"
|
||||
},
|
||||
"quantity": {
|
||||
"type": "Number"
|
||||
},
|
||||
"price": {
|
||||
"type": "Number"
|
||||
},
|
||||
"discount": {
|
||||
"type": "Number"
|
||||
},
|
||||
"reserved": {
|
||||
"type": "Number"
|
||||
},
|
||||
"isPicked": {
|
||||
"type": "Number"
|
||||
},
|
||||
"created": {
|
||||
"type": "date"
|
||||
}
|
||||
},
|
||||
"relations": {
|
||||
"item": {
|
||||
"type": "belongsTo",
|
||||
"model": "Item",
|
||||
"foreignKey": "itemFk",
|
||||
"required": true
|
||||
},
|
||||
"ticket": {
|
||||
"type": "belongsTo",
|
||||
"model": "Ticket",
|
||||
"foreignKey": "ticketFk",
|
||||
"required": true
|
||||
},
|
||||
"isChecked": {
|
||||
"type": "hasOne",
|
||||
"model": "SaleChecked",
|
||||
"foreignKey": "saleFk"
|
||||
},
|
||||
"components": {
|
||||
"type": "hasMany",
|
||||
"model": "SaleComponent",
|
||||
"foreignKey": "saleFk"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -5,9 +5,6 @@
|
|||
"ObservationType": {
|
||||
"dataSource": "vn"
|
||||
},
|
||||
"Sale": {
|
||||
"dataSource": "vn"
|
||||
},
|
||||
"TicketTracking": {
|
||||
"dataSource": "vn"
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue