BenoitCier
/
Opendistrib
forkad från Laclic/Souke
Bevaka 1
Stjärnmärk 0
Förgrening 0
Kod Ärenden 0 Pull-förfrågningar 0 Släpp 0 Wiki Aktiviteter
Bläddra i källkod

Merge branch 'feature/backend/pouvoir_ajouter_produits_desactives_commandes' into dev

dev
keun 6 år sedan
förälder
673e438d12 e0d0bf6e83
incheckning
788f716577
5 ändrade filer med 125 tillägg och 108 borttagningar
Delad Vy Visa Diff Statistik
  1. +7
    -5
      backend/views/commande/_total_commandes.php
  2. +8
    -10
      backend/views/commande/index.php
  3. Binär
      backend/web/.sass-cache/2a0ffb00578c9d5a537db16d14c734a22b18f35c/screen.scssc
  4. +101
    -93
      backend/web/css/screen.css
  5. +9
    -0
      backend/web/sass/screen.scss

+ 7
- 5
backend/views/commande/_total_commandes.php Visa fil

@@ -22,9 +22,12 @@ use yii\helpers\Html ;
<tr>
<?php
foreach ($produits as $p) {
if (isset($produits_selec[$p->id]['actif']) && $produits_selec[$p->id]['actif'])
if ((isset($produits_selec[$p->id]['actif']) && $produits_selec[$p->id]['actif']) ||
(!$produits_selec[$p->id]['actif'] && Commande::getQuantiteProduit($p->id, $commandes)))
{
echo '<th class="rotate-45"><div><span>'.Html::encode($p->getLibelleAdmin()).'</span></div></th>' ;
(!$produits_selec[$p->id]['actif']) ? $class_disabled = 'disabled' : $class_disabled = '' ;
echo '<th class="rotate-45 '.$class_disabled.'"><div><span>'.Html::encode($p->getLibelleAdmin()).'</span></div></th>' ;
}
}
?>
@@ -32,10 +35,9 @@ use yii\helpers\Html ;
<tr>
<?php
foreach ($produits as $p) {
if (isset($produits_selec[$p->id]['actif']) && $produits_selec[$p->id]['actif'])
$quantite = Commande::getQuantiteProduit($p->id, $commandes);
if ((isset($produits_selec[$p->id]['actif']) && $produits_selec[$p->id]['actif']) || $quantite)
{

$quantite = Commande::getQuantiteProduit($p->id, $commandes);
$str_quantite = '';
if ($quantite)
$str_quantite = $quantite;

+ 8
- 10
backend/views/commande/index.php Visa fil

@@ -266,17 +266,15 @@ foreach ($produits as $p) {
<table class="table table-bordered table-condensed tab-content table-produits">
<tbody>
<?php foreach ($produits as $p): ?>
<?php if (isset($produits_selec[$p->id]['actif']) && $produits_selec[$p->id]['actif']): ?>
<tr class="produit-<?= $p->id ?>" data-id-produit="<?= $p->id ?>">
<td class="td-commande"></td>
<td class="td-produit"><?php echo Html::encode($p->getLibelleAdmin()); ?></td>
</tr>
<?php endif; ?>
<tr class="produit-<?= $p->id ?> <?php if(!$produits_selec[$p->id]['actif']): ?> disabled<?php endif; ?>" data-id-produit="<?= $p->id ?>">
<td class="td-commande"></td>
<td class="td-produit"><?php echo Html::encode($p->getLibelleAdmin()); ?></td>
</tr>
<?php endforeach; ?>
<tr class="tr-total">
<td class="td-total"></td>
<td class="td-paiement"></td>
</tr>
<tr class="tr-total">
<td class="td-total"></td>
<td class="td-paiement"></td>
</tr>
</tbody>
</table>
</div>

Binär
backend/web/.sass-cache/2a0ffb00578c9d5a537db16d14c734a22b18f35c/screen.scssc Visa fil


+ 101
- 93
backend/web/css/screen.css Visa fil

@@ -754,30 +754,34 @@ a:hover, a:focus, a:active {
text-align: center;
}
/* line 751, ../sass/screen.scss */
#page-commande #commandes-points-vente table.table-produits tr.disabled .td-produit {
color: gray;
}
/* line 757, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-produit,
#page-commande #commandes-points-vente .th-produit {
width: 70%;
}
/* line 756, ../sass/screen.scss */
/* line 762, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-commande,
#page-commande #commandes-points-vente .th-commande {
width: 30%;
text-align: center;
}
/* line 762, ../sass/screen.scss */
/* line 768, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-produit {
text-transform: uppercase;
}
/* line 766, ../sass/screen.scss */
/* line 772, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-commande {
font-weight: bold;
}
/* line 770, ../sass/screen.scss */
/* line 776, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-total {
font-size: 18px;
text-align: center;
}
/* line 774, ../sass/screen.scss */
/* line 780, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-total span {
padding: 2px 10px;
background-color: #BB8757;
@@ -787,33 +791,33 @@ a:hover, a:focus, a:active {
-webkit-border-radius: 8px;
border-radius: 8px;
}
/* line 784, ../sass/screen.scss */
/* line 790, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-paiement .buttons-credit {
float: right;
}
/* line 790, ../sass/screen.scss */
/* line 796, ../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 797, ../sass/screen.scss */
/* line 803, ../sass/screen.scss */
#page-commande #commandes-points-vente .panel-commande-automatique .jours .form-group {
float: left;
margin-right: 10px;
}
/* line 806, ../sass/screen.scss */
/* line 812, ../sass/screen.scss */
#page-commande #old-commandes {
display: none;
}
/* line 810, ../sass/screen.scss */
/* line 816, ../sass/screen.scss */
#page-commande .form-commandes-point-vente {
margin-top: 20px;
}
/* line 814, ../sass/screen.scss */
/* line 820, ../sass/screen.scss */
#page-commande .form-commandes-point-vente table {
border-bottom: solid 1px #e0e0e0;
}
/* line 818, ../sass/screen.scss */
/* line 824, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .title-point-vente {
background-color: #fff8e2;
border-left: solid 3px #BB8757;
@@ -821,76 +825,76 @@ a:hover, a:focus, a:active {
text-align: left;
padding: 10px;
}
/* line 826, ../sass/screen.scss */
/* line 832, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .title-totaux {
text-align: center;
}
/* line 830, ../sass/screen.scss */
/* line 836, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .border-left {
border-left: solid 1px #e0e0e0;
}
/* line 834, ../sass/screen.scss */
/* line 840, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .border-right {
border-right: solid 1px #e0e0e0;
}
/* line 838, ../sass/screen.scss */
/* line 844, ../sass/screen.scss */
#page-commande .form-commandes-point-vente input.quantite {
width: 30px;
background-color: white;
border: solid 1px #e0e0e0;
text-align: center;
}
/* line 846, ../sass/screen.scss */
/* line 852, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .td-produit {
text-align: center;
}
/* line 850, ../sass/screen.scss */
/* line 856, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .submit-pv {
float: right;
}
/* line 854, ../sass/screen.scss */
/* line 860, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .select-user {
background-color: #F9F9F9;
border: solid 1px #e0e0e0;
}
/* line 859, ../sass/screen.scss */
/* line 865, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .date-commande {
font-size: 12px;
}
/* line 863, ../sass/screen.scss */
/* line 869, ../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 871, ../sass/screen.scss */
/* line 877, ../sass/screen.scss */
#page-commande .form-commandes-point-vente td.center {
text-align: center;
}
/* line 877, ../sass/screen.scss */
/* line 883, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .depasse {
color: #b32815;
}
/* line 881, ../sass/screen.scss */
/* line 887, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .total strong span {
font-weight: normal;
font-size: 13px;
}
/* line 886, ../sass/screen.scss */
/* line 892, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .vrac {
display: none;
}
/* line 890, ../sass/screen.scss */
/* line 896, ../sass/screen.scss */
#page-commande .form-commandes-point-vente td.client {
text-align: left;
padding: 3px;
}
/* line 893, ../sass/screen.scss */
/* line 899, ../sass/screen.scss */
#page-commande .form-commandes-point-vente td.client .date-commande {
color: gray;
}
/* line 900, ../sass/screen.scss */
/* line 906, ../sass/screen.scss */
#page-commande .table-header-rotated {
border-top: 0px;
border-left: 0px;
@@ -898,15 +902,15 @@ a:hover, a:focus, a:active {
width: 100%;
width: auto;
}
/* line 907, ../sass/screen.scss */
/* line 913, ../sass/screen.scss */
#page-commande .table-header-rotated .total strong {
border-bottom: solid 1px gray;
}
/* line 912, ../sass/screen.scss */
/* line 918, ../sass/screen.scss */
#page-commande .table-header-rotated th.row-header {
width: auto;
}
/* line 916, ../sass/screen.scss */
/* line 922, ../sass/screen.scss */
#page-commande .table-header-rotated td {
width: 40px;
border-top: 1px solid #dddddd;
@@ -915,7 +919,7 @@ a:hover, a:focus, a:active {
vertical-align: middle;
text-align: center;
}
/* line 925, ../sass/screen.scss */
/* line 931, ../sass/screen.scss */
#page-commande .table-header-rotated th.rotate-45 {
font-weight: normal;
height: 80px;
@@ -929,7 +933,7 @@ a:hover, a:focus, a:active {
line-height: 1;
border: 0px none;
}
/* line 939, ../sass/screen.scss */
/* line 945, ../sass/screen.scss */
#page-commande .table-header-rotated th.rotate-45 > div {
background-color: #F5F5F5;
position: relative;
@@ -947,7 +951,7 @@ a:hover, a:focus, a:active {
border-right: 1px solid #dddddd;
border-top: 1px solid #dddddd;
}
/* line 956, ../sass/screen.scss */
/* line 962, ../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);
@@ -964,52 +968,56 @@ a:hover, a:focus, a:active {
/* 80 / cos(45) - 40 cos (45) = 85 where 80 is the height of the cell, 40 the width of the cell and 45 the transform angle*/
text-align: left;
}
/* line 978, ../sass/screen.scss */
#page-commande .table-header-rotated .disabled {
color: gray;
}

/* line 977, ../sass/screen.scss */
/* line 986, ../sass/screen.scss */
#email-masse-form #ids-users {
line-height: 30px;
}
/* line 979, ../sass/screen.scss */
/* line 988, ../sass/screen.scss */
#email-masse-form #ids-users .label {
text-transform: capitalize;
}

/* line 987, ../sass/screen.scss */
/* line 996, ../sass/screen.scss */
.produit-create #jours-production .form-group, .produit-update #jours-production .form-group {
float: left;
margin-right: 15px;
}
/* line 991, ../sass/screen.scss */
/* line 1000, ../sass/screen.scss */
.produit-create #jours-production .form-group label, .produit-update #jours-production .form-group label {
font-weight: normal;
}
/* line 996, ../sass/screen.scss */
/* line 1005, ../sass/screen.scss */
.produit-create .field-produit-id_etablissement, .produit-update .field-produit-id_etablissement {
display: none;
}

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

/* line 1006, ../sass/screen.scss */
/* line 1015, ../sass/screen.scss */
.wrap .produit-index .td-photo {
max-width: 100px;
width: 100px;
}
/* line 1010, ../sass/screen.scss */
/* line 1019, ../sass/screen.scss */
.wrap .produit-index .photo-produit {
max-width: 100px;
}
/* line 1014, ../sass/screen.scss */
/* line 1023, ../sass/screen.scss */
.wrap .produit-index .ui-state-highlight {
height: 75px;
background-color: #F8F1DD;
}

