lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10484 from andreubisquerra/master

Browse Source 
CSS improvements and Takepos setup check
This commit is contained in:
Laurent Destailleur 2019-02-03 19:16:08 +01:00 committed by GitHub
commit 3a5372b59c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/langs/en_US/cashdesk.lang
View File

@ -53,4 +53,5 @@ NbOfInvoices=Nb of invoices
Paymentnumpad=Payment Num Pad
Numberspad=Numbers Pad
BillsCoinsPad=Bills and Coins Pad
DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr
TakeposNeedsCategories=TakePOS needs product categories to work

53
htdocs/takepos/css/pos.css
View File

@ -1,21 +1,11 @@
html,body {
padding:0;
box-sizing: border-box;
padding:3px;
margin:0;
height:100%;
width:100%;
}
.row {
width:100%;
height:50%;
}
.row div {
width:33%;
height:100%;
float:left;
}
button.calcbutton {
display: inline-block;
position: relative;
@ -69,33 +59,36 @@ button.actionbutton {
vertical-align: middle;
text-align: center;
overflow: visible; /* removes extra width in IE */
width:32%;
height:32%;
width:33%;
height:33%;
}
div.wrapper{
float:left; /* important */
position:relative; /* important(so we can absolutely position the description div */
width:21.5%;
height:23%;
margin:1%;
width:25%;
height:25%;
margin:0;
padding:1px;
border: 0.1em solid;
box-shadow: 3px 3px 2px #888;
text-align: center;
box-sizing: border-box;
background-color:#f0eeee;
}
div.wrapper2{
float:left; /* important */
position:relative; /* important(so we can absolutely position the description div */
width:10.9%;
height:23%;
margin-top:0.5%;
margin-bottom:0.5%;
margin-left:0.5%;
margin-right:0.5%;
width:12.5%;
height:25%;
margin:0;
padding:1px;
border: 0.1em solid;
box-shadow: 3px 3px 2px #888;
box-shadow: 2px 2px 1px #888;
text-align: center;
box-sizing: border-box;
background-color:#f0eeee;
}
button:active{
@ -124,8 +117,8 @@ div.description{
}
.container{
width: 98%;
height: 98%;
width: 100%;
height: 100%;
margin: 0 auto;
overflow: visible;
box-sizing: border-box;
@ -145,10 +138,12 @@ div.description{
.div1{
height:100%;
width: 33%;
width: 34%;
float: left;
text-align: center;
box-sizing: border-box;
overflow: auto;
background-color:white;
}
.div2{
@ -156,7 +151,6 @@ div.description{
width: 33%;
font-size: 0;
float: left;
text-align: center;
padding-left: 10px;
box-sizing: border-box;
}
@ -165,7 +159,6 @@ div.description{
height: 100%;
width: 33%;
float: left;
text-align: center;
box-sizing: border-box;
}
@ -175,6 +168,7 @@ div.description{
float: left;
box-sizing: border-box;
font-size: 6px;
padding:3px;
}
.div5{
@ -183,6 +177,7 @@ div.description{
float: left;
box-sizing: border-box;
font-size: 6px;
padding:10px;
}
p.description_content{

11
htdocs/takepos/takepos.php
View File

@ -387,12 +387,12 @@ $( document ).ready(function() {
});
</script>
<body style="overflow: hidden; background-color:#E8E8E8;">
<body style="overflow: hidden; background-color:#D1D1D1;">
<div class="container">
<div class="row1">
<div id="poslines" class="div1" style="overflow: auto;">
<div id="poslines" class="div1">
</div>
<div class="div2">
@ -415,6 +415,13 @@ $( document ).ready(function() {
</div>
<?php
// TakePOS setup check
if (empty($conf->global->CASHDESK_ID_THIRDPARTY) or empty($conf->global->CASHDESK_ID_BANKACCOUNT_CASH) or empty($conf->global->CASHDESK_ID_BANKACCOUNT_CB)) {
setEventMessages($langs->trans("ErrorModuleSetupNotComplete"), null, 'errors');
}
if (count($maincategories)==0) {
setEventMessages($langs->trans("TakeposNeedsCategories"), null, 'errors');
}
// User menu and external TakePOS modules
$menus = array();
$r=0;