From 7107222e57be9fb932321d0fb8cb7452caaec14d Mon Sep 17 00:00:00 2001
From: h-alstad <>
Date: Mon, 16 Aug 2010 21:03:04 +0200
Subject: [PATCH] Fixed bugs in handling of membercard delivery

---
 inside/Page.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/inside/Page.php b/inside/Page.php
index eb1f1dc..7a6816c 100644
--- a/inside/Page.php
+++ b/inside/Page.php
@@ -3211,6 +3211,9 @@ Teksten under er hentet fra kunnskapsdatabasen. Du st
         while ($row =& $users->users->fetchRow(DB_FETCHMODE_OBJECT)){
           $user = new User($row->id);
           print "<tr>";
+          print "<form action=\"" . $action . "\" method=\"post\">";
+          print "<input type=\"hidden\" name=\"action\" value=\"membership-sale\" />";
+          print "<input type=\"hidden\" name=\"userid\" value=\"" . $user->getId() . "\" />";
           print "<td class=\"number\" id=\"user_" . $user->getId() . "_cardno\">". $user->cardno . "</td>\n";
           print "<td><a href=\"index.php?page=display-user&amp;userid=" . $user->id . "\">" . $user->getName() . "</a></td>";
           print "<td class=\"is_member\">";
@@ -3231,9 +3234,6 @@ Teksten under er hentet fra kunnskapsdatabasen. Du st
           print "<td class=\"is_member\">" . $user->getLastSticker() . "</td>";
 
           print "<td>";
-          print "<form action=\"" . $action . "\" method=\"post\">";
-          print "<input type=\"hidden\" name=\"action\" value=\"membership-sale\" />";
-          print "<input type=\"hidden\" name=\"userid\" value=\"" . $user->getId() . "\" />";
           if ($user->hasExpired()) {
             if (!$user->getCardProduced()) {
               print "forny (produser kort)";
@@ -3253,7 +3253,9 @@ Teksten under er hentet fra kunnskapsdatabasen. Du st
             if (!$user->getCardProduced()) {
               print "produser kort";
             } elseif (!$user->getCardDelivered()) {
-              print "lever ut kort";
+              print "<input type=\"hidden\" name=\"subaction\" value=\"give-card\" />";
+              print "<input type=\"hidden\" name=\"new-sticker-date\" value=\"" . date("Y", strtotime($user->getExpiryDate())) . "\" />";
+              print "<input type=\"submit\" name=\"give-card\" value=\"lever ut kort (" . date("Y", strtotime($user->getExpiryDate())) . ")\" />";
             } elseif (!$user->hasCardSticker()) {
               print "<input type=\"hidden\" name=\"subaction\" value=\"give-sticker\" />";
               print "<input type=\"hidden\" name=\"new-sticker-date\" value=\"" . date("Y", strtotime($user->getExpiryDate())) . "\" />";
@@ -3262,15 +3264,16 @@ Teksten under er hentet fra kunnskapsdatabasen. Du st
               print "-";
             }
           }
-          print "</form>";
           print "</td>";
 
           print "<td>";
           if ($user->getCardDelivered()) {
-            print "produser nytt medlemskort";
+            print "<input type=\"hidden\" name=\"subaction\" value=\"order-new-card\" />";
+            print "<input type=\"submit\" name=\"order-new-card\" value=\"bestille nytt kort\" />";
           }
           print  "</td>";
 
+          print "</form>";
           print "</tr>";
         }
         print "</table>";