diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index 69137bfd998..0ca2382d214 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -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 \ No newline at end of file +DolistorePosCategory=TakePOS modules and other POS solutions for Dolibarr +TakeposNeedsCategories=TakePOS needs product categories to work \ No newline at end of file diff --git a/htdocs/takepos/css/pos.css b/htdocs/takepos/css/pos.css index 122f55ac974..c47d7190baa 100644 --- a/htdocs/takepos/css/pos.css +++ b/htdocs/takepos/css/pos.css @@ -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{ diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php index 458343afbb0..b2a7e36cb8d 100644 --- a/htdocs/takepos/takepos.php +++ b/htdocs/takepos/takepos.php @@ -387,12 +387,12 @@ $( document ).ready(function() { }); - +
-
+
@@ -415,6 +415,13 @@ $( document ).ready(function() {
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;