From 88a5443d64efcaa21afb4e27cc5673896baea16e Mon Sep 17 00:00:00 2001 From: carlosjr Date: Mon, 14 Jun 2021 15:52:46 +0200 Subject: [PATCH 1/3] table style changes --- front/core/components/table/style.scss | 4 + modules/entry/front/buy/index/index.html | 355 +++++++++++----------- modules/entry/front/buy/index/style.scss | 27 +- modules/ticket/front/component/index.html | 110 +++---- modules/ticket/front/index/index.html | 286 ++++++++--------- 5 files changed, 406 insertions(+), 376 deletions(-) diff --git a/front/core/components/table/style.scss b/front/core/components/table/style.scss index dea26a462..878002e01 100644 --- a/front/core/components/table/style.scss +++ b/front/core/components/table/style.scss @@ -229,4 +229,8 @@ vn-table.scrollable.sm, vn-table.scrollable.lg, .vn-table.scrollable.lg { max-height: 700px +} + +.tableWrapper { + overflow-x: auto; } \ No newline at end of file diff --git a/modules/entry/front/buy/index/index.html b/modules/entry/front/buy/index/index.html index 9b9cd4634..5e5c02e6c 100644 --- a/modules/entry/front/buy/index/index.html +++ b/modules/entry/front/buy/index/index.html @@ -10,182 +10,185 @@
- - - - - - -

Subtotal {{$ctrl.ticket.totalWithoutVat | currency: 'EUR':2}}

-

VAT {{$ctrl.ticket.totalWithVat - $ctrl.ticket.totalWithoutVat | currency: 'EUR':2}}

-

Total {{$ctrl.ticket.totalWithVat | currency: 'EUR':2}}

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - ItemQuantityPackageStickersWeightPackingGroupingBuying valueGrouping pricePacking priceImport
- - - - - {{::buy.item.id | zeroFill:6}} - - - - {{::id}} - {{::name}} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{buy.quantity * buy.buyingValue | currency: 'EUR':2}} - -
- - - {{::buy.item.itemType.code}} - - - - {{::buy.item.size}} - - - - {{::buy.item.minPrice | currency: 'EUR':2}} - - - {{::buy.item.name}} - - -
-
- - +
+ + + + + + +

Subtotal {{$ctrl.ticket.totalWithoutVat | currency: 'EUR':2}}

+

VAT {{$ctrl.ticket.totalWithVat - $ctrl.ticket.totalWithoutVat | currency: 'EUR':2}}

+

