From c29599e75d61c718e56b568cf9f87b5bc1d7e72e Mon Sep 17 00:00:00 2001
From: Will Patera <willpatera@gmail.com>
Date: Thu, 5 Jan 2017 11:19:42 +0700
Subject: [PATCH] merge and squash dev into master

---
 assets/coffeescript/product_list.coffee | 2 +-
 assets/coffeescript/pupil_store.coffee  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/assets/coffeescript/product_list.coffee b/assets/coffeescript/product_list.coffee
index 02d23948..8369a0a6 100644
--- a/assets/coffeescript/product_list.coffee
+++ b/assets/coffeescript/product_list.coffee
@@ -98,7 +98,7 @@ get_world_cam_ids = ->
   return (k for k,v of get_world_cam_data())
 
 get_eye_cam_ids = ->
-  return (k for k,v of get_eye_cam_data())
+  return (k for k,v of get_eye_cam_data() when k isnt 'e30')
 
 get_edu_discount_data = ->
   edu_discount_data = 
diff --git a/assets/coffeescript/pupil_store.coffee b/assets/coffeescript/pupil_store.coffee
index 98711748..e1196c96 100644
--- a/assets/coffeescript/pupil_store.coffee
+++ b/assets/coffeescript/pupil_store.coffee
@@ -63,7 +63,7 @@ class PupilStore
       # create eye products in configurator
       for eye_id in get_eye_cam_ids()
         title_store = get_eye_cam_data()[eye_id]['title_store']
-        klass = if eye_id is "e30" then "StoreConfig-eye StoreConfig--state-active" else "StoreConfig-eye"
+        klass = if eye_id is "e120" then "StoreConfig-eye StoreConfig--state-active" else "StoreConfig-eye"
         html = "<li class='Grid-cell u-textCenter'>
                  <button class='#{ klass }' id='#{ eye_id }' href='#{}'>#{title_store}</button> 
                  </li>"
@@ -113,7 +113,7 @@ class PupilStore
 
 
       @_updateSpecTxt('world','w120')
-      @_updateSpecTxt('eye','e30')
+      @_updateSpecTxt('eye','e120')
       @_updateConfigSubTotal()
 
   eventAddToCart: ->