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

NEW Better look for POS. More responsive design.

Browse Source
This commit is contained in:
Laurent Destailleur 2015-09-18 14:11:50 +02:00
parent fd8afdf098
commit 3eb8d3105a
5 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/cashdesk/affContenu.php
View File

@ -56,6 +56,7 @@ exit;*/
// Left area with selected articles (area for article, amount and payments) // Left area with selected articles (area for article, amount and payments)
print '<div class="inline-block" style="vertical-align: top">';
print '<div class="principal">'; print '<div class="principal">';
$page=GETPOST('menu','alpha'); $page=GETPOST('menu','alpha');
@ -78,16 +79,17 @@ else
} }
print '</div>'; print '</div>';
print '</div>';
// Right area with selected articles (shopping cart) // Right area with selected articles (shopping cart)
print '<div class="inline-block" style="vertical-align: top">';
print '<div class="liste_articles">'; print '<div class="liste_articles">';
require ('tpl/liste_articles.tpl.php'); require ('tpl/liste_articles.tpl.php');
print '</div>'; print '</div>';
print '</div>';
$_SESSION['serObjFacturation'] = serialize($obj_facturation); $_SESSION['serObjFacturation'] = serialize($obj_facturation);

21
htdocs/cashdesk/css/style.css
View File

@ -15,7 +15,7 @@
*/ */
body { body {
background: #eee; background: #fff;
color: #333; color: #333;
margin: 0; margin: 0;
padding: 0; padding: 0;
@ -30,9 +30,9 @@ p {
.conteneur { .conteneur {
background: #fff; background: #fff;
text-align: left; text-align: left;
max-width: 770px; /*max-width: 770px;*/
margin: 10px auto; /*margin: 10px auto;
border: 2px solid #000; border: 2px solid #000;*/
} }
.conteneur_img_gauche { .conteneur_img_gauche {
@ -43,6 +43,11 @@ p {
/* background: url("../img/bg_conteneur_droite.png") top right repeat-y; */ /* background: url("../img/bg_conteneur_droite.png") top right repeat-y; */
} }
.contenu {
width: 100%;
text-align: center;
}
/* ------------------- Header ------------------- */ /* ------------------- Header ------------------- */
.entete { .entete {
height: 15px; height: 15px;
@ -138,6 +143,7 @@ li.menu_choix0 {
margin-right: 20px; margin-right: 20px;
border: 1px dotted #5ca64d; border: 1px dotted #5ca64d;
padding-bottom: 10px; padding-bottom: 10px;
vertical-align: middle;
} }
p.titre { p.titre {
@ -192,8 +198,10 @@ p.titre {
/* ------------------- Contenu ------------------- */ /* ------------------- Contenu ------------------- */
.principal_login { .principal_login {
margin: 30px; margin: 10px;
padding: 0; padding: 0;
max-width: 800px;
text-align: left;
} }
.formulaire_login { .formulaire_login {
@ -221,8 +229,7 @@ p.titre {
float: left; float: left;
margin: 0 15px; margin: 0 15px;
padding: 0; padding: 0;
max-width: 500px; max-width: 900px;
width: 100%;
} }
.titre1 { .titre1 {

5
htdocs/cashdesk/index.php
View File

@ -60,10 +60,11 @@ top_htmlhead('','',0,0,'',$arrayofcss);
<h1 class="entete"></h1> <h1 class="entete"></h1>
<div class="menu_principal"> <div class="menu_principal hideonsmartphone">
</div> </div>
<div class="contenu"> <div class="contenu">
<div class="inline-block" style="vertical-align: top">
<div class="principal_login"> <div class="principal_login">
<?php if ($err) print dol_escape_htmltag($err)."<br><br>\n"; ?> <?php if ($err) print dol_escape_htmltag($err)."<br><br>\n"; ?>
<fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Identification"); ?></legend> <fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("Identification"); ?></legend>
@ -156,6 +157,7 @@ print "</tr>\n";
</form> </form>
</fieldset> </fieldset>
<?php <?php
if ($_GET['err'] < 0) if ($_GET['err'] < 0)
{ {
@ -171,6 +173,7 @@ else
} }
?> ?>
</div>
</div> </div>
</div> </div>

40
htdocs/cashdesk/tpl/facturation1.tpl.php
View File

@ -116,13 +116,13 @@ $langs->load("cashdesk");
<!-- Show unit price --> <!-- Show unit price -->
<?php // TODO Remove the disabled and use this value when adding product into cart ?> <?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><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 --> <!-- Choix de la remise -->
<td><input class="texte1" type="text" id="txtRemise" name="txtRemise" value="0" onkeyup="javascript: modif();" onfocus="javascript: this.select();"/> <td><input class="texte1" type="text" id="txtRemise" name="txtRemise" value="0" onkeyup="javascript: modif();" onfocus="javascript: this.select();"/>
<?php print genkeypad("txtRemise", "frmQte");?> <?php print genkeypad("txtRemise", "frmQte");?>
</td> </td>
<!-- Affichage du total HT --> <!-- 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 --> <!-- Choix du taux de TVA -->
<td class="select_tva"> <td class="select_tva">
<?php //var_dump($tab_tva); ?> <?php //var_dump($tab_tva); ?>
@ -171,48 +171,42 @@ $langs->load("cashdesk");
</fieldset> </fieldset>
<fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("PaymentMode"); ?></legend> <fieldset class="cadre_facturation"><legend class="titre1"><?php echo $langs->trans("PaymentMode"); ?></legend>
<table> <div class="inline-block">
<tr>
<?php <?php
print '<td>'; print '<div class="inline-block" style="margin: 6px;">';
if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CASH']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CASH'] < 0) if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CASH']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CASH'] < 0)
{ {
$langs->load("errors"); $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")).'" />'; 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\');" />'; else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cash").'" onclick="javascript: verifClic(\'ESP\');" />';
print '</td>'; print '</div>';
print '<td>'; print '<div class="inline-block" style="margin: 6px;">';
if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] < 0) if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] < 0)
{ {
$langs->load("errors"); $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")).'" />'; 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\');" />'; else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" onclick="javascript: verifClic(\'CB\');" />';
print '</td>'; print '</div>';
print '<td>'; print '<div class="inline-block" style="margin: 6px;">';
if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CB']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] < 0) if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CB']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] < 0)
{ {
$langs->load("errors"); $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")).'" />'; 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\');" />'; 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');" /> <input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="<?php echo $langs->trans("Reported"); ?>" onclick="javascript: verifClic('DIF');" />
<?php <?php
print $langs->trans("DateEcheance").' :'; print $langs->trans("DateEcheance").' :';
print $form->select_date(-1,'txtDatePaiement',0,0,0,'paymentmode',1,0,1); print $form->select_date(-1,'txtDatePaiement',0,0,0,'paymentmode',1,0,1);
?> print '</div>';
</td> ?>
</tr> </div>
</table>
</fieldset> </fieldset>
</form> </form>

13
htdocs/theme/eldy/style.css.php
View File

@ -535,12 +535,15 @@ td.showDragHandle {
/* ============================================================================== */ /* ============================================================================== */
#id-container { #id-container {
margin-top: 12px; /* margin-top: 12px;
margin-bottom: 8px; margin-bottom: 8px; */
display: table; display: table;
table-layout: fixed; table-layout: fixed;
} }
#id-right, #id-left { #id-right, #id-left {
padding-top: 12px;
padding-bottom: 8px;
display: table-cell; display: table-cell;
float: none; float: none;
vertical-align: top; vertical-align: top;
@ -1113,7 +1116,7 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks
background: rgb(<?php echo $colorbackvmenu1; ?>); background: rgb(<?php echo $colorbackvmenu1; ?>);
border-left: 1px solid #AAA; /*border-left: 1px solid #AAA;
border-right: 1px solid #BBB; border-right: 1px solid #BBB;
border-bottom: 1px solid #BBB; border-bottom: 1px solid #BBB;
border-top: 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; -moz-box-shadow: 3px 3px 4px #DDD;
-webkit-box-shadow: 3px 3px 4px #DDD; -webkit-box-shadow: 3px 3px 4px #DDD;
box-shadow: 3px 3px 4px #DDD; box-shadow: 3px 3px 4px #DDD;
*/
} }
div.blockvmenusearch div.blockvmenusearch
@ -1136,7 +1140,7 @@ div.blockvmenusearch
padding-bottom: 3px; padding-bottom: 3px;
margin: 1px 0px 8px 2px; margin: 1px 0px 8px 2px;
background: rgb(<?php echo $colorbackvmenu2; ?>); background: rgb(<?php echo $colorbackvmenu2; ?>);
/*
border-left: 1px solid #AAA; border-left: 1px solid #AAA;
border-right: 1px solid #CCC; border-right: 1px solid #CCC;
border-bottom: 1px solid #CCC; border-bottom: 1px solid #CCC;
@ -1146,6 +1150,7 @@ div.blockvmenusearch
-moz-box-shadow: 3px 3px 4px #DDD; -moz-box-shadow: 3px 3px 4px #DDD;
-webkit-box-shadow: 3px 3px 4px #DDD; -webkit-box-shadow: 3px 3px 4px #DDD;
box-shadow: 3px 3px 4px #DDD; box-shadow: 3px 3px 4px #DDD;
*/
} }
div.blockvmenusearch > form > div { div.blockvmenusearch > form > div {