Laclic
/
Souke
Watch 5
Star 0
Fork 1
Code Issues 1 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

[Backend] Commandes : bouton importer les commandes récurrentes 

Ajout d'un bouton permettant d'importer les commandes récurrentes. En effet, cela se fait de manière automatique lors de l'activation d'une production mais il faut également un moyen de le faire manuellement.
prodstable
keun 7 years ago
parent
0edf9da9f7
commit
542e43bbe1
6 changed files with 160 additions and 120 deletions
Split View Show Diff Stats
  1. +5
    -0
      backend/controllers/CommandeController.php
  2. +13
    -2
      backend/views/commande/index.php
  3. BIN
      backend/web/.sass-cache/c8fef7d48da4dc7f024edc2b0fada9d8d6de5dac/screen.scssc
  4. +127
    -114
      backend/web/css/screen.css
  5. +13
    -2
      backend/web/sass/screen.scss
  6. +2
    -2
      common/models/CommandeAuto.php

+ 5
- 0
backend/controllers/CommandeController.php View File

@@ -819,6 +819,11 @@ class CommandeController extends BackendController {
'filename' => $filename
];
}
public function actionAddCommandesAuto($date) {
CommandeAuto::addAll($date, true);
$this->redirect(['index', 'date' => $date]);
}

public function actionChangeState($date, $actif) {
// changement état

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

@@ -157,11 +157,22 @@ foreach ($produits as $p) {
<h3 class="panel-title">
Commandes
<?php if (!count($commandes)): ?><span class="label label-danger">0</span>
<?php else: ?><span class="label label-success"><?= count($commandes) ?></span>
<?php endif; ?>
<?php else: ?><span class="label label-success"><?= count($commandes) ?></span>
<?php endif; ?>
<?php if (count($commandes)): ?>
<a id="btn-export-commandes" class="btn btn-primary" href="<?php echo Yii::$app->urlManager->createUrl(['commande/report', 'date' => $date, 'id_point_vente' => 0, 'global' => 1]); ?>"><span class="glyphicon glyphicon-download-alt"></span> Exporter</a>
<?php endif; ?>
<div id="btn-commandes-auto" class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span class="glyphicon glyphicon-repeat"></span> Commandes récurrentes <span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li><a href="<?= Yii::$app->urlManager->createUrl(['commande/add-commandes-auto', 'date' => $date]); ?>">Importer toutes les commandes</a></li>
</ul>
</div>
</h3>
</div>
<div class="panel-body">

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


+ 127
- 114
backend/web/css/screen.css View File

@@ -549,7 +549,7 @@ a:hover, a:focus, a:active {
}
/* line 529, ../sass/screen.scss */
#page-commande #btn-export-commandes,
#page-commande #btn-commande-auto {
#page-commande #btn-commandes-auto {
float: right;
position: relative;
top: -5px;
@@ -557,29 +557,42 @@ a:hover, a:focus, a:active {
padding: 2px 5px;
}
/* line 538, ../sass/screen.scss */
#page-commande #btn-export-commandes {
#page-commande #btn-export-commandes,
#page-commande #btn-commandes-auto {
color: white;
margin-left: 10px;
padding: 1px 5px;
}
/* line 546, ../sass/screen.scss */
/* line 545, ../sass/screen.scss */
#page-commande #btn-commandes-auto {
top: -7px;
}
/* line 547, ../sass/screen.scss */
#page-commande #btn-commandes-auto .btn {
padding: 2px 5px;
}
/* line 549, ../sass/screen.scss */
#page-commande #btn-commandes-auto .btn span {
top: 2px;
}
/* line 557, ../sass/screen.scss */
#page-commande #bloc-totaux .table-produits .depasse {
color: #b32815;
}
/* line 550, ../sass/screen.scss */
/* line 561, ../sass/screen.scss */
#page-commande #bloc-totaux .table-produits .total strong span {
font-weight: normal;
font-size: 13px;
}
/* line 559, ../sass/screen.scss */
/* line 570, ../sass/screen.scss */
#page-commande #commandes-points-vente .tab-pane {
padding-top: 20px;
}
/* line 566, ../sass/screen.scss */
/* line 577, ../sass/screen.scss */
#page-commande #commandes-points-vente .recap-pv.no-commande .recettes {
display: none;
}
/* line 570, ../sass/screen.scss */
/* line 581, ../sass/screen.scss */
#page-commande #commandes-points-vente .recap-pv .recettes {
float: right;
color: #BB8757;
@@ -592,11 +605,11 @@ a:hover, a:focus, a:active {
position: relative;
top: -3px;
}
/* line 584, ../sass/screen.scss */
/* line 595, ../sass/screen.scss */
#page-commande #commandes-points-vente .alert.commentaire {
display: none;
}
/* line 588, ../sass/screen.scss */
/* line 599, ../sass/screen.scss */
#page-commande #commandes-points-vente ul.liste-commandes {
margin-top: 10px;
list-style-type: none;
@@ -608,16 +621,16 @@ a:hover, a:focus, a:active {
width: 100%;
overflow-y: scroll;
}
/* line 600, ../sass/screen.scss */
/* line 611, ../sass/screen.scss */
#page-commande #commandes-points-vente ul.liste-commandes.no-commande {
display: none;
}
/* line 604, ../sass/screen.scss */
/* line 615, ../sass/screen.scss */
#page-commande #commandes-points-vente ul.liste-commandes li {
padding: 0;
margin: 0;
}
/* line 607, ../sass/screen.scss */
/* line 618, ../sass/screen.scss */
#page-commande #commandes-points-vente ul.liste-commandes li a {
text-align: left;
-moz-border-radius: 0px;
@@ -627,22 +640,22 @@ a:hover, a:focus, a:active {
padding: 7px;
color: #333;
}
/* line 615, ../sass/screen.scss */
/* line 626, ../sass/screen.scss */
#page-commande #commandes-points-vente ul.liste-commandes li a .montant {
float: right;
color: #BB8757;
font-weight: bold;
}
/* line 620, ../sass/screen.scss */
/* line 631, ../sass/screen.scss */
#page-commande #commandes-points-vente ul.liste-commandes li a .montant.paye {
color: #5cb85c;
color: #519951;
}
/* line 626, ../sass/screen.scss */
/* line 637, ../sass/screen.scss */
#page-commande #commandes-points-vente ul.liste-commandes li a .glyphicon-comment {
color: #BB8757;
}
/* line 630, ../sass/screen.scss */
/* line 641, ../sass/screen.scss */
#page-commande #commandes-points-vente ul.liste-commandes li a:hover, #page-commande #commandes-points-vente ul.liste-commandes li a:active, #page-commande #commandes-points-vente ul.liste-commandes li a.active {
text-decoration: none;
background-color: #FCF8E3;
@@ -653,82 +666,82 @@ a:hover, a:focus, a:active {
-webkit-transition: all 0.1s;
transition: all 0.1s;
}
/* line 644, ../sass/screen.scss */
/* line 655, ../sass/screen.scss */
#page-commande #commandes-points-vente .creer-commande,
#page-commande #commandes-points-vente .commandes-auto {
width: 100%;
margin-bottom: 10px;
}
/* line 650, ../sass/screen.scss */
/* line 661, ../sass/screen.scss */
#page-commande #commandes-points-vente .bloc-commande {
padding-top: 20px;
margin-top: 20px;
display: none;
}
/* line 656, ../sass/screen.scss */
/* line 667, ../sass/screen.scss */
#page-commande #commandes-points-vente .title-user {
display: none;
font-size: 19px;
margin-top: 0px;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}
/* line 662, ../sass/screen.scss */
/* line 673, ../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 669, ../sass/screen.scss */
/* line 680, ../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 673, ../sass/screen.scss */
/* line 684, ../sass/screen.scss */
#page-commande #commandes-points-vente .title-user .buttons-save-cancel {
display: none;
}
/* line 677, ../sass/screen.scss */
/* line 688, ../sass/screen.scss */
#page-commande #commandes-points-vente .title-user .choix-user {
display: none;
}
/* line 680, ../sass/screen.scss */
/* line 691, ../sass/screen.scss */
#page-commande #commandes-points-vente .title-user .choix-user .form-control {
width: 200px;
display: inline;
}
/* line 688, ../sass/screen.scss */
/* line 699, ../sass/screen.scss */
#page-commande #commandes-points-vente table.table-produits .td-commande {
text-align: center;
}
/* line 691, ../sass/screen.scss */
/* line 702, ../sass/screen.scss */
#page-commande #commandes-points-vente table.table-produits input.form-control {
text-align: center;
}
/* line 697, ../sass/screen.scss */
/* line 708, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-produit,
#page-commande #commandes-points-vente .th-produit {
width: 70%;
}
/* line 702, ../sass/screen.scss */
/* line 713, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-commande,
#page-commande #commandes-points-vente .th-commande {
width: 30%;
text-align: center;
}
/* line 708, ../sass/screen.scss */
/* line 719, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-produit {
text-transform: uppercase;
}
/* line 712, ../sass/screen.scss */
/* line 723, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-commande {
font-weight: bold;
}
/* line 716, ../sass/screen.scss */
/* line 727, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-total {
font-size: 18px;
text-align: center;
}
/* line 720, ../sass/screen.scss */
/* line 731, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-total span {
padding: 2px 10px;
background-color: #BB8757;
@@ -738,33 +751,33 @@ a:hover, a:focus, a:active {
-webkit-border-radius: 8px;
border-radius: 8px;
}
/* line 730, ../sass/screen.scss */
/* line 741, ../sass/screen.scss */
#page-commande #commandes-points-vente .td-paiement .buttons-credit {
float: right;
}
/* line 736, ../sass/screen.scss */
/* line 747, ../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 743, ../sass/screen.scss */
/* line 754, ../sass/screen.scss */
#page-commande #commandes-points-vente .panel-commande-automatique .jours .form-group {
float: left;
margin-right: 10px;
}
/* line 752, ../sass/screen.scss */
/* line 763, ../sass/screen.scss */
#page-commande #old-commandes {
display: none;
}
/* line 756, ../sass/screen.scss */
/* line 767, ../sass/screen.scss */
#page-commande .form-commandes-point-vente {
margin-top: 20px;
}
/* line 760, ../sass/screen.scss */
/* line 771, ../sass/screen.scss */
#page-commande .form-commandes-point-vente table {
border-bottom: solid 1px #e0e0e0;
}
/* line 764, ../sass/screen.scss */
/* line 775, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .title-point-vente {
background-color: #fff8e2;
border-left: solid 3px #BB8757;
@@ -772,76 +785,76 @@ a:hover, a:focus, a:active {
text-align: left;
padding: 10px;
}
/* line 772, ../sass/screen.scss */
/* line 783, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .title-totaux {
text-align: center;
}
/* line 776, ../sass/screen.scss */
/* line 787, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .border-left {
border-left: solid 1px #e0e0e0;
}
/* line 780, ../sass/screen.scss */
/* line 791, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .border-right {
border-right: solid 1px #e0e0e0;
}
/* line 784, ../sass/screen.scss */
/* line 795, ../sass/screen.scss */
#page-commande .form-commandes-point-vente input.quantite {
width: 30px;
background-color: white;
border: solid 1px #e0e0e0;
text-align: center;
}
/* line 792, ../sass/screen.scss */
/* line 803, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .td-produit {
text-align: center;
}
/* line 796, ../sass/screen.scss */
/* line 807, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .submit-pv {
float: right;
}
/* line 800, ../sass/screen.scss */
/* line 811, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .select-user {
background-color: #F9F9F9;
border: solid 1px #e0e0e0;
}
/* line 805, ../sass/screen.scss */
/* line 816, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .date-commande {
font-size: 12px;
}
/* line 809, ../sass/screen.scss */
/* line 820, ../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 817, ../sass/screen.scss */
/* line 828, ../sass/screen.scss */
#page-commande .form-commandes-point-vente td.center {
text-align: center;
}
/* line 823, ../sass/screen.scss */
/* line 834, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .depasse {
color: #b32815;
}
/* line 827, ../sass/screen.scss */
/* line 838, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .total strong span {
font-weight: normal;
font-size: 13px;
}
/* line 832, ../sass/screen.scss */
/* line 843, ../sass/screen.scss */
#page-commande .form-commandes-point-vente .vrac {
display: none;
}
/* line 836, ../sass/screen.scss */
/* line 847, ../sass/screen.scss */
#page-commande .form-commandes-point-vente td.client {
text-align: left;
padding: 3px;
}
/* line 839, ../sass/screen.scss */
/* line 850, ../sass/screen.scss */
#page-commande .form-commandes-point-vente td.client .date-commande {
color: gray;
}
/* line 846, ../sass/screen.scss */
/* line 857, ../sass/screen.scss */
#page-commande .table-header-rotated {
border-top: 0px;
border-left: 0px;
@@ -849,15 +862,15 @@ a:hover, a:focus, a:active {
width: 100%;
width: auto;
}
/* line 853, ../sass/screen.scss */
/* line 864, ../sass/screen.scss */
#page-commande .table-header-rotated .total strong {
border-bottom: solid 1px gray;
}
/* line 858, ../sass/screen.scss */
/* line 869, ../sass/screen.scss */
#page-commande .table-header-rotated th.row-header {
width: auto;
}
/* line 862, ../sass/screen.scss */
/* line 873, ../sass/screen.scss */
#page-commande .table-header-rotated td {
width: 40px;
border-top: 1px solid #dddddd;
@@ -866,7 +879,7 @@ a:hover, a:focus, a:active {
vertical-align: middle;
text-align: center;
}
/* line 871, ../sass/screen.scss */
/* line 882, ../sass/screen.scss */
#page-commande .table-header-rotated th.rotate-45 {
font-weight: normal;
height: 80px;
@@ -880,7 +893,7 @@ a:hover, a:focus, a:active {
line-height: 1;
border: 0px none;
}
/* line 885, ../sass/screen.scss */
/* line 896, ../sass/screen.scss */
#page-commande .table-header-rotated th.rotate-45 > div {
background-color: #F5F5F5;
position: relative;
@@ -898,7 +911,7 @@ a:hover, a:focus, a:active {
border-right: 1px solid #dddddd;
border-top: 1px solid #dddddd;
}
/* line 902, ../sass/screen.scss */
/* line 913, ../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);
@@ -916,51 +929,51 @@ a:hover, a:focus, a:active {
text-align: left;
}

/* line 923, ../sass/screen.scss */
/* line 934, ../sass/screen.scss */
#email-masse-form #ids-users {
line-height: 30px;
}
/* line 925, ../sass/screen.scss */
/* line 936, ../sass/screen.scss */
#email-masse-form #ids-users .label {
text-transform: capitalize;
}

/* line 933, ../sass/screen.scss */
/* line 944, ../sass/screen.scss */
.produit-create #jours-production .form-group, .produit-update #jours-production .form-group {
float: left;
margin-right: 15px;
}
/* line 937, ../sass/screen.scss */
/* line 948, ../sass/screen.scss */
.produit-create #jours-production .form-group label, .produit-update #jours-production .form-group label {
font-weight: normal;
}
/* line 942, ../sass/screen.scss */
/* line 953, ../sass/screen.scss */
.produit-create .field-produit-id_etablissement, .produit-update .field-produit-id_etablissement {
display: none;
}

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

/* line 952, ../sass/screen.scss */
/* line 963, ../sass/screen.scss */
.wrap .produit-index .td-photo {
max-width: 100px;
width: 100px;
}
/* line 956, ../sass/screen.scss */
/* line 967, ../sass/screen.scss */
.wrap .produit-index .photo-produit {
max-width: 100px;
}
/* line 960, ../sass/screen.scss */
/* line 971, ../sass/screen.scss */
.wrap .produit-index .ui-state-highlight {
height: 75px;
background-color: #F8F1DD;
}

/* communiquer */
/* line 968, ../sass/screen.scss */
/* line 979, ../sass/screen.scss */
.communiquer-mode-emploi {
border: solid 1px #e0e0e0;
padding: 10px;
@@ -970,18 +983,18 @@ a:hover, a:focus, a:active {
margin-bottom: 30px;
font-family: "myriadpro-regular";
}
/* line 976, ../sass/screen.scss */
/* line 987, ../sass/screen.scss */
.communiquer-mode-emploi .header .logo {
float: left;
width: 75px;
padding-right: 20px;
padding-top: 10px;
}
/* line 982, ../sass/screen.scss */
/* line 993, ../sass/screen.scss */
.communiquer-mode-emploi .header .logo img {
width: 75px;
}
/* line 988, ../sass/screen.scss */
/* line 999, ../sass/screen.scss */
.communiquer-mode-emploi .header h1 {
font-family: "comfortaaregular";
font-size: 40px;
@@ -989,7 +1002,7 @@ a:hover, a:focus, a:active {
margin-bottom: 0px;
font-weight: normal;
}
/* line 996, ../sass/screen.scss */
/* line 1007, ../sass/screen.scss */
.communiquer-mode-emploi .header h2 {
margin-top: 0px;
font-family: "myriadpro-regular";
@@ -999,7 +1012,7 @@ a:hover, a:focus, a:active {
left: 2px;
font-weight: normal;
}
/* line 1007, ../sass/screen.scss */
/* line 1018, ../sass/screen.scss */
.communiquer-mode-emploi h3 {
font-family: "comfortaalight";
font-family: "myriadpro-regular";
@@ -1009,45 +1022,45 @@ a:hover, a:focus, a:active {
margin-bottom: 0px;
}

/* line 1017, ../sass/screen.scss */
/* line 1028, ../sass/screen.scss */
.communiquer-mode-emploi-encart {
width: 420px;
margin-top: 20px;
}
/* line 1021, ../sass/screen.scss */
/* line 1032, ../sass/screen.scss */
.communiquer-mode-emploi-encart .header .logo {
width: 60px;
margin-right: 20px;
padding-top: 5px;
}
/* line 1026, ../sass/screen.scss */
/* line 1037, ../sass/screen.scss */
.communiquer-mode-emploi-encart .header .logo img {
width: 60px;
}
/* line 1032, ../sass/screen.scss */
/* line 1043, ../sass/screen.scss */
.communiquer-mode-emploi-encart .header h1 {
margin-bottom: 3px;
}
/* line 1041, ../sass/screen.scss */
/* line 1052, ../sass/screen.scss */
.communiquer-mode-emploi-encart h3 {
margin-top: 15px;
margin-bottom: 15px;
}

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

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

/* line 1058, ../sass/screen.scss */
/* line 1069, ../sass/screen.scss */
.communiquer-mode-emploi-pdf {
border: 0px none;
-moz-border-radius: 0px;
@@ -1056,108 +1069,108 @@ a:hover, a:focus, a:active {
margin-bottom: 0px;
padding: 20px 0px 20px 30px;
}
/* line 1066, ../sass/screen.scss */
/* line 1077, ../sass/screen.scss */
.communiquer-mode-emploi-pdf .header .logo {
float: left;
width: 55px;
padding-right: 15px;
padding-top: 10px;
}
/* line 1072, ../sass/screen.scss */
/* line 1083, ../sass/screen.scss */
.communiquer-mode-emploi-pdf .header .logo img {
width: 55px;
}
/* line 1076, ../sass/screen.scss */
/* line 1087, ../sass/screen.scss */
.communiquer-mode-emploi-pdf .header h1 {
font-size: 32px;
}
/* line 1079, ../sass/screen.scss */
/* line 1090, ../sass/screen.scss */
.communiquer-mode-emploi-pdf .header h2 {
font-size: 16px;
}
/* line 1084, ../sass/screen.scss */
/* line 1095, ../sass/screen.scss */
.communiquer-mode-emploi-pdf h3 {
font-weight: normal;
}

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

/* commandes auto */
/* line 1099, ../sass/screen.scss */
/* line 1110, ../sass/screen.scss */
.commandeauto-form #bloc-select-user {
padding-left: 0px;
}
/* line 1103, ../sass/screen.scss */
/* line 1114, ../sass/screen.scss */
.commandeauto-form #or-user {
font-size: 20px;
text-align: center;
}
/* line 1106, ../sass/screen.scss */
/* line 1117, ../sass/screen.scss */
.commandeauto-form #or-user span {
position: relative;
top: 24px;
}
/* line 1112, ../sass/screen.scss */
/* line 1123, ../sass/screen.scss */
.commandeauto-form .field-commandeautoform-id_etablissement {
display: none;
}
/* line 1116, ../sass/screen.scss */
/* line 1127, ../sass/screen.scss */
.commandeauto-form .jours .form-group {
float: left;
margin-right: 20px;
}
/* line 1123, ../sass/screen.scss */
/* line 1134, ../sass/screen.scss */
.commandeauto-form .produits .table {
width: 500px;
}
/* line 1126, ../sass/screen.scss */
/* line 1137, ../sass/screen.scss */
.commandeauto-form .produits .quantite {
text-align: center;
}

/* points de vente */
/* line 1135, ../sass/screen.scss */
/* line 1146, ../sass/screen.scss */
.point-vente-form #pointvente-users {
display: none;
height: 500px;
overflow-y: scroll;
}
/* line 1139, ../sass/screen.scss */
/* line 1150, ../sass/screen.scss */
.point-vente-form #pointvente-users label {
font-weight: normal;
display: block;
}
/* line 1143, ../sass/screen.scss */
/* line 1154, ../sass/screen.scss */
.point-vente-form #pointvente-users .commentaire {
display: none;
margin-left: 17px;
width: 200px;
}
/* line 1151, ../sass/screen.scss */
/* line 1162, ../sass/screen.scss */
.point-vente-form #jours-livraison .form-group {
float: left;
margin-right: 15px;
}
/* line 1155, ../sass/screen.scss */
/* line 1166, ../sass/screen.scss */
.point-vente-form #jours-livraison .form-group label {
font-weight: normal;
}

