Fix tax settings saving bug

reactioncommerce · Mar 6, 2017 · 6c389a5 · 6c389a5
1 parent c97de61
commit 6c389a5
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/client/modules/accounts/templates/tax-settings/taxSettings.js b/client/modules/accounts/templates/tax-settings/taxSettings.js
@@ -1,16 +1,15 @@
 import _ from "lodash";
+import { Meteor } from "meteor/meteor";
 import { Template } from "meteor/templating";
 import { Accounts } from "/lib/collections";
 import { Accounts as AccountsSchema } from "/lib/collections/schemas/accounts";
-import { Reaction } from "/client/api";
 import { TaxEntityCodes } from "/client/collections";
 
 Template.taxSettingsPanel.helpers({
   account() {
-    if (Reaction.Subscriptions.Account.ready()) {
-      return Accounts.findOne({
-        _id: this.member.userId
-      });
+    const sub = Meteor.subscribe("Accounts.single", this.member.userId);
+    if (sub.ready()) {
+      return Accounts.findOne({ _id: this.member.userId });
     }
     return null;
   },

diff --git a/server/publications/collections/accounts.js b/server/publications/collections/accounts.js
@@ -44,6 +44,17 @@ Meteor.publish("Accounts", function (userId) {
   });
 });
 
+/**
+ * Single account
+ * @params {String} userId -  id of user to find
+ */
+Meteor.publish("Accounts.single", function (userId) {
+  check(userId, Match.OneOf(String, null));
+  return Collections.Accounts.find({
+    userId: userId
+  });
+});
+
 /**
  * userProfile
  * @deprecated since version 0.10.2