Browse Source

Bug suite au renommage de variables

refactoring
Guillaume Bourgeois 5 years ago
parent
commit
c7234cebb1
3 changed files with 6 additions and 8 deletions
  1. +3
    -3
      backend/controllers/CommandeController.php
  2. +3
    -3
      backend/views/commande/report.php
  3. +0
    -2
      common/models/PointVente.php

+ 3
- 3
backend/controllers/CommandeController.php View File

} }
} }
$line[] = substr($str_produits, 0, strlen($str_produits) - 2); $line[] = substr($str_produits, 0, strlen($str_produits) - 2);
$line[] = number_format($pv->recettes_pain, 2) . ' €';
$line[] = number_format($pv->recettes, 2) . ' €';
$data[] = $line; $data[] = $line;


$line = ['Total vrac']; $line = ['Total vrac'];
} }
} }
$line[] = substr($str_produits, 0, strlen($str_produits) - 2); $line[] = substr($str_produits, 0, strlen($str_produits) - 2);
$line[] = number_format($pv->recettes_vrac, 2) . ' €';
$line[] = number_format($pv->recettes, 2) . ' €';
$data[] = $line; $data[] = $line;


$data[] = []; $data[] = [];
'produits' => $produits, 'produits' => $produits,
'commandes' => $commandes, 'commandes' => $commandes,
'produits_selec' => $produits_selec, 'produits_selec' => $produits_selec,
'recettes_pain' => $recettes,
'recettes' => $recettes,
'poids_total' => $poids_total, 'poids_total' => $poids_total,
'ca_potentiel' => $ca_potentiel, 'ca_potentiel' => $ca_potentiel,
'poids_pain' => $poids_pain, 'poids_pain' => $poids_pain,

+ 3
- 3
backend/views/commande/report.php View File

if($pv->credit_pain) { if($pv->credit_pain) {
$html .= '<td></td>' ; $html .= '<td></td>' ;
} }
$html .= '<td><strong>'.number_format($pv->recettes_pain, 2) . ' €</strong></td>';
$html .= '<td><strong>'.number_format($pv->recettes, 2) . ' €</strong></td>';
$html .= '</tbody></table><pagebreak>' ; $html .= '</tbody></table><pagebreak>' ;
} }
$html = substr($html, 0, strlen($html) - 2) ; $html = substr($html, 0, strlen($html) - 2) ;
$html .= '</td><td>'.number_format($pv->recettes_pain, 2).' €</td></tr>' ;
$recettes += $pv->recettes_pain ;
$html .= '</td><td>'.number_format($pv->recettes, 2).' €</td></tr>' ;
$recettes += $pv->recettes ;
} }
} }



+ 0
- 2
common/models/PointVente.php View File

{ {
var $commandes = []; var $commandes = [];
var $recettes = 0; var $recettes = 0;
var $recettes_pain = 0;
var $recettes_vrac = 0;
var $data_select_commandes; var $data_select_commandes;
var $data_options_commandes; var $data_options_commandes;
var $users = []; var $users = [];

Loading…
Cancel
Save