From e876210b80d89c217292ccb62c7de912e318a7df Mon Sep 17 00:00:00 2001
From: Clinton Ebadi <clinton@unknownlamer.org>
Date: Sun, 22 Apr 2018 15:02:11 -0400
Subject: [PATCH] Finally excise remaining references to Google Checkout

Resolves https://bugzilla.hcoop.net/show_bug.cgi?id=1203
---
 apps.mlt          | 6 ------
 money.mlt         | 7 -------
 remind/remind.sml | 2 +-
 3 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/apps.mlt b/apps.mlt
index e3ac4b2..ac7af72 100644
--- a/apps.mlt
+++ b/apps.mlt
@@ -104,9 +104,6 @@ elseif $"cmd" = "approved" then
 	<tr> <td>E-mail address:</td> <td><a href="mailto:<% #email appl %>"><% #email appl %></a></td> </tr>
 	<% switch #paypal appl of
 	  SOME s => %><tr> <td>PayPal:</td> <td><a href="mailto:<% s %>"><% s %></a></td> </tr>
-	<% end;
-	switch #checkout appl of
-	  SOME s => %><tr> <td>Google Checkout:</td> <td><a href="mailto:<% s %>"><% s %></a></td> </tr>
 	<% end %>
 	<tr> <td>Forward e-mail?</td> <td><% if #forward appl then %>yes<% else %>no<% end %></td> </tr>
 	<tr> <td>Proposed uses:</td> <td><% Web.htmlNl (#uses appl) %></td> </tr>
@@ -187,9 +184,6 @@ end %>
 	<tr> <td>E-mail address:</td> <td><a href="mailto:<% #email appl %>"><% #email appl %></a></td> </tr>
 	<% switch #paypal appl of
 	  SOME s => %><tr> <td>PayPal:</td> <td><a href="mailto:<% s %>"><% s %></a></td> </tr>
-	<% end;
-	switch #checkout appl of
-	  SOME s => %><tr> <td>Google Checkout:</td> <td><a href="mailto:<% s %>"><% s %></a></td> </tr>
 	<% end %>
 	<tr> <td>Forward e-mail?</td> <td><% if #forward appl then %>yes<% else %>no<% end %></td> </tr>
 	<tr> <td>Proposed uses:</td> <td><% Web.htmlNl (#uses appl) %></td> </tr>
diff --git a/money.mlt b/money.mlt
index de5fdb5..d92969b 100644
--- a/money.mlt
+++ b/money.mlt
@@ -258,7 +258,6 @@ end %></textarea></td> </tr>
 <table class="blanks">
 <tr> <td>Description:</td> <td><select name="descr">
 	<option<% if $"checkout" = "" then %> selected<% end %>>PayPal</option>
-	<option<% if $"checkout" <> "" then %> selected<% end %>>Google Checkout</option>
 	<option>Check</option>
 	<option>Direct transfer</option>
 	<option value="">Other:</option>
@@ -489,9 +488,6 @@ end %>
 	<tr> <td>E-mail address:</td> <td><a href="mailto:<% #email appl %>"><% #email appl %></a></td> </tr>
 	<% switch #paypal appl of
 	  SOME s => %><tr> <td>PayPal:</td> <td><a href="mailto:<% s %>"><% s %></a></td> </tr>
-	<% end;
-	switch #checkout appl of
-	  SOME s => %><tr> <td>Google Checkout:</td> <td><a href="mailto:<% s %>"><% s %></a></td> </tr>
 	<% end %>
 	<tr> <td>Forward e-mail?</td> <td><% if #forward appl then %>yes<% else %>no<% end %></td> </tr>
 	<tr> <td>Proposed uses:</td> <td><% Web.htmlNl (#uses appl) %></td> </tr>
@@ -563,9 +559,6 @@ elseif $"cmd" = "checkout" then
 	<tr> <td>E-mail address:</td> <td><a href="mailto:<% #email appl %>"><% #email appl %></a></td> </tr>
 	<% switch #paypal appl of
 	  SOME s => %><tr> <td>PayPal:</td> <td><a href="mailto:<% s %>"><% s %></a></td> </tr>
-	<% end;
-	switch #checkout appl of
-	  SOME s => %><tr> <td>Google Checkout:</td> <td><a href="mailto:<% s %>"><% s %></a></td> </tr>
 	<% end %>
 	<tr> <td>Forward e-mail?</td> <td><% if #forward appl then %>yes<% else %>no<% end %></td> </tr>
 	<tr> <td>Proposed uses:</td> <td><% Web.htmlNl (#uses appl) %></td> </tr>
diff --git a/remind/remind.sml b/remind/remind.sml
index d3e3b8b..6fac15b 100644
--- a/remind/remind.sml
+++ b/remind/remind.sml
@@ -81,7 +81,7 @@ fun main _ =
 
 			write "To make a payment, visit:\n";
 			write "     https://members.hcoop.net/\n";
-			write "and use the PayPal or Google Checkout link.\n";
+			write "and use the PayPal or Stripe link.\n";
 
 			write "\nIf for whatever reason you don't plan to pay the amount suggested in this e-mail,\n";
 			write "_please_ don't stay silent.  Reply to this message explaining your circumstances.\n";
-- 
2.20.1