BenoitCier
/
Opendistrib
forked from Laclic/Souke
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Backend : commandes 

Affichage des commandes en prenant toute la largeur.
La première commande n'est pas affichée par défaut car pas nécessaire.
master
keun 8 years ago
parent
8d7056cda4
commit
0d2a173e3e
5 changed files with 102 additions and 84 deletions
Split View Show Diff Stats
  1. +2
    -2
      backend/views/commande/index.php
  2. BIN
      backend/web/.sass-cache/c8fef7d48da4dc7f024edc2b0fada9d8d6de5dac/screen.scssc
  3. +87
    -81
      backend/web/css/screen.css
  4. +7
    -1
      backend/web/js/lechatdesnoisettes.js
  5. +6
    -0
      backend/web/sass/screen.scss

+ 2
- 2
backend/views/commande/index.php View File

@@ -160,7 +160,7 @@ foreach ($produits as $p) {
<div class="tab-content" id="commandes-points-vente">
<?php foreach($points_vente as $pv): ?>
<div role="tabpanel" data-id-pv="<?= $pv->id ?>" class="bloc-point-vente tab-pane <?php if($pv->point_fabrication): ?> active<?php endif; ?>" id="point-vente-<?= $pv->id ?>">
<div class="col-md-4">
<div class="col-md-12">
<div class="alert alert-warning recap-pv <?php if(!count($pv->commandes)): ?>no-commande<?php endif; ?>">
<?php if(count($pv->commandes)): ?>
<strong class="commandes"><?= count($pv->commandes) ?> commande<?php if(count($pv->commandes) > 1): ?>s<?php endif; ?></strong>
@@ -202,7 +202,7 @@ foreach ($produits as $p) {
<?= Html::a('<span class="glyphicon glyphicon-plus"></span> Créer une commande', 'javascript:void(0);', ['class' => 'btn btn-default creer-commande', 'data-pv-id' => $pv->id]) ?>
</div>
<div class="col-md-8">
<div class="col-md-12 bloc-commande">
<h2 class="title-user">
<span class="buttons-edit-remove">
<?= Html::a('<span class="glyphicon glyphicon-trash"></span> Supprimer', 'javascript:void(0);', ['class' => 'btn btn-default btn-remove']) ?>

BIN
backend/web/.sass-cache/c8fef7d48da4dc7f024edc2b0fada9d8d6de5dac/screen.scssc View File


+ 87
- 81
backend/web/css/screen.css View File

@@ -488,68 +488,74 @@ a:hover, a:focus, a:active {
margin-bottom: 10px;
}
/* line 470, ../sass/screen.scss */
#page-commande #commandes-points-vente .bloc-commande {
padding-top: 20px;
margin-top: 20px;
display: none;
}
/* line 476, ../sass/screen.scss */
#page-commande #commandes-points-vente .title-user {
display: none;
font-size: 19px;
margin-top: 0px;
}
/* line 475, ../sass/screen.scss */
/* line 481, ../sass/screen.scss */
#page-commande #commandes-points-vente .title-user .btn-edit, #page-commande #commandes-points-vente .title-user .btn-remove,
#page-commande #commandes-points-vente .title-user .btn-cancel, #page-commande #commandes-points-vente .title-user .btn-save {
float: right;
position: relative;
top: -6px;
}
/* line 482, ../sass/screen.scss */
/* line 488, ../sass/screen.scss */
#page-commande #commandes-points-vente .title-user .btn-edit, #page-commande #commandes-points-vente .title-user .btn-cancel {
margin-right: 10px;
}
/* line 486, ../sass/screen.scss */
/* line 492, ../sass/screen.scss */
#page-commande #commandes-points-vente .title-user .buttons-save-cancel {
display: none;
}
/* line 490, ../sass/screen.scss */
/* line 496, ../sass/screen.scss */
#page-commande #commandes-points-vente .title-user .choix-user {
display: none;
}
/* line 493, ../sass/screen.scss */
/* line 499, ../sass/screen.scss */
#page-commande #commandes-points-vente .title-user .choix-user .form-control {
width: 200px;
display: inline;
}
/* line 501, ../sass/screen.scss */
/* line 507, ../sass/screen.scss */
#page-commande #commandes-points-vente table.table-produits .td-commande {
text-align: center;
}
/* line 504, ../sass/screen.scss */
/* line 510, ../sass/screen.scss */
#page-commande #commandes-points-vente table.table-produits input.form-control {
text-align: center;
}
/* line 510, ../sass/screen.scss */
/* line 516, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-produit,
#page-commande #commandes-points-vente .th-produit {
width: 70%;
}
/* line 515, ../sass/screen.scss */
/* line 521, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-commande,
#page-commande #commandes-points-vente .th-commande {
width: 30%;
text-align: center;
}
/* line 521, ../sass/screen.scss */
/* line 527, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-produit {
text-transform: uppercase;
}
/* line 525, ../sass/screen.scss */
/* line 531, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-commande {
font-weight: bold;
}
/* line 529, ../sass/screen.scss */
/* line 535, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-total {
font-size: 20px;
text-align: center;
}
/* line 533, ../sass/screen.scss */
/* line 539, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-total span {
padding: 5px 10px;
background-color: #BB8757;
@@ -559,29 +565,29 @@ a:hover, a:focus, a:active {
-webkit-border-radius: 15px;
border-radius: 15px;
}
/* line 543, ../sass/screen.scss */
/* line 549, ../sass/screen.scss */
#page-commande #commandes-points-vente .panel-commande-automatique .field-commandeautoform-id_user,
#page-commande #commandes-points-vente .panel-commande-automatique .field-commandeautoform-id_etablissement {
display: none;
}
/* line 550, ../sass/screen.scss */
/* line 556, ../sass/screen.scss */
#page-commande #commandes-points-vente .panel-commande-automatique .jours .form-group {
float: left;
margin-right: 10px;
}
/* line 559, ../sass/screen.scss */
/* line 565, ../sass/screen.scss */
#page-commande #old-commandes {
display: none;
}
/* line 563, ../sass/screen.scss */
/* line 569, ../sass/screen.scss */
#page-commande .form-commandes-point-vente {
margin-top: 20px;
}
/* line 567, ../sass/screen.scss */
/* line 573, ../sass/screen.scss */
#page-commande .form-commandes-point-vente table {
border-bottom: solid 1px #e0e0e0;
}
/* line 571, ../sass/screen.scss */
/* line 577, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .title-point-vente {
background-color: #fff8e2;
border-left: solid 3px #BB8757;
@@ -589,76 +595,76 @@ a:hover, a:focus, a:active {
text-align: left;
padding: 10px;
}
/* line 579, ../sass/screen.scss */
/* line 585, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .title-totaux {
text-align: center;
}
/* line 583, ../sass/screen.scss */
/* line 589, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .border-left {
border-left: solid 1px #e0e0e0;
}
/* line 587, ../sass/screen.scss */
/* line 593, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .border-right {
border-right: solid 1px #e0e0e0;
}
/* line 591, ../sass/screen.scss */
/* line 597, ../sass/screen.scss */
#page-commande .form-commandes-point-vente input.quantite {
width: 30px;
background-color: white;
border: solid 1px #e0e0e0;
text-align: center;
}
/* line 599, ../sass/screen.scss */
/* line 605, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .td-produit {
text-align: center;
}
/* line 603, ../sass/screen.scss */
/* line 609, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .submit-pv {
float: right;
}
/* line 607, ../sass/screen.scss */
/* line 613, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .select-user {
background-color: #F9F9F9;
border: solid 1px #e0e0e0;
}
/* line 612, ../sass/screen.scss */
/* line 618, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .date-commande {
font-size: 12px;
}
/* line 616, ../sass/screen.scss */
/* line 622, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .datepicker, #page-commande .form-commandes-point-vente .text {
background-color: white;
border: solid 1px #e0e0e0;
margin-top: 3px;
width: 100px;
}
/* line 624, ../sass/screen.scss */
/* line 630, ../sass/screen.scss */
#page-commande .form-commandes-point-vente td.center {
text-align: center;
}
/* line 630, ../sass/screen.scss */
/* line 636, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .depasse {
color: #b32815;
}
/* line 634, ../sass/screen.scss */
/* line 640, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .total strong span {
font-weight: normal;
font-size: 13px;
}
/* line 639, ../sass/screen.scss */
/* line 645, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .vrac {
display: none;
}
/* line 643, ../sass/screen.scss */
/* line 649, ../sass/screen.scss */
#page-commande .form-commandes-point-vente td.client {
text-align: left;
padding: 3px;
}
/* line 646, ../sass/screen.scss */
/* line 652, ../sass/screen.scss */
#page-commande .form-commandes-point-vente td.client .date-commande {
color: gray;
}
/* line 653, ../sass/screen.scss */
/* line 659, ../sass/screen.scss */
#page-commande .table-header-rotated {
border-top: 0px;
border-left: 0px;
@@ -666,15 +672,15 @@ a:hover, a:focus, a:active {
width: 100%;
width: auto;
}
/* line 660, ../sass/screen.scss */
/* line 666, ../sass/screen.scss */
#page-commande .table-header-rotated .total strong {
border-bottom: solid 1px gray;
}
/* line 665, ../sass/screen.scss */
/* line 671, ../sass/screen.scss */
#page-commande .table-header-rotated th.row-header {
width: auto;
}
/* line 669, ../sass/screen.scss */
/* line 675, ../sass/screen.scss */
#page-commande .table-header-rotated td {
width: 40px;
border-top: 1px solid #dddddd;
@@ -683,7 +689,7 @@ a:hover, a:focus, a:active {
vertical-align: middle;
text-align: center;
}
/* line 678, ../sass/screen.scss */
/* line 684, ../sass/screen.scss */
#page-commande .table-header-rotated th.rotate-45 {
font-weight: normal;
height: 80px;
@@ -697,7 +703,7 @@ a:hover, a:focus, a:active {
line-height: 1;
border: 0px none;
}
/* line 692, ../sass/screen.scss */
/* line 698, ../sass/screen.scss */
#page-commande .table-header-rotated th.rotate-45 > div {
background-color: #F5F5F5;
position: relative;
@@ -715,7 +721,7 @@ a:hover, a:focus, a:active {
border-right: 1px solid #dddddd;
border-top: 1px solid #dddddd;
}
/* line 709, ../sass/screen.scss */
/* line 715, ../sass/screen.scss */
#page-commande .table-header-rotated th.rotate-45 span {
-ms-transform: skew(45deg, 0deg) rotate(315deg);
-moz-transform: skew(45deg, 0deg) rotate(315deg);
@@ -733,51 +739,51 @@ a:hover, a:focus, a:active {
text-align: left;
}

