pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] point_of_sale: layout improvements on the payment screen + fix some styling issues + use most common notes value on the numpad

Browse Source
This commit is contained in:
Frederic van der Essen
2014-08-08 12:22:13 +02:00
parent 78e79073b9
commit daaf9eb23b
2 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/point_of_sale/static/src/css/pos.css
+22 -15
View File
@@ -933,7 +933,7 @@ td {
border-right: dashed 1px rgb(215,215,215);
}
.screen .left-content.pc40{
right: 60%;
right: 66%;
}
.screen .right-content{
position: absolute;
@@ -943,7 +943,7 @@ td {
overflow-y: auto;
}
.screen .right-content.pc60{
left:40%
left:34%
}
.screen .centered-content{
position: absolute;
@@ -996,17 +996,22 @@ td {
.pos .payment-numpad {
display: inline-block;
width: 232px;
margin-top: 8px;
margin-right: 8px;
float: right;
width: 50%;
box-sizing: border-box;
padding: 8px;
text-align: center;
float: left;
}
.pos .payment-numpad .numpad button {
width: 66px;
height: 66px;
}
.pos .paymentlines-container {
padding: 16px;
padding-top: 0;
border-bottom: dashed 1px gainsboro;
min-height: 148px;
min-height: 154px;
}
.pos .paymentlines {
@@ -1041,12 +1046,12 @@ td {
}
.pos .paymentline > *{
padding: 8px;
padding: 8px 12px;
}
.pos .paymentline .col-due,
.pos .paymentline .col-tendered,
.pos .paymentline .col-change {
min-width: 80px;
min-width: 90px;
}
.pos .paymentline .col-change.highlight {
background: rgb(184, 152, 204);
@@ -1060,10 +1065,10 @@ td {
}
.pos .payment-buttons {
display: inline-block;
width: 300px;
margin: 16px;
margin-right: 0px;
float: left;
width: 50%;
box-sizing: border-box;
padding: 16px;
float: right;
}
.payment-screen .payment-buttons .button {
@@ -1091,11 +1096,13 @@ td {
/* c) The receipt screen */
.pos .receipt-screen .centered-content .button {
line-height: 32px;
line-height: 40px;
padding: 3px 13px;
font-size: 20px;
text-align: center;
background: rgb(230, 230, 230);
margin: 12px;
margin: 16px;
margin-bottom: 0px;
border-radius: 3px;
border: solid 1px rgb(209, 209, 209);
cursor: pointer;
addons/point_of_sale/static/src/xml/pos.xml
+6 -5
View File
@@ -461,17 +461,17 @@
<button class="input-button number-char" data-action='1'>1</button>
<button class="input-button number-char" data-action='2'>2</button>
<button class="input-button number-char" data-action='3'>3</button>
<button class="mode-button" data-action='+5'>+5</button>
<button class="mode-button" data-action='+10'>+10</button>
<br />
<button class="input-button number-char" data-action='4'>4</button>
<button class="input-button number-char" data-action='5'>5</button>
<button class="input-button number-char" data-action='6'>6</button>
<button class="mode-button" data-action='+10'>+10</button>
<button class="mode-button" data-action='+20'>+20</button>
<br />
<button class="input-button number-char" data-action='7'>7</button>
<button class="input-button number-char" data-action='8'>8</button>
<button class="input-button number-char" data-action='9'>9</button>
<button class="mode-button" data-action='+20'>+20</button>
<button class="mode-button" data-action='+50'>+50</button>
<br />
<button class="input-button numpad-char" data-action='CLEAR' >C</button>
<button class="input-button number-char" data-action='0'>0</button>
@@ -518,6 +518,9 @@
<section class='paymentlines-container'>
</section>
<section class='payment-numpad'>
</section>
<div class='payment-buttons'>
<t t-if='widget.pos.config.iface_invoicing'>
<div class='button js_invoice'>
@@ -531,8 +534,6 @@
</t>
</div>
<section class='payment-numpad'>
</section>
</div>
</div>