Merge pull request chi-otters-2017#48 from chi-otters-2017/merge-helper

Merge helper

Author: rrichardsonv

app/assets/javascripts/measures.js

@@ -1,2 +1,22 @@
 // Place all the behaviors and hooks related to the matching controller here.
 // All this logic will automatically be available in application.js.
+
+$(document).on('ready', function(){
+  $('#recipe-data form').on('submit', function(e) {
+    e.preventDefault();
+    var data = $(this).serialize();
+    var url = $(this).attr("action");
+    var $section = $(this).closest('#recipe-data');
+
+    $.ajax({
+      url: url,
+      type: 'POST',
+      data: data
+    })
+    .done(function(response) {
+      $section.append(response);
+    });
+
+  });
+
+});

app/controllers/measures_controller.rb

@@ -1,14 +1,15 @@
 class MeasuresController < ApplicationController
-  def new
-    @recipe = Recipe.find_by(id: params[:recipe_id])
-    @measure = Measure.new
-  end
+  # def new
+  #   # @recipe = Recipe.find_by(id: params[:recipe_id])
+  #   @measure = Measure.new
+  #   puts "IM IN MESURES"
+  # end
 
   def create
     @recipe = Recipe.find_by(id: params[:recipe_id])
     @measure = @recipe.measures.new(measure_deets)
     if @measure.save
-      redirect_to new_recipe_measure_path(@recipe)
+      redirect_to recipe_path(@recipe)
     else
       raise 'ur dum'
     end

app/controllers/ratings_controller.rb

@@ -1,15 +1,19 @@
 class RatingsController < ApplicationController
   include SessionsHelper
+  include RatingsHelper
 
   def create
     get_recipe
+    if !already_rated?(@recipe)
+      @rating = @recipe.ratings.new(rating_params)
+      @rating.update_attributes(user_id: current_user.id)
+      if @rating.save
+        flash[:notice] = "Rating has been recorded."
 
-    @rating = @recipe.ratings.new(rating_params)
-    @rating.update_attributes(user_id: current_user.id)
-    if @rating.save
-      flash[:notice] = "Rating has been recorded."
-
-      redirect_to recipe_path(@recipe)
+        redirect_to recipe_path(@recipe)
+      else
+        render file: 'public/404.html'
+      end
     else
       render file: 'public/404.html'
     end

app/controllers/recipes_controller.rb

@@ -11,13 +11,21 @@ def new
   def create
     @recipe = get_category.recipes.new(recipe_params)
     current_user.recipes << @recipe
-
-    if @recipe.save
-      flash.notice = "Your recipe has been added!"
-
-      redirect_to "/categories/#{@category.name}", notice: "You recipe was successfully added!"
+    if request.xhr?
+      if @recipe.save
+        flash.notice = "Your recipe has been added!"
+        render partial: 'measures/new', recipe: @recipe
+      else
+        render :new
+      end
     else
-      render :new
+      if @recipe.save
+        flash.notice = "Your recipe has been added!"
+
+        redirect_to "/categories/#{@category.name}", notice: "You recipe was successfully added!"
+      else
+        render :new
+      end
     end
   end
 

app/controllers/sales_controller.rb

@@ -9,10 +9,9 @@ def index
   def create
     @sale = Sale.new(sale_deets)
     @sale.recipe_id = recipe_params[:recipe_id]
-    raise @sale.inspect
     if @sale.save
       flash[:notice] = 'Success!'
-      redirect_to :index
+      redirect_to recipe_sales_path(@sale)
     else
       flash[:alert] = "Save failed!"
       redirect_to :index

app/controllers/users_controller.rb

@@ -43,7 +43,7 @@ def destroy
       redirect_to users_path
     else
       flash[:not_admin] = "You do not have permission to view this page."
-      redirect_to "/"
+      redirect_to users_path
     end
   end
 

app/helpers/rating_helper.rb app/helpers/ratings_helper.rbapp/helpers/rating_helper.rb renamed to app/helpers/ratings_helper.rb

@@ -1,4 +1,4 @@
-module RatingHelper
+module RatingsHelper
   def recipe_rating(recipe)
     total = 0
     recipe.ratings.each do |rating|

app/models/sale.rb

@@ -6,18 +6,17 @@ class Sale < ApplicationRecord
 
 
   def gross_sales
-    self.cents.dup.insert(-2, '.').insert(0, '$')
+    ['$', self.cents / 100, ".00"].join
   end
 
   private
   def set_cents
-    working_price = self.sale_price
-    raise working_price.inspect
-    unless working_price.include?('.')
+    working_price = self.sale_price.to_s
+    if working_price.include?('.')
       working_price.concat('00')
     end
-      clean_price = working_price.split('').delete_if{|char| (char =~ /[[:punct:][$][\s]]/)}.join
-      clean_price.to_i *= self.volume
-      self.cents = clean_price.to_s
+      clean_price = working_price.split('').delete_if{|char| (char =~ /[[:punct:][$][\s]]/)}.join.to_i
+      clean_price *= self.volume
+      self.cents = clean_price
   end
 end

app/views/measures/new.html.erb app/views/measures/_new.html.erbapp/views/measures/new.html.erb renamed to app/views/measures/_new.html.erb

@@ -12,7 +12,7 @@
   </div>
   <div class='recipe-ingredient container'>
   <% if @recipe.measures %>
-    <h4><%= @recipe.title%></h4>
+
     <ul>
       <% @recipe.measures.each do |ingred| %>
         <li>
@@ -23,7 +23,7 @@
   <% end %>
   </div>
 
-<%= form_for @measure, url: recipe_measures_path(@recipe) do |f|%>
+<%= form_for Measure.new, url: recipe_measures_path(@recipe) do |f|%>
  <span> <%= f.label :quantity %>
   <%= f.text_field :quantity %>
   <%= f.label :units %>

app/views/recipes/new.html.erb

@@ -8,22 +8,25 @@
     <% end %>
   <% end %>
 
-  <%= form_for @recipe, url: category_recipes_path do |f| %>
+  <section id='recipe-data'>
+    <%= form_for @recipe, url: category_recipes_path do |f| %>
 
-  <p><%= f.label :title %></p>
-  <p><%= f.text_field :title %></p>
+    <p><%= f.label :title %></p>
+    <p><%= f.text_field :title %></p>
 
-  <p><%= f.label :directions %></p>
-  <p><%= f.text_area :directions %></p>
+    <p><%= f.label :directions %></p>
+    <p><%= f.text_area :directions %></p>
 
-  <p><%= f.label :time %></p>
-  <span><%= f.text_field :time %></span>
-  <span><%= f.label "in minutes" %></span>
+    <p><%= f.label :time %></p>
+    <span><%= f.text_field :time %></span>
+    <span><%= f.label "in minutes" %></span>
 
-  <p><%= f.label :difficulty %></p>
-  <p><%= f.select :difficulty, options_for_select([['easy', 'easy'], ['medium', 'medium'], ['hard', 'hard']]) %></p><br>
+    <p><%= f.label :difficulty %></p>
+    <p><%= f.select :difficulty, options_for_select([['easy', 'easy'], ['medium', 'medium'], ['hard', 'hard']]) %></p><br>
+
+    <p><%= f.submit "Submit" %></p>
+    <% end %>
+  </section>
 
-  <%= f.submit "Add My Recipe!" %>
 
-  <% end %>
 </article>