/* line 730, ../sass/screen.scss */
/* line 736, ../sass/screen.scss */
#email-masse-form #ids-users {
line-height: 30px;
}
/* line 732, ../sass/screen.scss */
/* line 738, ../sass/screen.scss */
#email-masse-form #ids-users .label {
text-transform: capitalize;
}

/* line 740, ../sass/screen.scss */
/* line 746, ../sass/screen.scss */
.produit-create #jours-production .form-group, .produit-update #jours-production .form-group {
float: left;
margin-right: 15px;
}
/* line 744, ../sass/screen.scss */
/* line 750, ../sass/screen.scss */
.produit-create #jours-production .form-group label, .produit-update #jours-production .form-group label {
font-weight: normal;
}
/* line 749, ../sass/screen.scss */
/* line 755, ../sass/screen.scss */
.produit-create .field-produit-id_etablissement, .produit-update .field-produit-id_etablissement {
display: none;
}

/* line 754, ../sass/screen.scss */
/* line 760, ../sass/screen.scss */
.table-striped > tbody > tr:nth-of-type(2n) {
background-color: white;
}

/* line 759, ../sass/screen.scss */
/* line 765, ../sass/screen.scss */
.wrap .produit-index .td-photo {
max-width: 100px;
width: 100px;
}
/* line 763, ../sass/screen.scss */
/* line 769, ../sass/screen.scss */
.wrap .produit-index .photo-produit {
max-width: 100px;
}
/* line 767, ../sass/screen.scss */
/* line 773, ../sass/screen.scss */
.wrap .produit-index .ui-state-highlight {
height: 75px;
background-color: #F8F1DD;
}

