*
* PHP version 5
*
- * Copyright © 2020-2022 The Galette Team
+ * Copyright © 2020-2023 The Galette Team
*
* This file is part of Galette (http://galette.tuxfamily.org).
*
* @package Galette
*
* @author Johan Cwiklinski <johan@x-tnd.be>
- * @copyright 2020-2022 The Galette Team
+ * @copyright 2020-2023 The Galette Team
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version
* @link http://galette.tuxfamily.org
* @since Available since 0.9.4dev - 2020-05-08
namespace Galette\Controllers\Crud;
-use Galette\Filters\ContributionsList;
-use Throwable;
+use Galette\Features\BatchList;
use Analog\Analog;
use Galette\Controllers\CrudController;
-use Slim\Http\Request;
-use Slim\Http\Response;
+use Slim\Psr7\Request;
+use Slim\Psr7\Response;
use Galette\Entity\Adherent;
use Galette\Entity\Contribution;
use Galette\Entity\Transaction;
* @name ContributionsController
* @package Galette
* @author Johan Cwiklinski <johan@x-tnd.be>
- * @copyright 2020-2022 The Galette Team
+ * @copyright 2020-2023 The Galette Team
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL License 3.0 or (at your option) any later version
* @link http://galette.tuxfamily.org
* @since Available since 0.9.4dev - 2020-05-02
class ContributionsController extends CrudController
{
+ use BatchList;
+
// CRUD - Create
/**
// check for ajax mode
$ajax = false;
if (
- $request->isXhr()
+ ($request->getHeaderLine('X-Requested-With') === 'XMLHttpRequest')
|| isset($post['ajax'])
&& $post['ajax'] == 'true'
) {
}
$ext_membership = '';
- if ($contrib->isFee() || !isset($contrib) && $type === Contribution::TYPE_FEE) {
+ if ($contrib->isFee() || $type === Contribution::TYPE_FEE) {
$ext_membership = $this->preferences->pref_membership_ext;
}
$params['pref_membership_ext'] = $ext_membership;
$contrib = new Contribution(
$this->zdb,
$this->login,
- (count($cparams) > 0 ? $cparams : null)
+ $cparams
);
if (isset($cparams['adh'])) {
$filters = $this->session->filter_members;
$data = [
'id' => $filters->selected,
- 'redirect_uri' => $this->router->pathFor('members')
+ 'redirect_uri' => $this->routeparser->urlFor('members')
];
// display page
$response,
'modals/mass_choose_contributions_type.html.twig',
array(
- 'mode' => $request->isXhr() ? 'ajax' : '',
+ 'mode' => ($request->getHeaderLine('X-Requested-With') === 'XMLHttpRequest') ? 'ajax' : '',
'page_title' => str_replace(
'%count',
count($data['id']),
_T('Mass add contribution on %count members')
),
'data' => $data,
- 'form_url' => $this->router->pathFor('massAddContributions'),
- 'cancel_uri' => $this->router->pathFor('members')
+ 'form_url' => $this->routeparser->urlFor('massAddContributions'),
+ 'cancel_uri' => $this->routeparser->urlFor('members')
)
);
return $response;
{
$post = $request->getParsedBody();
$filters = $this->session->filter_members;
- $contribution = new Contribution($this->zdb, $this->login);
-
$type = $post['type'];
+
+ $ct = new ContributionsTypes($this->zdb);
+ $contributions_types = $ct->getList($type === Contribution::TYPE_FEE);
+
+ $contribution = new Contribution(
+ $this->zdb,
+ $this->login,
+ ['type' => array_keys($contributions_types)[0]]
+ );
+
$data = [
'id' => $filters->selected,
- 'redirect_uri' => $this->router->pathFor('members'),
+ 'redirect_uri' => $this->routeparser->urlFor('members'),
'type' => $type
];
- // contribution types
- $ct = new ContributionsTypes($this->zdb);
- $contributions_types = $ct->getList($type === Contribution::TYPE_FEE);
-
// display page
$this->view->render(
$response,
'modals/mass_add_contributions.html.twig',
array(
- 'mode' => $request->isXhr() ? 'ajax' : '',
+ 'mode' => ($request->getHeaderLine('X-Requested-With') === 'XMLHttpRequest') ? 'ajax' : '',
'page_title' => str_replace(
'%count',
count($data['id']),
_T('Mass add contribution on %count members')
),
- 'form_url' => $this->router->pathFor('doMassAddContributions'),
- 'cancel_uri' => $this->router->pathFor('members'),
+ 'form_url' => $this->routeparser->urlFor('doMassAddContributions'),
+ 'cancel_uri' => $this->routeparser->urlFor('members'),
'data' => $data,
'contribution' => $contribution,
'type' => $type,
foreach ($members_ids as $member_id) {
$post[Adherent::PK] = (int)$member_id;
$contrib = new Contribution($this->zdb, $this->login);
+ $contrib->disableEvents();
// regular fields
$valid = $contrib->check($post, $contrib->getRequired(), $disabled);
}
if (count($error_detected) == 0) {
- $redirect_url = $this->router->pathFor('members');
+ $redirect_url = $this->routeparser->urlFor('members');
} else {
//something went wrong.
//store entity in session
- $redirect_url = $this->router->pathFor('massAddContributions');
+ $redirect_url = $this->routeparser->urlFor('massAddContributions');
//report errors
foreach ($error_detected as $error) {
$this->flash->addMessage(
$ajax = false;
$get = $request->getQueryParams();
- if (
- $request->isXhr()
- || isset($get['ajax'])
- && $get['ajax'] == 'true'
- ) {
- $ajax = true;
- }
-
switch ($type) {
case 'transactions':
$raw_type = 'transactions';
->withStatus(301)
->withHeader(
'Location',
- $this->router->pathFor('me')
+ $this->routeparser->urlFor('me')
);
}
$filter_name = 'filter_' . $raw_type;
+ if (
+ ($request->getHeaderLine('X-Requested-With') === 'XMLHttpRequest')
+ || isset($get['ajax'])
+ && $get['ajax'] == 'true'
+ ) {
+ $ajax = true;
+ $filter_name .= '_ajax';
+ }
- if (isset($this->session->$filter_name) && $ajax === false) {
+ if (isset($this->session->$filter_name)) {
$filters = $this->session->$filter_name;
} else {
$filter_class = '\\Galette\\Filters\\' . ucwords($raw_type . 'List');
$filters->filtre_cotis_adh = (int)$get[Adherent::PK];
}
- $filters->filtre_transactions = false;
- if (isset($request->getQueryParams()['max_amount'])) {
- $filters->filtre_transactions = true;
- $filters->max_amount = (int)$request->getQueryParams()['max_amount'];
+ if ($type === 'contributions') {
+ if (isset($request->getQueryParams()['max_amount'])) {
+ $filters->filtre_transactions = true;
+ $filters->max_amount = (int)$request->getQueryParams()['max_amount'];
+ }
}
if ($option !== null) {
);
if (
!$member->hasParent() ||
- $member->hasParent() && $member->parent->id != $this->login->id
+ $member->parent->id != $this->login->id
) {
$value = $this->login->id;
Analog::log(
->withStatus(301)
->withHeader(
'Location',
- $this->router->pathFor('me')
+ $this->routeparser->urlFor('me')
);
}
}
//assign pagination variables to the template and add pagination links
- $filters->setSmartyPagination($this->router, $this->view);
+ $filters->setSmartyPagination($this->routeparser, $this->view);
$tpl_vars = [
'page_title' => $raw_type === 'contributions' ?
if ($filters->filtre_cotis_adh != null) {
$member = new Adherent($this->zdb);
+ $member->enableDep('children');
$member->load($filters->filtre_cotis_adh);
$tpl_vars['member'] = $member;
}
);
}
- /**
+ /**
* Filtering
*
* @param Request $request PSR Request
*/
public function filter(Request $request, Response $response, string $type = null): Response
{
+ $ajax = false;
$filter_name = 'filter_' . $type;
+ if ($request->getHeaderLine('X-Requested-With') === 'XMLHttpRequest') {
+ $ajax = true;
+ $filter_name .= '_ajax';
+ }
+
$post = $request->getParsedBody();
$error_detected = [];
}
if (isset($post['clear_filter'])) {
- $filters->reinit();
+ $filters->reinit($ajax);
} else {
- if (isset($post['max_amount'])) {
+ if (!isset($post['max_amount'])) {
$filters->max_amount = null;
}
}
if (isset($post['end_date_filter']) || isset($post['start_date_filter'])) {
- try {
- if (isset($post['start_date_filter'])) {
- $filters->start_date_filter = $post['start_date_filter'];
- }
- if (isset($post['end_date_filter'])) {
- $filters->end_date_filter = $post['end_date_filter'];
- }
- } catch (Throwable $e) {
- $error_detected[] = $e->getMessage();
+ if (isset($post['start_date_filter'])) {
+ $filters->start_date_filter = $post['start_date_filter'];
+ }
+ if (isset($post['end_date_filter'])) {
+ $filters->end_date_filter = $post['end_date_filter'];
}
}
return $response
->withStatus(301)
- ->withHeader('Location', $this->router->pathFor('contributions', ['type' => $type]));
+ ->withHeader('Location', $this->routeparser->urlFor('contributions', ['type' => $type]));
}
/**
$post = $request->getParsedBody();
if (isset($post['entries_sel'])) {
- $filters = $this->session->$filter_name ?? new ContributionsList();
+ $filter_class = '\\Galette\\Filters\\' . ucwords($type . 'List');
+ $filters = $this->session->$filter_name ?? new $filter_class();
$filters->selected = $post['entries_sel'];
$this->session->$filter_name = $filters;
if (isset($post['csv'])) {
return $response
->withStatus(301)
- ->withHeader('Location', $this->router->pathFor('csv-contributionslist', ['type' => $type]));
+ ->withHeader('Location', $this->routeparser->urlFor('csv-contributionslist', ['type' => $type]));
}
if (isset($post['delete'])) {
return $response
->withStatus(301)
- ->withHeader('Location', $this->router->pathFor('removeContributions'));
+ ->withHeader('Location', $this->routeparser->urlFor('removeContributions', ['type' => $type]));
}
throw new \RuntimeException('Does not know what to batch :(');
return $response
->withStatus(301)
- ->withHeader('Location', $this->router->pathFor('contributions', ['type' => $type]));
+ ->withHeader('Location', $this->routeparser->urlFor('contributions', ['type' => $type]));
}
}
);
return $response
->withStatus(301)
- ->withHeader('Location', $this->router->pathFor(
+ ->withHeader('Location', $this->routeparser->urlFor(
'contributions',
['type' => 'contributions']
));
public function store(Request $request, Response $response, $action, string $type, $id = null): Response
{
$post = $request->getParsedBody();
- $args = [
+ $url_args = [
'action' => $action,
'type' => $type
];
if ($id !== null) {
- $args['id'] = $id;
+ $url_args['id'] = $id;
}
if ($action == 'edit' && isset($post['btnreload'])) {
- $redirect_url = $this->router->pathFor($action . 'Contribution', $args);
+ $redirect_url = $this->routeparser->urlFor($action . 'Contribution', $url_args);
$redirect_url .= '?' . Adherent::PK . '=' . $post[Adherent::PK] . '&' .
ContributionsTypes::PK . '=' . $post[ContributionsTypes::PK] . '&' .
'montant_cotis=' . $post['montant_cotis'];
$this->session->contribution = null;
if ($contrib->isTransactionPart() && $contrib->transaction->getMissingAmount() > 0) {
//new contribution
- $redirect_url = $this->router->pathFor(
+ $redirect_url = $this->routeparser->urlFor(
'addContribution',
[
- 'type' => $post['contrib_type']
+ 'type' => $post['contrib_type'] ?? $type
]
) . '?' . Transaction::PK . '=' . $contrib->transaction->id .
'&' . Adherent::PK . '=' . $contrib->member;
} else {
//contributions list for member
- $redirect_url = $this->router->pathFor(
+ $redirect_url = $this->routeparser->urlFor(
'contributions',
[
'type' => 'contributions'
//something went wrong.
//store entity in session
$this->session->contribution = $contrib;
- $redirect_url = $this->router->pathFor($action . 'Contribution', $args);
+ $redirect_url = $this->routeparser->urlFor($action . 'Contribution', $url_args);
//report errors
foreach ($error_detected as $error) {
*/
public function redirectUri(array $args)
{
- return $this->router->pathFor('contributions', ['type' => $args['type']]);
+ return $this->routeparser->urlFor('contributions', ['type' => $args['type']]);
}
/**
*/
public function formUri(array $args)
{
- return $this->router->pathFor(
+ return $this->routeparser->urlFor(
'doRemoveContribution',
$args
);
// /CRUD - Delete
// /CRUD
+
+ /**
+ * Get filter name in session
+ *
+ * @param array|null $args Route arguments
+ *
+ * @return string
+ */
+ public function getFilterName(array $args = null): string
+ {
+ return 'filter_' . $args['type'];
+ }
}
Projects / galette.git / blobdiff