{
'id',
'typeFk',
'name',
+ 'subName',
'size',
'minPrice',
'tag5',
diff --git a/modules/entry/front/buy/index/index.html b/modules/entry/front/buy/index/index.html
index 1e1a7ecd26..dbe43c4670 100644
--- a/modules/entry/front/buy/index/index.html
+++ b/modules/entry/front/buy/index/index.html
@@ -172,7 +172,12 @@
|
- {{::buy.item.name}}
+
+ {{::buy.item.name}}
+
+ {{::buy.item.subName}}
+
+
{{::buy.size}}
- {{::buy.name}}
-
- {{::buy.subName}}
-
+
+ {{::buy.name}}
+
+ {{::buy.subName}}
+
+
|
- {{::line.item.name}}
+
+ {{::line.item.name}}
+
+ {{::line.item.subName}}
+
+
Send invoice PDF
@@ -106,9 +106,18 @@
-
-
\ No newline at end of file
+
+ Are you sure you want to send it?
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/modules/invoiceOut/front/descriptor/index.js b/modules/invoiceOut/front/descriptor/index.js
index e6305db93b..5a535c9b52 100644
--- a/modules/invoiceOut/front/descriptor/index.js
+++ b/modules/invoiceOut/front/descriptor/index.js
@@ -60,10 +60,10 @@ class Controller extends Descriptor {
.then(res => this.entity = res.data);
}
- sendInvoice() {
+ sendInvoice($data) {
return this.vnEmail.send('invoice', {
recipientId: this.invoiceOut.client.id,
- recipient: this.invoiceOut.client.email,
+ recipient: $data.email,
invoiceId: this.id
});
}
diff --git a/modules/item/front/fetched-tags/style.scss b/modules/item/front/fetched-tags/style.scss
index 3f170937a6..2cd7afbb21 100644
--- a/modules/item/front/fetched-tags/style.scss
+++ b/modules/item/front/fetched-tags/style.scss
@@ -1,5 +1,30 @@
@import "variables";
+[vn-fetched-tags] {
+ min-width: 155px;
+ & [wide] {
+ width: 430px;
+ }
+ & div {
+ display: flex;
+ flex-wrap: wrap;
+ align-items: center;
+ & vn-one {
+ min-width: 200px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ font-size: 1rem;
+ }
+ & vn-one h3 {
+ color: $color-font-secondary;
+ text-transform: uppercase;
+ line-height: initial;
+ font-size: 0.75rem;
+ margin-bottom: 0px;
+ }
+ }
+}
+
vn-fetched-tags {
& > vn-horizontal {
align-items: center;
diff --git a/modules/item/front/fixed-price/index.html b/modules/item/front/fixed-price/index.html
index f7819de371..34e7926268 100644
--- a/modules/item/front/fixed-price/index.html
+++ b/modules/item/front/fixed-price/index.html
@@ -65,10 +65,12 @@
- {{price.name}}
-
- {{price.subName}}
-
+
+ {{price.name}}
+
+ {{price.subName}}
+
+
{{::item.grouping | dashIfEmpty}}
{{::item.packing | dashIfEmpty}}
- {{::item.name}}
-
- {{::item.subName}}
-
+
+ {{::item.name}}
+
+ {{::item.subName}}
+
+
{
beforeEach(inject(($componentController, $rootScope) => {
$scope = $rootScope.$new();
$scope.model = crudModel;
- $scope.model.data = [{priority: 1}, {priority: 2}, {priority: 1}];
const $element = angular.element('');
controller = $componentController('vnItemTags', {$element, $scope});
}));
describe('getHighestPriority', () => {
it('should return the highest priority value + 1 from the array', () => {
+ $scope.model.data = [{priority: 1}, {priority: 2}, {priority: 1}];
let result = controller.getHighestPriority();
expect(result).toEqual(3);
diff --git a/modules/monitor/back/methods/sales-monitor/salesFilter.js b/modules/monitor/back/methods/sales-monitor/salesFilter.js
index 6483a906ac..1b56d87f78 100644
--- a/modules/monitor/back/methods/sales-monitor/salesFilter.js
+++ b/modules/monitor/back/methods/sales-monitor/salesFilter.js
@@ -115,9 +115,8 @@ module.exports = Self => {
}
});
const collegues = worker.collegues() || [];
- collegues.forEach(collegue => {
+ for (let collegue of collegues)
teamMembersId.push(collegue.collegueFk);
- });
if (teamMembersId.length == 0)
teamMembersId.push(userId);
diff --git a/modules/order/front/line/index.html b/modules/order/front/line/index.html
index df81102d51..f0a2f2bdf1 100644
--- a/modules/order/front/line/index.html
+++ b/modules/order/front/line/index.html
@@ -43,10 +43,12 @@
- {{::row.item.name}}
-
- {{::row.item.subName}}
-
+
+ {{::row.item.name}}
+
+ {{::row.item.subName}}
+
+
-
- {{::row.item.name}}
-
- {{::row.item.subName}}
-
+
+
+ {{::row.item.name}}
+
+ {{::row.item.subName}}
+
+
-
- {{::row.item.name}}
-
- {{::row.item.subName}}
-
+
+
+ {{::row.item.name}}
+
+ {{::row.item.subName}}
+
+
-
-
-
- {{::buy.subName}}
-
+
+
+
+
+ {{::buy.subName}}
+
+
{
}, myOptions);
const collegues = worker.collegues() || [];
- collegues.forEach(collegue => {
+ for (let collegue of collegues)
teamMembersId.push(collegue.collegueFk);
- });
if (teamMembersId.length == 0)
teamMembersId.push(userId);
diff --git a/modules/ticket/back/methods/ticket/getSales.js b/modules/ticket/back/methods/ticket/getSales.js
index c3c7fd8605..6dfee5dfae 100644
--- a/modules/ticket/back/methods/ticket/getSales.js
+++ b/modules/ticket/back/methods/ticket/getSales.js
@@ -35,6 +35,7 @@ module.exports = Self => {
fields: [
'id',
'name',
+ 'subName',
'itemPackingTypeFk',
'tag5',
'value5',
diff --git a/modules/ticket/front/basic-data/step-two/index.html b/modules/ticket/front/basic-data/step-two/index.html
index 5bea7bd474..439f2b527f 100644
--- a/modules/ticket/front/basic-data/step-two/index.html
+++ b/modules/ticket/front/basic-data/step-two/index.html
@@ -18,11 +18,13 @@
{{("000000"+sale.itemFk).slice(-6)}}
-
- {{::sale.item.name}}
-
- {{::sale.item.subName}}
-
+
+
+ {{::sale.item.name}}
+
+ {{::sale.item.subName}}
+
+
|
- {{::sale.item.name}}
-
- {{::sale.item.subName}}
-
+
+ {{::sale.item.name}}
+
+ {{::sale.item.subName}}
+
+
diff --git a/modules/ticket/front/main/index.js b/modules/ticket/front/main/index.js
index 78334ba97c..1df7518d4d 100644
--- a/modules/ticket/front/main/index.js
+++ b/modules/ticket/front/main/index.js
@@ -5,9 +5,9 @@ export default class Ticket extends ModuleMain {
constructor() {
super();
- this.filterParams = {
+ this.filterParams = this.fetchParams({
scopeDays: 1
- };
+ });
}
fetchParams($params) {
diff --git a/modules/ticket/front/sale-checked/index.html b/modules/ticket/front/sale-checked/index.html
index e84d583a37..1bc6f1f68f 100644
--- a/modules/ticket/front/sale-checked/index.html
+++ b/modules/ticket/front/sale-checked/index.html
@@ -35,10 +35,12 @@
- {{::sale.item.name}}
-
- {{::sale.item.subName}}
-
+
+ {{::sale.item.name}}
+
+ {{::sale.item.subName}}
+
+
-
- {{::sale.item.name}}
-
- {{::sale.item.subName}}
-
+
+
+ {{::sale.item.name}}
+
+ {{::sale.item.subName}}
+
+
-
+
- {{sale.concept}}
-
- {{::sale.subName}}
-
+
+ {{sale.concept}}
+
+ {{::sale.item.subName}}
+
+
Available
Quantity
Description
- Price
- Discount
- Amount
+ Price
+ Discount
+ Amount
Packing
@@ -191,20 +191,22 @@
{{::sale.quantity}}
-
- {{::sale.item.name}}
-
- {{::sale.item.subName}}
-
+
+
+ {{::sale.item.name}}
+
+ {{::sale.item.subName}}
+
+
- {{::sale.price | currency: 'EUR':2}}
- {{::sale.discount}} %
- {{::sale.quantity * sale.price * ((100 - sale.discount) / 100) | currency: 'EUR':2}}
+ {{::sale.price | currency: 'EUR':2}}
+ {{::sale.discount}} %
+ {{::sale.quantity * sale.price * ((100 - sale.discount) / 100) | currency: 'EUR':2}}
{{::sale.item.itemPackingTypeFk | dashIfEmpty}}
diff --git a/modules/ticket/front/volume/index.html b/modules/ticket/front/volume/index.html
index 8e2bc4bb6e..70bd4f5fbb 100644
--- a/modules/ticket/front/volume/index.html
+++ b/modules/ticket/front/volume/index.html
@@ -43,10 +43,12 @@
- {{::sale.item.name}}
-
- {{::sale.item.subName}}
-
+
+ {{::sale.item.name}}
+
+ {{::sale.item.subName}}
+
+
|