updated toggleSessions

#73 - [x] editable provider (cog near method title) - [x] add additional providers ui
reactioncommerce · Jan 24, 2015 · 7ddc40e · 7ddc40e
1 parent 10011e8
commit 7ddc40e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/packages/reaction-core/client/helpers/helpers.coffee b/packages/reaction-core/client/helpers/helpers.coffee
@@ -13,16 +13,24 @@ String::toCamelCase = ->
   s = s.replace(/([0-9]+)([a-zA-Z])/g, (a, b, c) ->
     b + c.toUpperCase()
   )
-  s
+  return s
+
 ###
 # quick and easy snippet for toggling sessions
+# accepts string name, see http://docs.meteor.com/#/basic/session
+# optional pass positive param match
 ###
-@toggleSession = (session_variable) ->
-  if Session.get(session_variable)
-    Session.set session_variable, false
+@toggleSession = (sessionVariable, positive) ->
+  check sessionVariable, String
+  session = Session.get sessionVariable
+  positive = positive || true
+
+  if _.isEqual positive, session
+    Session.set sessionVariable, false
   else
-    Session.set session_variable, true
-  return
+    Session.set sessionVariable, positive
+
+  return Session.get sessionVariable
 
 ###
 # method to return tag specific product

diff --git a/...es/reaction-core/client/templates/dashboard/settings/settingsGeneral/settingsGeneral.html b/...es/reaction-core/client/templates/dashboard/settings/settingsGeneral/settingsGeneral.html
@@ -1,5 +1,5 @@
 <template name="settingsGeneral">
-<h2>Shop<small> Settings</small></h2>
+<h2>Shop <small data-18n="app.settings">Settings</small></h2>
 <div class="col-md-5">
 <ul class="nav nav-tabs">
   <li class="active"><a href="#general" data-toggle="tab">General</a></li>

diff --git a/packages/reaction-core/common/schemas/shipping.coffee b/packages/reaction-core/common/schemas/shipping.coffee
@@ -43,7 +43,7 @@ ReactionCore.Schemas.Shipment = new SimpleSchema
 ReactionCore.Schemas.ShippingProvider = new SimpleSchema
   name:
     type: String
-    label: "Service Name"
+    label: "Service Code"
   label:
     type: String
     label: "Public Label"

diff --git a/packages/reaction-core/private/data/i18n/en.json b/packages/reaction-core/private/data/i18n/en.json
@@ -17,7 +17,8 @@
                     "submit": "Submit",
                     "delete": "Delete",
                     "create": "Create",
-                    "close": "Close"
+                    "close": "Close",
+                    "settings": "Settings"
                 },
                 "header": {
                     "tagsAdd": "Add tag",
@@ -134,7 +135,8 @@
                 "checkoutShipping": {
                     "selectShippingOption": "Select shipping option",
                     "noShippingMethods": "No shipping methods are configured.",
-                    "configureNow": "Configure now."
+                    "configureNow": "Configure now.",
+                    "shipping": "Shipping"
                 },
                 "shopEditForm": {
                     "name": "Name",