kitchen sink

Author: spompea-cfa

app/controllers/diy/base_controller.rb

@@ -12,8 +12,26 @@ def current_diy_intake
 
     private
 
+    def require_diy_intake
+      redirect_to diy_qualifications_path unless session[:diy_intake_id].present?
+    end
+
     def redirect_in_offseason
       redirect_to root_path unless open_for_diy?
     end
+
+    def track_question_answer
+      send_mixpanel_event(event_name: "question_answered", data: tracking_data)
+    end
+
+    def track_validation_error
+      send_mixpanel_validation_error(@form.errors, tracking_data)
+    end
+
+    def tracking_data
+      return {} unless @form.class.scoped_attributes.key?(:diy_intake)
+
+      @form.attributes_for(:diy_intake).except(*Rails.application.config.filter_parameters)
+    end
   end
 end

app/controllers/diy/continue_to_fsa_controller.rb

@@ -31,11 +31,5 @@ def click_fsa_link
       end
       redirect_to DiySupportExperimentService.fsa_link(treatment.to_s, diy_intake.received_1099_yes?), allow_other_host: true
     end
-
-    private
-
-    def require_diy_intake
-      redirect_to diy_file_yourself_path unless session[:diy_intake_id].present?
-    end
   end
 end

app/controllers/diy/diy_cell_phone_number_controller.rb

@@ -0,0 +1,41 @@
+module Diy
+  class DiyCellPhoneNumberController < BaseController
+    before_action :require_diy_intake
+
+    def edit
+      @form = DiyNotificationPreferenceForm.new
+    end
+
+    def update
+      diy_intake = current_diy_intake
+      form_params = params.fetch(:diy_notification_preference_form, {}).permit(*DiyCellPhoneNumberForm.attribute_names)
+      @form = DiyCellPhoneNumberForm.new(diy_intake, form_params)
+      if @form.valid?
+        @form.save
+        session[:diy_intake_id] = diy_intake.id
+        redirect_to(diy_continue_to_fsa_path)
+      else
+        render :edit
+      end
+    end
+
+    private
+
+    def tracking_data
+      {}
+    end
+
+    def self.show?(diy_intake)
+      diy_intake.sms_phone_number.blank? && diy_intake.sms_notification_opt_in_yes?
+    end
+
+    def after_update_success
+      if @form.diy_intake.sms_notification_opt_in_yes?
+        ClientMessagingService.send_system_text_message(
+          client: @form.diy_intake.client,
+          body: I18n.t("messages.sms_opt_in")
+        )
+      end
+    end
+  end
+end

app/controllers/diy/diy_notification_preference_controller.rb

@@ -1,5 +1,7 @@
 module Diy
   class DiyNotificationPreferenceController < BaseController
+    before_action :require_diy_intake
+
     def edit
       @form = DiyNotificationPreferenceForm.new
     end
@@ -11,10 +13,18 @@ def update
       if @form.valid?
         @form.save
         session[:diy_intake_id] = diy_intake.id
-        redirect_to(diy_continue_to_fsa_path)
+        #redirect_to(diy_continue_to_fsa_path)
+        redirect_to(diy_diy_cell_phone_number_path)
       else
         render :edit
       end
     end
+
+    private
+   
+    def tracking_data
+      @form.attributes_for(:intake).reject { |k, _| k == :sms_phone_number }
+      #@form.attributes_for(:diy_intake)
+    end
   end
 end

app/forms/diy_cell_phone_number_form.rb

@@ -0,0 +1,17 @@
+class DiyCellPhoneNumberForm < DiyForm
+  set_attributes_for :diy_intake, :sms_phone_number, :sms_phone_number_confirmation
+  before_validation :normalize_phone_numbers
+
+  validates :sms_phone_number, e164_phone: true
+  validates :sms_phone_number, confirmation: true
+  validates :sms_phone_number_confirmation, presence: true
+
+  def normalize_phone_numbers
+    self.sms_phone_number = PhoneParser.normalize(sms_phone_number) if sms_phone_number.present?
+    self.sms_phone_number_confirmation = PhoneParser.normalize(sms_phone_number_confirmation) if sms_phone_number_confirmation.present?
+  end
+
+  def save
+    @diy_intake.update(attributes_for(:diy_intake).except(:sms_phone_number_confirmation))
+  end
+end

