Skip to content
Snippets Groups Projects
Commit 3eb8d310 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

NEW Better look for POS. More responsive design.

parent fd8afdf0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
htdocs/cashdesk/affContenu.php
+ 4
− 2
View file @ 3eb8d310
......@@ -56,6 +56,7 @@ exit;*/
// Left area with selected articles (area for article, amount and payments)
print '<div class="inline-block" style="vertical-align: top">';
print '<div class="principal">';
$page=GETPOST('menu','alpha');
......@@ -78,16 +79,17 @@ else
}
print '</div>';
print '</div>';
// Right area with selected articles (shopping cart)
print '<div class="inline-block" style="vertical-align: top">';
print '<div class="liste_articles">';
require ('tpl/liste_articles.tpl.php');
print '</div>';
print '</div>';
$_SESSION['serObjFacturation'] = serialize($obj_facturation);
htdocs/cashdesk/css/style.css
+ 14
− 7
View file @ 3eb8d310
......@@ -15,7 +15,7 @@
*/
body {
background: #eee;
background: #fff;
color: #333;
margin: 0;
padding: 0;
......@@ -30,9 +30,9 @@ p {
.conteneur {
background: #fff;
text-align: left;
max-width: 770px;
margin: 10px auto;
border: 2px solid #000;
/*max-width: 770px;*/
/*margin: 10px auto;
border: 2px solid #000;*/
}
.conteneur_img_gauche {
......@@ -43,6 +43,11 @@ p {
/* background: url("../img/bg_conteneur_droite.png") top right repeat-y; */
}
.contenu {
width: 100%;
text-align: center;
}
/* ------------------- Header ------------------- */
.entete {
height: 15px;
......@@ -138,6 +143,7 @@ li.menu_choix0 {
margin-right: 20px;
border: 1px dotted #5ca64d;
padding-bottom: 10px;
vertical-align: middle;
}
p.titre {
......@@ -192,8 +198,10 @@ p.titre {
/* ------------------- Contenu ------------------- */
.principal_login {
margin: 30px;
margin: 10px;
padding: 0;
max-width: 800px;
text-align: left;
}
.formulaire_login {
......@@ -221,8 +229,7 @@ p.titre {
float: left;
margin: 0 15px;
padding: 0;
max-width: 500px;
width: 100%;
max-width: 900px;
}
.titre1 {
......
htdocs/cashdesk/index.php
+ 4
− 1
View file @ 3eb8d310
......@@ -60,10 +60,11 @@ top_htmlhead('','',0,0,'',$arrayofcss);
<h1 class="entete"></h1>
<div class="menu_principal">
<div class="menu_principal hideonsmartphone">
</div>
<div class="contenu">
<div class="inline-block" style="vertical-align: top">
<div class="principal_login">
<?php if ($err) print dol_escape_htmltag($err)."<br><br>\n"; ?>
<fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Identification"); ?></legend>
......@@ -156,6 +157,7 @@ print "</tr>\n";
</form>
</fieldset>
<?php
if ($_GET['err'] < 0)
{
......@@ -171,6 +173,7 @@ else
}
?>
</div>
</div>
</div>
......
htdocs/cashdesk/tpl/facturation1.tpl.php
+ 17
− 23
View file @ 3eb8d310
......@@ -116,13 +116,13 @@ $langs->load("cashdesk");
<!-- Show unit price -->
<?php // TODO Remove the disabled and use this value when adding product into cart ?>
<td><input class="texte1_off" type="text" name="txtPrixUnit" value="<?php echo price2num($obj_facturation->prix(), 'MU'); ?>" onchange="javascript: modif();" disabled /></td>
<td><?php echo $conf->currency; ?></td>
<td></td>
<!-- Choix de la remise -->
<td><input class="texte1" type="text" id="txtRemise" name="txtRemise" value="0" onkeyup="javascript: modif();" onfocus="javascript: this.select();"/>
<?php print genkeypad("txtRemise", "frmQte");?>
</td>
<!-- Affichage du total HT -->
<td><input class="texte1_off" type="text" name="txtTotal" value="" disabled /></td><td><?php echo $conf->currency; ?></td>
<td><input class="texte1_off" type="text" name="txtTotal" value="" disabled /></td><td></td>
<!-- Choix du taux de TVA -->
<td class="select_tva">
<?php //var_dump($tab_tva); ?>
......@@ -171,48 +171,42 @@ $langs->load("cashdesk");
</fieldset>
<fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("PaymentMode"); ?></legend>
<table>
<tr>
<div class="inline-block">
<?php
print '<td>';
print '<div class="inline-block" style="margin: 6px;">';
if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CASH']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CASH'] < 0)
{
$langs->load("errors");
print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("Cash").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
}
else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cash").'" onclick="javascript: verifClic(\'ESP\');" />';
print '</td>';
print '<td>';
print '</div>';
print '<div class="inline-block" style="margin: 6px;">';
if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] < 0)
{
$langs->load("errors");
print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
}
else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" onclick="javascript: verifClic(\'CB\');" />';
print '</td>';
print '<td>';
print '</div>';
print '<div class="inline-block" style="margin: 6px;">';
if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CB']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] < 0)
{
$langs->load("errors");
print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
}
else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CheckBank").'" onclick="javascript: verifClic(\'CHQ\');" />';
print '</td>';
print '</div>';
print '<div class="clearboth">';
print '<div class="inline-block" style="margin: 6px;">';
?>
</tr>
</table>
<table>
<tr>
<td>
<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="<?php echo $langs->trans("Reported"); ?>" onclick="javascript: verifClic('DIF');" />
<?php
print $langs->trans("DateEcheance").' :';
print $form->select_date(-1,'txtDatePaiement',0,0,0,'paymentmode',1,0,1);
?>
</td>
</tr>
</table>
<?php
print $langs->trans("DateEcheance").' :';
print $form->select_date(-1,'txtDatePaiement',0,0,0,'paymentmode',1,0,1);
print '</div>';
?>
</div>
</fieldset>
</form>
......
htdocs/theme/eldy/style.css.php
+ 9
− 4
View file @ 3eb8d310
......@@ -535,12 +535,15 @@ td.showDragHandle {
/* ============================================================================== */
#id-container {
margin-top: 12px;
margin-bottom: 8px;
/* margin-top: 12px;
margin-bottom: 8px; */
display: table;
table-layout: fixed;
}
#id-right, #id-left {
padding-top: 12px;
padding-bottom: 8px;
display: table-cell;
float: none;
vertical-align: top;
......@@ -1113,7 +1116,7 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks
background: rgb(<?php echo $colorbackvmenu1; ?>);
border-left: 1px solid #AAA;
/*border-left: 1px solid #AAA;
border-right: 1px solid #BBB;
border-bottom: 1px solid #BBB;
border-top: 1px solid #BBB;
......@@ -1122,6 +1125,7 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks
-moz-box-shadow: 3px 3px 4px #DDD;
-webkit-box-shadow: 3px 3px 4px #DDD;
box-shadow: 3px 3px 4px #DDD;
*/
}
div.blockvmenusearch
......@@ -1136,7 +1140,7 @@ div.blockvmenusearch
padding-bottom: 3px;
margin: 1px 0px 8px 2px;
background: rgb(<?php echo $colorbackvmenu2; ?>);
/*
border-left: 1px solid #AAA;
border-right: 1px solid #CCC;
border-bottom: 1px solid #CCC;
......@@ -1146,6 +1150,7 @@ div.blockvmenusearch
-moz-box-shadow: 3px 3px 4px #DDD;
-webkit-box-shadow: 3px 3px 4px #DDD;
box-shadow: 3px 3px 4px #DDD;
*/
}
div.blockvmenusearch > form > div {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment