Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 797

Přidáno uživatelem Michal Kliment před téměř 14 roky(ů)

Oprava nekolik dalsich chyb u tarifu. Testing je treba jeste testovat, pote zmergovat do trunku.

Zobrazit rozdíly:

freenetis/testing/application/models/enum_type.php
public static $device_type_id = 2;
public static $user_type_id = 3;
public static $contact_type_id = 4;
public static $fee_type_id = 6;
public static $mode_type_id = 8;
public static $norm_type_id = 9;
freenetis/testing/application/controllers/members_fees.php
if ($fee->special_type_id == Fee_Model::$membership_interrupt)
continue;
// name is optional, uses it only if it is not empthy
// name is optional, uses it only if it is not empty
$name = ($fee->readonly) ? url_lang::lang('texts.'.$fee->name) : $fee->name;
$name = ($name!='') ? "- $name " : "";
......
// translate fee type name
$type = $translation_model->get_translation($members_fee->fee->type->value);
// fee name is optional, if it not set uses only fee type name
$name = ($members_fee->fee->name!='') ? $members_fee->fee->name." ($type)" : $type;
// name is optional, uses it only if it is not empthy
$name = ($members_fee->fee->readonly) ? url_lang::lang('texts.'.$members_fee->fee->name) : $members_fee->fee->name;
$name = ($name!='') ? $name." ($type)" : $type;
// in from and to date replaces dashes with slashes
$from = str_replace('-','/',$members_fee->fee->from);
freenetis/testing/application/views/main.php
<?php echo html::script('media/js/js', FALSE) ?>
<?php echo html::script('media/js/jquery.min', FALSE) ?>
<?php echo html::script('media/js/jquery-ui.min', FALSE) ?>
<?php echo html::script('media/js/jquery.ui.datepicker-cs', FALSE) ?>
<?php echo html::script('media/js/jquery.autocomplete.min', FALSE) ?>
<?php echo html::script('media/js/jquery.validate.min', FALSE) ?>
<?php echo html::script('media/js/jquery.validate.password', FALSE) ?>
freenetis/testing/application/views/fees/add.php
<?php echo html::anchor(url_lang::base().'fees/show_all',url_lang::lang('texts.Back to list of all fees')) ?>
<br /><br />
<?php echo form::open(url_lang::base().'fees/add', '', 'POST', array('id' => 'article_form')) ?>
<?php echo form::open(url::base().url::current(TRUE), '', 'POST', array('id' => 'article_form')) ?>
<table cellspacing="3" class="form">
<tr>
<th><?php echo form::label('type_id',url_lang::lang('texts.Type').':') ?></th>

Také k dispozici: Unified diff