Changeset 2e8d57 in indico for indico/MaKaC/webinterface/rh/registrantsModif.py

Timestamp:

01/28/11 15:57:45 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 4c7d4152dff271ba5df5a8606605969cab454080

Children:

97539e

Parents:

c50671

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (01/28/11 15:20:03)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (01/28/11 15:57:45)

Message:

[FIX] Disable billable fields after payment

File:

• indico/MaKaC/webinterface/rh/registrantsModif.py (modified) (3 diffs)

indico/MaKaC/webinterface/rh/registrantsModif.py

@@ -570 +570 @@
     def _process( self ):
         if not self._cancel:
-            self._registrant.setSessions(self._sessions)
+            if not self._registrant.getPayed():
+                sessions = self._sessions
+            else:
+                # First keep all sessions which are billable (they are not submitted anymore)
+                sessions = [session for session in self._registrant.getSessionList() if session.isBillable()]
+                # Then take all chosen sessions which are not billable
+                sessions += [session for session in self._sessions if not session.isBillable()]
+            self._registrant.setSessions(sessions)
         self._redirect(urlHandlers.UHRegistrantModification.getURL(self._registrant))
 
@@ -606 +613 @@
     def _process( self ):
         if not self._cancel:
-            self._registrant.getAccommodation().setArrivalDate(self._arrivalDate)
-            self._registrant.getAccommodation().setDepartureDate(self._departureDate)
+            # Allow changing of the dates only if the current accomodation is not billable or the user hasn't paid yet
+            currentAccoType = self._registrant.getAccommodation().getAccommodationType()
+            if not self._registrant.getPayed() or currentAccoType is None or not currentAccoType.isBillable():
+                self._registrant.getAccommodation().setArrivalDate(self._arrivalDate)
+                self._registrant.getAccommodation().setDepartureDate(self._departureDate)
             if self._regForm.getAccommodationForm().getAccommodationTypesList() !=[]:
-                self._registrant.getAccommodation().setAccommodationType(self._accoType)
+                # Only change the accommodation type if:
+                # - the registrant hasn't paid yet OR
+                # - neither the current nor the new accommodation is billable
+                if not self._registrant.getPayed() or \
+                    ((currentAccoType is None or not currentAccoType.isBillable()) and \
+                     (self._accoType is None or not self._accoType.isBillable())):
+                    self._registrant.getAccommodation().setAccommodationType(self._accoType)
         self._redirect(urlHandlers.UHRegistrantModification.getURL(self._registrant))
 
@@ -642 +658 @@
         if not self._cancel:
             for seItem in self._registrant.getSocialEvents()[:]:
-                self._registrant.removeSocialEventById(seItem.getId())
+                # Remove all items which can be added back (i.e. if paid only non-billable ones)
+                if not (self._registrant.getPayed() and seItem.isBillable()):
+                    self._registrant.removeSocialEventById(seItem.getId())
 
             l = []
             for seItem in self._socialEvents:
-                newSE = SocialEvent(seItem, int(self._places[seItem.getId()]))
-                self._registrant.addSocialEvent(newSE)
+                # Only add item if the registrant hasn't paid yet or the item is not billable
+                if not self._registrant.getPayed() or not seItem.isBillable():
+                    newSE = SocialEvent(seItem, int(self._places[seItem.getId()]))
+                    self._registrant.addSocialEvent(newSE)
         self._redirect(urlHandlers.UHRegistrantModification.getURL(self._registrant))