Merge pull request reactioncommerce#2019 from reactioncommerce/brent-…

…fix-issue-1837 Remove unnecessary call to `shop/getLocale`, eliminate unused code
altaxa · Mar 28, 2017 · a1a0cf5 · a1a0cf5
2 parents 986d403 + 66a3137
commit a1a0cf5
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 86 deletions.
diff --git a/client/modules/core/helpers/globals.js b/client/modules/core/helpers/globals.js
@@ -27,35 +27,6 @@ export function toggleSession(sessionVariable, positiveState) {
   return Session.get(sessionVariable);
 }
 
-/**
- * locateUser
- * @return {Object} set and return session address based on browser latitude, longitude
- */
-export function locateUser() {
-  function successFunction(position) {
-    const lat = position.coords.latitude;
-    const lng = position.coords.longitude;
-    return Meteor.call("shop/locateAddress", lat, lng, function (error,
-      address) {
-      if (address) {
-        return Session.set("address", address);
-      }
-    });
-  }
-
-  function errorFunction() {
-    return Meteor.call("shop/locateAddress", function (error, address) {
-      if (address) {
-        return Session.set("address", address);
-      }
-    });
-  }
-
-  if (navigator.geolocation) {
-    return navigator.geolocation.getCurrentPosition(successFunction,
-      errorFunction);
-  }
-}
 
 /**
  * getCardTypes

diff --git a/server/api/core/core.js b/server/api/core/core.js
@@ -214,6 +214,17 @@ export default {
     return shop && shop.currency || "USD";
   },
 
+  getShopLanguage() {
+    const { language } = Shops.findOne({
+      _id: this.getShopId()
+    }, {
+      fields: {
+        language: 1
+      } }
+    );
+    return language;
+  },
+
   getPackageSettings(name) {
     return Packages.findOne({ packageName: name, shopId: this.getShopId() }) || null;
   },

diff --git a/server/api/core/email/email.js b/server/api/core/email/email.js
@@ -1,7 +1,7 @@
 import { Meteor } from "meteor/meteor";
 import { Job } from "meteor/vsivsi:job-collection";
 import { Jobs, Templates } from "/lib/collections";
-import { Logger } from "/server/api";
+import { Reaction, Logger } from "/server/api";
 
 
 /**
@@ -33,14 +33,7 @@ export function getSubject(template) {
   }
 
   // set default
-  let language = "en";
-
-  const shopLocale = Meteor.call("shop/getLocale");
-
-  // set the language if found
-  if (shopLocale && shopLocale.locale && shopLocale.locale.languages) {
-    language = shopLocale.locale.languages;
-  }
+  const language = Reaction.getShopLanguage();
 
   // check database for a matching template
   const tmpl = Templates.findOne({
@@ -52,8 +45,6 @@ export function getSubject(template) {
   if (tmpl && tmpl.template) {
     return tmpl.subject;
   }
-
-  // otherwise, use the default template from the filesystem
   return "A message from {{shop.name}}";
 }
 
@@ -71,14 +62,7 @@ export function getTemplate(template) {
   }
 
   // set default
-  let language = "en";
-
-  const shopLocale = Meteor.call("shop/getLocale");
-
-  // set the language if found
-  if (shopLocale && shopLocale.locale && shopLocale.locale.languages) {
-    language = shopLocale.locale.languages;
-  }
+  const language = Reaction.getShopLanguage();
 
   // check database for a matching template
   const tmpl = Templates.findOne({

diff --git a/server/methods/core/methods.app-test.js b/server/methods/core/methods.app-test.js
@@ -116,42 +116,4 @@ describe("Server/Core", function () {
       return done();
     });
   });
-
-  describe.skip("shop/locateAddress", function () {
-    it("should locate an address based on known US coordinates", function (done) {
-      this.timeout(20000);
-      const address = Meteor.call("shop/locateAddress", 34.043125, -118.267118);
-      expect(address.zipcode).to.equal("90015");
-      return done();
-    });
-
-    it("should locate an address with known international coordinates", function () {
-      this.timeout(20000);
-      const address = Meteor.call("shop/locateAddress", 53.414619, -2.947065);
-      expect(address.formattedAddress).to.not.be.undefined;
-      expect(address.formattedAddress).to.contain("248 Molyneux Rd, Kensington");
-      expect(address.formattedAddress).to.contain("Liverpool");
-      expect(address.formattedAddress).to.contain("L6 6AW");
-      expect(address.formattedAddress).to.contain("UK");
-    });
-
-    it("should provide default empty address", function (done) {
-      this.timeout(20000);
-      const address = Meteor.call("shop/locateAddress", 26.352498, -89.25293);
-      const defaultAddress = {
-        latitude: null,
-        longitude: null,
-        country: "United States",
-        city: null,
-        state: null,
-        stateCode: null,
-        zipcode: null,
-        streetName: null,
-        streetNumber: null,
-        countryCode: "US"
-      };
-      expect(_.isEqual(address, defaultAddress)).to.be.true;
-      return done();
-    });
-  });
 });