Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev

2021-01-22 07:27:51 +01:00 · 2021-01-22 07:27:51 +01:00 · ad7be8f9b4
parent 030c87217a 1c7325c1c0
commit ad7be8f9b4
2 changed files with 4 additions and 3 deletions
--- a/front/salix/components/descriptor/style.scss
+++ b/front/salix/components/descriptor/style.scss
@ -11,8 +11,8 @@ vn-descriptor-content {
        & > img[ng-src] {
            min-height: 16em;
            display: block;
-            height: 100%;
-            width: 100%;
+            width: 256px;
+            height: 256px;
        }

        vn-float-button {
--- a/modules/ticket/front/descriptor-menu/index.js
+++ b/modules/ticket/front/descriptor-menu/index.js
@ -60,7 +60,8 @@ class Controller extends Section {
                }
            },
            {relation: 'ship'},
-            {relation: 'stowaway'}]
+            {relation: 'stowaway'},
+            {relation: 'invoiceOut'}]
        };

        return this.$http.get(`Tickets/${this.ticketId}`, {filter})