/* utilisateurs */
/* line 1165, ../sass/screen.scss */
/* line 1176, ../sass/screen.scss */
.user-index .input-group {
width: 180px;
}
/* line 1168, ../sass/screen.scss */
/* line 1179, ../sass/screen.scss */
.user-index .input-group .input-credit {
text-align: center;
}

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

/* facturation */
/* line 1190, ../sass/screen.scss */
/* line 1201, ../sass/screen.scss */
#estimation-facture {
padding: 20px;
background-color: #F9F9F9;
}
/* line 1194, ../sass/screen.scss */
/* line 1205, ../sass/screen.scss */
#estimation-facture h2 {
font-family: "myriadpro-it";
}
/* line 1198, ../sass/screen.scss */
/* line 1209, ../sass/screen.scss */
#estimation-facture .montant span {
font-size: 25px;
color: white;
@@ -1194,17 +1207,17 @@ a:hover, a:focus, a:active {
padding-top: 7px;
font-family: "myriadpro-regular";
}
/* line 1209, ../sass/screen.scss */
/* line 1220, ../sass/screen.scss */
#estimation-facture label {
text-transform: uppercase;
font-family: "myriadpro-light";
font-size: 20px;
}
/* line 1214, ../sass/screen.scss */
/* line 1225, ../sass/screen.scss */
#estimation-facture label span {
font-size: 16px;
}
/* line 1219, ../sass/screen.scss */
/* line 1230, ../sass/screen.scss */
#estimation-facture #etablissement-prix_libre {
width: 100px;
height: 60px;
@@ -1213,18 +1226,18 @@ a:hover, a:focus, a:active {
text-align: center;
}

