Revize 2218
Přidáno uživatelem Ondřej Fibich před asi 11 roky(ů)
freenetis/branches/1.1/application/controllers/membership_interrupts.php | ||
---|---|---|
->type('date')
|
||
->table('mf');
|
||
|
||
$filter_form->add('end_after_interrupt_end')
|
||
->type('select')
|
||
->values(arr::bool())
|
||
->label('End membership after end');
|
||
|
||
$filter_form->add('comment');
|
||
|
||
$membership_interrupt_model = new Membership_interrupt_Model();
|
||
... | ... | |
));
|
||
|
||
$grid->order_field('id')
|
||
->label(__('ID'));
|
||
->label('ID');
|
||
|
||
$grid->order_callback_field('member_id')
|
||
->label(__('Member'))
|
||
->label('Member')
|
||
->callback('callback::member_field');
|
||
|
||
$grid->order_field('from')
|
||
->label(__('Date from'));
|
||
->label('Date from');
|
||
|
||
$grid->order_field('to')
|
||
->label(__('Date to'));
|
||
->label('Date to');
|
||
|
||
$grid->order_callback_field('end_after_interrupt_end')
|
||
->callback('callback::boolean')
|
||
->class('center')
|
||
->label('End membership after end');
|
||
|
||
$grid->order_field('comment');
|
||
|
||
$actions = $grid->grouped_action_field();
|
||
... | ... | |
{
|
||
$membership_interrupt->end_after_interrupt_end = 1;
|
||
|
||
if ($member->leaving_date < date('Y-m-d'))
|
||
if ($member->leaving_date > date('Y-m-d') ||
|
||
!$member->leaving_date ||
|
||
$member->leaving_date == '0000-00-00')
|
||
{
|
||
// leaving date is validated by validator
|
||
$member->leaving_date = $to;
|
||
... | ... | |
$member->save_throwable();
|
||
}
|
||
}
|
||
else if (isset($form_data['end_after_interrupt_end']) &&
|
||
$form_data['end_after_interrupt_end'] == '0')
|
||
else if (isset($form_data['end_after_interrupt_end']))
|
||
{
|
||
$membership_interrupt->end_after_interrupt_end = 0;
|
||
|
||
if ($member->leaving_date < date('Y-m-d'))
|
||
if ($member->leaving_date > date('Y-m-d'))
|
||
{
|
||
$member->leaving_date = NULL;
|
||
|
||
... | ... | |
$membership_interrupt->transaction_commit();
|
||
|
||
status::success('Membership interrupt has been succesfully updated');
|
||
$this->redirect('members/show/'.$membership_interrupt->member_id);
|
||
}
|
||
catch (Exception $e)
|
||
{
|
||
... | ... | |
Log::add_exception($e);
|
||
status::error('Error - Cannot update membership interrupt', $e);
|
||
}
|
||
|
||
$this->redirect('members/show/'.$membership_interrupt->member_id);
|
||
}
|
||
else
|
||
{
|
||
$headline = __('Edit interrupt of membership');
|
||
|
||
$headline = __('Edit interrupt of membership');
|
||
|
||
// breadcrumbs navigation
|
||
$breadcrumbs = breadcrumbs::add()
|
||
->link('members/show_all', 'Members',
|
||
$this->acl_check_view('Members_Controller', 'members'))
|
||
->disable_translation()
|
||
->link('members/show/'.$membership_interrupt->member->id,
|
||
'ID ' . $membership_interrupt->member->id . ' - ' .
|
||
$membership_interrupt->member->name,
|
||
$this->acl_check_view(
|
||
'Members_Controller', 'membership_interrupts',
|
||
$membership_interrupt->member->id
|
||
)
|
||
)
|
||
->enable_translation()
|
||
->link('membership_interrupts/show_all', 'Membership interrupts',
|
||
$this->acl_check_view('Members_Controller', 'membership_interrupts'))
|
||
->disable_translation()
|
||
->text($headline);
|
||
// breadcrumbs navigation
|
||
$breadcrumbs = breadcrumbs::add()
|
||
->link('members/show_all', 'Members',
|
||
$this->acl_check_view('Members_Controller', 'members'))
|
||
->disable_translation()
|
||
->link('members/show/'.$membership_interrupt->member->id,
|
||
'ID ' . $membership_interrupt->member->id . ' - ' .
|
||
$membership_interrupt->member->name,
|
||
$this->acl_check_view(
|
||
'Members_Controller', 'membership_interrupts',
|
||
$membership_interrupt->member->id
|
||
)
|
||
)
|
||
->enable_translation()
|
||
->link('membership_interrupts/show_all', 'Membership interrupts',
|
||
$this->acl_check_view('Members_Controller', 'membership_interrupts'))
|
||
->disable_translation()
|
||
->text($headline);
|
||
|
||
// end of validation
|
||
$view = new View('main');
|
||
$view->title = $headline;
|
||
$view->breadcrumbs = $breadcrumbs->html();
|
||
$view->content = new View('form');
|
||
$view->content->form = $this->form->html();
|
||
$view->content->headline = $headline;
|
||
$view->render(TRUE);
|
||
}
|
||
// end of validation
|
||
$view = new View('main');
|
||
$view->title = $headline;
|
||
$view->breadcrumbs = $breadcrumbs->html();
|
||
$view->content = new View('form');
|
||
$view->content->form = $this->form->html();
|
||
$view->content->headline = $headline;
|
||
$view->render(TRUE);
|
||
}
|
||
|
||
/**
|
||
... | ... | |
$membership_interrupt->transaction_start();
|
||
|
||
if ($membership_interrupt->end_after_interrupt_end &&
|
||
$member->leaving_date < date('Y-m-d'))
|
||
$member->leaving_date > date('Y-m-d'))
|
||
{
|
||
$member->leaving_date = NULL;
|
||
|
freenetis/branches/1.1/application/models/membership_interrupt.php | ||
---|---|---|
return $this->db->query("
|
||
SELECT mi.id, mi.member_id, m.name AS member_name,
|
||
mf.activation_date AS `from`, mf.deactivation_date AS `to`,
|
||
mi.comment
|
||
mi.comment, mi.end_after_interrupt_end
|
||
FROM membership_interrupts mi
|
||
JOIN members m ON mi.member_id = m.id
|
||
JOIN members_fees mf ON mi.members_fee_id = mf.id
|
Také k dispozici: Unified diff
Opravy:
- oprava nastavovani leaving_date clena pri editaci a mazani preruseni s ukoncenim clenstvi
- do prehledu vsech prruseni pridan sloupec s indikaci preruseni s ukoncenim clenstvi