Merge fixes

e2e/helpers/selectors.js

@@ -442,7 +442,7 @@ export default {
         saleLine: 'vn-table div > vn-tbody > vn-tr',
         saleDescriptorPopover: '.vn-popover.shown vn-item-descriptor',
         saleDescriptorPopoverSummaryButton: '.vn-popover.shown vn-item-descriptor a[ui-sref="item.card.summary({id: $ctrl.item.id})"]',
-        descriptorItemDiaryButton: 'vn-item-descriptor .quicklinks.ng-scope > vn-horizontal > a > vn-icon > i',
+        descriptorItemDiaryButton: '.vn-popover vn-item-descriptor vn-quick-link[icon="icon-transaction"] > a',
         newItemFromCatalogButton: 'vn-ticket-sale vn-float-button[icon="add"]',
         newItemButton: 'vn-ticket-sale vn-card vn-icon-button[icon="add_circle"]',
         moreMenu: 'vn-ticket-sale vn-tool-bar > vn-button-menu[vn-id="more-button"] > div > button',
@@ -569,9 +569,9 @@ export default {
         firstSaleItemId: 'vn-claim-summary vn-horizontal > vn-auto:nth-child(4) vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(1) > span',
         firstSaleDescriptorImage: '.vn-popover.shown vn-item-descriptor img',
         itemDescriptorPopover: '.vn-popover.shown vn-item-descriptor',
-        itemDescriptorPopoverItemDiaryButton: '.vn-popover.shown vn-item-descriptor a[href="#!/item/2/diary"]',
+        itemDescriptorPopoverItemDiaryButton: '.vn-popover vn-item-descriptor vn-quick-link[icon="icon-transaction"] > a',
         firstDevelopmentWorker: 'vn-claim-summary vn-horizontal > vn-auto:nth-child(5) vn-table > div > vn-tbody > vn-tr:nth-child(1) > vn-td:nth-child(4) > span',
-        firstDevelopmentWorkerGoToClientButton: '.vn-popover.shown vn-worker-descriptor .quicklinks a[href="#!/client/21/summary"]',
+        firstDevelopmentWorkerGoToClientButton: '.vn-popover vn-worker-descriptor vn-quick-link[icon="person"] > a',
         firstActionTicketId: 'vn-claim-summary > vn-card > vn-horizontal > vn-auto:nth-child(6) vn-table > div > vn-tbody > vn-tr > vn-td:nth-child(2) > span',
         firstActionTicketDescriptor: '.vn-popover.shown vn-ticket-descriptor'
     },
@@ -847,7 +847,7 @@ export default {
     },
     entryDescriptor: {
         agency: 'vn-entry-descriptor div.body vn-label-value:nth-child(2) span',
-        travelsQuicklink: 'vn-entry-descriptor .quicklinks > :nth-child(1) a',
+        travelsQuicklink: 'vn-entry-descriptor vn-quick-link[icon="local_airport"] > a',
-        entriesQuicklink: 'vn-entry-descriptor .quicklinks > :nth-child(2) a'
+        entriesQuicklink: 'vn-entry-descriptor vn-quick-link[icon="icon-entry"] > a'
     }
 };

front/core/components/autocomplete/index.html

@@ -16,7 +16,7 @@
         </div>
         <div class="fix suffix"></div>
         <label>
-            <span translate>{{::$ctrl.label}}</span>
+            <span translate>{{$ctrl.label}}</span>
             <span class="required">*</span>
         </label> 
     </div>

front/core/components/field/index.html

@@ -8,7 +8,7 @@
         <div class="control"></div>
         <div class="fix suffix"></div>
         <label>
-            <span translate>{{::$ctrl.label}}</span>
+            <span translate>{{$ctrl.label}}</span>
             <span class="required">*</span>
         </label> 
     </div>

front/core/components/input-file/index.html

@@ -19,7 +19,7 @@
         </div>
         <div class="fix suffix"></div>
         <label>
-            <span translate>{{::$ctrl.label}}</span>
+            <span translate>{{$ctrl.label}}</span>
             <span class="required">*</span>
         </label> 
     </div>

front/core/components/input-number/index.html