/* line 1230, ../sass/screen.scss */
/* line 1241, ../sass/screen.scss */
.developpement-index #tab-developpements .btn-group-priorite {
width: 100%;
margin-bottom: 5px;
}
/* line 1234, ../sass/screen.scss */
/* line 1245, ../sass/screen.scss */
.developpement-index #tab-developpements .btn-group-priorite .btn-priorite {
display: block;
float: none;
width: 100%;
}
/* line 1241, ../sass/screen.scss */
/* line 1252, ../sass/screen.scss */
.developpement-index #tab-developpements .label-priorite {
display: block;
width: 100%;

+ 13
- 2
backend/web/sass/screen.scss View File

@@ -527,7 +527,7 @@ a {
}
#btn-export-commandes,
#btn-commande-auto {
#btn-commandes-auto {
float: right ;
position: relative;
top: -5px ;
@@ -535,12 +535,23 @@ a {
padding: 2px 5px ;
}
#btn-export-commandes {
#btn-export-commandes,
#btn-commandes-auto {
color: white ;
margin-left: 10px ;
padding: 1px 5px ;
}
#btn-commandes-auto {
top: -7px ;
.btn {
padding: 2px 5px;
span {
top: 2px ;
}
}
}
#bloc-totaux {
.table-produits {
.depasse {

+ 2
- 2
common/models/CommandeAuto.php View File

@@ -136,7 +136,7 @@ class CommandeAuto extends \yii\db\ActiveRecord {
return $arr_commandes_auto;
}

public static function addAll($date) {
public static function addAll($date, $force = false) {
// production
$production = Production::findOne([
'date' => date('Y-m-d', strtotime($date)),
@@ -148,7 +148,7 @@ class CommandeAuto extends \yii\db\ActiveRecord {
->where(['id_production' => $production->id])
->count();

if (!$count_commandes_prod) {
if (!$count_commandes_prod || $force) {
$commandes_auto = self::getAll($date);
foreach ($commandes_auto as $c) {
$c->add($date);

Write Preview
Loading…
Cancel
Save