/* communiquer */
/* line 775, ../sass/screen.scss */
/* line 781, ../sass/screen.scss */
.communiquer-mode-emploi {
border: solid 1px #e0e0e0;
padding: 10px;
@@ -787,18 +793,18 @@ a:hover, a:focus, a:active {
margin-bottom: 30px;
font-family: "myriadpro-regular";
}
/* line 783, ../sass/screen.scss */
/* line 789, ../sass/screen.scss */
.communiquer-mode-emploi .header .logo {
float: left;
width: 75px;
padding-right: 20px;
padding-top: 10px;
}
/* line 789, ../sass/screen.scss */
/* line 795, ../sass/screen.scss */
.communiquer-mode-emploi .header .logo img {
width: 75px;
}
/* line 795, ../sass/screen.scss */
/* line 801, ../sass/screen.scss */
.communiquer-mode-emploi .header h1 {
font-family: "comfortaaregular";
font-size: 40px;
@@ -806,7 +812,7 @@ a:hover, a:focus, a:active {
margin-bottom: 0px;
font-weight: normal;
}
/* line 803, ../sass/screen.scss */
/* line 809, ../sass/screen.scss */
.communiquer-mode-emploi .header h2 {
margin-top: 0px;
font-family: "myriadpro-regular";
@@ -816,7 +822,7 @@ a:hover, a:focus, a:active {
left: 2px;
font-weight: normal;
}
/* line 814, ../sass/screen.scss */
/* line 820, ../sass/screen.scss */
.communiquer-mode-emploi h3 {
font-family: "comfortaalight";
font-family: "myriadpro-regular";
@@ -826,45 +832,45 @@ a:hover, a:focus, a:active {
margin-bottom: 0px;
}

/* line 824, ../sass/screen.scss */
/* line 830, ../sass/screen.scss */
.communiquer-mode-emploi-encart {
width: 420px;
margin-top: 20px;
}
/* line 828, ../sass/screen.scss */
/* line 834, ../sass/screen.scss */
.communiquer-mode-emploi-encart .header .logo {
width: 60px;
margin-right: 20px;
padding-top: 5px;
}
/* line 833, ../sass/screen.scss */
/* line 839, ../sass/screen.scss */
.communiquer-mode-emploi-encart .header .logo img {
width: 60px;
}
/* line 839, ../sass/screen.scss */
/* line 845, ../sass/screen.scss */
.communiquer-mode-emploi-encart .header h1 {
margin-bottom: 3px;
}
/* line 848, ../sass/screen.scss */
/* line 854, ../sass/screen.scss */
.communiquer-mode-emploi-encart h3 {
margin-top: 15px;
margin-bottom: 15px;
}

/* line 854, ../sass/screen.scss */
/* line 860, ../sass/screen.scss */
.bloc-mode-emploi-pdf {
width: 49.9%;
float: left;
border-bottom: dotted 1px gray;
}

/* line 860, ../sass/screen.scss */
/* line 866, ../sass/screen.scss */
.bloc-mode-emploi-border {
border-right: dotted 1px gray;
border-bottom: dotted 1px gray;
}

/* line 865, ../sass/screen.scss */
/* line 871, ../sass/screen.scss */
.communiquer-mode-emploi-pdf {
border: 0px none;
-moz-border-radius: 0px;
@@ -873,88 +879,88 @@ a:hover, a:focus, a:active {
margin-bottom: 0px;
padding: 20px 0px 20px 30px;
}
/* line 873, ../sass/screen.scss */
/* line 879, ../sass/screen.scss */
.communiquer-mode-emploi-pdf .header .logo {
float: left;
width: 55px;
padding-right: 15px;
padding-top: 10px;
}
/* line 879, ../sass/screen.scss */
/* line 885, ../sass/screen.scss */
.communiquer-mode-emploi-pdf .header .logo img {
width: 55px;
}
/* line 883, ../sass/screen.scss */
/* line 889, ../sass/screen.scss */
.communiquer-mode-emploi-pdf .header h1 {
font-size: 32px;
}
/* line 886, ../sass/screen.scss */
/* line 892, ../sass/screen.scss */
.communiquer-mode-emploi-pdf .header h2 {
font-size: 16px;
}
/* line 891, ../sass/screen.scss */
/* line 897, ../sass/screen.scss */
.communiquer-mode-emploi-pdf h3 {
font-weight: normal;
}

/* line 896, ../sass/screen.scss */
/* line 902, ../sass/screen.scss */
.bloc-mode-emploi-bottom {
border-bottom: 0px none;
border-bottom: solid 1px white;
}

/* commandes auto */
/* line 906, ../sass/screen.scss */
/* line 912, ../sass/screen.scss */
.commandeauto-form #bloc-select-user {
padding-left: 0px;
}
/* line 910, ../sass/screen.scss */
/* line 916, ../sass/screen.scss */
.commandeauto-form #or-user {
font-size: 20px;
text-align: center;
}
/* line 913, ../sass/screen.scss */
/* line 919, ../sass/screen.scss */
.commandeauto-form #or-user span {
position: relative;
top: 24px;
}
/* line 919, ../sass/screen.scss */
/* line 925, ../sass/screen.scss */
.commandeauto-form .field-commandeautoform-id_etablissement {
display: none;
}
/* line 923, ../sass/screen.scss */
/* line 929, ../sass/screen.scss */
.commandeauto-form .jours .form-group {
float: left;
margin-right: 20px;
}
/* line 930, ../sass/screen.scss */
/* line 936, ../sass/screen.scss */
.commandeauto-form .produits .table {
width: 500px;
}
/* line 933, ../sass/screen.scss */
/* line 939, ../sass/screen.scss */
.commandeauto-form .produits .quantite {
text-align: center;
}

/* points de vente */
/* line 942, ../sass/screen.scss */
/* line 948, ../sass/screen.scss */
.point-vente-form #pointvente-users {
display: none;
height: 500px;
overflow-y: scroll;
}
/* line 946, ../sass/screen.scss */
/* line 952, ../sass/screen.scss */
.point-vente-form #pointvente-users label {
font-weight: normal;
display: block;
}

