+
diff --git a/front/salix/components/home/home.js b/front/salix/components/home/home.js
index 4891f29ef..dd8765286 100644
--- a/front/salix/components/home/home.js
+++ b/front/salix/components/home/home.js
@@ -3,26 +3,42 @@ import './style.scss';
import keybindings from '../../global-keybindings.yml';
export default class Controller {
- constructor(modulesFactory, $state, $translate, $scope) {
+ constructor(modulesFactory, $state, $translate, $sce) {
this.modules = modulesFactory.getModules();
- this.state = $state;
- this.$translate = $translate;
- this.$scope = $scope;
+ this.$state = $state;
+ this._ = $translate;
+ this.$sce = $sce;
this.keybindings = keybindings;
}
$onInit() {
- this.modules.map(module => {
+ this.modules.map(mod => {
let keyBind = this.keybindings.find(keyBind => {
- return keyBind.sref == module.route.state;
+ return keyBind.sref == mod.route.state;
});
if (keyBind)
- module.keyBind = keyBind.key.toUpperCase();
+ mod.keyBind = keyBind.key.toUpperCase();
});
}
+ getModuleName(mod) {
+ let getName = mod => {
+ let name = this._.instant(mod.name);
+ let lower = name.toUpperCase();
+ if (!mod.keyBind) return name;
+ let index = lower.indexOf(mod.keyBind);
+ if (index === -1) return name;
+
+ let newName = name.substr(0, index);
+ newName += `${name.substr(index, 1)}`;
+ newName += name.substr(index + 1);
+ return newName;
+ };
+
+ return this.$sce.trustAsHtml(getName(mod));
+ }
}
-Controller.$inject = ['modulesFactory', '$state', '$translate', '$scope'];
+Controller.$inject = ['modulesFactory', '$state', '$translate', '$sce'];
ngModule.component('vnHome', {
template: require('./home.html'),
diff --git a/front/salix/components/home/style.scss b/front/salix/components/home/style.scss
index b33949240..f9ba0732b 100644
--- a/front/salix/components/home/style.scss
+++ b/front/salix/components/home/style.scss
@@ -15,6 +15,8 @@ vn-home {
flex-direction: row;
justify-content: center;
flex-wrap: wrap;
+ max-width: 40em;
+ margin: 0 auto;
& > a {
@extend %clickable-light;
@@ -30,18 +32,17 @@ vn-home {
padding: 1em;
justify-content: center;
- & > vn-icon {
- font-size: 4em;
- }
+ & > div {
+ height: 70px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
- & > vn-icon i[class="material-icons"] {
- line-height: 75px;
+ & > vn-icon {
+ display: block;
+ font-size: 3.5em;
+ }
}
-
- & > vn-icon, & > vn-icon i, & > vn-icon i::before {
- max-height: 75px;
- }
-
& > span {
font-size: 0.9em;
text-align: center;
@@ -53,6 +54,11 @@ vn-home {
white-space: nowrap;
overflow: hidden;
color: white;
+ margin: 0;
+
+ & > .bind-letter {
+ color: #FD0;
+ }
}
}
}
diff --git a/front/salix/components/main-menu/main-menu.html b/front/salix/components/main-menu/main-menu.html
index ba6cd6688..5f771d363 100644
--- a/front/salix/components/main-menu/main-menu.html
+++ b/front/salix/components/main-menu/main-menu.html
@@ -22,7 +22,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Id
- Landed
- Quantity
- Claimed
- Description
- Price
- Disc.
- Total
-
-
-
-
-
-
- {{("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.quantity * saleClaimed.sale.price) -
- ((saleClaimed.sale.discount *
- (saleClaimed.sale.quantity * saleClaimed.sale.price))/100) | currency:'€':2
- }}
-
-
-
-
- No results
-
-
-
-
-
-
-
-
-
- Reason
- Result
- Responsible
- Worker
- Redelivery
-
-
-
-
- {{::development.claimReason.description}}
- {{::development.claimResult.description}}
- {{::development.claimResponsible.description}}
- {{::development.worker.firstName}}
- {{::development.claimRedelivery.description}}
-
-
-
- No results
-
-
-
-
-
-
-
-
-
- Id
- Destination
- Landed
- Quantity
- Description
- Price
- Disc.
- Total
-
-
-
-
-
-
- {{("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.quantity * action.sale.price) -
- ((action.sale.discount *
- (action.sale.quantity * action.sale.price))/100) | currency:'€':2
- }}
-
-
-
-
- No results
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/client/front/locale/es.yml b/modules/client/front/locale/es.yml
index 917e440a9..64614337e 100644
--- a/modules/client/front/locale/es.yml
+++ b/modules/client/front/locale/es.yml
@@ -33,7 +33,7 @@ List: Listado
New client: Nuevo cliente
Summary: Vista previa
Basic data: Datos básicos
-Fiscal data: Datos Fiscales
+Fiscal data: Datos fiscales
Pay method: Forma de pago
Addresses: Consignatarios
New address: Nuevo consignatario
diff --git a/modules/client/front/summary/index.html b/modules/client/front/summary/index.html
index 7ea875094..311da805a 100644
--- a/modules/client/front/summary/index.html
+++ b/modules/client/front/summary/index.html
@@ -1,208 +1,195 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
\ No newline at end of file
+
+
+
\ No newline at end of file
diff --git a/modules/client/front/summary/locale/es.yml b/modules/client/front/summary/locale/es.yml
index 36faf51d6..8377e8bc5 100644
--- a/modules/client/front/summary/locale/es.yml
+++ b/modules/client/front/summary/locale/es.yml
@@ -11,3 +11,4 @@ Balance due: Saldo vencido
Rate: Tarifa
Business data: Datos comerciales
Recovery since: Recobro desde
+Fiscal address: Dirección fiscal
diff --git a/modules/client/front/summary/style.scss b/modules/client/front/summary/style.scss
index a8a0be75b..7918cdffd 100644
--- a/modules/client/front/summary/style.scss
+++ b/modules/client/front/summary/style.scss
@@ -1,9 +1,3 @@
-vn-dialog {
- vn-client-summary vn-one {
- min-width: 10em;
- }
-}
-
vn-client-summary {
.bold {
font-family: vn-font-bold;
diff --git a/modules/item/front/descriptor/index.html b/modules/item/front/descriptor/index.html
index f44f13f37..2742b5f26 100644
--- a/modules/item/front/descriptor/index.html
+++ b/modules/item/front/descriptor/index.html
@@ -31,16 +31,16 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ ![]()
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/item/front/summary/style.scss b/modules/item/front/summary/style.scss
index fd2af274a..40f3c2f9e 100644
--- a/modules/item/front/summary/style.scss
+++ b/modules/item/front/summary/style.scss
@@ -1,5 +1,5 @@
vn-item-summary {
- p{
+ p {
margin: 0;
}
}
\ No newline at end of file
diff --git a/modules/item/front/ticket-descriptor/index.js b/modules/item/front/ticket-descriptor/index.js
index b0d5c54fa..dc8432be8 100644
--- a/modules/item/front/ticket-descriptor/index.js
+++ b/modules/item/front/ticket-descriptor/index.js
@@ -10,9 +10,10 @@ class Controller {
this.$translate = $translate;
this.moreOptions = [
{callback: this.showAddTurnDialog, name: 'Add turn', show: true},
- {callback: this.showDeleteTicketDialog, name: 'Delete ticket', show: true},
+ {callback: this.showDeleteTicketDialog, name: 'Delete ticket', show: true}/* ,
{callback: this.showAddStowaway, name: 'Add stowaway', show: true},
- {callback: this.showRemoveStowaway, name: 'Remove stowaway', show: () => this.shouldShowRemoveStowaway()}
+ {callback: this.showRemoveStowaway, name: 'Remove stowaway', show: false}
+ */
];
}
@@ -109,8 +110,7 @@ class Controller {
tooltip: 'Ship'
};
}
- console.log(value.ship);
-
+ /*
if (value.ship.length == 1) {
links.btnThree = {
icon: 'icon-polizon',
@@ -119,7 +119,7 @@ class Controller {
};
} else if (value.ship.length > 1)
this.shipStowaways = value.ship;
-
+*/
this._quicklinks = links;
}
diff --git a/modules/order/front/index/index.html b/modules/order/front/index/index.html
index 6c05f0d05..4528cfe45 100644
--- a/modules/order/front/index/index.html
+++ b/modules/order/front/index/index.html
@@ -70,18 +70,14 @@
- -
-
+ {{::mod.name}}
{{$ctrl.summary.claim.id}} - {{$ctrl.summary.claim.client.name}}
-Detail
-Development
-Action
-{{$ctrl.summary.claim.id}} - {{$ctrl.summary.claim.client.name}}
+Detail
+
+
+
+
+ Id
+ Landed
+ Quantity
+ Claimed
+ Description
+ Price
+ Disc.
+ Total
+
+
+
+
+
+
+ {{("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.quantity * saleClaimed.sale.price) -
+ ((saleClaimed.sale.discount *
+ (saleClaimed.sale.quantity * saleClaimed.sale.price))/100) | currency:'€':2
+ }}
+
+
+
+
+ No results
+
+
+
+ Development
+
+
+
+
+ Reason
+ Result
+ Responsible
+ Worker
+ Redelivery
+
+
+
+
+ {{development.claimReason.description}}
+ {{development.claimResult.description}}
+ {{development.claimResponsible.description}}
+ {{development.worker.firstName}}
+ {{development.claimRedelivery.description}}
+
+
+
+ No results
+
+
+
+ Action
+
+
+
+
+ Id
+ Destination
+ Landed
+ Quantity
+ Description
+ Price
+ Disc.
+ Total
+
+
+
+
+
+
+ {{("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.quantity * action.sale.price) -
+ ((action.sale.discount *
+ (action.sale.quantity * action.sale.price))/100) | currency:'€':2
+ }}
+
+
+
+
+ No results
+
+
+
+ {{$ctrl.summary.name}} - {{$ctrl.summary.id}} - {{$ctrl.summary.salesPerson.firstName}} {{$ctrl.summary.salesPerson.name}}
-Basic data
-Fiscal data
-Pay method
-Default address
-Web access
-Business data
-Financial information
-{{$ctrl.summary.name}} - {{$ctrl.summary.id}} - {{$ctrl.summary.salesPerson.firstName}} {{$ctrl.summary.salesPerson.name}}
+Basic data
+Fiscal address
+Fiscal data
+Pay method
+Default address
+Web access
+Business data
+Financial information
+Visible
-{{$ctrl.item.visible}}
-Available
-{{$ctrl.item.available}}
-Visible
+{{$ctrl.item.visible}}
+Available
+{{$ctrl.item.available}}
+{{$ctrl.item.id}}
{{$ctrl.item.id}}
-Visible
-{{$ctrl.summary.visible}}
-Available
-{{$ctrl.summary.available}}
-Basic data
-{{$ctrl.item.id}} - {{$ctrl.summary.item.name}}
+Other data
-Tags
-Tax
-Niche
-Botanical
-Barcode
-- {{barcode.code}} -
-Visible
+{{$ctrl.summary.visible}}
+Available
+{{$ctrl.summary.available}}
+Basic data
+Other data
+Tags
+Tax
+Niche
+Botanical
+Barcode
++ {{barcode.code}} +
+