diff --git a/fsfe.org/cgi-bin/weborder.pl b/fsfe.org/cgi-bin/weborder.pl
index d506f318c2..f02c24c211 100755
--- a/fsfe.org/cgi-bin/weborder.pl
+++ b/fsfe.org/cgi-bin/weborder.pl
@@ -97,15 +97,20 @@ my $items = XML::LibXML->load_xml(location => $items_file);
my $count = 0;
my $amount = 0;
+my $pickup = 0;
foreach my $item ( $query->param ) {
my $value = $query->param($item);
if ( not $item =~ /^_/ and $value ) {
# Remove size from item info so price is found properly
+ my $origitem = $item;
$item =~ s/_.*//;
my $price = $items->findvalue("/itemset/item[\@id=\"$item\"]/\@price");
$count += 1;
$amount += $value * $price;
+ if ( !$pickup ) {
+ $pickup = "hoodie-fourfreedoms" eq substr($origitem,0,length("hoodie-fourfreedoms"));
+ }
}
}
@@ -117,6 +122,10 @@ if ( $country_code eq 'DE' ) {
} else {
$shipping = 8;
}
+# if one item was for pick up only, then shipping cost are 0
+if ( $pickup ) {
+ $shipping = 0;
+}
$amount += $shipping;
@@ -218,6 +227,18 @@ HTML
}
}
+if ( $pickup ) {
+$body .= <<"HTML";
+Self pick-up (Shipping): € 0
+Total amount: € $amount
+
+
+ Best regards, +
+