/* utilisateurs */
/* line 956, ../sass/screen.scss */
/* line 962, ../sass/screen.scss */
.user-index .input-group {
width: 180px;
}
/* line 959, ../sass/screen.scss */
/* line 965, ../sass/screen.scss */
.user-index .input-group .input-credit {
text-align: center;
}

+ 7
- 1
backend/web/js/lechatdesnoisettes.js View File

@@ -230,7 +230,7 @@ function chat_index_commandes_points_vente() {
$('#commandes-points-vente .liste-commandes').each(function() {
$(this).find('a:first').trigger('click') ;
//$(this).find('a:first').trigger('click') ;
}) ;
}

@@ -318,11 +318,15 @@ function chat_btn_plus_moins() {

function chat_index_commandes_affiche_commande(id_commande) {


var link = $("a[data-id-commande="+id_commande+"]") ;

var id_pv = link.data('pv-id') ;
$('#point-vente-'+id_pv+' .bloc-commande').hide() ;
$('#point-vente-'+id_pv+' .liste-commandes a').removeClass('active') ;
link.addClass('active') ;
@@ -363,6 +367,8 @@ function chat_index_commandes_affiche_commande(id_commande) {
}

$('#point-vente-'+id_pv+' .title-user span.the-title').html(link.find('.user').html()+" <small>"+link.data('date')+"</small>") ;
$('#point-vente-'+id_pv+' .bloc-commande').fadeIn() ;
$('#point-vente-'+id_pv+' .title-user').show() ;
$('#point-vente-'+id_pv+' .tr-total').show() ;

+ 6
- 0
backend/web/sass/screen.scss View File

@@ -467,6 +467,12 @@ a {
margin-bottom: 10px ;
}
.bloc-commande {
padding-top: 20px ;
margin-top: 20px ;
display: none ;
}
.title-user {
display: none ;
font-size: 19px ;

Write Preview
Loading…
Cancel
Save