/* communiquer */
/* line 1022, ../sass/screen.scss */
/* line 1031, ../sass/screen.scss */
.communiquer-mode-emploi {
border: solid 1px #e0e0e0;
padding: 10px;
@@ -1019,18 +1027,18 @@ a:hover, a:focus, a:active {
margin-bottom: 30px;
font-family: "myriadpro-regular";
}
/* line 1030, ../sass/screen.scss */
/* line 1039, ../sass/screen.scss */
.communiquer-mode-emploi .header .logo {
float: left;
width: 75px;
padding-right: 20px;
padding-top: 10px;
}
/* line 1036, ../sass/screen.scss */
/* line 1045, ../sass/screen.scss */
.communiquer-mode-emploi .header .logo img {
width: 75px;
}
/* line 1042, ../sass/screen.scss */
/* line 1051, ../sass/screen.scss */
.communiquer-mode-emploi .header h1 {
font-family: "comfortaaregular";
font-size: 40px;
@@ -1038,7 +1046,7 @@ a:hover, a:focus, a:active {
margin-bottom: 0px;
font-weight: normal;
}
/* line 1050, ../sass/screen.scss */
/* line 1059, ../sass/screen.scss */
.communiquer-mode-emploi .header h2 {
margin-top: 0px;
font-family: "myriadpro-regular";
@@ -1048,7 +1056,7 @@ a:hover, a:focus, a:active {
left: 2px;
font-weight: normal;
}
/* line 1061, ../sass/screen.scss */
/* line 1070, ../sass/screen.scss */
.communiquer-mode-emploi h3 {
font-family: "comfortaalight";
font-family: "myriadpro-regular";
@@ -1058,45 +1066,45 @@ a:hover, a:focus, a:active {
margin-bottom: 0px;
}

/* line 1071, ../sass/screen.scss */
/* line 1080, ../sass/screen.scss */
.communiquer-mode-emploi-encart {
width: 420px;
margin-top: 20px;
}
/* line 1075, ../sass/screen.scss */
/* line 1084, ../sass/screen.scss */
.communiquer-mode-emploi-encart .header .logo {
width: 60px;
margin-right: 20px;
padding-top: 5px;
}
/* line 1080, ../sass/screen.scss */
/* line 1089, ../sass/screen.scss */
.communiquer-mode-emploi-encart .header .logo img {
width: 60px;
}
/* line 1086, ../sass/screen.scss */
/* line 1095, ../sass/screen.scss */
.communiquer-mode-emploi-encart .header h1 {
margin-bottom: 3px;
}
/* line 1095, ../sass/screen.scss */
/* line 1104, ../sass/screen.scss */
.communiquer-mode-emploi-encart h3 {
margin-top: 15px;
margin-bottom: 15px;
}

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

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

/* line 1112, ../sass/screen.scss */
/* line 1121, ../sass/screen.scss */
.communiquer-mode-emploi-pdf {
border: 0px none;
-moz-border-radius: 0px;
@@ -1105,118 +1113,118 @@ a:hover, a:focus, a:active {
margin-bottom: 0px;
padding: 20px 0px 20px 30px;
}
/* line 1120, ../sass/screen.scss */
/* line 1129, ../sass/screen.scss */
.communiquer-mode-emploi-pdf .header .logo {
float: left;
width: 55px;
padding-right: 15px;
padding-top: 10px;
}
/* line 1126, ../sass/screen.scss */
/* line 1135, ../sass/screen.scss */
.communiquer-mode-emploi-pdf .header .logo img {
width: 55px;
}
/* line 1130, ../sass/screen.scss */
/* line 1139, ../sass/screen.scss */
.communiquer-mode-emploi-pdf .header h1 {
font-size: 32px;
}
/* line 1133, ../sass/screen.scss */
/* line 1142, ../sass/screen.scss */
.communiquer-mode-emploi-pdf .header h2 {
font-size: 16px;
}
/* line 1138, ../sass/screen.scss */
/* line 1147, ../sass/screen.scss */
.communiquer-mode-emploi-pdf h3 {
font-weight: normal;
}

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

/* commandes auto */
/* line 1153, ../sass/screen.scss */
/* line 1162, ../sass/screen.scss */
.commandeauto-form #bloc-select-user {
padding-left: 0px;
}
/* line 1157, ../sass/screen.scss */
/* line 1166, ../sass/screen.scss */
.commandeauto-form #or-user {
font-size: 20px;
text-align: center;
}
/* line 1160, ../sass/screen.scss */
/* line 1169, ../sass/screen.scss */
.commandeauto-form #or-user span {
position: relative;
top: 24px;
}
/* line 1166, ../sass/screen.scss */
/* line 1175, ../sass/screen.scss */
.commandeauto-form .field-commandeautoform-id_etablissement {
display: none;
}
/* line 1170, ../sass/screen.scss */
/* line 1179, ../sass/screen.scss */
.commandeauto-form .jours .form-group {
float: left;
margin-right: 20px;
}
/* line 1177, ../sass/screen.scss */
/* line 1186, ../sass/screen.scss */
.commandeauto-form .produits .table {
width: 500px;
}
/* line 1180, ../sass/screen.scss */
/* line 1189, ../sass/screen.scss */
.commandeauto-form .produits .quantite {
text-align: center;
}

/* points de vente */
/* line 1189, ../sass/screen.scss */
/* line 1198, ../sass/screen.scss */
.point-vente-form #pointvente-users {
display: none;
height: 500px;
overflow-y: scroll;
}
/* line 1193, ../sass/screen.scss */
/* line 1202, ../sass/screen.scss */
.point-vente-form #pointvente-users label {
font-weight: normal;
display: block;
}
/* line 1197, ../sass/screen.scss */
/* line 1206, ../sass/screen.scss */
.point-vente-form #pointvente-users .commentaire {
display: none;
margin-left: 17px;
width: 200px;
}
/* line 1205, ../sass/screen.scss */
/* line 1214, ../sass/screen.scss */
.point-vente-form #jours-livraison .form-group {
float: left;
margin-right: 15px;
}
/* line 1209, ../sass/screen.scss */
/* line 1218, ../sass/screen.scss */
.point-vente-form #jours-livraison .form-group label {
font-weight: normal;
}

