| '.$langs->trans("CashDeskBankAccountForSell").' | ';
print '';
- $form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CASH,'CASHDESK_ID_BANKACCOUNT_CASH',0,"courant=2",1);
+ $form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CASH, 'CASHDESK_ID_BANKACCOUNT_CASH', 0, "courant=2", 1);
print ' |
';
print '| '.$langs->trans("CashDeskBankAccountForCheque").' | ';
print '';
- $form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE,'CASHDESK_ID_BANKACCOUNT_CHEQUE',0,"courant=1",1);
+ $form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CHEQUE, 'CASHDESK_ID_BANKACCOUNT_CHEQUE', 0, "courant=1", 1);
print ' |
';
print '| '.$langs->trans("CashDeskBankAccountForCB").' | ';
print '';
- $form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CB,'CASHDESK_ID_BANKACCOUNT_CB',0,"courant=1",1);
+ $form->select_comptes($conf->global->CASHDESK_ID_BANKACCOUNT_CB, 'CASHDESK_ID_BANKACCOUNT_CB', 0, "courant=1", 1);
print ' |
';
}
@@ -181,12 +231,12 @@ if (! empty($conf->stock->enabled))
print '| '.$langs->trans("CashDeskDoNotDecreaseStock").' | '; // Force warehouse (this is not a default value)
print '';
if (empty($conf->productbatch->enabled)) {
- print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK',$conf->global->CASHDESK_NO_DECREASE_STOCK,1);
+ print $form->selectyesno('CASHDESK_NO_DECREASE_STOCK', $conf->global->CASHDESK_NO_DECREASE_STOCK, 1);
}
else
{
if (!$conf->global->CASHDESK_NO_DECREASE_STOCK) {
- $res = dolibarr_set_const($db,"CASHDESK_NO_DECREASE_STOCK",1,'chaine',0,'',$conf->entity);
+ $res = dolibarr_set_const($db, "CASHDESK_NO_DECREASE_STOCK", 1, 'chaine', 0, '', $conf->entity);
}
print $langs->trans("Yes").'
';
print ''.$langs->trans('StockDecreaseForPointOfSaleDisabledbyBatch').'';
@@ -200,7 +250,7 @@ if (! empty($conf->stock->enabled))
print ' | ';
if (! $disabled)
{
- print $formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE,'CASHDESK_ID_WAREHOUSE','',1,$disabled);
+ print $formproduct->selectWarehouses($conf->global->CASHDESK_ID_WAREHOUSE, 'CASHDESK_ID_WAREHOUSE', '', 1, $disabled);
print ' ('.$langs->trans("Create").')';
}
else
@@ -223,14 +273,14 @@ print '
';
// Marketplace
print "\n";
print "\n";
-print '| TakePOS Marketplace | ';
+print ''.$langs->trans("WebSiteDesc").' | ';
print ''.$langs->trans("URL").' | ';
print ' ';
print "\n";
-$url='https://www.dolistore.com/en/modules/980-TakePOS-7-mobile.html';
-print ' | ';
-print 'TakePOS for mobile devices | ';
+$url='https://www.dolistore.com/45-pos';
+ print ' | ';
+print ''.$langs->trans("DolistorePosCategory").' | ';
print ''.$url.' | ';
print ' ';
@@ -246,7 +296,7 @@ print '';
print "\n";
$url='http://www.takepos.com';
-print ' | ';
+print ' | ';
print 'TakePOS original developers | ';
print ''.$url.' | ';
print ' ';
diff --git a/htdocs/takepos/css/pos.css b/htdocs/takepos/css/pos.css
index 62a0865482f..87c74c8952d 100644
--- a/htdocs/takepos/css/pos.css
+++ b/htdocs/takepos/css/pos.css
@@ -1,22 +1,9 @@
html,body {
- padding:0;
+ box-sizing: border-box;
+ padding:3px;
margin:0;
height:100%;
-}
-
-body {
- width:100%;
-}
-
-.row {
- width:100%;
- height:50%;
-}
-
-.row div {
- width:33%;
- height:100%;
- float:left;
+ width:100%;
}
button.calcbutton {
@@ -27,10 +14,11 @@ button.calcbutton {
cursor: pointer;
vertical-align: middle;
text-align: center;
- font-size:180%;
overflow: visible; /* removes extra width in IE */
width:24%;
height:24%;
+ font-weight: bold;
+ color: #555555;
}
button.calcbutton2 {
@@ -41,10 +29,11 @@ button.calcbutton2 {
cursor: pointer;
vertical-align: middle;
text-align: center;
- font-size:120%;
overflow: visible; /* removes extra width in IE */
width:24%;
height:24%;
+ font-weight: bold;
+ color: #555555;
}
button.calcbutton3 {
@@ -59,7 +48,6 @@ button.calcbutton3 {
overflow: visible; /* removes extra width in IE */
width:12%;
height:24%;
-
}
button.actionbutton {
@@ -70,35 +58,42 @@ button.actionbutton {
cursor: pointer;
vertical-align: middle;
text-align: center;
- font-size:100%;
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.2%;
- 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{
+ background:black;
+ color: white;
}
div.description{
@@ -106,10 +101,9 @@ div.description{
bottom:0px; /* position will be on bottom */
left:0px;
width:100%;
- /* styling bellow */
+ /* styling below */
background-color:black;
font-family: 'tahoma';
- font-size:100%;
color:white;
opacity:0.8; /* transparency */
filter:alpha(opacity=80); /* IE transparency */
@@ -122,8 +116,126 @@ div.description{
}
}
+.container{
+ width: 100%;
+ height: 100%;
+ 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: 34%;
+ float: left;
+ text-align: center;
+ box-sizing: border-box;
+ overflow: auto;
+ background-color:white;
+}
+
+.div2{
+ height: 100%;
+ width: 33%;
+ font-size: 0;
+ float: left;
+ padding-left: 10px;
+ box-sizing: border-box;
+}
+
+.div3{
+ height: 100%;
+ width: 33%;
+ float: left;
+ box-sizing: border-box;
+}
+
+.div4{
+ height: 100%;
+ width: 34%;
+ float: left;
+ box-sizing: border-box;
+ font-size: 6px;
+ padding:3px;
+}
+
+.div5{
+ height: 100%;
+ width: 66%;
+ float: left;
+ box-sizing: border-box;
+ font-size: 6px;
+ padding:10px;
+}
+
p.description_content{
padding:10px;
margin:0px;
}
+
+@media screen and (min-width: 892px) {
+ .calcbutton{
+ font-size: 18px;
+ }
+ .calcbutton2{
+ font-size: 14px;
+ }
+ .actionbutton{
+ font-size: 13px;
+ }
+ div.description{
+ font-size: 15px;
+ }
+ .invoice{
+ font-size: 14px;
+ }
+}
+
+@media (max-width: 891px) and (min-width: 386px) {
+ .calcbutton{
+ font-size: 12px;
+ }
+ .calcbutton2{
+ font-size: 9px;
+ }
+ .actionbutton{
+ font-size: 12px;
+ }
+ div.description{
+ font-size: 13px;
+ }
+ .invoice{
+ font-size: 12px;
+ }
+}
+
+@media screen and (max-width: 385px){
+ .calcbutton{
+ font-size: 8px;
+ }
+ .calcbutton2{
+ font-size: 7px;
+ }
+ .actionbutton{
+ font-size: 10px;
+ }
+ div.description{
+ font-size: 11px;
+ }
+ .invoice{
+ font-size: 10px;
+ }
+}
\ No newline at end of file
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 52d4864385f..ed3e5def318 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -189,7 +189,7 @@ if ($action=="order" and $placeid!=0){
?>
|