fix bug

f67de3d0 · Dao Minh Nhut · 9452905f · f67de3d0 · f67de3d0 · f67de3d0
Commit f67de3d0 authored Aug 04, 2015 by Dao Minh Nhut
19 changed files
--- a/app/controllers/admins/users_controller.rb
+++ b/app/controllers/admins/users_controller.rb
-class Admin::UsersController < ApplicationController
+class Admins::UsersController < ApplicationController
  def show
    @users = User.all
  end
 end
--- a/app/controllers/carts_controller.rb
+++ b/app/controllers/carts_controller.rb
@@ -7,6 +7,7 @@ class CartsController < ApplicationController
  end
  def info
+    @new_cart = Cart.new
    if user_signed_in?
      @current_user
    end
@@ -14,17 +15,19 @@ class CartsController < ApplicationController
  def create
    if !session[:cart].nil?
-      new_cart = Cart.new(cart_params)
+      @new_cart = Cart.new(fullname: params[:cart][:fullname], email: params[:cart][:email],
-      new_cart.total_price = calculate_total_price
+      address: params[:cart][:address], phone: params[:cart][:phone],
-      new_cart.status = "new cart"
+      total_price: calculate_total_price, status: "new cart", user_id: cart_user_id)
-      if user_signed_in?
+      #new_cart.total_price = calculate_total_price
-        new_cart.user_id = current_user.id
+      #new_cart.status = "new cart"
-      end
+      #if user_signed_in?
-      new_cart.save
+      #  new_cart.user_id = current_user.id
-      if !new_cart.id.nil?
+      #end
+      if @new_cart.save
+      #if !new_cart.id.nil?
        session[:cart].each do |id, quantity|
          cart_product = CartProduct.new
-          cart_product.cart_id = new_cart.id
+          cart_product.cart_id = @new_cart.id
          cart_product.product_id = id
          cart_product.price = Product.find_by_id(id).price
          cart_product.quantity = quantity
@@ -33,14 +36,16 @@ class CartsController < ApplicationController
        flash[:success] = "Success!"
        Emailer.send_email_to(cart_params[:email].to_s,session[:cart]).deliver
        session[:cart] = nil
+        redirect_to cart_path
+      else
+        render :info
      end
    end
    flash[:danger] = "Wrong input please input again!"
-    render :info
  end
  def cart_params
-    params.require(:session).permit(:fullname, :email, :address, :phone)
+    params.require(:cart).permit(:fullname, :email, :address, :phone)
  end
  private
@@ -57,4 +62,12 @@ class CartsController < ApplicationController
    end
    total
  end
+  def cart_user_id
+    user_id = ""
+    if user_signed_in?
+      user_id = current_user.id
+    end
+    user_id
+  end
 end
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
 class CategoriesController < ApplicationController
  include CategoriesHelper
  def show
+    begin
      category = Category.find(params[:id])
      @products = category.products
+    rescue
+      redirect_to root_path
+    end
  end
 end
\ No newline at end of file
--- a/app/controllers/products_controller.rb
+++ b/app/controllers/products_controller.rb
@@ -2,7 +2,11 @@ class ProductsController < ApplicationController
  include CategoriesHelper
  include CartProductsHelper
  def index
+    begin
      @products = Product.paginate(page: params[:page])
+    rescue
+      @products = Product.paginate(page: "1")
+    end
  end
  def show
    begin

--- a/app/models/cart.rb
+++ b/app/models/cart.rb
@@ -2,11 +2,10 @@ class Cart < ActiveRecord::Base
  has_many :cart_product
  VALID_PHONE_REGEX = /\d[0-9]\)*\z/
  VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-.]+\.[a-z]+\z/i
-  VALID_NUMBER_REGEX = /\A[+-]?\d+\Z/
-  validates :email, presence: true, length: { maximum: 255 }, format: { with: VALID_EMAIL_REGEX }
+  validates :email, presence: true, length: { maximum: 100 }, format: { with: VALID_EMAIL_REGEX }
  validates :phone, presence: true, length: { maximum: 15 }, format: { with: VALID_PHONE_REGEX }
-  validates :total_price, presence: true, format: { with: VALID_NUMBER_REGEX }
+  validates :total_price, :numericality => { :greater_than_or_equal_to => 0, :less_than_or_equal_to => 99999999 }
  validates :fullname, presence: true, length: { maximum: 50 }
  validates :address, presence: true, length: { maximum: 1000 }
 end
--- a/app/models/category.rb
+++ b/app/models/category.rb
 class Category < ActiveRecord::Base
  has_many :products
-  def new
-    @category = Category.new
-  end
 end
--- a/app/models/product.rb
+++ b/app/models/product.rb
 class Product < ActiveRecord::Base
  belongs_to :category
  has_many :cart_products