/* utilisateurs */
/* line 1219, ../sass/screen.scss */
/* line 1228, ../sass/screen.scss */
.user-index .input-group {
width: 180px;
}
/* line 1222, ../sass/screen.scss */
/* line 1231, ../sass/screen.scss */
.user-index .input-group .input-credit {
text-align: center;
}
/* line 1227, ../sass/screen.scss */
/* line 1236, ../sass/screen.scss */
.user-index #tabs-points-vente {
margin-bottom: 20px;
}
/* line 1231, ../sass/screen.scss */
/* line 1240, ../sass/screen.scss */
.user-index .btn-liste-emails {
float: right;
position: relative;
top: -8px;
}

/* line 1239, ../sass/screen.scss */
/* line 1248, ../sass/screen.scss */
.user-credit .the-credit {
float: right;
font-weight: bold;
@@ -1232,16 +1240,16 @@ a:hover, a:focus, a:active {
}

/* facturation */
/* line 1254, ../sass/screen.scss */
/* line 1263, ../sass/screen.scss */
#estimation-facture {
padding: 20px;
background-color: #F9F9F9;
}
/* line 1258, ../sass/screen.scss */
/* line 1267, ../sass/screen.scss */
#estimation-facture h2 {
font-family: "myriadpro-it";
}
/* line 1262, ../sass/screen.scss */
/* line 1271, ../sass/screen.scss */
#estimation-facture .montant span {
font-size: 25px;
color: white;
@@ -1253,17 +1261,17 @@ a:hover, a:focus, a:active {
padding-top: 7px;
font-family: "myriadpro-regular";
}
/* line 1273, ../sass/screen.scss */
/* line 1282, ../sass/screen.scss */
#estimation-facture label {
text-transform: uppercase;
font-family: "myriadpro-light";
font-size: 20px;
}
/* line 1278, ../sass/screen.scss */
/* line 1287, ../sass/screen.scss */
#estimation-facture label span {
font-size: 16px;
}
/* line 1283, ../sass/screen.scss */
/* line 1292, ../sass/screen.scss */
#estimation-facture #etablissement-prix_libre {
width: 100px;
height: 60px;
@@ -1272,37 +1280,37 @@ a:hover, a:focus, a:active {
text-align: center;
}

