From 23300f22a2f82685cc0cef5a5c37a2af02290454 Mon Sep 17 00:00:00 2001
From: Seth Call <sethcall@gmail.com>
Date: Mon, 11 Jul 2016 21:38:08 -0500
Subject: [PATCH] fix recurring lessons

---
 .../react-components/BookLesson.js.jsx.coffee | 22 ++++++++++++-------
 .../mixins/ICheckMixin.js.coffee              |  4 +---
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/web/app/assets/javascripts/react-components/BookLesson.js.jsx.coffee b/web/app/assets/javascripts/react-components/BookLesson.js.jsx.coffee
index 54264ab47..f19dce5ee 100644
--- a/web/app/assets/javascripts/react-components/BookLesson.js.jsx.coffee
+++ b/web/app/assets/javascripts/react-components/BookLesson.js.jsx.coffee
@@ -25,10 +25,12 @@ UserStore = context.UserStore
 
     value = $(e.target).val()
 
-    @setState({ recurring: value })
+    state = {}
+    state['lesson-frequency'] = value
+    @setState(state)
 
   componentDidMount: () ->
-    @checkboxes = [{selector: 'input.lesson-frequency', stateKey: 'lesson-frequency'}]
+    @checkboxes = [{selector: 'input.lesson-freq-field', stateKey: 'lesson-frequency'}]
     @root = $(@getDOMNode())
 
     @slot1Date = @root.find('.slot-1 .date-picker')
@@ -103,7 +105,7 @@ UserStore = context.UserStore
       logger.debug("BookLesson: ignoring teacher details", response.id, @state.teacherId)
 
   getInitialState: () ->
-    {
+    state = {
     user: null,
     teacher: null,
     teacherId: null,
@@ -116,6 +118,9 @@ UserStore = context.UserStore
     recurring: 'single'
     }
 
+    state['lesson-frequency'] = 'single'
+    state
+
   jamclassPolicies: (e) ->
     e.preventDefault()
     context.JK.popExternalLink($(e.target).attr('href'))
@@ -155,7 +160,8 @@ UserStore = context.UserStore
     @setState({generalErrors: null, slot1Errors: null, slot2Errors: null, descriptionErrors: null, bookedPriceErrors: null})
 
   isRecurring: () ->
-    @state.recurring == 'recurring'
+    @state['lesson-frequency'] == 'recurring'
+    #@state.recurring == 'recurring'
 
   isMonthly: () ->
     if !@isRecurring()
@@ -291,13 +297,13 @@ UserStore = context.UserStore
         lesson_price = teacher["price_per_lesson_#{minutes}_cents"]
         value = "single|#{minutes}"
         display = "#{minutes} Minute Lesson for $#{(lesson_price / 100).toFixed(2)}"
-        results.push(`<option value={value}>{display}</option>`)
+        results.push(`<option key={value} value={value}>{display}</option>`)
     else
       for minutes in enabledMinutes
         lesson_price = teacher["price_per_lesson_#{minutes}_cents"]
         value = "single|#{minutes}"
         display = "#{minutes} Minute Lesson Each Week - $#{(lesson_price / 100).toFixed(2)} Per Week"
-        results.push(`<option value={value}>{display}</option>`)
+        results.push(`<option key={value} value={value}>{display}</option>`)
 
 
       for minutes in enabledMinutes
@@ -516,10 +522,10 @@ UserStore = context.UserStore
         {header}
         <div className="lesson-frequency">
           <div className="field lesson-frequency lesson-frequency-single">
-            <input type="radio" name="lesson-frequency" value="single" checked={!this.isRecurring()}/><label htmlFor="lesson-frequency">A single lesson</label>
+            <input type="radio" className="lesson-freq-field" name="lesson-frequency" value="single" checked={!this.isRecurring()} readOnly={true}/><label htmlFor="lesson-frequency">A single lesson</label>
           </div>
           <div className="field lesson-frequency lesson-frequency-recurring">
-            <input type="radio" name="lesson-frequency" value="recurring" checked={this.isRecurring()}/><label htmlFor="lesson-frequency">A series of recurring weekly lessons</label>
+            <input type="radio" className="lesson-freq-field" name="lesson-frequency" value="recurring" checked={this.isRecurring()} readOnly={true}/><label htmlFor="lesson-frequency">A series of recurring weekly lessons</label>
           </div>
         </div>
         <div className={bookedPriceClasses}>
diff --git a/web/app/assets/javascripts/react-components/mixins/ICheckMixin.js.coffee b/web/app/assets/javascripts/react-components/mixins/ICheckMixin.js.coffee
index 38b7c247b..6889fea84 100644
--- a/web/app/assets/javascripts/react-components/mixins/ICheckMixin.js.coffee
+++ b/web/app/assets/javascripts/react-components/mixins/ICheckMixin.js.coffee
@@ -39,8 +39,7 @@ teacherActions = window.JK.Actions.Teacher
   setCheckboxState: () ->
     for checkbox in this.checkboxes
       @setSingleCheckbox(checkbox)
-      return
-
+    return
   enableSingle: (checkbox) ->
     selector = checkbox.selector
 
@@ -60,7 +59,6 @@ teacherActions = window.JK.Actions.Teacher
 
     for checkbox in this.checkboxes
       @enableSingle(checkbox)
-      return
 
     true