Adaptations display

This commit is contained in:
lars 2019-05-07 11:49:34 +02:00
parent f6bda79039
commit 7bd99b3387
3 changed files with 17 additions and 15 deletions

View File

@ -284,13 +284,13 @@ die();
'required' => array('error', 'Merci de préciser la nature de la prestation!'),
));
// "digits"
$form->add('label', 'label_nor_tot', 'nor_tot', 'Total nombre entrées:');
$form->add('label', 'label_nor_tot', 'nor_tot', 'Total nombre entrées: ');
$obj = $form->add('text', 'nor_tot',$ar['nor_tot'],array('readonly' => 'readonly', 'size' => '5'));
$obj->set_attributes(array('class'=>'num'), false);
$form->add('label', 'label_vip_tot', 'vip_tot', 'Total accès VIP:');
$obj = $form->add('text', 'vip_tot',$ar['vip_tot'],array('readonly' => 'readonly', 'size' => '5'));
$obj->set_attributes(array('class'=>'num'), false);
$form->add('label', 'label_presta_tot', 'presta_tot', 'Total Prestations CHF:');
$form->add('label', 'label_presta_tot', 'presta_tot', 'Total Prestations CHF: ');
$obj = $form->add('text', 'presta_tot',$ar['presta_tot'],array('readonly' => 'readonly', 'size' => '5'));
$obj->set_attributes(array('class'=>'num'), false);
@ -316,7 +316,9 @@ die();
// VIP gratuit ?
$form->add('label', 'label_vip_gratuit', 'vip_gratuit', 'Gratuité des billets VIP:');
$form->add('label', 'label_vip_gratuit_1', 'vip_gratuit', 'Gratuité des billets VIP');
$form->add('label', 'label_vip_gratuit_2', 'vip_gratuit_2', 'Cochez la case, si le prix des accès VIP ne doit pas être comptabilisé dans le total des contre-prestations.');
$obj = $form->add('checkbox', 'vip_gratuit', 'oui' );
if($ar['vip_gratuit']=='oui') {
$obj->set_attributes(array('checked'=>'checked'));

View File

@ -331,7 +331,7 @@ if ($mysqli->connect_errno) {
<?php } ?>
</ul>
<tr><th>No</th><th>Stat</th><th>Salutation</th><th>Prenom</th><th>Nom</th><th>Statut</th><th>Commande</th><th>Aperçu</th><th>Création</th><th>Mise à jour</th><th>Commandé par</th>
<tr><th>No</th><th>Stat</th><th>Salutation</th><th>Prenom</th><th>Nom</th><th>Statut</th><th>Commande</th><th>Aperçu</th><th>Création</th><th>Mise à jour</th><th>Commandé par / pour</th>
</thead>
</table>
</div>

View File

@ -29,9 +29,9 @@
<h6><strong>Contre-prestation</strong> <span id="xtot_num_nor"></span></h6><br>
<div class="clear" style="margin-bottom:10px"></div>
<table id="tpresta">
<th>
<td>Jour</td><td>Normal</td><td></td><td>VIP</td><td></td>
</th>
<tr>
<th>Jour</th><th></th><th>Normal</th><th></th><th style="align: right">VIP</th>
</tr>
<?php foreach($prices as $day => $onePrice) { ?>
<tr class="<?php echo $day; ?>">
<td><?php echo $onePrice['label']; ?></td><td>CHF <span class="prixnor"><?php echo $onePrice['nor']; ?></span></td><td><?php echo ${$day.'_nor'}; ?></td><td>CHF <span class="prixvip"><?php echo $onePrice['vip']; ?></span></td><td><?php echo ${$day.'_vip'}; ?></td>
@ -41,22 +41,22 @@
<?php } ?>
</table>
<div class="clear" style="margin-bottom:10px"></div>
<div class="cell"><?php echo $label_nor_tot ?></div>
<div class="cell"><?php echo $nor_tot ?></div>
<div class="cell"><?php echo $label_vip_tot ?></div>
<div class="cell" style="width: 210px; float: left;"><?php echo $label_nor_tot ?></div>
<span class="cell" style="width: 132px; float: left"><?php echo $nor_tot ?></span>
<div class="cell"><?php echo $vip_tot ?></div>
<div class="cell"><?php echo $label_vip_gratuit ?></div>
<div class="cell"><?php echo $vip_gratuit_oui ?></div>
<br>
<span class="cell" style="float: left"><?php echo $vip_gratuit_oui; echo $label_vip_gratuit_1?></span>
<div class="cell" style="float: left" ><?php echo $label_vip_gratuit_2 ?></div>
<div class="clear" style="margin-bottom:10px"></div>
<div class="cell"><?php echo $label_presta_tot ?></div>
<div class="cell"><?php echo $presta_tot ?></div>
<div class="cell" style="float: left"><?php echo $label_presta_tot ?></div>
<div class="cell" style="float: left"><?php echo $presta_tot ?></div>
<div class="clear" style="margin-bottom:10px"></div>
</div>
<div class="row even">
<h6><strong>Paiement</strong></h6>
<div class="cell"><label>&nbsp;</label><?php echo $type_paiement ?></div>
<div class="cell" style="float: left"><label>&nbsp;</label><?php echo $type_paiement ?></div>
<div class="optional optional3" style="padding: 0">
<div class="cell"><label><?php echo $label_choix_paiement_payant ?></label><?php echo $choix_paiement_payant ?></div>
</div>