From: Iain Patterson <me@iain.cx>
Date: Fri, 19 Apr 2013 08:27:29 +0000 (-0400)
Subject: Typo.
X-Git-Tag: 2013-04-19^0
X-Git-Url: http://git.iain.cx/?a=commitdiff_plain;h=a2e796d4502f96c1ec0e85dd22c7eccf7d1d9ac3;p=readifood.git

Typo.

Incorrect bitshift caused $PARCEL_SINGLE to be ignored.

To fix in the database, run

  update Contact set parcel=parcel|1 where parcel>0 and not (parcel & 7);
  update FoodOrder set parcel=parcel|1 where parcel>0 and not (parcel & 7);
---

diff --git a/lib/contact.php b/lib/contact.php
index 8ba1fcd..4e3b456 100644
--- a/lib/contact.php
+++ b/lib/contact.php
@@ -266,9 +266,9 @@
     echo "<tr>\n";
     echo "  <td>Family unit</td>\n";
     echo "  <td><select name=\"parcel_size\">\n";
-    $mask = 1 << (count($parcel_sizes) + 1);
+    $mask = 1 << count($parcel_sizes);
     for ($i = 0; $i < count($parcel_sizes); $i++) {
-      option("parcel_size", $i << 1, $parcel_sizes[$i], $contact->getParcel() % $mask);
+      option("parcel_size", 1 << $i, $parcel_sizes[$i], $contact->getParcel() % $mask);
     }
     echo "</select></td>\n";
     echo "</tr>\n";
diff --git a/lib/order.php b/lib/order.php
index 928ca67..f1911c5 100644
--- a/lib/order.php
+++ b/lib/order.php
@@ -303,9 +303,9 @@
     echo "<tr>\n";
     echo "  <td>Parcel size</td>\n";
     echo "  <td><select name=\"parcel_size\">\n";
-    $mask = 1 << (count($parcel_sizes) + 1);
+    $mask = 1 << count($parcel_sizes);
     for ($i = 0; $i < count($parcel_sizes); $i++) {
-      option("parcel_size", $i << 1, $parcel_sizes[$i], $order->getParcel() % $mask);
+      option("parcel_size", 1 << $i, $parcel_sizes[$i], $order->getParcel() % $mask);
     }
     echo "</select></td>\n";
     echo "</tr>\n";