Skip to content

Commit b9a2591

Browse files
thyseusthyseus
committed
prepared for 0.8 release
1 parent e46d6d3 commit b9a2591

18 files changed

+38
-3416
lines changed

‎membership/views/membership/_view.php

+29-29
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
<?
66
echo Yum::t('Order number'). ': '.$data->id . '<br />';
7-
if($data->role->price != 0)
8-
if($data->payment_date == 0)
7+
if($data->role->price != 0)
8+
if($data->payment_date == 0)
99
echo Yum::t('Membership has not been payed yet');
1010
else {
1111
echo Yum::t('Membership payed at: {date}', array(
@@ -18,38 +18,38 @@
1818
?>
1919

2020
<? if($data->role->price != 0) { ?>
21-
<br />
22-
<? echo Yum::t('Ordered at') . ': '; ?>
23-
<? echo date('d. m. Y', $data->order_date); ?>
24-
<br />
25-
<? echo Yum::t('Payment type') . ': '; ?>
26-
<? if(isset($data->payment)) echo $data->payment->title . '<br />'; ?>
27-
<? } ?>
21+
<br />
22+
<? echo Yum::t('Ordered at') . ': '; ?>
23+
<? echo date('d. m. Y', $data->order_date); ?>
24+
<br />
25+
<? echo Yum::t('Payment type') . ': '; ?>
26+
<? if(isset($data->payment)) echo $data->payment->title . '<br />'; ?>
27+
<? } ?>
2828

29-
<?
29+
<?
3030
if($data->end_date != 0)
3131
echo Yum::t('This membership is still active {days} days', array(
3232
'{days}' => $data->daysLeft()));
3333
?>
3434

3535

36-
<? if($data->isActive()) { ?>
37-
<?= CHtml::beginForm(array('//membership/membership/extend')); ?>
38-
<p> <?= Yum::t('When the membership expires'); ?>: </p>
39-
<?
40-
$options = array(
41-
0 => Yum::t('Automatically extend subscription'),
42-
'cancel' => Yum::t('Cancel Subscription'));
43-
foreach( $data->getPossibleExtendOptions('downgrade') as $key => $option)
44-
$options[$key] = $option;
45-
foreach( $data->getPossibleExtendOptions('upgrade') as $key => $option)
46-
$options[$key] = $option;
36+
<? if($data->isActive()) { ?>
37+
<? echo CHtml::beginForm(array('//membership/membership/extend')); ?>
38+
<p> <? echo Yum::t('When the membership expires'); ?>: </p>
39+
<?
40+
$options = array(
41+
0 => Yum::t('Automatically extend subscription'),
42+
'cancel' => Yum::t('Cancel Subscription'));
43+
foreach( $data->getPossibleExtendOptions('downgrade') as $key => $option)
44+
$options[$key] = $option;
45+
foreach( $data->getPossibleExtendOptions('upgrade') as $key => $option)
46+
$options[$key] = $option;
4747

48-
echo CHtml::hiddenField('membership_id', $data->id);
49-
echo CHtml::dropDownList('subscription',
50-
$data->subscribed == -1 ? 'cancel' : $data->subscribed, $options);
51-
echo CHtml::submitButton(Yum::t('Save'));
52-
?>
53-
<?= CHtml::endForm(); ?>
54-
<? } ?>
55-
</div>
48+
echo CHtml::hiddenField('membership_id', $data->id);
49+
echo CHtml::dropDownList('subscription',
50+
$data->subscribed == -1 ? 'cancel' : $data->subscribed, $options);
51+
echo CHtml::submitButton(Yum::t('Save'));
52+
?>
53+
<? echo CHtml::endForm(); ?>
54+
<? } ?>
55+
</div>

‎role/views/role/_form.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
<? echo CHtml::activeLabelEx($model,'membership_priority'); ?>
2525
<? echo CHtml::activeTextField($model, 'membership_priority'); ?>
2626
<div class="hint">
27-
<?= Yum::t('Leave empty or set to 0 to disable membership for this role.'); ?>
28-
<?= Yum::t('Set to >0 to enable membership for this role and set a priority.'); ?>
29-
<?= Yum::t('Higher is usually more worthy. This is used to determine downgrade possibilities.'); ?>
27+
<? echo Yum::t('Leave empty or set to 0 to disable membership for this role.'); ?>
28+
<? echo Yum::t('Set to >0 to enable membership for this role and set a priority.'); ?>
29+
<? echo Yum::t('Higher is usually more worthy. This is used to determine downgrade possibilities.'); ?>
3030
</div>
3131
</div>
3232
<div class="row">

‎user/UserModule.php

+1-7
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ class UserModule extends CWebModule {
1616
public $loginLayout = 'application.modules.user.views.layouts.yum';
1717
public $adminLayout = 'application.modules.user.views.layouts.yum';
1818

19-
// configuration related control vars
2019
public $enableLogging = true;
2120
public $enableOnlineStatus = true;
2221

@@ -58,10 +57,6 @@ class UserModule extends CWebModule {
5857

5958
public $customCsvExportCriteria = '1';
6059

61-
//public $salt = '';
62-
// valid callback function for password hashing ie. sha1
63-
//public $hashFunc = 'md5';
64-
6560
// valid callback function that executes after user login
6661
public $afterLogin = false;
6762

@@ -73,7 +68,7 @@ class UserModule extends CWebModule {
7368
// set avoidSql to true if you intent do use yii-user-management on a non
7469
// mysql database. All places where a SQL query would be used for performance
7570
// reason are overwritten with a ActiveRecord implementation. This should
76-
// make it more compatible with other rdbms.
71+
// make it more compatible with other rdbms. Experimental of course.
7772
public $avoidSql = false;
7873

7974
// When the auditTrail extension
@@ -243,5 +238,4 @@ public function beforeControllerAction($controller, $action) {
243238

244239
return parent::beforeControllerAction($controller, $action);
245240
}
246-
247241
}

‎user/components/YumWebUser.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?php
1+
<?
22
class YumWebUser extends CWebUser
33
{
44
public $_data;

‎user/docs/changelog.txt

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
Changelog for Yii User Management Module (Yum)
22

3+
4+
New in 0.8 final release:
5+
6+
- Added Avatar Management
37
- removed Yum::route
48
- membership: downgrading support
59
- membership: user can chooses if he want to subscribe to his membership

‎user/docs/extending_statistics.txt

-5
This file was deleted.

0 commit comments

Comments
 (0)