-  VALID_NUMBER_REGEX = /\A[+-]?\d+\Z/
  validates :category_id, presence: true
  validates :name, :image, presence: true, length: { maximum: 1000 }
  validates :description, length: { maximum: 65535 }
-  validates :price, :numericality => { :greater_than_or_equal_to => 0, :less_than_or_equal_to => 9999 }
+  validates :price, :numericality => { :greater_than_or_equal_to => 0, :less_than_or_equal_to => 99999999 }
+  validates :page, :numericality => { :greater_than_or_equal_to => 0 }
 end
--- a/app/views/admins/products/show.html.erb
+++ b/app/views/admins/products/show.html.erb
 <% if admin_signed_in? %>
 <div class="span12">
  <h2>Products</h2>
-    <%= link_to "Insert Product", insert_product_path %>
+    <%= link_to "Insert Product", insert_product_path, class: "pull-right"%>
    <table class="table table-striped table-hover">
      <thead>
        <tr>
          <th>Product Name</th>
+          <th>Image</th>
          <th>Edit</th>
          <th>Delete</th>
        </tr>
@@ -14,6 +15,7 @@
     <% @products.each do |product| %>
        <tr>
          <td><%= product.name %></td>
+          <td><%= image_tag product.image, height: '60', width: '60' %></td>
          <td><%= link_to "Edit", "/update_product/#{product.id}" %></td>
          <td><%= link_to "Delete", "/delete_product/#{product.id}" %></td>
        </tr>

--- a/app/views/cart_products/index.html.erb
+++ b/app/views/cart_products/index.html.erb
@@ -2,6 +2,7 @@
 <div class="span9">
  <h2>Shopping Cart</h2>
+  <% if !session[:cart].nil? && !session[:cart].empty? %>
    <div>
      <ul>
        <table class="table table-striped table-hover">
@@ -49,8 +50,11 @@
      <dd><%=(total/100.to_f).to_s + "$" %></dd>
    </dl>
    <div class="clearfix"></div>
-  <%= link_to "Continue Shopping " , root_path, class: "btn btn-primary" %>
    <%= link_to "Check Out", "/cart", class: "btn btn-success pull-right"%>&nbsp;&nbsp;
    <%= link_to "Delete All" ,'/cart_product/clear', class: "btn btn-lg btn-danger pull-right" %>
+  <%else%>
+    <h1>Your Cart is Empty!</h1>
+  <% end %>
+  <%= link_to "Continue Shopping " , root_path, class: "btn btn-primary" %>
  <!--%= link_to "info", "/carts", class: "btn btn-lg btn-success"%-->
 </div>
\ No newline at end of file
--- a/app/views/carts/info.html.erb
+++ b/app/views/carts/info.html.erb
@@ -32,16 +32,27 @@
      <dd><%= number_to_currency(@total/100.to_f, :unit => '$')%></dd>
    </dl></div><br><br><br>
    <div align="center">
-      <% flash.each do |message_type, message| %>
+      <% if @new_cart.errors.any? %>
-        <div class="alert alert-<%= message_type %>"><%= message %></div>
+        <div id="error_explanation">
+          <div class="alert alert-danger">
+            The form contains <%= pluralize(@new_cart.errors.count, "error") %>.
+          </div>
+          <ul>
+          <% @new_cart.errors.full_messages.each do |msg| %>
+            <li><%= msg %></li>
+          <% end %>
+          </ul>
+        </div>
      <% end %>
      <div>
+        <%= form_for(@new_cart, url: create_cart_path) do |f| %>
+          <%= f.label :email %>
          <% if user_signed_in? %>
            <% email = @current_user.email  %>
-          <% end %>
-          <%= form_for(:session, url: create_cart_path) do |f| %>
-            <%= f.label :email %>
            <%= f.email_field :email, value: email, class: 'form-control'%>
+          <% else %>
+            <%= f.email_field :email, class: 'form-control'%>
+          <% end %>
          <%= f.label :fullname %>
          <%= f.text_field :fullname, class: 'form-control' %>
          <%= f.label :address %>

--- a/app/views/products/index.html.erb
+++ b/app/views/products/index.html.erb
 <%= render 'categories/view' %>
 <div class="span9">
  <div class="hero-unit">
    <h1 class="">Ventura Trainee</h1>
    <p class="">Ruby on Rails</p>

--- a/config/routes.rb
+++ b/config/routes.rb
 VenShop::Application.routes.draw do
  namespace :admins do
-  get 'users/show'
-  end
-  namespace :admins do
  get 'users/new'
  end

--- a/db/migrate/20150721070908_create_products.rb
+++ b/db/migrate/20150721070908_create_products.rb
@@ -4,7 +4,7 @@ class CreateProducts < ActiveRecord::Migration
      t.string :name
      t.string :image
      t.integer :price
-      t.string :description, limit: 65535
+      t.string :description
      t.integer :category_id
      t.timestamps null: false

