Le 11/05/2014 15:09, Johan Cwiklinski a écrit :
....
Ha, et BTW, puisqu'il est question de transactions :
http://redmine.ulysses.fr/issues/812
++
Bonjour
Concernant le ticket 737 il convient aussi à la version 0.7.8 en
incluant les modifs dans les 2 fichiers concernés (en PJ). Je viens de
faire un petit test et à priori ça roule.
(manque juste les traductions). Il serait pratique aussi en cas de
transaction que la date de celle ci (qui peut être différente de la date
du jour) soit recopiée par défaut lors de la ventilation de cette
transaction en contribution.
François
<<< text/html; name="ajouter_contribution.php": Unrecognized >>>
{if !$head_redirect}
{if isset($adh_options)}
<form action="ajouter_contribution.php" method="post">
<div class="bigtable">
{if $contribution->isTransactionPart()}
{assign var="mid" value=$contribution->transaction->member}
<table id="transaction_detail">
<caption>{_T string="Related transaction
informations"}</caption>
<thead>
<tr>
<td colspan="5">
{$contribution->transaction->description}
<a
href="{$galette_base_path}ajouter_transaction.php?trans_id={$contribution->transaction->id}"
title="{_T string="View transaction"}">
<img
src="{$template_subdir}images/icon-money.png"
alt="{_T string="[view]"}"
width="16"
height="16"/>
</a>
</td>
</tr>
</thead>
<tbody>
<tr>
<th class="listing">#</th>
<th class="listing">{_T string="Date"}</th>
<th class="listing">{_T string="Member"}</th>
<th class="listing">{_T string="Amount"}</th>
<th class="listing">{_T string="Not dispatched
amount"}</th>
</tr>
<tr>
<td>{$contribution->transaction->id}</td>
<td>{$contribution->transaction->date}</td>
<td>{memberName id="$mid"}</td>
<td
class="right">{$contribution->transaction->amount}</td>
<td
class="right">{$contribution->transaction->getMissingAmount()}</td>
</tr>
</tbody>
</table>
{/if}
<p>{_T string="NB : The mandatory fields are in"} <span
class="required">{_T string="red"}</span></p>
<fieldset class="cssform">
<legend class="ui-state-active ui-corner-top">{_T
string="Select contributor and contribution type"}</legend>
<p>
<label for="id_adh" class="bline">{_T
string="Contributor:"}</label>
<select name="id_adh" id="id_adh"{if
isset($disabled.id_adh)} {$disabled.id_adh}{/if}>
{if $adh_selected eq 0}
<option value="">{_T string="-- select a name
--"}</option>
{/if}
{foreach $adh_options as $k=>$v}
<option value="{$k}"{if $contribution->member ==
$k} selected="selected"{/if}>{$v}</option>
{/foreach}
</select>
</p>
<p>
<label for="id_type_cotis" class="bline">{_T
string="Contribution type:"}</label>
<select name="id_type_cotis" id="id_type_cotis"
{if $type_selected eq
0}onchange="form.submit()"{/if}{if $required.id_type_cotis eq 1}
required{/if}>
{if $contribution->type}
{assign var="selectedid"
value=$contribution->type->id}
{else}
{assign var="selectedid" value=null}
{/if}
{html_options options=$type_cotis_options
selected=$selectedid}
</select>
{if $type_selected eq 1}
<a class="button" id="btnback" href="javascript:back();"
title="{_T string="Back to previous window, if you want to select a
contribution type that is not listed here"}">{_T string="Back"}</a>
{/if}
</p>
</fieldset>
{if $type_selected eq 1}
<fieldset class="cssform">
<legend class="ui-state-active ui-corner-top">{_T
string="Details of contribution"}</legend>
<p>
<label class="bline" for="montant_cotis">{_T
string="Amount:"}</label>
<input type="text" name="montant_cotis"
id="montant_cotis" value="{$contribution->amount}" maxlength="10"{if
$required.montant_cotis eq 1} required{/if}/>
</p>
<p>
<label class="bline" for="type_paiement_cotis">{_T
string="Payment type:"}</label>
<select name="type_paiement_cotis"
id="type_paiement_cotis">
<option value="{php}echo
Galette\Entity\Contribution::PAYMENT_CASH;{/php}"{if
$contribution->payment_type eq
constant('Galette\Entity\Contribution::PAYMENT_CASH')}
selected="selected"{/if}>{_T string="Cash"}</option>
<option value="{php}echo
Galette\Entity\Contribution::PAYMENT_CREDITCARD;{/php}"{if
$contribution->payment_type eq
constant('Galette\Entity\Contribution::PAYMENT_CREDITCARD')}
selected="selected"{/if}>{_T string="Credit card"}</option>
<option value="{php}echo
Galette\Entity\Contribution::PAYMENT_CHECK;{/php}"{if
$contribution->payment_type eq
constant('Galette\Entity\Contribution::PAYMENT_CHECK')}
selected="selected"{/if}>{_T string="Check"}</option>
<option value="{php}echo
Galette\Entity\Contribution::PAYMENT_TRANSFER;{/php}"{if
$contribution->payment_type eq
constant('Galette\Entity\Contribution::PAYMENT_TRANSFER')}
selected="selected"{/if}>{_T string="Transfer"}</option>
<option value="{php}echo
Galette\Entity\Contribution::PAYMENT_PAYPAL;{/php}"{if
$contribution->payment_type eq
constant('Galette\Entity\Contribution::PAYMENT_PAYPAL')}
selected="selected"{/if}>{_T string="Paypal"}</option>
<option value="{php}echo
Galette\Entity\Contribution::PAYMENT_OTHER;{/php}"{if
$contribution->payment_type eq
constant('Galette\Entity\Contribution::PAYMENT_OTHER')}
selected="selected"{/if}>{_T string="Other"}</option>
</select>
</p>
<p>
<label class="bline" for="date_enreg">
{_T string="Record date:"}
</label>
<input class="past-date-pick" type="text"
name="date_enreg" id="date_enreg" value="{$contribution->date}"
maxlength="10"{if $required.date_enreg eq 1} required{/if}/>
<span class="exemple">{_T string="(yyyy-mm-dd
format)"}</span>
</p>
<p>
<label class="bline" for="date_debut_cotis">
{if $contribution->isCotis()}
{_T string="Start date of membership:"}
{else}
{_T string="Date of contribution:"}
{/if}
</label>
<input class="past-date-pick" type="text"
name="date_debut_cotis" id="date_debut_cotis"
value="{$contribution->begin_date}" maxlength="10"{if
$required.date_debut_cotis eq 1} required{/if}/>
<span class="exemple">{_T string="(yyyy-mm-dd
format)"}</span>
</p>
{if $contribution->isCotis()}
<p>
{if $pref_membership_ext != ""}
<label class="bline" for="duree_mois_cotis">{_T
string="Membership extension:"}</label>
<input type="text" name="duree_mois_cotis"
id="duree_mois_cotis" value="{$contribution->duration}" maxlength="3"{if
$required.date_fin_cotis eq 1} required{/if}/>
<span class="exemple">{_T string="months"}</span>
{else}
<label class="bline" for="date_fin_cotis">{_T string="End
date of membership:"}</label>
<input type="text" name="date_fin_cotis"
id="date_fin_cotis" value="{$contribution->end_date}" maxlength="10"{if
$required.date_fin_cotis eq 1} required{/if}/>
<span class="exemple">{_T string="(yyyy-mm-dd
format)"}</span>
{/if}
</p>
{/if}
<p>
<label class="bline" for="info_cotis">{_T
string="Comments:"}</label>
<textarea name="info_cotis" id="info_cotis" cols="61"
rows="6"{if isset($required.info_cotis) and $required.info_cotis eq 1}
required{/if}>{$contribution->info}</textarea>
</p>
</fieldset>
{include file="edit_dynamic_fields.tpl"}
{/if} {* $type_selected eq 1 *}
{if $pref_mail_method neq
constant('Galette\Core\GaletteMail::METHOD_DISABLED')}
<p>
<label for="mail_confirm">{_T string="Notify member"}</label>
<input type="checkbox" name="mail_confirm" id="mail_confirm"
value="1" {if isset($smarty.post.mail_confirm) and $smarty.post.mail_confirm
!= ""}checked="checked"{/if}/>
<br/><span class="exemple">{_T string="Member will receive a
notification by email, if he has an address."}</span>
</p>
{/if}
</div>
<div class="button-container">
{if $type_selected eq 1}
<input type="submit" id="btnsave" value="{_T string="Save"}"/>
<input type="hidden" name="id_cotis" value="{$contribution->id}"/>
{* Second step validator *}
<input type="hidden" name="valid" value="1"/>
{else} {* $type_selected ne 1 *}
<input type="submit" value="{_T string="Continue"}"/>
{* At creation time, we can get an amount, that will be hidden on
the first step *}
<input type="hidden" name="montant_cotis"
value="{$contribution->amount}"/>
{/if} {* $type_selected eq 1 *}
<input type="hidden" name="trans_id" value="{if
$contribution->transaction neq NULL}{$contribution->transaction->id}{/if}"/>
{* First step validator *}
<input type="hidden" name="type_selected" value="1"/>
</div>
</form>
<script type="text/javascript">
$(function(){
$.datepicker.setDefaults($.datepicker.regional['{$galette_lang}']);
$('#date_debut_cotis, #date_fin_cotis, #date_enreg').datepicker({
changeMonth: true,
changeYear: true,
showOn: 'button',
buttonImage: '{$template_subdir}images/calendar.png',
buttonImageOnly: true
});
});
</script>
{else} {* No members *}
<div class="center" id="warningbox">
<h3>{_T string="No member registered!"}</h3>
<p>
{_T string="Unfortunately, there is no member in your database
yet,"}
<br/>
<a href="ajouter_adherent.php">{_T string="please create a
member"}</a>
</p>
</div>
{/if}
{/if}
Re: [Galette-discussion] totalisation des contributions (# 737)