Total {{$ctrl.ticket.totalWithVat | currency: 'EUR':2}}

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + ItemQuantityPackageStickersWeightPackingGroupingBuying valueGrouping pricePacking priceImport
+ + + + + {{::buy.item.id | zeroFill:6}} + + + + {{::id}} - {{::name}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{buy.quantity * buy.buyingValue | currency: 'EUR':2}} + +
+ + + {{::buy.item.itemType.code}} + + + + {{::buy.item.size}} + + + + {{::buy.item.minPrice | currency: 'EUR':2}} + + + {{::buy.item.name}} + + +
+
+ + +
diff --git a/modules/entry/front/buy/index/style.scss b/modules/entry/front/buy/index/style.scss index 836f1eddc..0ffccd99a 100644 --- a/modules/entry/front/buy/index/style.scss +++ b/modules/entry/front/buy/index/style.scss @@ -3,19 +3,34 @@ vn-entry-buy-index vn-card { max-width: $width-xl; - + .dark-row { background-color: lighten($color-marginal, 10%); } - tbody tr:nth-child(1) { - border-top: 1px solid $color-marginal; + thead tr { + border-left: 1px solid white; + border-right: 1px solid white; } + tbody tr:nth-child(1), + tbody tr:nth-child(2) { + border-left: 1px solid $color-marginal; + border-right: 1px solid $color-marginal; + } + + tbody tr:nth-child(2) { + border-bottom: 1px solid $color-marginal; + } + tbody{ border-bottom: 1px solid $color-marginal; } + tbody:last-child { + border-bottom: 0; + } + tbody tr:nth-child(3) { height: inherit } @@ -23,6 +38,12 @@ vn-entry-buy-index vn-card { tr { margin-bottom: 10px; } + + .gap { + border-left: 1px solid transparent; + border-right: 1px solid transparent; + height: inherit; + } } $color-font-link-medium: lighten($color-font-link, 20%) \ No newline at end of file diff --git a/modules/ticket/front/component/index.html b/modules/ticket/front/component/index.html index 3843529c3..2e3544cd0 100644 --- a/modules/ticket/front/component/index.html +++ b/modules/ticket/front/component/index.html @@ -8,60 +8,62 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -
ItemDescriptionQuantitySerieComponentsImportTotal
- - {{sale.itemFk | zeroFill:6}} - - - {{::sale.item.name}} - -

{{::sale.item.subName}}

-
- - -
- {{::sale.quantity}} -
- {{::saleComponent.component.componentType.type}} - - {{::saleComponent.component.name}} - - {{::saleComponent.value | currency: 'EUR':3}} - - {{::sale.quantity * saleComponent.value | currency: 'EUR':3}} -
+
+ + + + + + + + + + + + + + + + + + + + + + + + + +
ItemDescriptionQuantitySerieComponentsImportTotal
+ + {{sale.itemFk | zeroFill:6}} + + + {{::sale.item.name}} + +

{{::sale.item.subName}}

+
+ + +
+ {{::sale.quantity}} +
+ {{::saleComponent.component.componentType.type}} + + {{::saleComponent.component.name}} + + {{::saleComponent.value | currency: 'EUR':3}} + + {{::sale.quantity * saleComponent.value | currency: 'EUR':3}} +
+
diff --git a/modules/ticket/front/index/index.html b/modules/ticket/front/index/index.html index acef6cd23..79774c647 100644 --- a/modules/ticket/front/index/index.html +++ b/modules/ticket/front/index/index.html @@ -5,149 +5,149 @@ model="model" class="vn-mb-xl vn-w-xl"> - - - - - - - - - Id - Salesperson - Date - Hour - Closure - Alias - Province - State - Zone - Warehouse - Total - - - - - - - - - - - - - - - - - - - - - - - - {{::ticket.id}} - - - {{::ticket.userName | dashIfEmpty}} - - - - - {{::ticket.shipped | date: 'dd/MM/yyyy'}} - - - {{::ticket.shipped | date: 'HH:mm'}} - {{::ticket.zoneLanding | date: 'HH:mm'}} - - - {{::ticket.nickname}} - - - {{::ticket.province}} - - - {{::ticket.refFk}} - - - {{ticket.state}} - - - - - {{::ticket.zoneName | dashIfEmpty}} - - - {{::ticket.warehouse}} - - - {{::(ticket.totalWithVat ? ticket.totalWithVat : 0) | currency: 'EUR': 2}} - - - - - - - - - - - + + + + + + + + + Id + Salesperson + Date + Hour + Closure + Alias + Province + State + Zone + Warehouse + Total + + + + + + + + + + + + + + + + + + + + + + + + {{::ticket.id}} + + + {{::ticket.userName | dashIfEmpty}} + + + + + {{::ticket.shipped | date: 'dd/MM/yyyy'}} + + + {{::ticket.shipped | date: 'HH:mm'}} + {{::ticket.zoneLanding | date: 'HH:mm'}} + + + {{::ticket.nickname}} + + + {{::ticket.province}} + + + {{::ticket.refFk}} + + + {{ticket.state}} + + + + + {{::ticket.zoneName | dashIfEmpty}} + + + {{::ticket.warehouse}} + + + {{::(ticket.totalWithVat ? ticket.totalWithVat : 0) | currency: 'EUR': 2}} + + + + + + + + + + +
From 9c0cff2f3abe2c80598c026d2fdf10f19f4e6a04 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Mon, 14 Jun 2021 16:09:28 +0200 Subject: [PATCH 2/3] removed unused code --- modules/entry/front/buy/index/index.html | 2 +- modules/entry/front/buy/index/style.scss | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/modules/entry/front/buy/index/index.html b/modules/entry/front/buy/index/index.html index 5e5c02e6c..50cd26329 100644 --- a/modules/entry/front/buy/index/index.html +++ b/modules/entry/front/buy/index/index.html @@ -177,7 +177,7 @@ - +
diff --git a/modules/entry/front/buy/index/style.scss b/modules/entry/front/buy/index/style.scss index 0ffccd99a..55df72f1c 100644 --- a/modules/entry/front/buy/index/style.scss +++ b/modules/entry/front/buy/index/style.scss @@ -38,12 +38,6 @@ vn-entry-buy-index vn-card { tr { margin-bottom: 10px; } - - .gap { - border-left: 1px solid transparent; - border-right: 1px solid transparent; - height: inherit; - } } $color-font-link-medium: lighten($color-font-link, 20%) \ No newline at end of file From db3d5ca4d8d85b0e7403c08a08e53029d6cdd7e3 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Tue, 15 Jun 2021 13:14:21 +0200 Subject: [PATCH 3/3] added missing html closing tag --- modules/supplier/front/billing-data/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/supplier/front/billing-data/index.html b/modules/supplier/front/billing-data/index.html index 0fb7011b8..12d3b84b3 100644 --- a/modules/supplier/front/billing-data/index.html +++ b/modules/supplier/front/billing-data/index.html @@ -49,6 +49,7 @@ rule> +