From 88160e1cfa9e723a4dc7d3ed99ca9c71a47dd3a3 Mon Sep 17 00:00:00 2001
From: Martin Kamerbeek <martin@webgui-svn>
Date: Mon, 26 May 2008 22:24:31 +0000
Subject: [PATCH] Converted the Subscription related macro's to use the new
 commerce system.

---
 lib/WebGUI/Macro/SubscriptionItem.pm          | 33 +++++++++++++++----
 .../Macro/SubscriptionItemPurchaseUrl.pm      | 13 ++++++--
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/lib/WebGUI/Macro/SubscriptionItem.pm b/lib/WebGUI/Macro/SubscriptionItem.pm
index fe2ef4b71..6a7f1d8cd 100644
--- a/lib/WebGUI/Macro/SubscriptionItem.pm
+++ b/lib/WebGUI/Macro/SubscriptionItem.pm
@@ -28,12 +28,33 @@ be used from the Macro/SubscriptionItem namespace.
 =cut
 
 sub process {
-	my $session = shift;
-	my ($subscriptionId, $templateId, %var);
-	($subscriptionId, $templateId) = @_;
-	%var = $session->db->quickHash('select * from subscription where subscriptionId='.$session->db->quote($subscriptionId));
-	$var{url} = $session->url->page('op=purchaseSubscription;sid='.$subscriptionId);
-	return WebGUI::Asset::Template->new($session,$templateId || "PBtmpl0000000000000046")->process(\%var);
+	my $session         = shift;
+    my $subscriptionId  = shift;
+    my $templateId      = shift || 'PBtmpl0000000000000046';
+
+    # Fetch subscription asset
+    my $subscription = WebGUI::Asset->newByDynamicClass( $session, $subscriptionId );
+    return "Could not find subscription with id: [$subscriptionId]" unless $subscription;
+    return "Only Subscription assets can be used with this macro."
+        unless $subscription->get('className') =~ m{^WebGUI::Asset::Sku::Subscription};
+
+    # Setup template vars
+    my $var;
+    $var->{ subscriptionId      } = $subscription->getId;
+    $var->{ name                } = $subscription->get('title');
+    $var->{ price               } = $subscription->getPrice;
+    $var->{ description         } = $subscription->get('description');
+    $var->{ subscriptionGroup   } = $subscription->get('subscriptionGroup');
+    $var->{ duration            } = $subscription->get('duration');
+    $var->{ karma               } = $subscription->get('karma');
+    $var->{ useSalesTax         } = $subscription->get('useSalesTax');
+    $var->{ url                 } = $subscription->getUrl('func=purchaseSubscription');
+
+    # Fetch template 
+    my $template = WebGUI::Asset::Template->new( $session, $templateId );
+    return "Could not instantiate template with id:[$templateId]" unless $template;
+
+	return $template->process( $var );
 }
 
 1;
diff --git a/lib/WebGUI/Macro/SubscriptionItemPurchaseUrl.pm b/lib/WebGUI/Macro/SubscriptionItemPurchaseUrl.pm
index 83ef582e3..a83931530 100644
--- a/lib/WebGUI/Macro/SubscriptionItemPurchaseUrl.pm
+++ b/lib/WebGUI/Macro/SubscriptionItemPurchaseUrl.pm
@@ -22,8 +22,17 @@ The ID of the subscription item to purchase.
 =cut
 
 sub process {
-	my $session = shift;
-	return $session->url->page('op=purchaseSubscription;sid='.shift);
+	my $session         = shift;
+    my $subscriptionId  = shift;
+
+    # Fetch subscription asset
+    my $subscription = WebGUI::Asset->newByDynamicClass( $session, $subscriptionId );
+    return "Could not find subscription with id: [$subscriptionId]" unless $subscription;
+    return "Only Subscription assets can be used with this macro."
+        unless $subscription->get('className') =~ m{^WebGUI::Asset::Sku::Subscription};
+
+    # Construct and output the purchase url for this subscription
+	return $subscription->getUrl('func=purchaseSubscription');
 }
 
 1;