--- a/db/migrate/20150724080644_create_carts.rb
+++ b/db/migrate/20150724080644_create_carts.rb
 class CreateCarts < ActiveRecord::Migration
  def change
    create_table :carts do |t|
-      t.integer :User_id
+      t.integer :user_id
      t.integer :total_price
      t.string :status
      t.string :fullname
-      t.integer :phone
+      t.string :phone
      t.string :address
      t.string :email

--- a/db/migrate/20150804082910_change_limit.rb
+++ b/db/migrate/20150804082910_change_limit.rb
+class ChangeLimit < ActiveRecord::Migration
+  def change
+    change_column :products, :price, :integer, :limit => 5
+    change_column :products, :description, :string, :limit => 20000
+    change_column :cart_products, :cart_id, :integer, :limit => 5
+    change_column :cart_products, :product_id, :integer, :limit => 5
+    change_column :cart_products, :quantity, :integer, :limit => 5
+    change_column :cart_products, :price, :integer, :limit => 5
+    change_column :carts, :user_id, :integer, :limit => 5
+    change_column :carts, :total_price, :integer, :limit => 5
+    change_column :products, :name, :string, :limit => 1000
+    change_column :products, :category_id, :integer, :limit => 5
+  end
+end
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema.define(version: 20150730075349) do
+ActiveRecord::Schema.define(version: 20150804082910) do
  create_table "admins", force: :cascade do |t|
    t.string   "email",                  limit: 255, default: "", null: false
@@ -32,20 +32,20 @@ ActiveRecord::Schema.define(version: 20150730075349) do
  add_index "admins", ["reset_password_token"], name: "index_admins_on_reset_password_token", unique: true, using: :btree
  create_table "cart_products", force: :cascade do |t|
-    t.integer  "cart_id",    limit: 4
+    t.integer  "cart_id",    limit: 8
-    t.integer  "product_id", limit: 4
+    t.integer  "product_id", limit: 8
-    t.integer  "quantity",   limit: 4
+    t.integer  "quantity",   limit: 8
-    t.integer  "price",      limit: 4
+    t.integer  "price",      limit: 8
    t.datetime "created_at",           null: false
    t.datetime "updated_at",           null: false
  end
  create_table "carts", force: :cascade do |t|
-    t.integer  "User_id",     limit: 4
+    t.integer  "user_id",     limit: 8
-    t.integer  "total_price", limit: 4
+    t.integer  "total_price", limit: 8
    t.string   "status",      limit: 255
    t.string   "fullname",    limit: 255
-    t.integer  "phone",       limit: 4
+    t.string   "phone",       limit: 255
    t.string   "address",     limit: 255
    t.string   "email",       limit: 255
    t.datetime "created_at",              null: false
@@ -59,11 +59,11 @@ ActiveRecord::Schema.define(version: 20150730075349) do
  end
  create_table "products", force: :cascade do |t|
-    t.string   "name",        limit: 255
+    t.string   "name",        limit: 1000
    t.string   "image",       limit: 255
-    t.integer  "price",       limit: 4
+    t.integer  "price",       limit: 8
    t.string   "description", limit: 20000
-    t.integer  "category_id", limit: 4
+    t.integer  "category_id", limit: 8
    t.datetime "created_at",                null: false
    t.datetime "updated_at",                null: false
  end

--- a/lib/import_amazon.rb
+++ b/lib/import_amazon.rb
@@ -3,9 +3,9 @@ class ImportAmazon
  def initialize
    @request = Vacuum.new('US')
    @request.configure(
-      aws_access_key_id:            "AKIAJ77C4CTZOP7TUVWQ",
+      aws_access_key_id:     'AKIAIAJR65JO6EIPQWTA',
-      aws_secret_access_key:        "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",
+      aws_secret_access_key: '8rpb5q169RUtj7HU3njH3zxcKthZJmWbgtrzESXy',
-      associate_tag:                "zigexn6400-22"
+      associate_tag:         'microv'
    )
    @request.associate_tag = 'tag'
  end

--- a/test/controllers/admins/users_controller_test.rb
+++ b/test/controllers/admins/users_controller_test.rb
 require 'test_helper'
 class Admins::UsersControllerTest < ActionController::TestCase
-  test "should get show" do
+  test "should get new" do
-    get :show
+    get :new
    assert_response :success
  end

--- a/test/fixtures/carts.yml
+++ b/test/fixtures/carts.yml
 # Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
 one:
-  User_id: 1
+  user_id: 1
  total_price: 1
  status: MyString
  fullname: MyString
-  phone: 1
+  phone: MyString
  address: MyString
  email: MyString
 two:
-  User_id: 1
+  user_id: 1
  total_price: 1
  status: MyString
  fullname: MyString
-  phone: 1
+  phone: MyString
  address: MyString
  email: MyString