Merge branch 'test' into dev

modules/agency/front/descriptor/index.html

@@ -3,7 +3,9 @@
         <a translate-attr="{title: 'Return to module index'}" ui-sref="zone.index">
             <vn-icon icon="chevron_left"></vn-icon>
         </a>
-        <vn-icon icon="my_location"></vn-icon>
+        <a translate-attr="{title: 'Preview'}" ui-sref="zone.card.summary({id: $ctrl.zone.id})">
+            <vn-icon icon="desktop_windows"></vn-icon>
+        </a>
         <vn-icon-menu
             vn-id="more-button"
             icon="more_vert"
@@ -15,7 +17,7 @@
         </vn-icon-menu>
     </vn-horizontal>
     <div class="body">
-        <vn-one>    
+        <div class="attributes">
             <vn-label-value label="Id" 
                 value="{{$ctrl.zone.id}}">
             </vn-label-value>
@@ -40,7 +42,7 @@
             <vn-label-value label="Bonus"
                 value="{{$ctrl.zone.price | currency: 'EUR': 2}}">
             </vn-label-value>
-        </vn-one>
+        </div>
     </div>
 </div>
 <vn-confirm

modules/agency/front/routes.json

@@ -38,7 +38,8 @@
             "params": {
                 "zone": "$ctrl.zone"
             }
-        }, {
+        }, 
+        {
             "url": "/basic-data",
             "state": "zone.card.basicData",
             "component": "vn-zone-basic-data",
@@ -46,6 +47,15 @@
             "params": {
                 "zone": "$ctrl.zone"
             }
+        },
+        {
+            "url": "/summary",
+            "state": "zone.card.summary",
+            "component": "vn-zone-summary",
+            "description": "Summary",
+            "params": {
+                "zone": "$ctrl.zone"
+            }
         }
     ]
 }

print/common/css/layout.css

@@ -40,7 +40,7 @@
 
 .panel {
     position: relative;
-    margin-bottom: 20px;
+    margin-bottom: 15px;
     padding-top: 10px;
     break-inside: avoid;
     break-before: always;
@@ -130,7 +130,7 @@ table {
 }
 
 .column-oriented {
-    margin: 20px 0
+    margin-bottom: 15px
 }
 
 .column-oriented td, 

print/report/rpt-delivery-note/assets/css/style.css

@@ -1,10 +1,12 @@
 #signature {
-    margin-top: 80px
+    padding-right: 10px
 }
 
 #signature img {
-    margin-bottom: 20px;
+    -webkit-filter: brightness(0%);
-    width: 150px
+    filter: brightness(0%);
+    margin-bottom: 10px;
+    max-width: 150px
 }
 
 #packagings {

print/report/rpt-delivery-note/index.html

@@ -175,8 +175,8 @@
                             </tfoot>
                         </table>
                     </section>
-                </section>
+                    <section class="size50 pull-left">
-                <section id="signature" class="panel dark" v-if="signature && signature.id">
+                        <section id="signature" class="panel" v-if="signature && signature.id">
                             <section class="header">Firma digital</section>
                             <section class="body centered">
                                 <img v-bind:src="dmsPath"/>
@@ -184,6 +184,9 @@
                             </section>
                         </section>
                     </section>
+                </section>
+
+            </section>
             <!-- Footer component -->     
             <report-footer id="pageFooter"
                 :left-text="$t('ticket', [ticket.id])"

print/report/rpt-delivery-note/index.js

@@ -51,7 +51,7 @@ module.exports = {
             }).format(parseFloat(input));
         },
         date(input) {
-            return strftime('%d-%m-%Y', input);
+            return strftime('%d-%m-%Y %H:%I:%S', input);
         }
     },
     methods: {