Merge branch 'master' into USPS_int

docs/changelog/7.x.x.txt

@@ -8,6 +8,7 @@
  - fixed Shop is not sending notification emails to the user, or to the notification group.
  - Set a minimum package weight of 0.1 oz for the USPS driver.
  - Handle per package errors in USPS response data.
+ - fixed #11207: Shop Email receipts going out to everyone.
 
 7.8.3
  - Rewrote Spectre's workflow queues to prevent it from "forgetting" about some workflows.

docs/gotcha.txt

@@ -7,6 +7,14 @@ upgrading from one version to the next, or even between multiple
 versions. Be sure to heed the warnings contained herein as they will
 save you many hours of grief.
 
+7.8.4
+--------------------------------------------------------------------
+ * A bug introduced in 7.8.1 could cause the Shop sale notification
+   group to be reset to the group Everyone.  The bug has been fixed,
+   and the group has been reset to Admins.  If you were using a different
+   group, you will need to edit the Shop Settings and reselect the
+   proper group.
+
 7.8.3
 --------------------------------------------------------------------
  * WebGUI now requires Locales::Country 0.05 or higher to use

docs/upgrades/upgrade_7.8.3-7.8.4.pl

@@ -34,6 +34,7 @@ my $session = start(); # this line required
 dropSkipNotification($session);
 addEMSSubmissionTables($session);
 configEMSActivities($session);
+resetShopNotificationGroup($session);
 
 finish($session); # this line required
 
@@ -170,6 +171,14 @@ sub dropSkipNotification {
     print "Done.\n" unless $quiet;
 }
 
+#------------------------------------------------------------------------
+sub resetShopNotificationGroup {
+    my $session = shift;
+    print "\tResetting the shop reciept notification group to Admins if it is set to Everyone... " unless $quiet;
+    $session->db->write(q{update settings set value='3' where name='shopSaleNotificationGroupId' and value='7'});
+    print "Done.\n" unless $quiet;
+}
+
 # -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
 
 #----------------------------------------------------------------------------

lib/WebGUI/Shop/Admin.pm

@@ -209,7 +209,7 @@ sub www_editSettings {
         defaultValue    => 'bPz1yk6Y9uwMDMBcmMsSCg',
     );
     $form->group(
-        name            => 'saleNotificationGroupId',
+        name            => 'shopSaleNotificationGroupId',
         label           => $i18n->get("sale notification group"),
         hoverHelp       => $i18n->get("sale notification group help"),
         defaultValue    => '3',