Author: jkoster
Date: 2009-09-16 16:49:36 +0200 (Wed, 16 Sep 2009)
New Revision: 38657
Modified:
natmm/trunk/src/nl/leocms/evenementen/forms/SubscribeInitAction.java
natmm/trunk/src/nl/natuurmonumenten/activiteiten/ActiviteitenService.java
Log:
NMCMS-669 - Added price calculation of subscription. (Prijsberekening komt niet
in de mailtjes uit CAD)
Modified: natmm/trunk/src/nl/leocms/evenementen/forms/SubscribeInitAction.java
===================================================================
--- natmm/trunk/src/nl/leocms/evenementen/forms/SubscribeInitAction.java
2009-09-16 14:46:12 UTC (rev 38656)
+++ natmm/trunk/src/nl/leocms/evenementen/forms/SubscribeInitAction.java
2009-09-16 14:49:36 UTC (rev 38657)
@@ -49,13 +49,16 @@
// promptforconfirmation: after book from website
// canceled: after cancel action
- SubscribeForm subscribeForm = (SubscribeForm) form;
- subscribeForm.setNode(request.getParameter("number"));
+ prepareForm((SubscribeForm)form, request.getParameter("number"),
request.getParameter("p") );
+
+ return mapping.findForward("success");
+ }
+
+ public static void prepareForm(SubscribeForm subscribeForm, String
nodeNumber, String pageNumber) {
+ subscribeForm.setNode(nodeNumber);
subscribeForm.setParent(subscribeForm.findParent());
- subscribeForm.setPageNumber(request.getParameter("p"));
+ subscribeForm.setPageNumber(pageNumber);
subscribeForm.setPaymentType(subscribeForm.getDefaultPaymentType());
subscribeForm.resetNumbers();
-
- return mapping.findForward("success");
}
}
Modified:
natmm/trunk/src/nl/natuurmonumenten/activiteiten/ActiviteitenService.java
===================================================================
--- natmm/trunk/src/nl/natuurmonumenten/activiteiten/ActiviteitenService.java
2009-09-16 14:46:12 UTC (rev 38656)
+++ natmm/trunk/src/nl/natuurmonumenten/activiteiten/ActiviteitenService.java
2009-09-16 14:49:36 UTC (rev 38657)
@@ -11,6 +11,8 @@
import nl.leocms.applications.NatMMConfig;
import nl.leocms.evenementen.Evenement;
import nl.leocms.evenementen.forms.SubscribeAction;
+import nl.leocms.evenementen.forms.SubscribeForm;
+import nl.leocms.evenementen.forms.SubscribeInitAction;
import org.apache.log4j.Logger;
import org.mmbase.bridge.Cloud;
@@ -38,7 +40,7 @@
* nl.natuurmonumenten.activiteiten.ActiviteitenServiceInterf#getVersion()
*/
public String getVersion() {
- return "2.2";
+ return "2.3";
}
/*
@@ -250,6 +252,11 @@
subscriptionNode.setStringValue("source",
ActiviteitenHelper.getMediaTypeText(cloud, subscription.getMediaTypeId()));
subscriptionNode.setStringValue("description",
subscription.getBijzonderheden());
subscriptionNode.setStringValue("ticket_office_source", "website");
+
+ SubscribeForm subscribeForm = new SubscribeForm();
+ SubscribeInitAction.prepareForm(subscribeForm, null, "agenda");
+ subscriptionNode.setStringValue("betaalwijze",
subscribeForm.getPaymentType());
+
subscriptionNode.commit();
eventNode.createRelation(subscriptionNode,
cloud.getRelationManager("posrel")).commit();
// *** update inschrijvingen,related,inschrijvings_status
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