@@ -8,7 +8,7 @@
         <div class="control"></div>
         <div class="fix suffix"></div>
         <label>
-            <span translate>{{::$ctrl.label}}</span>
+            <span translate>{{$ctrl.label}}</span>
             <span class="required">*</span>
         </label> 
     </div>

modules/claim/front/summary/index.html

@@ -65,7 +65,7 @@
                         <vn-tr ng-repeat="saleClaimed in $ctrl.summary.salesClaimed">
                             <vn-td number>
                                 <span 
-                                    ng-click="itemDescriptor.show($event, saleClaimed.sale.itemFk)"
+                                    ng-click="itemDescriptor.show($event, saleClaimed.sale.itemFk, saleClaimed.sale.id)"
                                     class="link">
                                     {{::saleClaimed.sale.itemFk | zeroFill:6}}
                                 </span>
@@ -148,7 +148,7 @@
                         <vn-tr ng-repeat="action in $ctrl.summary.actions">
                             <vn-td number>
                                 <span 
-                                    ng-click="itemDescriptor.show($event, action.sale.itemFk)"
+                                    ng-click="itemDescriptor.show($event, action.sale.itemFk, action.sale.id)"
                                     class="link">
                                     {{::action.sale.itemFk | zeroFill:6}}
                                 </span>

modules/item/front/descriptor-popover/index.html

@@ -3,7 +3,7 @@
         <btn-three>
         <vn-quick-link
             tooltip="Item diary"
-            state="['item.card.diary', {id: $ctrl.id, warehouseFk: $ctrl.warehouseFk, ticketFk: $ctrl.ticketFk}]"
+            state="['item.card.diary', {id: $ctrl.id, warehouseFk: $ctrl.warehouseFk, lineFk: $ctrl.lineFk}]"
             icon="icon-transaction">
         </vn-quick-link>
         </btn-three>

modules/item/front/descriptor-popover/index.js

@@ -1,13 +1,23 @@
 import ngModule from '../module';
 import DescriptorPopover from 'salix/components/descriptor-popover';
 
-class Controller extends DescriptorPopover {}
+class Controller extends DescriptorPopover {
+    show(parent, id, lineFk) {
+        super.show(parent, id);
+        this.lineFk = lineFk;
+    }
+
+    hide() {
+        super.hide();
+        this.lineFk = null;
+    }
+}
 
 ngModule.vnComponent('vnItemDescriptorPopover', {
     slotTemplate: require('./index.html'),
     controller: Controller,
     bindings: {
         warehouseFk: '<?',
-        ticketFk: '<?'
+        lineFk: '<?'
     }
 });

modules/zone/front/delivery-days/index.html

@@ -27,15 +27,18 @@
             fields="['code','townFk']"
             order="code, townFk"
             value-field="geoFk"
-            show-field="code"
+            show-field="code">
-            >
             <tpl-item>
-                {{code}} - {{town.name}} ({{town.province.name}}, 
+                <div>
-                {{town.province.country.country}})
+                    {{code}} {{town.name}}
+                </div>
+                <div class="text-caption text-secondary">
+                    {{town.province.name}}, {{town.province.country.country}}
+                </div>
             </tpl-item>
         </vn-autocomplete>
         <vn-autocomplete
-            label="Agency"
+            label="{{$ctrl.deliveryMethodFk == 'delivery' ? 'Agency' : 'Warehouse'}}"
             ng-model="params.agencyModeFk"
             url="AgencyModes/isActive"
             where="$ctrl.agencyFilter"

modules/zone/front/events/index.html

@@ -88,15 +88,13 @@
         </div>
     </vn-data-viewer>
 </vn-side-menu>
-<a
+<vn-float-button
-    vn-tooltip="Add event"
     ng-click="$ctrl.create('weekday')"
+    icon="add"
+    vn-tooltip="Add event"
     vn-bind="+"
     fixed-bottom-right>
-    <vn-float-button
+</vn-float-button>
-        icon="add">
-    </vn-float-button>
-</a>
 <vn-dialog 
     vn-id="dialog"
     on-response="$ctrl.onIncludeResponse($response)"