test #18

Merged
juan merged 6 commits from test into dev 2023-01-31 13:15:48 +00:00
12 changed files with 292 additions and 287 deletions
Showing only changes of commit be43a38b38 - Show all commits

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
hedera-web (22.48.6) stable; urgency=low hedera-web (22.48.7) stable; urgency=low
* Initial Release. * Initial Release.

View File

@ -1,15 +1,16 @@
.basket .head { .hedera-basket {
.head {
border-bottom: 1px solid #DDD; border-bottom: 1px solid #DDD;
} }
.basket .head p { .head p {
font-weight: bold; font-weight: bold;
margin: 0; margin: 0;
padding: 0; padding: 0;
font-size: 1.4rem; font-size: 1.4rem;
text-align: right; text-align: right;
} }
.basket .form > p { .form > p {
margin: 0; margin: 0;
font-size: 1.4rem; font-size: 1.4rem;
color: white; color: white;
@ -18,59 +19,59 @@
/* Lines */ /* Lines */
.basket .line { .line {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 12px; gap: 12px;
margin: 10px 0; margin: 10px 0;
height: 80px; height: 80px;
} }
.basket .line:first-child { .line:first-child {
margin-top: 0; margin-top: 0;
} }
.basket .line:last-child { .line:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.basket .line > .delete { .line > .delete {
margin: 0 -8px; margin: 0 -8px;
} }
.basket .line > .photo { .line > .photo {
flex: none; flex: none;
border-radius: 50%; border-radius: 50%;
width: 68px; width: 68px;
height: 68px; height: 68px;
gap: 0; gap: 0;
} }
.basket .line > .info { .line > .info {
flex: 1; flex: 1;
overflow: hidden; overflow: hidden;
} }
.basket .line > .info > * { .line > .info > * {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
} }
.basket .line > .info > h2 { .line > .info > h2 {
font-size: 1rem; font-size: 1rem;
font-weight: normal; font-weight: normal;
margin: 0; margin: 0;
} }
.basket .line > .info > p { .line > .info > p {
margin: 0; margin: 0;
} }
.basket .line > .info > .tags { .line > .info > .tags {
color: #777; color: #777;
} }
.basket .line .subtotal { .line .subtotal {
float: right; float: right;
} }
/* Fields */ /* Fields */
.basket td.available-exceeded input { td.available-exceeded input {
background-color: #FCC; background-color: #FCC;
} }
.basket .icon > img { .icon > img {
border-radius: 50%; border-radius: 50%;
} }
}

View File

@ -16,7 +16,7 @@
tip="_Checkout" tip="_Checkout"
on-click="this.hash.setAll({form: 'ecomerce/confirm'})"/> on-click="this.hash.setAll({form: 'ecomerce/confirm'})"/>
</div> </div>
<div id="form" class="basket"> <div id="form" class="hedera-basket">
<div class="box vn-w-sm vn-pa-lg"> <div class="box vn-w-sm vn-pa-lg">
<div class="head vn-pb-lg"> <div class="head vn-pb-lg">
<p> <p>

View File

@ -1,5 +1,6 @@
.checkout .bar { .hedera-checkout {
.bar {
margin-bottom: 16px; margin-bottom: 16px;
} }
@ -51,4 +52,4 @@
.htk-assistant .thin { .htk-assistant .thin {
float: right; float: right;
} }
}

View File

@ -54,7 +54,7 @@
tip="_Cancel" tip="_Cancel"
on-click="onCancelClick"/> on-click="onCancelClick"/>
</div> </div>
<div id="form" class="checkout"> <div id="form" class="hedera-checkout">
<div class="vn-w-sm"> <div class="vn-w-sm">
<div class="box bar"> <div class="box bar">
<htk-assistant-bar <htk-assistant-bar

View File

@ -1,93 +1,95 @@
.confirm .summary { .hedera-confirm {
.summary {
margin-bottom: 16px; margin-bottom: 16px;
} }
.confirm p { p {
margin: .2em 0; margin: .2em 0;
} }
/* Table */ /* Table */
.confirm .debt-info { .debt-info {
padding: 0; padding: 0;
} }
.confirm .debt-info > table { .debt-info > table {
border-collapse: collapse; border-collapse: collapse;
} }
.confirm td { td {
padding: .15em 0; padding: .15em 0;
} }
.confirm .sum-total > td { .sum-total > td {
border-top: solid 1px #DDD; border-top: solid 1px #DDD;
font-weight: bold; font-weight: bold;
} }
.confirm .currency { .currency {
text-align: right; text-align: right;
} }
.confirm .credit-info { .credit-info {
display: none; display: none;
} }
.confirm .exceeded-info { .exceeded-info {
display: none; display: none;
color: #E53935; color: #E53935;
} }
/* Pay */ /* Pay */
.confirm .amount-selector, .amount-selector,
.confirm .pay-methods > div { .pay-methods > div {
display: none; display: none;
} }
.confirm .pay-methods > div { .pay-methods > div {
margin: .3em 0; margin: .3em 0;
} }
.confirm .pay-methods > div > label > input[type=radio] { .pay-methods > div > label > input[type=radio] {
margin: 0; margin: 0;
margin-right: .5em; margin-right: .5em;
vertical-align: middle; vertical-align: middle;
} }
.confirm .pay-methods > div > div { .pay-methods > div > div {
padding: .5em 1.5em; padding: .5em 1.5em;
display: none; display: none;
} }
.confirm .pay-methods > div.selected > div { .pay-methods > div.selected > div {
display: block; display: block;
} }
.confirm .transfer-account { .transfer-account {
margin-top: .5em; margin-top: .5em;
} }
.confirm .transfer-account > p { .transfer-account > p {
margin: .1em 0; margin: .1em 0;
} }
.confirm .payment > div { .payment > div {
margin-bottom: 1.4em; margin-bottom: 1.4em;
} }
.confirm .payment > .button-bar { .payment > .button-bar {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-bottom: 0; margin-bottom: 0;
margin-top: 32px; margin-top: 32px;
} }
.confirm .payment > .button-bar button{ .payment > .button-bar button{
font-size: 1.2rem; font-size: 1.2rem;
border-radius: 2rem; border-radius: 2rem;
padding: .5rem 1rem; padding: .5rem 1rem;
margin: 0; margin: 0;
} }
.confirm .modify-order { .modify-order {
border: 1px solid #1a1a1a; border: 1px solid #1a1a1a;
} }
.confirm .modify-order:hover { .modify-order:hover {
color: white; color: white;
background-color: #1a1a1a; background-color: #1a1a1a;
} }
.confirm .confirm-order { .confirm-order {
border: 1px solid #8cc63f; border: 1px solid #8cc63f;
background-color: #8cc63f; background-color: #8cc63f;
color: white; color: white;
} }
.confirm .confirm-order:hover { .confirm-order:hover {
background-color: transparent; background-color: transparent;
color: #6b5; color: #6b5;
} }
}

View File

@ -27,7 +27,7 @@
<div id="title"> <div id="title">
<h1><t>Order summary</t></h1> <h1><t>Order summary</t></h1>
</div> </div>
<div id="form" class="confirm"> <div id="form" class="hedera-confirm">
<div class="vn-w-sm"> <div class="vn-w-sm">
<div class="box vn-pa-lg summary"> <div class="box vn-pa-lg summary">
<div> <div>

View File

@ -2,7 +2,7 @@
<div id="title"> <div id="title">
<h1><t>Invoices</t></h1> <h1><t>Invoices</t></h1>
</div> </div>
<div id="form" class="invoices"> <div id="form" class="hedera-invoices">
<htk-grid <htk-grid
class="box vn-w-sm" class="box vn-w-sm"
show-header="false"> show-header="false">

View File

@ -34,7 +34,7 @@
tip="_ShoppingBasket" tip="_ShoppingBasket"
on-click="onBasketClick"/> on-click="onBasketClick"/>
</div> </div>
<div id="form" class="orders"> <div id="form" class="hedera-orders">
<htk-repeater <htk-repeater
class="htk-list box confirmed vn-w-sm" class="htk-list box confirmed vn-w-sm"
form-id="iter" form-id="iter"

View File

@ -1,29 +1,30 @@
.hedera-ticket {
/* Header */ /* Header */
.ticket .head { .head {
padding: 0; padding: 0;
padding-bottom: 3px; padding-bottom: 3px;
border-bottom: 1px solid #DDD; border-bottom: 1px solid #DDD;
margin-bottom: 1px; margin-bottom: 1px;
} }
.ticket .head > div > div { .head > div > div {
margin: 15px 0; margin: 15px 0;
} }
.ticket .head > div > div:first-child { .head > div > div:first-child {
margin: 0; margin: 0;
} }
.ticket .head p { .head p {
margin: 3px 0; margin: 3px 0;
} }
.ticket .head p.important { .head p.important {
font-size: 1.2rem; font-size: 1.2rem;
font-weight: bold; font-weight: bold;
} }
.ticket .total { .total {
text-align: right; text-align: right;
} }
.ticket .packages { .packages {
margin-top: 14px; margin-top: 14px;
padding-top: 14px; padding-top: 14px;
border-top: 1px solid #DDD; border-top: 1px solid #DDD;
@ -32,47 +33,47 @@
/* Lines */ /* Lines */
.ticket .line { .line {
display: flex; display: flex;
align-items: center; align-items: center;
gap: 12px; gap: 12px;
margin: 10px 0; margin: 10px 0;
height: 80px; height: 80px;
} }
.ticket .line:last-child { .line:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.ticket .line > .photo { .line > .photo {
flex: none; flex: none;
border-radius: 50%; border-radius: 50%;
width: 68px; width: 68px;
height: 68px; height: 68px;
gap: 0; gap: 0;
} }
.ticket .line > .info { .line > .info {
flex: 1; flex: 1;
overflow: hidden; overflow: hidden;
} }
.ticket .line > .info > * { .line > .info > * {
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
} }
.ticket .line > .info > h2 { .line > .info > h2 {
font-size: 1rem; font-size: 1rem;
font-weight: normal; font-weight: normal;
margin-bottom: 2px; margin-bottom: 2px;
} }
.ticket .line > .info > p { .line > .info > p {
margin: 0; margin: 0;
} }
.ticket .line > .info > .tags { .line > .info > .tags {
color: #777; color: #777;
} }
.ticket .line > .info .discount { .line > .info .discount {
color: green; color: green;
} }
.ticket .line > .info > .subtotal { .line > .info > .subtotal {
float: right; float: right;
} }
}

View File

@ -14,7 +14,7 @@
tip="_Print delivery note" tip="_Print delivery note"
on-click="this.onPrintClick()"/> on-click="this.onPrintClick()"/>
</div> </div>
<div id="form" class="ticket"> <div id="form" class="hedera-ticket">
<div class="box vn-w-sm vn-pa-lg"> <div class="box vn-w-sm vn-pa-lg">
<htk-loader class="head" form="ticket-form"> <htk-loader class="head" form="ticket-form">
<h5>#{{ticket.id}}</h5> <h5>#{{ticket.id}}</h5>

View File

@ -1,6 +1,6 @@
{ {
"name": "hedera-web", "name": "hedera-web",
"version": "22.48.6", "version": "22.48.7",
"description": "Verdnatura web page", "description": "Verdnatura web page",
"license": "GPL-3.0", "license": "GPL-3.0",
"repository": { "repository": {