/* line 1293, ../sass/screen.scss */
/* line 1302, ../sass/screen.scss */
.developpement-index ul#tabs-statuts-developpements {
margin-bottom: 30px;
border-bottom: solid 3px #BB8757;
}
/* line 1297, ../sass/screen.scss */
/* line 1306, ../sass/screen.scss */
.developpement-index ul#tabs-statuts-developpements a {
text-transform: uppercase;
}
/* line 1300, ../sass/screen.scss */
/* line 1309, ../sass/screen.scss */
.developpement-index ul#tabs-statuts-developpements .active {
border: 0px none;
background: none;
}
/* line 1303, ../sass/screen.scss */
/* line 1312, ../sass/screen.scss */
.developpement-index ul#tabs-statuts-developpements .active a {
background-color: #BB8757;
color: white;
}
/* line 1311, ../sass/screen.scss */
/* line 1320, ../sass/screen.scss */
.developpement-index #tab-developpements .btn-group-priorite {
width: 100%;
margin-bottom: 5px;
}
/* line 1315, ../sass/screen.scss */
/* line 1324, ../sass/screen.scss */
.developpement-index #tab-developpements .btn-group-priorite .btn-priorite {
display: block;
float: none;
width: 100%;
}
/* line 1322, ../sass/screen.scss */
/* line 1331, ../sass/screen.scss */
.developpement-index #tab-developpements .label-priorite {
display: block;
width: 100%;

+ 9
- 0
backend/web/sass/screen.scss Visa fil

@@ -746,6 +746,12 @@ a {
//width: 100px ;
text-align: center ;
}
tr.disabled {
.td-produit {
color: gray ;
}
}
}
.td-produit,
@@ -969,6 +975,9 @@ a {
// white-space: nowrap; /*whether to display in one line or not*/
}
.table-header-rotated .disabled {
color: gray ;
}
}


Write Förhandsgranska
Laddar…
Avbryt
Spara