diff --git a/e2e/helpers/selectors.js b/e2e/helpers/selectors.js
index d752b265fa..bb23c9d963 100644
--- a/e2e/helpers/selectors.js
+++ b/e2e/helpers/selectors.js
@@ -360,7 +360,7 @@ export default {
goBackToModuleIndexButton: 'vn-ticket-descriptor a[ui-sref="ticket.index"]',
moreMenu: 'vn-ticket-descriptor vn-icon-menu[icon=more_vert]',
moreMenuAddStowaway: '.vn-drop-down.shown li[name="Add stowaway"]',
- moreMenuDeleteStowawayButton: '.vn-drop-down.shown li[name="Remove stowaway"]',
+ moreMenuDeleteStowawayButton: '.vn-drop-down.shown li[name="Delete stowaway"]',
moreMenuAddToTurn: '.vn-drop-down.shown li[name="Add turn"]',
moreMenuDeleteTicket: '.vn-drop-down.shown li[name="Delete ticket"]',
moreMenuMakeInvoice: '.vn-drop-down.shown li[name="Make invoice"]',
diff --git a/front/core/components/chip/style.scss b/front/core/components/chip/style.scss
index 5840ecdf18..3778c62b95 100644
--- a/front/core/components/chip/style.scss
+++ b/front/core/components/chip/style.scss
@@ -14,8 +14,25 @@ vn-chip {
&.colored {
background-color: $color-main;
- color: $color-font-dark;
+ color: $color-font-bg;
}
+ &.notice {
+ background-color: $color-notice-medium
+ }
+ &.success {
+ background-color: $color-success-medium;
+ }
+ &.warning {
+ background-color: $color-main-medium;
+ }
+ &.alert {
+ background-color: $color-alert-medium;
+ }
+ &.message {
+ color: $color-font-dark;
+ background-color: $color-bg-dark
+ }
+
& > div {
display: flex;
align-items: center;
diff --git a/modules/agency/front/location/style.scss b/modules/agency/front/location/style.scss
index 4972a5d293..2316a26225 100644
--- a/modules/agency/front/location/style.scss
+++ b/modules/agency/front/location/style.scss
@@ -1,14 +1,19 @@
@import "variables";
vn-treeview-child {
- .content > .vn-check:not(.indeterminate) {
- color: $color-button;
+ .content > .vn-check:not(.indeterminate):not(.checked) {
+ color: $color-alert;
& > .btn {
- border-color: $color-button;
+ border-color: $color-alert;
}
}
.content > .vn-check.checked {
- color: $color-button;
+ color: $color-notice;
+
+ & > .btn {
+ background-color: $color-notice;
+ border-color: $color-notice
+ }
}
}
\ No newline at end of file
diff --git a/modules/item/front/last-entries/index.html b/modules/item/front/last-entries/index.html
index a7046e17bd..28ba9989bc 100644
--- a/modules/item/front/last-entries/index.html
+++ b/modules/item/front/last-entries/index.html
@@ -43,27 +43,27 @@
disabled="true">
- {{entry.warehouse| dashIfEmpty}}
- {{entry.landed | date:'dd/MM/yyyy HH:mm'}}
- {{entry.entryFk | dashIfEmpty}}
- {{entry.price2 | dashIfEmpty}}
- {{entry.price3 | dashIfEmpty}}
+ {{::entry.warehouse| dashIfEmpty}}
+ {{::entry.landed | date:'dd/MM/yyyy HH:mm'}}
+ {{::entry.entryFk | dashIfEmpty}}
+ {{::entry.price2 | dashIfEmpty}}
+ {{::entry.price3 | dashIfEmpty}}
{{entry.stickers | dashIfEmpty}}
-
- {{entry.packing | dashIfEmpty}}
-
+
+ {{::entry.packing | dashIfEmpty}}
+
-
- {{entry.grouping | dashIfEmpty}}
-
+
+ {{::entry.grouping | dashIfEmpty}}
+
- {{entry.stems | dashIfEmpty}}
- {{entry.quantity}}
- {{entry.buyingValue | dashIfEmpty}}
- {{entry.packageFk | dashIfEmpty}}
- {{entry.supplier | dashIfEmpty}}
+ {{::entry.stems | dashIfEmpty}}
+ {{::entry.quantity}}
+ {{::entry.buyingValue | dashIfEmpty}}
+ {{::entry.packageFk | dashIfEmpty}}
+ {{::entry.supplier | dashIfEmpty}}
diff --git a/modules/ticket/back/methods/ticket/specs/deleteStowaway.spec.js b/modules/ticket/back/methods/ticket/specs/deleteStowaway.spec.js
index d5a10ac3be..3c8097e370 100644
--- a/modules/ticket/back/methods/ticket/specs/deleteStowaway.spec.js
+++ b/modules/ticket/back/methods/ticket/specs/deleteStowaway.spec.js
@@ -1,6 +1,6 @@
const app = require('vn-loopback/server/server');
-fdescribe('ticket deleteStowaway()', () => {
+describe('ticket deleteStowaway()', () => {
const shipId = 16;
const stowawayId = 17;