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

Merge pull request #10420 from andreubisquerra/master

Browse Source 
Remove absolute divs and add Dolistore POS category link to TakePOS
This commit is contained in:
Laurent Destailleur 2019-01-27 17:52:34 +01:00 committed by GitHub
commit 0738e0e7cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 116 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,3 +53,4 @@ NbOfInvoices=Nb of invoices
Paymentnumpad=Payment Num Pad Paymentnumpad=Payment Num Pad
Numberspad=Numbers Pad Numberspad=Numbers Pad
BillsCoinsPad=Bills and Coins Pad BillsCoinsPad=Bills and Coins Pad
DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr

8
htdocs/takepos/admin/setup.php
View File

@ -273,14 +273,14 @@ print '<br><br>';
// Marketplace // Marketplace
print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n"; print "<table summary=\"list_of_modules\" class=\"noborder\" width=\"100%\">\n";
print "<tr class=\"liste_titre\">\n"; print "<tr class=\"liste_titre\">\n";
print '<td colspan="2">TakePOS Marketplace</td>'; print '<td colspan="2">'.$langs->trans("WebSiteDesc").'</td>';
print '<td>'.$langs->trans("URL").'</td>'; print '<td>'.$langs->trans("URL").'</td>';
print '</tr>'; print '</tr>';
print "<tr class=\"oddeven\">\n"; print "<tr class=\"oddeven\">\n";
$url='https://www.dolistore.com/en/modules/980-TakePOS-7-mobile.html'; $url='https://www.dolistore.com/45-pos';
print '<td class="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="../img/marketplace/takeposmobile.jpg"></a></td>'; print '<td class="left"><a href="'.$url.'" target="_blank" rel="external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
print '<td>TakePOS for mobile devices</td>'; print '<td>'.$langs->trans("DolistorePosCategory").'</td>';
print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>'; print '<td><a href="'.$url.'" target="_blank" rel="external">'.$url.'</a></td>';
print '</tr>'; print '</tr>';

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

