Minor - flint fixes

pull/2624/head
Julio Montoya 7 years ago
parent bc26c9c577
commit faab4f3501
  1. 2
      main/social/terms.php
  2. 49
      plugin/buycourses/src/buy_course_plugin.class.php
  3. 1
      src/Chamilo/UserBundle/Repository/UserRepository.php

@ -39,14 +39,12 @@ $actions = Display::url(
$tpl->assign('actions', Display::toolbarAction('toolbar', [$actions]));
// Block Social Avatar
SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'messages');
if (api_get_setting('allow_social_tool') === 'true') {
$tpl->assign('social_menu_block', $socialMenuBlock);
} else {
$tpl->assign('social_menu_block', '');
}
$tpl->assign('term', $term);

@ -2192,6 +2192,30 @@ class BuyCoursesPlugin extends Plugin
return $paths[$var];
}
/**
* @param Session $session
*
* @return array
*/
public function getBuyCoursePluginPrice(Session $session)
{
// start buycourse validation
// display the course price and buy button if the buycourses plugin is enabled and this course is configured
$isThisCourseInSale = $this->buyCoursesForGridCatalogValidator($session->getId(), self::PRODUCT_TYPE_SESSION);
$return = [];
if ($isThisCourseInSale) {
// set the Price label
$return['html'] = $isThisCourseInSale['html'];
// set the Buy button instead register.
if ($isThisCourseInSale['verificator']) {
$return['buy_button'] = $this->returnBuyCourseButton($session->getId(), self::PRODUCT_TYPE_SESSION);
}
}
// end buycourse validation
return $return;
}
/**
* Filter the registered courses for show in plugin catalog.
*
@ -2518,29 +2542,4 @@ class BuyCoursesPlugin extends Plugin
['id = ?' => (int) $serviceSaleId]
);
}
/**
* @param Session $session
*
* @return array
*/
public function getBuyCoursePluginPrice(Session $session)
{
// start buycourse validation
// display the course price and buy button if the buycourses plugin is enabled and this course is configured
$isThisCourseInSale = $this->buyCoursesForGridCatalogValidator($session->getId(), self::PRODUCT_TYPE_SESSION);
$return = [];
if ($isThisCourseInSale) {
// set the Price label
$return['html'] = $isThisCourseInSale['html'];
// set the Buy button instead register.
if ($isThisCourseInSale['verificator']) {
$return['buy_button'] = $this->returnBuyCourseButton($session->getId(), self::PRODUCT_TYPE_SESSION);
}
}
// end buycourse validation
return $return;
}
}

@ -491,7 +491,6 @@ class UserRepository extends EntityRepository
$items = $extraFieldValues->getAllValuesByItem($userId);
$user->setExtraFields($items);
$lastLogin = $user->getLastLogin();
if (empty($lastLogin)) {
$login = $this->getLastLogin($user);

Loading…
Cancel
Save