app/lib/navigation/diy_navigation.rb

@@ -6,6 +6,10 @@ class DiyNavigation
       Diy::QualificationsController,
       Diy::FileYourselfController,
       Diy::DiyNotificationPreferenceController,
+      Diy::DiyCellPhoneNumberController,
+      #Diy::DiyPhoneVerificationController,
+      #Diy::DiyEmailAddressController,
+      #Diy::DiyEmailAddressVerificationController,
       Diy::ContinueToFsaController
     ].freeze
   end

app/models/diy_intake.rb

@@ -2,22 +2,25 @@
 #
 # Table name: diy_intakes
 #
-#  id                        :bigint           not null, primary key
-#  clicked_chat_with_us_at   :datetime
-#  email_address             :string
-#  email_notification_opt_in :integer          default("unfilled")
-#  filing_frequency          :integer          default("unfilled"), not null
-#  locale                    :string
-#  preferred_first_name      :string
-#  received_1099             :integer          default("unfilled"), not null
-#  referrer                  :string
-#  sms_notification_opt_in   :integer          default("unfilled")
-#  source                    :string
-#  token                     :string
-#  zip_code                  :string
-#  created_at                :datetime         not null
-#  updated_at                :datetime         not null
-#  visitor_id                :string
+#  id                           :bigint           not null, primary key
+#  clicked_chat_with_us_at      :datetime
+#  email_address                :string
+#  email_address_verified_at    :datetime
+#  email_notification_opt_in    :integer          default("unfilled")
+#  filing_frequency             :integer          default("unfilled"), not null
+#  locale                       :string
+#  preferred_first_name         :string
+#  received_1099                :integer          default("unfilled"), not null
+#  referrer                     :string
+#  sms_notification_opt_in      :integer          default("unfilled")
+#  sms_phone_number             :string
+#  sms_phone_number_verified_at :datetime
+#  source                       :string
+#  token                        :string
+#  zip_code                     :string
+#  created_at                   :datetime         not null
+#  updated_at                   :datetime         not null
+#  visitor_id                   :string
 #
 class DiyIntake < ApplicationRecord
   attr_accessor :email_address_confirmation

app/views/diy/diy_cell_phone_number/edit.html.erb

@@ -0,0 +1,28 @@
+<% content_for :page_title, t("views.questions.phone_number.title") %>
+
+<section class="slab slab--white question-layout">
+  <div class="grid">
+    <div class="grid__item question-wrapper">
+      <div class="main-content-inner">
+        <%= image_tag("questions/phone-number.svg", alt: "") %>
+
+        <%= form_with model: @form, url: diy_diy_cell_phone_number_path, local: true, method: "put", builder: VitaMinFormBuilder, html: { class: "form-card form-card--long" } do |f| %>
+
+        <h1 class="h2"><%= content_for :page_title %></h1>
+        <p class="text--help">
+          <%=t("views.questions.phone_number.info") %>
+        </p>
+
+        <div class="form-card__content">
+          <%= f.cfa_input_field(:sms_phone_number, t("views.questions.phone_number.phone_number"), classes: ["form-width--long"]) %>
+          <%= f.cfa_input_field(:sms_phone_number_confirmation, t("views.questions.phone_number.phone_number_confirmation"), classes: ["form-width--long"]) %>
+        </div>
+
+        <%= f.continue %>
+
+      </div>
+    </div>
+  </div>
+</section>
+
+<% end %>

app/views/diy/diy_notification_preference/edit.html.erb

@@ -28,16 +28,11 @@
           <%= f.cfa_checkbox(:sms_notification_opt_in, t("views.questions.notification_preference.options.sms_notification_opt_in"), options: { checked_value: "yes", unchecked_value: "no", "data-follow-up": "#sms-opt-in" }) %>
         </div>
 
-        <!-- TODO add reveal widget -->
-        <%= t('views.questions.notification_preference.reveal_header') %>
-        <%= t('views.questions.notification_preference.below_reveal') %>
-
         <p class="text--small spacing-above-25">
           <%= t("views.questions.notification_preference.note_html", terms_url: sms_terms_url, privacy_url: privacy_url) %>
         </p>
       </div>
     </div>
-
     <%= f.continue %>
 <% end %>
 </div></div></div></section>