Author: benj
Date: Fri Mar  6 14:22:52 2015
New Revision: 1647

URL: http://svn.gna.org/viewcvs/gdtc?rev=1647&view=rev
Log:
Handle expiration date correctly

Modified:
    trunk/gdtc/scripts/dtcmanager

Modified: trunk/gdtc/scripts/dtcmanager
URL: 
http://svn.gna.org/viewcvs/gdtc/trunk/gdtc/scripts/dtcmanager?rev=1647&r1=1646&r2=1647&view=diff
==============================================================================
--- trunk/gdtc/scripts/dtcmanager       (original)
+++ trunk/gdtc/scripts/dtcmanager       Fri Mar  6 14:22:52 2015
@@ -644,16 +644,26 @@
                                      $entry -> { 'cbrecur_expiration_date' },
                                      $entry -> { 'cbrecur_expiration_date' },
                                      $last_insert [ 0 ] -> { 'id' } ) );
+               &do_query ( sprintf ( "UPDATE membership " .
+                                     "   SET renewal_date = '%s' " .
+                                     " WHERE membership_id = '%s'; ",
+                                     $entry -> { 'cbrecur_expiration_date' },
+                                     $entry -> { 'membership_id' } ) );
+               record_change ( 'changed', 'membership', 'membership_id', 
+                               $entry -> { 'membership_id' }, 'renewal_date', 
+                               $entry -> { 'renewal_date' }, $entry -> { 
'subscription_end_date' } );
            }
-
-           &do_query ( sprintf ( "UPDATE membership " .
-                                 "   SET renewal_date = ADDDATE('%s', INTERVAL 
2 YEAR) " .
-                                 " WHERE membership_id = '%s'; ",
-                                 $entry -> { 'subscription_start_date' },
-                                 $entry -> { 'membership_id' } ) );
-           record_change ( 'changed', 'membership', 'membership_id', 
-                           $entry -> { 'membership_id' }, 'renewal_date', 
-                           $entry -> { 'renewal_date' }, $entry -> { 
'subscription_end_date' } );
+           else
+           {
+               &do_query ( sprintf ( "UPDATE membership " .
+                                     "   SET renewal_date = ADDDATE('%s', 
INTERVAL 2 YEAR) " .
+                                     " WHERE membership_id = '%s'; ",
+                                     $entry -> { 'subscription_start_date' },
+                                     $entry -> { 'membership_id' } ) );
+               record_change ( 'changed', 'membership', 'membership_id', 
+                               $entry -> { 'membership_id' }, 'renewal_date', 
+                               $entry -> { 'renewal_date' }, $entry -> { 
'subscription_end_date' } );
+           }
 
 
            ### Envoi mail adhérent


_______________________________________________
Gdtc-commits mailing list
[email protected]
https://mail.gna.org/listinfo/gdtc-commits

Reply via email to