Author: benj
Date: Thu Sep 15 14:54:36 2016
New Revision: 1742
URL: http://svn.gna.org/viewcvs/gdtc?rev=1742&view=rev
Log:
Allow display of is own invoices if connected
Modified:
trunk/gdtc/include/subscription.php
Modified: trunk/gdtc/include/subscription.php
URL:
http://svn.gna.org/viewcvs/gdtc/trunk/gdtc/include/subscription.php?rev=1742&r1=1741&r2=1742&view=diff
==============================================================================
--- trunk/gdtc/include/subscription.php (original)
+++ trunk/gdtc/include/subscription.php Thu Sep 15 14:54:36 2016
@@ -226,40 +226,50 @@
function do_my_invoice ( $actor_id, $subscription_id, $key = null )
{
- if ( $subscription_id && $key )
- {
- $results = simple_unique_query ( sprintf ( " SELECT actor.actor_id
" .
- " FROM actor,
membership, subscription " .
- " WHERE actor.actor_id
= membership.actor_id " .
- " AND actor.cle =
'%s' " .
- " AND
membership.membership_id = subscription.membership_id " .
- " AND
subscription.subscription_id = '%s';",
- $key, $subscription_id )
);
- $actor_id = $results [ 'actor_id' ];
- }
-
- if ( ! $results )
- {
- croak ( "Veuillez vous identifier pour obtenir une facture.");
- return;
- }
-
- $subscription = simple_unique_query ( sprintf ( "SELECT * " .
- " FROM subscription,
membership " .
- " WHERE
subscription.membership_id = membership.membership_id " .
- " AND membership.actor_id
= '%s' " .
- " AND
subscription.subscription_id = '%s'; ",
- $actor_id, $subscription_id
) );
-
- if ( ! $subscription )
- {
- croak ( 'Impossible d\'afficher la facture.' );
- return;
- }
-
- do_invoice_pdf ( Array ( 'actor_id' => $actor_id,
- 'subscription_id' => $subscription_id ) );
- exit;
+ if ( $subscription_id && $key )
+ {
+ $results = simple_unique_query ( sprintf ( " SELECT actor.actor_id " .
+ " FROM actor, membership,
subscription " .
+ " WHERE actor.actor_id =
membership.actor_id " .
+ " AND actor.cle = '%s' " .
+ " AND
membership.membership_id = subscription.membership_id " .
+ " AND
subscription.subscription_id = '%s';",
+ $key, $subscription_id ) );
+ $actor_id = $results [ 'actor_id' ];
+ }
+ else if ( $subscription_id )
+ {
+ $results = simple_unique_query ( sprintf ( " SELECT membership.actor_id
" .
+ " FROM membership,
subscription " .
+ " WHERE
membership.membership_id = subscription.membership_id " .
+ " AND
subscription.subscription_id = '%s' " .
+ " AND membership.actor_id =
'%s' ;",
+ $subscription_id, my_id () ) );
+ $actor_id = my_id ( );
+ }
+
+ if ( ! $results )
+ {
+ croak ( "Veuillez vous identifier pour obtenir une facture.");
+ return;
+ }
+
+ $subscription = simple_unique_query ( sprintf ( "SELECT * " .
+ " FROM subscription,
membership " .
+ " WHERE
subscription.membership_id = membership.membership_id " .
+ " AND membership.actor_id =
'%s' " .
+ " AND
subscription.subscription_id = '%s'; ",
+ $actor_id, $subscription_id )
);
+
+ if ( ! $subscription )
+ {
+ croak ( 'Impossible d\'afficher la facture.' );
+ return;
+ }
+
+ do_invoice_pdf ( Array ( 'actor_id' => $actor_id,
+ 'subscription_id' => $subscription_id ) );
+ exit;
}
_______________________________________________
Gdtc-commits mailing list
[email protected]
https://mail.gna.org/listinfo/gdtc-commits