@ -2,9 +2,6 @@ html,body {
padding:0; padding:0;
margin:0; margin:0;
height:100%; height:100%;
}
body {
width:100%; width:100%;
} }
@ -90,7 +87,7 @@ div.wrapper{
div.wrapper2{ div.wrapper2{
float:left; /* important */ float:left; /* important */
position:relative; /* important(so we can absolutely position the description div */ position:relative; /* important(so we can absolutely position the description div */
width:10.2%; width:10.9%;
height:23%; height:23%;
margin-top:0.5%; margin-top:0.5%;
margin-bottom:0.5%; margin-bottom:0.5%;
@ -126,6 +123,68 @@ div.description{
} }
} }
.container{
width: 98%;
height: 98%;
margin: 0 auto;
overflow: visible;
box-sizing: border-box;
}
.row1{
margin: 0 auto;
width: 100%;
height: 34%;
}
.row2{
margin: 0 auto;
width: 100%;
height: 66%;
}
.div1{
height:100%;
width: 33%;
float: left;
text-align: center;
box-sizing: border-box;
}
.div2{
height: 100%;
width: 33%;
font-size: 0;
float: left;
text-align: center;
padding-left: 10px;
box-sizing: border-box;
}
.div3{
height: 100%;
width: 33%;
float: left;
text-align: center;
box-sizing: border-box;
}
.div4{
height: 100%;
width: 34%;
float: left;
box-sizing: border-box;
font-size: 6px;
}
.div5{
height: 100%;
width: 66%;
float: left;
box-sizing: border-box;
font-size: 6px;
}
p.description_content{ p.description_content{
padding:10px; padding:10px;
margin:0px; margin:0px;

BIN
htdocs/takepos/img/marketplace/cashcontrol.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 79 KiB

BIN
htdocs/takepos/img/marketplace/takeposmobile.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 56 KiB

2
htdocs/takepos/invoice.php
View File

@ -325,7 +325,7 @@ if ($placeid > 0) {
if ($line->special_code == "3") { print ' order'; if ($line->special_code == "3") { print ' order';
} }
print '" id="' . $line->rowid . '">'; print '" id="' . $line->rowid . '">';
print '<td>' . $line->product_label . $line->desc . '</td>'; print '<td align="left">' . $line->product_label . $line->desc . '</td>';
print '<td align="right">' . $line->qty . '</td>'; print '<td align="right">' . $line->qty . '</td>';
print '<td align="right">' . price($line->total_ttc) . '</td>'; print '<td align="right">' . price($line->total_ttc) . '</td>';
print '</tr>'; print '</tr>';

29
htdocs/takepos/takepos.php
View File

@ -55,7 +55,7 @@ $head='<meta name="apple-mobile-web-app-title" content="TakePOS"/>
top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
?> ?>
<link rel="stylesheet" href="css/pos.css?a=xxx"> <link rel="stylesheet" href="css/pos.css">
<script type="text/javascript" src="js/takepos.js" ></script> <script type="text/javascript" src="js/takepos.js" ></script>
<link rel="stylesheet" href="css/colorbox.css" type="text/css" media="screen" /> <link rel="stylesheet" href="css/colorbox.css" type="text/css" media="screen" />
<script type="text/javascript" src="js/jquery.colorbox-min.js"></script> <script type="text/javascript" src="js/jquery.colorbox-min.js"></script>
@ -353,10 +353,13 @@ $( document ).ready(function() {
<body style="overflow: hidden; background-color:#E8E8E8;"> <body style="overflow: hidden; background-color:#E8E8E8;">
<div id="poslines" style="position:absolute; top:2%; left:0.5%; height:36%; width:31%; overflow: auto;"> <div class="container">
</div> <div class="row1">
<div style="position:absolute; top:1%; left:32.5%; height:37%; width:32.5%; font-size: 0;"> <div id="poslines" class="div1" style="overflow: auto;">
</div>
<div class="div2">
<button type="button" class="calcbutton" onclick="Edit(7);">7</button> <button type="button" class="calcbutton" onclick="Edit(7);">7</button>
<button type="button" class="calcbutton" onclick="Edit(8);">8</button> <button type="button" class="calcbutton" onclick="Edit(8);">8</button>
<button type="button" class="calcbutton" onclick="Edit(9);">9</button> <button type="button" class="calcbutton" onclick="Edit(9);">9</button>
@ -373,7 +376,7 @@ $( document ).ready(function() {
<button type="button" class="calcbutton" onclick="Edit('.');">.</button> <button type="button" class="calcbutton" onclick="Edit('.');">.</button>
<button type="button" class="calcbutton" onclick="Edit('c');">C</button> <button type="button" class="calcbutton" onclick="Edit('c');">C</button>
<button type="button" class="calcbutton2" id="delete" style="color: red;" onclick="deleteline();"><b>X</b></button> <button type="button" class="calcbutton2" id="delete" style="color: red;" onclick="deleteline();"><b>X</b></button>
</div> </div>
<?php <?php
// User menu and external TakePOS modules // User menu and external TakePOS modules
@ -420,7 +423,7 @@ if (!empty($reshook))
} }
?> ?>
<div style="position:absolute; top:1%; left:65.5%; height:37%; width:32.5%;"> <div class="div3">
<?php <?php
$i = 0; $i = 0;
foreach($menus as $menu) { foreach($menus as $menu) {
@ -434,9 +437,10 @@ foreach($menus as $menu) {
else echo '<button type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>'; else echo '<button type="button" id="action'.$i.'" class="actionbutton" onclick="'.$menu['action'].'">'.$menu['title'].'</button>';
} }
?> ?>
</div> </div>
</div>
<div style="position:absolute; top:39%; left:0.3%; height:59%; width:32%;"> <div class="row2">
<div class="div4">
<?php <?php
$count=0; $count=0;
while ($count<16) while ($count<16)
@ -452,9 +456,9 @@ foreach($menus as $menu) {
$count++; $count++;
} }
?> ?>
</div> </div>
<div style="position:absolute; top:39%; left:32%; height:58%; width:72%;"> <div class="div5">
<?php <?php
$count=0; $count=0;
while ($count<32) while ($count<32)
@ -470,8 +474,9 @@ while ($count<32)
$count++; $count++;
} }
?> ?>
</div>
</div>
</div> </div>
</body> </body>
<?php <?php