make it better

Gemfile

@@ -5,7 +5,6 @@ gem 'bootstrap-sass',       '3.2.0.0'
 gem 'will_paginate-bootstrap'
 gem 'will_paginate-bootstrap'
 gem 'bootstrap-will_paginate', '0.0.10'
 gem 'bootstrap-will_paginate', '0.0.10'
 gem 'faker', '1.4.2'
 gem 'faker', '1.4.2'
-gem 'pg'
 
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.2.3'
 gem 'rails', '4.2.3'

Gemfile.lock

@@ -80,7 +80,6 @@ GEM
       lumberjack (~> 1.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       notiffany (~> 0.0)
-      pg (0.17.1)
       pry (>= 0.9.12)
       pry (>= 0.9.12)
       shellany (~> 0.0)
       shellany (~> 0.0)
       thor (>= 0.18.1)
       thor (>= 0.18.1)
@@ -232,7 +231,6 @@ DEPENDENCIES
   mini_backtrace (= 0.1.3)
   mini_backtrace (= 0.1.3)
   minitest-reporters (= 1.0.5)
   minitest-reporters (= 1.0.5)
   mysql2
   mysql2
-  pg (= 0.17.1)
   rails (= 4.2.3)
   rails (= 4.2.3)
   rails_12factor (= 0.0.2)
   rails_12factor (= 0.0.2)
   sass-rails (~> 5.0)
   sass-rails (~> 5.0)

app/controllers/admins/products_controller.rb

 class Admins::ProductsController < ApplicationController
 class Admins::ProductsController < ApplicationController
+
   def new
   def new
     @product = Product.new
     @product = Product.new
   end
   end
 
 
-
   def create
   def create
     if admin_signed_in?
     if admin_signed_in?
-      if product_params[:price].to_i >= 0 && params[:category][:id].to_i > 0 && !product_params[:image].nil? && !product_params[:image].empty? && !product_params[:price].empty? && !product_params[:name].empty? && product_params[:price].to_i <= 999999
+      if product_params[:price].to_i >= 0 && params[:category][:id].to_i > 0 &&
+        !product_params[:image].nil? && !product_params[:image].empty? &&
+        !product_params[:price].empty? && !product_params[:name].empty? &&
+        product_params[:price].to_i <= 999999
         product = Product.find_or_create_by(name: product_params[:name]) do |product|
         product = Product.find_or_create_by(name: product_params[:name]) do |product|
           product.image = product_params[:image]
           product.image = product_params[:image]
           product.category_id = params[:category][:id]
           product.category_id = params[:category][:id]
@@ -24,8 +27,10 @@ class Admins::ProductsController < ApplicationController
 
 
   def edit
   def edit
     if admin_signed_in?
     if admin_signed_in?
-      if product_params[:price].to_i >= 0 && params[:category][:id].to_i > 0 && !product_params[:image].nil? && !product_params[:image].empty? && !product_params[:price].empty? && !product_params[:name].empty? && product_params[:price].to_i <= 999999
-
+      if product_params[:price].to_i >= 0 && params[:category][:id].to_i > 0 &&
+        !product_params[:image].nil? && !product_params[:image].empty? &&
+        !product_params[:price].empty? && !product_params[:name].empty? &&
+        product_params[:price].to_i <= 999999
         product = Product.find(params[:id])
         product = Product.find(params[:id])
           product.name = product_params[:name]
           product.name = product_params[:name]
           product.image = product_params[:image]
           product.image = product_params[:image]

app/controllers/admins/users_controller.rb

 class Admins::UsersController < ApplicationController
 class Admins::UsersController < ApplicationController
+
   def index
   def index
     if admin_signed_in?
     if admin_signed_in?
       @users = User.all
       @users = User.all
     end
     end
   end
   end
+
 end
 end

app/controllers/application_controller.rb

@@ -9,7 +9,6 @@ class ApplicationController < ActionController::Base
   include CategoriesHelper
   include CategoriesHelper
   include SessionsHelper
   include SessionsHelper
 
 
-
   def configure_permitted_parameters
   def configure_permitted_parameters
     devise_parameter_sanitizer.for(:sign_up) << :username
     devise_parameter_sanitizer.for(:sign_up) << :username
   end
   end

app/controllers/cart_products_controller.rb

@@ -39,6 +39,7 @@ class CartProductsController < ApplicationController
     end
     end
       redirect_to :action => :index
       redirect_to :action => :index
   end
   end
+
   def clear
   def clear
     session[:cart] = nil
     session[:cart] = nil
     redirect_to :action => :index
     redirect_to :action => :index
@@ -51,4 +52,5 @@ class CartProductsController < ApplicationController
       @cart_product = {}
       @cart_product = {}
     end
     end
   end
   end
+
 end
 end
\ No newline at end of file

app/controllers/carts_controller.rb

 class CartsController < ApplicationController
 class CartsController < ApplicationController
-
   include CategoriesHelper
   include CategoriesHelper
+
   def show
   def show
     if user_signed_in?
     if user_signed_in?
       @show_cart = Cart.where(user_id: current_user.id)
       @show_cart = Cart.where(user_id: current_user.id)

app/mailers/emailer.rb

@@ -3,7 +3,7 @@ class Emailer < ApplicationMailer
   include CartsHelper
   include CartsHelper
   include CategoriesHelper
   include CategoriesHelper
   def send_email_to(email,cart)
   def send_email_to(email,cart)
-    mail to: email, subject: "Venshop!!"
     @cart_product = cart
     @cart_product = cart
+    mail to: email, subject: "Venshop!!"
   end
   end
 end
 end

app/views/emailer/send_email_to.html.erb

 
 
 <h1>Your Cart</h1>
 <h1>Your Cart</h1>
+
 <ul>
 <ul>
   <% total = 0 %>
   <% total = 0 %>
   <% if !@cart_product.nil? %>
   <% if !@cart_product.nil? %>
     <% @cart_product.each do |id, quantity| %>
     <% @cart_product.each do |id, quantity| %>
       <% product = Product.find_by_id(id) %>
       <% product = Product.find_by_id(id) %>
       <% if !product.nil? %>
       <% if !product.nil? %>
-        <% total = total + product.price * quantity %>
-        <li>
-          <%= link_to truncate(product.name, length:15), "/products/#{product.id}" %>
-          <%= quantity %>
-        </li>
+        <% total = total + product.price * quantity.to_i %>
+        <div class="col-md-4">
+          <%= image_tag(product.image, size: "170x210")%>
+          <h5><%= truncate(product.name, length: 22) %></h5>
+            <%=  number_to_currency(product.price/100.to_f) %>
+          </br>
+        </div>
       <% end %>
       <% end %>
     <% end -%>
     <% end -%>
-  <% else %>
-      <h3>Empty</h3>
+    <h2> Total price: <%=(total/100.to_f).to_s + "$" %></h2>
   <% end -%>
   <% end -%>
-  <br>
-  <br>
-  <h2> <%= number_to_currency(total/100.to_f, :unit => '$')%> </h2>
-  <h2> Thank !</h2>
 </ul>
 </ul>
\ No newline at end of file