diff --git a/.gitignore b/.gitignore index 9f14c9f5b6..efc7aa8627 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,7 @@ # Ignore Byebug command history file. .byebug_history config/database.yml +public/uploads + +# Ignore application configuration +/config/application.yml diff --git a/Gemfile b/Gemfile index 0447f70941..795642ac90 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '~> 5.0.0' # Use sqlite3 as the database for Active Record -gem 'sqlite3' + # Use Puma as the app server gem 'puma', '~> 3.0' # Use SCSS for stylesheets @@ -29,10 +29,21 @@ gem 'jbuilder', '~> 2.5' # Use Capistrano for deployment # gem 'capistrano-rails', group: :development +gem 'bootstrap-sass' +gem 'devise' +gem 'simple_form' +gem 'font-awesome-rails' +gem 'carrierwave' +gem 'mini_magick' +gem 'letter_opener', group: :development +gem 'aasm' +gem 'figaro' +gem 'fog' group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console gem 'byebug', platform: :mri + gem 'sqlite3' end group :development do @@ -40,9 +51,12 @@ group :development do gem 'web-console' gem 'listen', '~> 3.0.5' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring - gem 'spring' - gem 'spring-watcher-listen', '~> 2.0.0' +# gem 'spring' +# gem 'spring-watcher-listen', '~> 2.0.0' end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] +group :production do + gem 'pg' +end diff --git a/Gemfile.lock b/Gemfile.lock index 96abec2521..a7b4ded6ca 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,8 @@ GEM remote: https://rubygems.org/ specs: + CFPropertyList (2.3.5) + aasm (4.11.1) actioncable (5.0.0) actionpack (= 5.0.0) nio4r (~> 1.2) @@ -38,9 +40,21 @@ GEM i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) arel (7.1.1) + autoprefixer-rails (6.6.1) + execjs + bcrypt (3.1.11) + bootstrap-sass (3.3.7) + autoprefixer-rails (>= 5.2.1) + sass (>= 3.3.4) builder (3.2.2) byebug (9.0.5) + carrierwave (1.0.0) + activemodel (>= 4.0.0) + activesupport (>= 4.0.0) + mime-types (>= 1.16) coffee-rails (4.2.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.2.x) @@ -50,12 +64,153 @@ GEM coffee-script-source (1.10.0) concurrent-ruby (1.0.2) debug_inspector (0.0.2) + devise (4.2.0) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 4.1.0, < 5.1) + responders + warden (~> 1.2.3) erubis (2.7.0) + excon (0.55.0) execjs (2.7.0) ffi (1.9.14) + figaro (1.1.1) + thor (~> 0.14) + fission (0.5.0) + CFPropertyList (~> 2.2) + fog (1.38.0) + fog-aliyun (>= 0.1.0) + fog-atmos + fog-aws (>= 0.6.0) + fog-brightbox (~> 0.4) + fog-cloudatcost (~> 0.1.0) + fog-core (~> 1.32) + fog-dynect (~> 0.0.2) + fog-ecloud (~> 0.1) + fog-google (<= 0.1.0) + fog-json + fog-local + fog-openstack + fog-powerdns (>= 0.1.1) + fog-profitbricks + fog-rackspace + fog-radosgw (>= 0.0.2) + fog-riakcs + fog-sakuracloud (>= 0.0.4) + fog-serverlove + fog-softlayer + fog-storm_on_demand + fog-terremark + fog-vmfusion + fog-voxel + fog-vsphere (>= 0.4.0) + fog-xenserver + fog-xml (~> 0.1.1) + ipaddress (~> 0.5) + fog-aliyun (0.1.0) + fog-core (~> 1.27) + fog-json (~> 1.0) + ipaddress (~> 0.8) + xml-simple (~> 1.1) + fog-atmos (0.1.0) + fog-core + fog-xml + fog-aws (1.2.0) + fog-core (~> 1.38) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-brightbox (0.11.0) + fog-core (~> 1.22) + fog-json + inflecto (~> 0.0.2) + fog-cloudatcost (0.1.2) + fog-core (~> 1.36) + fog-json (~> 1.0) + fog-xml (~> 0.1) + ipaddress (~> 0.8) + fog-core (1.43.0) + builder + excon (~> 0.49) + formatador (~> 0.2) + fog-dynect (0.0.3) + fog-core + fog-json + fog-xml + fog-ecloud (0.3.0) + fog-core + fog-xml + fog-google (0.1.0) + fog-core + fog-json + fog-xml + fog-json (1.0.2) + fog-core (~> 1.0) + multi_json (~> 1.10) + fog-local (0.3.1) + fog-core (~> 1.27) + fog-openstack (0.1.19) + fog-core (>= 1.40) + fog-json (>= 1.0) + ipaddress (>= 0.8) + fog-powerdns (0.1.1) + fog-core (~> 1.27) + fog-json (~> 1.0) + fog-xml (~> 0.1) + fog-profitbricks (3.0.0) + fog-core (~> 1.42) + fog-json (~> 1.0) + fog-rackspace (0.1.4) + fog-core (>= 1.35) + fog-json (>= 1.0) + fog-xml (>= 0.1) + ipaddress (>= 0.8) + fog-radosgw (0.0.5) + fog-core (>= 1.21.0) + fog-json + fog-xml (>= 0.0.1) + fog-riakcs (0.1.0) + fog-core + fog-json + fog-xml + fog-sakuracloud (1.7.5) + fog-core + fog-json + fog-serverlove (0.1.2) + fog-core + fog-json + fog-softlayer (1.1.4) + fog-core + fog-json + fog-storm_on_demand (0.1.1) + fog-core + fog-json + fog-terremark (0.1.0) + fog-core + fog-xml + fog-vmfusion (0.1.0) + fission + fog-core + fog-voxel (0.1.0) + fog-core + fog-xml + fog-vsphere (1.7.0) + fog-core + rbvmomi (~> 1.9) + fog-xenserver (0.2.3) + fog-core + fog-xml + fog-xml (0.1.2) + fog-core + nokogiri (~> 1.5, >= 1.5.11) + font-awesome-rails (4.7.0.1) + railties (>= 3.2, < 5.1) + formatador (0.2.5) globalid (0.3.7) activesupport (>= 4.1.0) i18n (0.7.0) + inflecto (0.0.2) + ipaddress (0.8.3) jbuilder (2.6.0) activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) @@ -63,6 +218,11 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + json (2.0.3) + launchy (2.4.3) + addressable (~> 2.3) + letter_opener (1.4.1) + launchy (~> 2.2) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) @@ -74,6 +234,7 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) + mini_magick (4.6.0) mini_portile2 (2.1.0) minitest (5.9.0) multi_json (1.12.1) @@ -81,7 +242,10 @@ GEM nokogiri (1.6.8) mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) + orm_adapter (0.5.0) + pg (0.19.0) pkg-config (1.1.7) + public_suffix (2.0.5) puma (3.6.0) rack (2.0.1) rack-test (0.6.3) @@ -113,6 +277,13 @@ GEM rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) + rbvmomi (1.9.4) + builder (~> 3.2) + json (>= 1.8) + nokogiri (~> 1.5) + trollop (~> 2.1) + responders (2.3.0) + railties (>= 4.2.0, < 5.1) sass (3.4.22) sass-rails (5.0.6) railties (>= 4.0.0, < 6) @@ -120,10 +291,9 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - spring (1.7.2) - spring-watcher-listen (2.0.0) - listen (>= 2.7, < 4.0) - spring (~> 1.2) + simple_form (3.3.1) + actionpack (> 4, < 5.1) + activemodel (> 4, < 5.1) sprockets (3.7.0) concurrent-ruby (~> 1.0) rack (> 1, < 3) @@ -135,6 +305,7 @@ GEM thor (0.19.1) thread_safe (0.3.5) tilt (2.0.5) + trollop (2.1.2) turbolinks (5.0.0) turbolinks-source (~> 5) turbolinks-source (5.0.0) @@ -142,6 +313,8 @@ GEM thread_safe (~> 0.1) uglifier (3.0.1) execjs (>= 0.3.0, < 3) + warden (1.2.6) + rack (>= 1.0) web-console (3.3.1) actionview (>= 5.0) activemodel (>= 5.0) @@ -150,21 +323,31 @@ GEM websocket-driver (0.6.4) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) + xml-simple (1.1.5) PLATFORMS ruby DEPENDENCIES + aasm + bootstrap-sass byebug + carrierwave coffee-rails (~> 4.2) + devise + figaro + fog + font-awesome-rails jbuilder (~> 2.5) jquery-rails + letter_opener listen (~> 3.0.5) + mini_magick + pg puma (~> 3.0) rails (~> 5.0.0) sass-rails (~> 5.0) - spring - spring-watcher-listen (~> 2.0.0) + simple_form sqlite3 turbolinks (~> 5) tzinfo-data @@ -172,4 +355,4 @@ DEPENDENCIES web-console BUNDLED WITH - 1.12.5 + 1.13.6 diff --git a/app/assets/javascripts/account/orders.coffee b/app/assets/javascripts/account/orders.coffee new file mode 100644 index 0000000000..24f83d18bb --- /dev/null +++ b/app/assets/javascripts/account/orders.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/admin/orders.coffee b/app/assets/javascripts/admin/orders.coffee new file mode 100644 index 0000000000..24f83d18bb --- /dev/null +++ b/app/assets/javascripts/admin/orders.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/admin/products.coffee b/app/assets/javascripts/admin/products.coffee new file mode 100644 index 0000000000..24f83d18bb --- /dev/null +++ b/app/assets/javascripts/admin/products.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b12018d099..82b53be1b4 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,3 +14,5 @@ //= require jquery_ujs //= require turbolinks //= require_tree . +//= require bootstrap/dropdown +//= require bootstrap/alert diff --git a/app/assets/javascripts/cart_items.coffee b/app/assets/javascripts/cart_items.coffee new file mode 100644 index 0000000000..24f83d18bb --- /dev/null +++ b/app/assets/javascripts/cart_items.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/carts.coffee b/app/assets/javascripts/carts.coffee new file mode 100644 index 0000000000..24f83d18bb --- /dev/null +++ b/app/assets/javascripts/carts.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/orders.coffee b/app/assets/javascripts/orders.coffee new file mode 100644 index 0000000000..24f83d18bb --- /dev/null +++ b/app/assets/javascripts/orders.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/products.coffee b/app/assets/javascripts/products.coffee new file mode 100644 index 0000000000..24f83d18bb --- /dev/null +++ b/app/assets/javascripts/products.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/welcome.coffee b/app/assets/javascripts/welcome.coffee new file mode 100644 index 0000000000..24f83d18bb --- /dev/null +++ b/app/assets/javascripts/welcome.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/account/orders.scss b/app/assets/stylesheets/account/orders.scss new file mode 100644 index 0000000000..53b61bacf9 --- /dev/null +++ b/app/assets/stylesheets/account/orders.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the account/orders controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/admin/orders.scss b/app/assets/stylesheets/admin/orders.scss new file mode 100644 index 0000000000..7ed90c7eac --- /dev/null +++ b/app/assets/stylesheets/admin/orders.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the admin::orders controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/admin/products.scss b/app/assets/stylesheets/admin/products.scss new file mode 100644 index 0000000000..da8969d19f --- /dev/null +++ b/app/assets/stylesheets/admin/products.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the admin::products controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.scss similarity index 54% rename from app/assets/stylesheets/application.css rename to app/assets/stylesheets/application.scss index 0ebd7fe829..a37b60bee4 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.scss @@ -13,3 +13,36 @@ *= require_tree . *= require_self */ + @import "bootstrap-sprockets"; + @import "bootstrap"; + @import "font-awesome"; + + + + .jumbotron { + background-image:url('http://www.godisreal.today/wp-content/uploads/2014/05/pictures-jesus-howard-lyon-fear-faith.jpg'); + background-repeat: no-repeat; + background-size: cover; + padding-bottom: 110px; + } + + .title { + font-family: "Georgia"; + text-align: center; + margin-top: 200px; + margin-bottom: 80px; + } + + .slogan { + margin-top: 10px; + margin-bottom: 50px; + text-align: center; + color: black; + top: 12px; + } + + .lead { + margin-bottom: 60px; + text-align: center; + color: white; + } diff --git a/app/assets/stylesheets/cart_items.scss b/app/assets/stylesheets/cart_items.scss new file mode 100644 index 0000000000..c8ba3800bd --- /dev/null +++ b/app/assets/stylesheets/cart_items.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the cart_items controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/carts.scss b/app/assets/stylesheets/carts.scss new file mode 100644 index 0000000000..62647c9dde --- /dev/null +++ b/app/assets/stylesheets/carts.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the carts controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/orders.scss b/app/assets/stylesheets/orders.scss new file mode 100644 index 0000000000..3b0428a94e --- /dev/null +++ b/app/assets/stylesheets/orders.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the orders controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/products.scss b/app/assets/stylesheets/products.scss new file mode 100644 index 0000000000..89e2e8db07 --- /dev/null +++ b/app/assets/stylesheets/products.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the products controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/welcome.scss b/app/assets/stylesheets/welcome.scss new file mode 100644 index 0000000000..77ce11a740 --- /dev/null +++ b/app/assets/stylesheets/welcome.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the welcome controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/account/orders_controller.rb b/app/controllers/account/orders_controller.rb new file mode 100644 index 0000000000..e183ba3ac3 --- /dev/null +++ b/app/controllers/account/orders_controller.rb @@ -0,0 +1,7 @@ +class Account::OrdersController < ApplicationController + before_action :authenticate_user! + + def index + @orders = current_user.orders.order("id DESC") + end +end diff --git a/app/controllers/admin/orders_controller.rb b/app/controllers/admin/orders_controller.rb new file mode 100644 index 0000000000..a010d21b33 --- /dev/null +++ b/app/controllers/admin/orders_controller.rb @@ -0,0 +1,41 @@ +class Admin::OrdersController < ApplicationController + layout "admin" + + before_action :authenticate_user! + before_action :admin_required + + def index + @orders = Order.order("id DESC") + end + + def show + @order = Order.find(params[:id]) + @product_lists = @order.product_lists + end + + def ship + @order = Order.find(params[:id]) + @order.ship! + OrderMailer.notify_ship(@order).deliver! + redirect_to :back + end + + def shipped + @order = Order.find(params[:id]) + @order.deliver! + redirect_to :back + end + + def cancel + @order = Order.find(params[:id]) + @order.cancell_order! + OrderMailer.notify_cancel(@order).deliver! + redirect_to :back + end + + def return + @order = Order.find(params[:id]) + @order.return_good! + redirect_to :back + end +end diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb new file mode 100644 index 0000000000..1857beceff --- /dev/null +++ b/app/controllers/admin/products_controller.rb @@ -0,0 +1,55 @@ +class Admin::ProductsController < ApplicationController + layout "admin" + before_action :authenticate_user! + before_action :admin_required + def index + @products = Product.all + end + + def new + @product = Product.new + end + + def create + @product = Product.new(product_params) + if @product.save + redirect_to admin_products_path + else + render :new + end + end + + def show + @product = Product.find(params[:id]) + end + + def edit + @product = Product.find(params[:id]) + end + + def update + @product = Product.find(params[:id]) + if @product.update(product_params) + redirect_to admin_products_path + else + render :edit + end + + end + + def destroy + @product = Product.find(params[:id]) + @product.destroy + redirect_to admin_products_path, alert: "Product Deleted!" + end + + + + private + + def product_params + params.require(:product).permit(:title, :description, :quantity, :price, :image) + end + + +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1c07694e9d..743e10f3c3 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,3 +1,27 @@ class ApplicationController < ActionController::Base protect_from_forgery with: :exception + + def admin_required + if !current_user.admin? + redirect_to "/", alert: "You are not admin!" + end + end + +helper_method :current_cart + + def current_cart + @current_cart ||= find_cart + end + + private + + def find_cart + cart = Cart.find_by(id: session[:cart_id]) + if cart.blank? + cart = Cart.create + end + session[:cart_id] = cart.id + return cart + end + end diff --git a/app/controllers/cart_items_controller.rb b/app/controllers/cart_items_controller.rb new file mode 100644 index 0000000000..98a347a0ff --- /dev/null +++ b/app/controllers/cart_items_controller.rb @@ -0,0 +1,30 @@ +class CartItemsController < ApplicationController + before_action :authenticate_user! + def destroy + @cart = current_cart + @cart_item = @cart.cart_items.find_by(product_id: params[:id]) + @product = @cart_item.product + @cart_item.destroy + + flash[:warning] = "成功将 #{@product.title} 从购物车删除!" + redirect_to :back + end + + def update + @cart = current_cart + @cart_item = @cart.cart_items.find_by(product_id: params[:id]) + if @cart_item.product.quantity >= cart_item_params[:quantity].to_i + @cart_item.update(cart_item_params) + flash[:notice] = "成功变更数量!" + else + flash[:warning] = "数量不足,无法加入购物车!" + end + redirect_to carts_path + end + + private + + def cart_item_params + params.require(:cart_item).permit(:quantity) + end +end diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb new file mode 100644 index 0000000000..2338fd0331 --- /dev/null +++ b/app/controllers/carts_controller.rb @@ -0,0 +1,10 @@ +class CartsController < ApplicationController + def clean + current_cart.clean! + flash[:warning] = " 已清空购物车!" + redirect_to carts_path + end + def checkout + @order = Order.new + end +end diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb new file mode 100644 index 0000000000..5f3b7d7676 --- /dev/null +++ b/app/controllers/orders_controller.rb @@ -0,0 +1,59 @@ +class OrdersController < ApplicationController + def create + @order = Order.new(order_params) + @order.user = current_user + @order.total = current_cart.total_price + + if @order.save + + current_cart.cart_items.each do |cart_item| + product_list = ProductList.new + product_list.order = @order + product_list.product_name = cart_item.product.title + product_list.product_price = cart_item.product.price + product_list.quantity = cart_item.quantity + product_list.save + end + + current_cart.clean! + OrderMailer.notify_order_placed(@order).deliver! + + redirect_to order_path(@order.token) + else + render 'carts/checkout' + end + end + + def show + @order = Order.find_by_token(params[:id]) + @product_lists = @order.product_lists + end + + def pay_with_alipay + @order = Order.find_by_token(params[:id]) + @order.set_payment_with!("alipay") + @order.make_payment! + redirect_to order_path(@order.token), notice: "使用支付宝完成付款" + end + + def pay_with_wechat + @order = Order.find_by_token(params[:id]) + @order.set_payment_with!("wechat") + @order.make_payment! + redirect_to order_path(@order.token), notice: "使用微信支付完成" + end + + def apply_to_cancel + @order = Order.find(params[:id]) + OrderMailer.apply_cancel(@order).deliver! + flash[:notice] = "已提交申请" + redirect_to :back + end + + private + + def order_params + params.require(:order).permit(:billing_name, :billing_address, :shipping_name, :shipping_address) + end + +end diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb new file mode 100644 index 0000000000..24bf138008 --- /dev/null +++ b/app/controllers/products_controller.rb @@ -0,0 +1,21 @@ +class ProductsController < ApplicationController + def index + @products = Product.all + end + + def show + @product = Product.find(params[:id]) + end + + def add_to_cart + @product = Product.find(params[:id]) + if !current_cart.products.include?(@product) + current_cart.add_product_to_cart(@product) + flash[:notice] = "成功加入购物车!" + else + flash[:warning] = "购物车内已有该物品!" + end + redirect_to :back + end + +end diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb new file mode 100644 index 0000000000..b77e60cb68 --- /dev/null +++ b/app/controllers/welcome_controller.rb @@ -0,0 +1,5 @@ +class WelcomeController < ApplicationController + def index + flash[:notice] = "欢迎光临!" + end +end diff --git a/app/helpers/account/orders_helper.rb b/app/helpers/account/orders_helper.rb new file mode 100644 index 0000000000..6f690c4e84 --- /dev/null +++ b/app/helpers/account/orders_helper.rb @@ -0,0 +1,2 @@ +module Account::OrdersHelper +end diff --git a/app/helpers/admin/orders_helper.rb b/app/helpers/admin/orders_helper.rb new file mode 100644 index 0000000000..def15c5e39 --- /dev/null +++ b/app/helpers/admin/orders_helper.rb @@ -0,0 +1,9 @@ +module Admin::OrdersHelper + def render_order_paid_state(order) + if order.is_paid? + "已付款" + else + "未付款" + end + end +end diff --git a/app/helpers/admin/products_helper.rb b/app/helpers/admin/products_helper.rb new file mode 100644 index 0000000000..977a242f66 --- /dev/null +++ b/app/helpers/admin/products_helper.rb @@ -0,0 +1,2 @@ +module Admin::ProductsHelper +end diff --git a/app/helpers/cart_items_helper.rb b/app/helpers/cart_items_helper.rb new file mode 100644 index 0000000000..f30f6834fd --- /dev/null +++ b/app/helpers/cart_items_helper.rb @@ -0,0 +1,2 @@ +module CartItemsHelper +end diff --git a/app/helpers/carts_helper.rb b/app/helpers/carts_helper.rb new file mode 100644 index 0000000000..e307f24fa7 --- /dev/null +++ b/app/helpers/carts_helper.rb @@ -0,0 +1,5 @@ +module CartsHelper + def render_cart_total_price(cart) + cart.total_price + end +end diff --git a/app/helpers/flashes_helper.rb b/app/helpers/flashes_helper.rb new file mode 100644 index 0000000000..fa5ceef238 --- /dev/null +++ b/app/helpers/flashes_helper.rb @@ -0,0 +1,11 @@ +module FlashesHelper + FLASH_CLASSES = { alert: "danger", notice: "success", warning: "warning"}.freeze + + def flash_class(key) + FLASH_CLASSES.fetch key.to_sym, key + end + + def user_facing_flashes + flash.to_hash.slice "alert", "notice", "warning" + end +end diff --git a/app/helpers/orders_helper.rb b/app/helpers/orders_helper.rb new file mode 100644 index 0000000000..443227fd48 --- /dev/null +++ b/app/helpers/orders_helper.rb @@ -0,0 +1,2 @@ +module OrdersHelper +end diff --git a/app/helpers/products_helper.rb b/app/helpers/products_helper.rb new file mode 100644 index 0000000000..ab5c42b325 --- /dev/null +++ b/app/helpers/products_helper.rb @@ -0,0 +1,2 @@ +module ProductsHelper +end diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb new file mode 100644 index 0000000000..eeead45fc9 --- /dev/null +++ b/app/helpers/welcome_helper.rb @@ -0,0 +1,2 @@ +module WelcomeHelper +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index 286b2239d1..68e638ccbc 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,4 +1,4 @@ class ApplicationMailer < ActionMailer::Base - default from: 'from@example.com' - layout 'mailer' + default from: "service@jdstore.com" + layout 'mailer' end diff --git a/app/mailers/order_mailer.rb b/app/mailers/order_mailer.rb new file mode 100644 index 0000000000..7a5dddc762 --- /dev/null +++ b/app/mailers/order_mailer.rb @@ -0,0 +1,33 @@ +class OrderMailer < ApplicationMailer + def notify_order_placed(order) + @order = order + @user = order.user + @product_lists = @order.product_lists + + mail(to: @user.email , subject: "[JDstore] 感谢您完成本次的下单,以下是您这次购物明细 #{order.token}") + end + + def apply_cancel(order) + @order = order + @user = order.user + @product_lists = @order.product_lists + + mail(to: "328458211@qq.com" , subject: "[JDStore] 用户#{order.user.email}申请取消订单 #{order.token}") + end + + def notify_ship(order) + @order = order + @user = order.user + @product_lists = @order.product_lists + + mail(to: @user.email, subject: "[JDStore] 您的订单 #{order.token}已发货") + end + + def notify_cancel(order) + @order = order + @user = order.user + @product_lists = @order.product_lists + + mail(to: @user.email, subject: "[JDStore] 您的订单 #{order.token}已取消") + end +end diff --git a/app/models/cart.rb b/app/models/cart.rb new file mode 100644 index 0000000000..bd969e4c89 --- /dev/null +++ b/app/models/cart.rb @@ -0,0 +1,26 @@ +class Cart < ApplicationRecord + has_many :cart_items + has_many :products, through: :cart_items, source: :product + + def add_product_to_cart(product) + ci = cart_items.build + ci.product = product + ci.quantity = 1 + ci.save + end + + def total_price + sum = 0 + cart_items.each do |cart_item| + if cart_item.product.price.present? + sum += cart_item.quantity * cart_item.product.price + end + end + sum + end + + def clean! + cart_items.destroy_all + end + +end diff --git a/app/models/cart_item.rb b/app/models/cart_item.rb new file mode 100644 index 0000000000..23b07149b0 --- /dev/null +++ b/app/models/cart_item.rb @@ -0,0 +1,4 @@ +class CartItem < ApplicationRecord + belongs_to :cart + belongs_to :product +end diff --git a/app/models/order.rb b/app/models/order.rb new file mode 100644 index 0000000000..d05b0f58c3 --- /dev/null +++ b/app/models/order.rb @@ -0,0 +1,56 @@ +class Order < ApplicationRecord + before_create :generate_token + + def generate_token + self.token = SecureRandom.uuid + end + + belongs_to :user + has_many :product_lists + + validates :billing_name, presence: true + validates :billing_address, presence: true + validates :shipping_name, presence: true + validates :shipping_address, presence: true + + def set_payment_with!(method) + self.update_columns(payment_method: method) + end + + def pay! + self.update_columns(is_paid: true) + end + + + include AASM + + aasm do + state :order_placed, initial: true + state :paid + state :shipping + state :shipped + state :order_cancelled + state :good_returned + + + event :make_payment, after_commit: :pay! do + transitions from: :order_placed, to: :paid + end + + event :ship do + transitions from: :paid, to: :shipping + end + + event :deliver do + transitions from: :shipping, to: :shipped + end + + event :return_good do + transitions from: :shipped, to: :good_returned + end + + event :cancell_order do + transitions from: [:order_placed, :paid], to: :order_cancelled + end + end +end diff --git a/app/models/product.rb b/app/models/product.rb new file mode 100644 index 0000000000..f522db6c6d --- /dev/null +++ b/app/models/product.rb @@ -0,0 +1,3 @@ +class Product < ApplicationRecord + mount_uploader :image, ImageUploader +end diff --git a/app/models/product_list.rb b/app/models/product_list.rb new file mode 100644 index 0000000000..0eef1fc9dd --- /dev/null +++ b/app/models/product_list.rb @@ -0,0 +1,3 @@ +class ProductList < ApplicationRecord + belongs_to :order +end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000000..1176c5d0e7 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,10 @@ +class User < ApplicationRecord + # Include default devise modules. Others available are: + # :confirmable, :lockable, :timeoutable and :omniauthable + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :trackable, :validatable + def admin? + is_admin + end + has_many :orders +end diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb new file mode 100644 index 0000000000..6ea1973d54 --- /dev/null +++ b/app/uploaders/image_uploader.rb @@ -0,0 +1,60 @@ +class ImageUploader < CarrierWave::Uploader::Base + + # Include RMagick or MiniMagick support: + # include CarrierWave::RMagick + include CarrierWave::MiniMagick + + # Choose what kind of storage to use for this uploader: + storage :file + # storage :fog + + # Override the directory where uploaded files will be stored. + # This is a sensible default for uploaders that are meant to be mounted: + def store_dir + "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}" + end + + process resize_to_fit: [800, 800] + + version :thumb do + process resize_to_fill: [200, 200] + end + + version :medium do + process resize_to_fill: [400, 400] + end + + + # Provide a default URL as a default if there hasn't been a file uploaded: + # def default_url + # # For Rails 3.1+ asset pipeline compatibility: + # # ActionController::Base.helpers.asset_path("fallback/" + [version_name, "default.png"].compact.join('_')) + # + # "/images/fallback/" + [version_name, "default.png"].compact.join('_') + # end + + # Process files as they are uploaded: + # process scale: [200, 300] + # + # def scale(width, height) + # # do something + # end + + # Create different versions of your uploaded files: + # version :thumb do + # process resize_to_fit: [50, 50] + # end + + # Add a white list of extensions which are allowed to be uploaded. + # For images you might use something like this: + # def extension_whitelist + # %w(jpg jpeg gif png) + # end + + # Override the filename of the uploaded files: + # Avoid using model.id or version_name here, see uploader/store.rb for details. + # def filename + # "something.jpg" if original_filename + # end + +end diff --git a/app/views/account/orders/index.html.erb b/app/views/account/orders/index.html.erb new file mode 100644 index 0000000000..9df41c73b4 --- /dev/null +++ b/app/views/account/orders/index.html.erb @@ -0,0 +1,21 @@ +

订单列表

+ + + + + + + + + + + + <% @orders.each do |order| %> + + + + + <% end %> + + +
#生成时间
<%= link_to(order.id, order_path(order.token)) %> <%= order.created_at.to_s(:long) %>
diff --git a/app/views/admin/orders/_state_option.html.erb b/app/views/admin/orders/_state_option.html.erb new file mode 100644 index 0000000000..b829d19cf5 --- /dev/null +++ b/app/views/admin/orders/_state_option.html.erb @@ -0,0 +1,35 @@ +
+ + <% case order.aasm_state %> + <% when "order_placed" %> + <%= link_to("取消订单", + cancel_admin_order_path(order), + class: "btn btn-default btn-sm", method: :post) %> + + <% when "paid" %> + <%= link_to("取消订单", + cancel_admin_order_path(order), + class: "btn btn-default btn-sm", method: :post) %> + <%= link_to("出货", + ship_admin_order_path(order), + class: "btn btn-default btn-sm", method: :post) %> + + <% when "shipping" %> + <%= link_to("设为已出货", + shipped_admin_order_path(order), + class: "btn btn-default btn-sm", method: :post) %> + + <% when "shipped" %> + <%= link_to("退货", + return_admin_order_path(order), + class: "btn btn-default btn-sm", method: :post) %> + + <% when "order_cancelled" %> + 订单已取消 + + <% when "good_returned" %> + 已退货 + + <% end %> + +
diff --git a/app/views/admin/orders/index.html.erb b/app/views/admin/orders/index.html.erb new file mode 100644 index 0000000000..6079cafd33 --- /dev/null +++ b/app/views/admin/orders/index.html.erb @@ -0,0 +1,23 @@ +

订单列表

+ + + + + + + + + + + + <% @orders.each do |order| %> + + + + + + + <% end %> + + +
#生成时间订购者订单状态
<%= link_to(order.id, admin_order_path(order) ) %> <%= order.created_at.to_s(:long) %> <%= order.user.email %> <%= order.aasm_state %>
diff --git a/app/views/admin/orders/show.html.erb b/app/views/admin/orders/show.html.erb new file mode 100644 index 0000000000..0a101d7bc2 --- /dev/null +++ b/app/views/admin/orders/show.html.erb @@ -0,0 +1,70 @@ +
+
+ +

订单明细 (<%= render_order_paid_state(@order) %>)

+ + <%= render "admin/orders/state_option", order: @order %> + + + + + + + + + + + <% @product_lists.each do |product_list| %> + + + + + + <% end %> + + +
商品明细单价数量
+ <%= product_list.product_name %> + + <%= product_list.product_price %> + + <%= product_list.quantity %> +
+ +
+ + 总计 <%= @order.total %> CNY + +
+ +
+ +

寄送资讯

+ + + + + + + + + + + + + + + + +
+ 订购人 +
+ <%= @order.billing_name %> - <%= @order.billing_address %> +
+ 收件人 +
+ <%= @order.shipping_name %> - <%= @order.shipping_address %> +
+ +
+
diff --git a/app/views/admin/products/_form.html.erb b/app/views/admin/products/_form.html.erb new file mode 100644 index 0000000000..60ad06d30a --- /dev/null +++ b/app/views/admin/products/_form.html.erb @@ -0,0 +1,25 @@ +<%= simple_form_for [:admin, @product] do |f| %> + +
+ <%= f.input :title %> +
+ +
+ <%= f.input :description %> +
+ +
+ <%= f.input :quantity %> +
+ +
+ <%= f.input :price %> +
+ +
+ <%= f.input :image, as: :file %> +
+ + <%= f.submit "Submit", data: { disable_with: "Submiting..." } %> + +<% end %> diff --git a/app/views/admin/products/edit.html.erb b/app/views/admin/products/edit.html.erb new file mode 100644 index 0000000000..5e1cf905db --- /dev/null +++ b/app/views/admin/products/edit.html.erb @@ -0,0 +1,8 @@ +
+

Edit Product

+ +
+ + <%= render "form" %> + +
diff --git a/app/views/admin/products/index.html.erb b/app/views/admin/products/index.html.erb new file mode 100644 index 0000000000..962475f160 --- /dev/null +++ b/app/views/admin/products/index.html.erb @@ -0,0 +1,43 @@ +

Product List

+
+ <%= link_to("新增产品", new_admin_product_path, class: "btn btn-primary btn-sm") %> +
+ + + + + + + + + + + + <% @products.each do |product| %> + + + + + + + + <% end %> + +
#Product PicNamePrice Options
+ <%= product.id %> + + <%= link_to product_path(product) do %> + <% if product.image.present? %> + <%= image_tag(product.image.thumb.url, class: "thumbnail") %> + <% else %> + <%= image_tag("http://placehold.it/200x200&text=No Pic", class: "thumbnail") %> + <% end %> + <% end %> + + <%= product.title %> + + <%= product.price %> + + |<%= link_to("Edit", edit_admin_product_path(product)) %> | + |<%= link_to("Destroy", admin_product_path(product),:data => { :confirm => "Are you sure?" }) %>| +
diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb new file mode 100644 index 0000000000..3db2cabc00 --- /dev/null +++ b/app/views/admin/products/new.html.erb @@ -0,0 +1,8 @@ +
+

New Product

+ +
+ + <%= render "form" %> + +
diff --git a/app/views/admin/products/show.html.erb b/app/views/admin/products/show.html.erb new file mode 100644 index 0000000000..2eb6742873 --- /dev/null +++ b/app/views/admin/products/show.html.erb @@ -0,0 +1,15 @@ +
+ +
+ <%= link_to("Destroy", admin_product_path(@product), :method => :delete, :class => "btn btn btn-danger pull-right", :data => { :confirm => "Are you sure?" }) %> +
+ +
+ <%= link_to("Edit", edit_admin_product_path(@product), class: "btn btn-primary pull-right")%> +
+ +

<%= @product.title %>

+

<%= @product.description %>

+

<%= @product.quantity %>

+

<%= @product.price %>

+
diff --git a/app/views/carts/checkout.html.erb b/app/views/carts/checkout.html.erb new file mode 100644 index 0000000000..f249bf2a1a --- /dev/null +++ b/app/views/carts/checkout.html.erb @@ -0,0 +1,75 @@ +
+
+ +

购物明细

+ + + + + + + + + + + + <% current_cart.cart_items.each do |cart_item| %> + + + + + + + + <% end %> + + +
商品明细单价数量
+ <%= link_to(cart_item.product.title, product_path(cart_item.product)) %> + + <%= cart_item.product.price %> + + <%= cart_item.quantity %> +
+ +
+ + 总计 <%= render_cart_total_price(current_cart) %> CNY + +
+ +
+ +

订单资讯

+ +
+ + <%= simple_form_for @order do |f| %> + + + + 订购人 +
+ <%= f.input :billing_name %> +
+
+ <%= f.input :billing_address %> +
+ + 收货人 +
+ <%= f.input :shipping_name %> +
+
+ <%= f.input :shipping_address %> +
+ +
+ <%= f.submit "生成订单", class: "btn btn-lg btn-danger pull-right", + data: { disable_with: "Submitting..." } %> +
+ <% end %> + +
+
+
diff --git a/app/views/carts/index.html.erb b/app/views/carts/index.html.erb new file mode 100644 index 0000000000..50f9fa4bcf --- /dev/null +++ b/app/views/carts/index.html.erb @@ -0,0 +1,70 @@ +
+
+ + <%= link_to("清空购物车", clean_carts_path ,method: :delete , class: "pull-right", style: "text-decoration: underline;", data: { confirm: "你确定要清空整个购物车吗?"} )%> + +

购物车

+ + + + + + + + + + + + + <% current_cart.cart_items.each do |cart_item| %> + + + + + + + + + <% end %> + + +
商品资讯单价数量操作
+ <%= link_to product_path(cart_item.product) do %> + <% if cart_item.product.image.present? %> + <%= image_tag(cart_item.product.image.thumb.url, class: "thumbnail") %> + <% else %> + <%= image_tag("http://placehold.it/200x200&text=No Pic", class: "thumbnail") %> + <% end %> + <% end %> + + <%= link_to(cart_item.product.title, product_path(cart_item.product)) %> + + <%= cart_item.product.price %> + + <%= form_for cart_item, url: cart_item_path(cart_item.product_id) do |f| %> + <%= f.select :quantity, 1..cart_item.product.quantity %> + <%= f.submit "更新", data: { disable_with: "Submiting..." } %> + <% end %> + + <%= link_to cart_item_path(cart_item.product_id), method: :delete do %> + + <% end %> +
+ +
+ +
+ + + 总计 <%= render_cart_total_price(current_cart) %> RMB + + +
+ +
+ +
+ <%= link_to("确认结账", checkout_carts_path, method: :post, class: "btn btn-lg btn-danger pull-right") %> +
+
+
diff --git a/app/views/common/_flashes.html.erb b/app/views/common/_flashes.html.erb new file mode 100644 index 0000000000..3c00341228 --- /dev/null +++ b/app/views/common/_flashes.html.erb @@ -0,0 +1,8 @@ +<% if flash.any? %> + <% user_facing_flashes.each do |key, value| %> +
+ + <%= value %> +
+ <% end %> +<% end %> diff --git a/app/views/common/_footer.html.erb b/app/views/common/_footer.html.erb new file mode 100644 index 0000000000..32296995ed --- /dev/null +++ b/app/views/common/_footer.html.erb @@ -0,0 +1,8 @@ + diff --git a/app/views/common/_navbar.html.erb b/app/views/common/_navbar.html.erb new file mode 100644 index 0000000000..795184a852 --- /dev/null +++ b/app/views/common/_navbar.html.erb @@ -0,0 +1,58 @@ + + diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb new file mode 100644 index 0000000000..478b0e2127 --- /dev/null +++ b/app/views/layouts/admin.html.erb @@ -0,0 +1,25 @@ + + + + JDstore 后台 + <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> + <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> + <%= csrf_meta_tags %> + + +
+ <%= render "common/navbar" %> +
+
+ +
+
+ <%= yield %> +
+
+
+ + diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9af1008a35..489fce51cd 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,7 +1,7 @@ - Jdstore + Jdstore tag <%= csrf_meta_tags %> <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> @@ -9,6 +9,11 @@ - <%= yield %> +
+ <%= render "common/navbar" %> + <%= render "common/flashes" %> + <%= yield %> +
+ <%= render "common/footer" %> diff --git a/app/views/order_mailer/apply_cancel.html.erb b/app/views/order_mailer/apply_cancel.html.erb new file mode 100644 index 0000000000..f706a80b7c --- /dev/null +++ b/app/views/order_mailer/apply_cancel.html.erb @@ -0,0 +1,71 @@ +
+
+

+ 订单明细
+ + <%= link_to("订单连结", order_url(@order.token)) %> + +

+ + + + + + + + + + + + <% @product_lists.each do |product_list| %> + + + + + + + <% end %> + + +
商品明细单价数量小记
+ <%= product_list.product_name %> + + <%= product_list.product_price %> + + <%= product_list.quantity %> + + <%= product_list.quantity * product_list.product_price %> +
+ +
+

+ 总计 <%= @order.total %> CNY +

+
+ +
+ +

寄送资讯

+ + + + + + + + + + + + + + + + +
订购人
+ <%= @order.billing_name %> - <%= @order.billing_address %> +
收件者
+ <%= @order.shipping_name %> - <%= @order.shipping_address %> +
+
+
diff --git a/app/views/order_mailer/notify_cancel.html.erb b/app/views/order_mailer/notify_cancel.html.erb new file mode 100644 index 0000000000..f706a80b7c --- /dev/null +++ b/app/views/order_mailer/notify_cancel.html.erb @@ -0,0 +1,71 @@ +
+
+

+ 订单明细
+ + <%= link_to("订单连结", order_url(@order.token)) %> + +

+ + + + + + + + + + + + <% @product_lists.each do |product_list| %> + + + + + + + <% end %> + + +
商品明细单价数量小记
+ <%= product_list.product_name %> + + <%= product_list.product_price %> + + <%= product_list.quantity %> + + <%= product_list.quantity * product_list.product_price %> +
+ +
+

+ 总计 <%= @order.total %> CNY +

+
+ +
+ +

寄送资讯

+ + + + + + + + + + + + + + + + +
订购人
+ <%= @order.billing_name %> - <%= @order.billing_address %> +
收件者
+ <%= @order.shipping_name %> - <%= @order.shipping_address %> +
+
+
diff --git a/app/views/order_mailer/notify_order_placed.html.erb b/app/views/order_mailer/notify_order_placed.html.erb new file mode 100644 index 0000000000..f706a80b7c --- /dev/null +++ b/app/views/order_mailer/notify_order_placed.html.erb @@ -0,0 +1,71 @@ +
+
+

+ 订单明细
+ + <%= link_to("订单连结", order_url(@order.token)) %> + +

+ + + + + + + + + + + + <% @product_lists.each do |product_list| %> + + + + + + + <% end %> + + +
商品明细单价数量小记
+ <%= product_list.product_name %> + + <%= product_list.product_price %> + + <%= product_list.quantity %> + + <%= product_list.quantity * product_list.product_price %> +
+ +
+

+ 总计 <%= @order.total %> CNY +

+
+ +
+ +

寄送资讯

+ + + + + + + + + + + + + + + + +
订购人
+ <%= @order.billing_name %> - <%= @order.billing_address %> +
收件者
+ <%= @order.shipping_name %> - <%= @order.shipping_address %> +
+
+
diff --git a/app/views/order_mailer/notify_ship.html.erb b/app/views/order_mailer/notify_ship.html.erb new file mode 100644 index 0000000000..f706a80b7c --- /dev/null +++ b/app/views/order_mailer/notify_ship.html.erb @@ -0,0 +1,71 @@ +
+
+

+ 订单明细
+ + <%= link_to("订单连结", order_url(@order.token)) %> + +

+ + + + + + + + + + + + <% @product_lists.each do |product_list| %> + + + + + + + <% end %> + + +
商品明细单价数量小记
+ <%= product_list.product_name %> + + <%= product_list.product_price %> + + <%= product_list.quantity %> + + <%= product_list.quantity * product_list.product_price %> +
+ +
+

+ 总计 <%= @order.total %> CNY +

+
+ +
+ +

寄送资讯

+ + + + + + + + + + + + + + + + +
订购人
+ <%= @order.billing_name %> - <%= @order.billing_address %> +
收件者
+ <%= @order.shipping_name %> - <%= @order.shipping_address %> +
+
+
diff --git a/app/views/orders/show.html.erb b/app/views/orders/show.html.erb new file mode 100644 index 0000000000..a32ab90350 --- /dev/null +++ b/app/views/orders/show.html.erb @@ -0,0 +1,81 @@ +
+
+ +

订单明细

+ + + + + + + + + + + <% @product_lists.each do |product_list| %> + + + + + <% end %> + + +
商品明细单价
+ <%= product_list.product_name %> + + <%= product_list.product_price %> +
+ +
+ + 总计 <%= @order.total %> CNY + +
+ +
+ +

寄送资讯

+ + + + + + + + + + + + + + + + +
+ 订购人 +
+ <%= @order.billing_name %> - <%= @order.billing_address %> +
+ 收件人 +
+ <%= @order.shipping_name %> - <%= @order.shipping_address %> +
+ +
+ <% if @order.order_placed? || @order.paid? %> + <%= link_to("申请取消订单", apply_to_cancel_order_path(@order), method: :post, class: "btn btn-info") %> + <% end %> +
+ + + <% if !@order.is_paid? %> +
+ <%= link_to("以支付宝支付", pay_with_alipay_order_path(@order.token), :method => :post, :class => "btn btn-danger") %> + <%= link_to("以微信支付", pay_with_wechat_order_path(@order.token), :method => :post, :class => "btn btn-danger") %> +
+ <% else %> +

此订单已完成付款

+ <% end %> + +
+
diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb new file mode 100644 index 0000000000..0bb28a1f8e --- /dev/null +++ b/app/views/products/index.html.erb @@ -0,0 +1,27 @@ +
+

We Are Different

+

+
+ We are a new stratum. +
+ +

+

Come On

+
+ + + +
+ <% @products.each do |product| %> +
+ <%= link_to product_path(product) do %> + <% if product.image.present? %> + <%= image_tag(product.image.thumb.url, class: "thumbnail") %> + <% else %> + <%= image_tag("http://placehold.it/200x200&text=No Pic", class: "thumbnail") %> + <% end %> + <% end %> + <%= product.title %> ¥ <%= product.price %> +
+ <% end %> +
diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb new file mode 100644 index 0000000000..2f7d16b599 --- /dev/null +++ b/app/views/products/show.html.erb @@ -0,0 +1,27 @@ +
+
+ <% if @product.image.present? %> + <%= image_tag(@product.image.medium.url, class: "thumbnail") %> + <% else %> + <%= image_tag("http://placehold.it/400x400&text=No Pic", class: "thumbnail") %> + <% end %> +
+
+

<%= @product.title %>

+
+

+ <%= @product.description %> +

+
+
数量 : <%= @product.quantity %>
+
¥ <%= @product.price %>
+
+ <% if @product.quantity.present? && @product.quantity > 0 %> + <%= link_to("加入购物车", add_to_cart_product_path(@product), :method => :post , :class => "btn btn-primary btn-lg btn-danger") %> + <% else %> + 已经销售一空,无法购买! + <% end %> + +
+
+
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb new file mode 100644 index 0000000000..de44ea01fc --- /dev/null +++ b/app/views/welcome/index.html.erb @@ -0,0 +1 @@ +

Hello JDstore

diff --git a/config/application.yml.example b/config/application.yml.example new file mode 100644 index 0000000000..1b24013dd9 --- /dev/null +++ b/config/application.yml.example @@ -0,0 +1,11 @@ +# Add configuration values here, as shown below. +# +# pusher_app_id: "2954" +# pusher_key: 7381a978f7dd7f9a1117 +# pusher_secret: abdc3b896a0ffb85d373 +# stripe_api_key: sk_test_2J0l093xOyW72XUYJHE4Dv2r +# stripe_publishable_key: pk_test_ro9jV5SNwGb1yYlQfzG17LHK +# +# production: +# stripe_api_key: sk_live_EeHnL644i6zo4Iyq4v1KdV9H +# stripe_publishable_key: pk_live_9lcthxpSIHbGwmdO941O1XVU diff --git a/config/environments/development.rb b/config/environments/development.rb index 6f7197045a..bd01581c94 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -51,4 +51,7 @@ # Use an evented file watcher to asynchronously detect changes in source code, # routes, locales, etc. This feature depends on the listen gem. config.file_watcher = ActiveSupport::EventedFileUpdateChecker + + config.action_mailer.default_url_options = { host: 'localhost:3000' } + config.action_mailer.delivery_method = :letter_opener end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb new file mode 100644 index 0000000000..53345199dd --- /dev/null +++ b/config/initializers/devise.rb @@ -0,0 +1,274 @@ +# Use this hook to configure devise mailer, warden hooks and so forth. +# Many of these configuration options can be set straight in your model. +Devise.setup do |config| + # The secret key used by Devise. Devise uses this key to generate + # random tokens. Changing this key will render invalid all existing + # confirmation, reset password and unlock tokens in the database. + # Devise will use the `secret_key_base` as its `secret_key` + # by default. You can change it below and use your own secret key. + # config.secret_key = '9013eeefee05731048621a455a7809d7f8f5bf143fbd794b2940685f30d1069aa377e5c19a6277cc7d153ebb6b3c179389679442abc05badb85ee79661f79a5e' + + # ==> Mailer Configuration + # Configure the e-mail address which will be shown in Devise::Mailer, + # note that it will be overwritten if you use your own mailer class + # with default "from" parameter. + config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' + + # Configure the class responsible to send e-mails. + # config.mailer = 'Devise::Mailer' + + # Configure the parent class responsible to send e-mails. + # config.parent_mailer = 'ActionMailer::Base' + + # ==> ORM configuration + # Load and configure the ORM. Supports :active_record (default) and + # :mongoid (bson_ext recommended) by default. Other ORMs may be + # available as additional gems. + require 'devise/orm/active_record' + + # ==> Configuration for any authentication mechanism + # Configure which keys are used when authenticating a user. The default is + # just :email. You can configure it to use [:username, :subdomain], so for + # authenticating a user, both parameters are required. Remember that those + # parameters are used only when authenticating and not when retrieving from + # session. If you need permissions, you should implement that in a before filter. + # You can also supply a hash where the value is a boolean determining whether + # or not authentication should be aborted when the value is not present. + # config.authentication_keys = [:email] + + # Configure parameters from the request object used for authentication. Each entry + # given should be a request method and it will automatically be passed to the + # find_for_authentication method and considered in your model lookup. For instance, + # if you set :request_keys to [:subdomain], :subdomain will be used on authentication. + # The same considerations mentioned for authentication_keys also apply to request_keys. + # config.request_keys = [] + + # Configure which authentication keys should be case-insensitive. + # These keys will be downcased upon creating or modifying a user and when used + # to authenticate or find a user. Default is :email. + config.case_insensitive_keys = [:email] + + # Configure which authentication keys should have whitespace stripped. + # These keys will have whitespace before and after removed upon creating or + # modifying a user and when used to authenticate or find a user. Default is :email. + config.strip_whitespace_keys = [:email] + + # Tell if authentication through request.params is enabled. True by default. + # It can be set to an array that will enable params authentication only for the + # given strategies, for example, `config.params_authenticatable = [:database]` will + # enable it only for database (email + password) authentication. + # config.params_authenticatable = true + + # Tell if authentication through HTTP Auth is enabled. False by default. + # It can be set to an array that will enable http authentication only for the + # given strategies, for example, `config.http_authenticatable = [:database]` will + # enable it only for database authentication. The supported strategies are: + # :database = Support basic authentication with authentication key + password + # config.http_authenticatable = false + + # If 401 status code should be returned for AJAX requests. True by default. + # config.http_authenticatable_on_xhr = true + + # The realm used in Http Basic Authentication. 'Application' by default. + # config.http_authentication_realm = 'Application' + + # It will change confirmation, password recovery and other workflows + # to behave the same regardless if the e-mail provided was right or wrong. + # Does not affect registerable. + # config.paranoid = true + + # By default Devise will store the user in session. You can skip storage for + # particular strategies by setting this option. + # Notice that if you are skipping storage for all authentication paths, you + # may want to disable generating routes to Devise's sessions controller by + # passing skip: :sessions to `devise_for` in your config/routes.rb + config.skip_session_storage = [:http_auth] + + # By default, Devise cleans up the CSRF token on authentication to + # avoid CSRF token fixation attacks. This means that, when using AJAX + # requests for sign in and sign up, you need to get a new CSRF token + # from the server. You can disable this option at your own risk. + # config.clean_up_csrf_token_on_authentication = true + + # When false, Devise will not attempt to reload routes on eager load. + # This can reduce the time taken to boot the app but if your application + # requires the Devise mappings to be loaded during boot time the application + # won't boot properly. + # config.reload_routes = true + + # ==> Configuration for :database_authenticatable + # For bcrypt, this is the cost for hashing the password and defaults to 11. If + # using other algorithms, it sets how many times you want the password to be hashed. + # + # Limiting the stretches to just one in testing will increase the performance of + # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use + # a value less than 10 in other environments. Note that, for bcrypt (the default + # algorithm), the cost increases exponentially with the number of stretches (e.g. + # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation). + config.stretches = Rails.env.test? ? 1 : 11 + + # Set up a pepper to generate the hashed password. + # config.pepper = 'd9453757bed0607391ef681ae537379df5e6ea6cbe1b90e76188cbb65b8df3a20827233caf928b91bce95aedb154f188193cd7dc9ba4ebe675793674fd1b0e3b' + + # Send a notification email when the user's password is changed + # config.send_password_change_notification = false + + # ==> Configuration for :confirmable + # A period that the user is allowed to access the website even without + # confirming their account. For instance, if set to 2.days, the user will be + # able to access the website for two days without confirming their account, + # access will be blocked just in the third day. Default is 0.days, meaning + # the user cannot access the website without confirming their account. + # config.allow_unconfirmed_access_for = 2.days + + # A period that the user is allowed to confirm their account before their + # token becomes invalid. For example, if set to 3.days, the user can confirm + # their account within 3 days after the mail was sent, but on the fourth day + # their account can't be confirmed with the token any more. + # Default is nil, meaning there is no restriction on how long a user can take + # before confirming their account. + # config.confirm_within = 3.days + + # If true, requires any email changes to be confirmed (exactly the same way as + # initial account confirmation) to be applied. Requires additional unconfirmed_email + # db field (see migrations). Until confirmed, new email is stored in + # unconfirmed_email column, and copied to email column on successful confirmation. + config.reconfirmable = true + + # Defines which key will be used when confirming an account + # config.confirmation_keys = [:email] + + # ==> Configuration for :rememberable + # The time the user will be remembered without asking for credentials again. + # config.remember_for = 2.weeks + + # Invalidates all the remember me tokens when the user signs out. + config.expire_all_remember_me_on_sign_out = true + + # If true, extends the user's remember period when remembered via cookie. + # config.extend_remember_period = false + + # Options to be passed to the created cookie. For instance, you can set + # secure: true in order to force SSL only cookies. + # config.rememberable_options = {} + + # ==> Configuration for :validatable + # Range for password length. + config.password_length = 6..128 + + # Email regex used to validate email formats. It simply asserts that + # one (and only one) @ exists in the given string. This is mainly + # to give user feedback and not to assert the e-mail validity. + config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ + + # ==> Configuration for :timeoutable + # The time you want to timeout the user session without activity. After this + # time the user will be asked for credentials again. Default is 30 minutes. + # config.timeout_in = 30.minutes + + # ==> Configuration for :lockable + # Defines which strategy will be used to lock an account. + # :failed_attempts = Locks an account after a number of failed attempts to sign in. + # :none = No lock strategy. You should handle locking by yourself. + # config.lock_strategy = :failed_attempts + + # Defines which key will be used when locking and unlocking an account + # config.unlock_keys = [:email] + + # Defines which strategy will be used to unlock an account. + # :email = Sends an unlock link to the user email + # :time = Re-enables login after a certain amount of time (see :unlock_in below) + # :both = Enables both strategies + # :none = No unlock strategy. You should handle unlocking by yourself. + # config.unlock_strategy = :both + + # Number of authentication tries before locking an account if lock_strategy + # is failed attempts. + # config.maximum_attempts = 20 + + # Time interval to unlock the account if :time is enabled as unlock_strategy. + # config.unlock_in = 1.hour + + # Warn on the last attempt before the account is locked. + # config.last_attempt_warning = true + + # ==> Configuration for :recoverable + # + # Defines which key will be used when recovering the password for an account + # config.reset_password_keys = [:email] + + # Time interval you can reset your password with a reset password key. + # Don't put a too small interval or your users won't have the time to + # change their passwords. + config.reset_password_within = 6.hours + + # When set to false, does not sign a user in automatically after their password is + # reset. Defaults to true, so a user is signed in automatically after a reset. + # config.sign_in_after_reset_password = true + + # ==> Configuration for :encryptable + # Allow you to use another hashing or encryption algorithm besides bcrypt (default). + # You can use :sha1, :sha512 or algorithms from others authentication tools as + # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20 + # for default behavior) and :restful_authentication_sha1 (then you should set + # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper). + # + # Require the `devise-encryptable` gem when using anything other than bcrypt + # config.encryptor = :sha512 + + # ==> Scopes configuration + # Turn scoped views on. Before rendering "sessions/new", it will first check for + # "users/sessions/new". It's turned off by default because it's slower if you + # are using only default views. + # config.scoped_views = false + + # Configure the default scope given to Warden. By default it's the first + # devise role declared in your routes (usually :user). + # config.default_scope = :user + + # Set this configuration to false if you want /users/sign_out to sign out + # only the current scope. By default, Devise signs out all scopes. + # config.sign_out_all_scopes = true + + # ==> Navigation configuration + # Lists the formats that should be treated as navigational. Formats like + # :html, should redirect to the sign in page when the user does not have + # access, but formats like :xml or :json, should return 401. + # + # If you have any extra navigational formats, like :iphone or :mobile, you + # should add them to the navigational formats lists. + # + # The "*/*" below is required to match Internet Explorer requests. + # config.navigational_formats = ['*/*', :html] + + # The default HTTP method used to sign out a resource. Default is :delete. + config.sign_out_via = :delete + + # ==> OmniAuth + # Add a new OmniAuth provider. Check the wiki for more information on setting + # up on your models and hooks. + # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo' + + # ==> Warden configuration + # If you want to use other strategies, that are not supported by Devise, or + # change the failure app, you can configure them inside the config.warden block. + # + # config.warden do |manager| + # manager.intercept_401 = false + # manager.default_strategies(scope: :user).unshift :some_external_strategy + # end + + # ==> Mountable engine configurations + # When using Devise inside an engine, let's call it `MyEngine`, and this engine + # is mountable, there are some extra configurations to be taken into account. + # The following options are available, assuming the engine is mounted as: + # + # mount MyEngine, at: '/my_engine' + # + # The router that invoked `devise_for`, in the example above, would be: + # config.router_name = :my_engine + # + # When using OmniAuth, Devise cannot automatically set OmniAuth path, + # so you need to do it manually. For the users scope, it would be: + # config.omniauth_path_prefix = '/my_engine/users/auth' +end diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb new file mode 100644 index 0000000000..934487af6a --- /dev/null +++ b/config/initializers/simple_form.rb @@ -0,0 +1,165 @@ +# Use this setup block to configure all options available in SimpleForm. +SimpleForm.setup do |config| + # Wrappers are used by the form builder to generate a + # complete input. You can remove any component from the + # wrapper, change the order or even add your own to the + # stack. The options given below are used to wrap the + # whole input. + config.wrappers :default, class: :input, + hint_class: :field_with_hint, error_class: :field_with_errors do |b| + ## Extensions enabled by default + # Any of these extensions can be disabled for a + # given input by passing: `f.input EXTENSION_NAME => false`. + # You can make any of these extensions optional by + # renaming `b.use` to `b.optional`. + + # Determines whether to use HTML5 (:email, :url, ...) + # and required attributes + b.use :html5 + + # Calculates placeholders automatically from I18n + # You can also pass a string as f.input placeholder: "Placeholder" + b.use :placeholder + + ## Optional extensions + # They are disabled unless you pass `f.input EXTENSION_NAME => true` + # to the input. If so, they will retrieve the values from the model + # if any exists. If you want to enable any of those + # extensions by default, you can change `b.optional` to `b.use`. + + # Calculates maxlength from length validations for string inputs + b.optional :maxlength + + # Calculates pattern from format validations for string inputs + b.optional :pattern + + # Calculates min and max from length validations for numeric inputs + b.optional :min_max + + # Calculates readonly automatically from readonly attributes + b.optional :readonly + + ## Inputs + b.use :label_input + b.use :hint, wrap_with: { tag: :span, class: :hint } + b.use :error, wrap_with: { tag: :span, class: :error } + + ## full_messages_for + # If you want to display the full error message for the attribute, you can + # use the component :full_error, like: + # + # b.use :full_error, wrap_with: { tag: :span, class: :error } + end + + # The default wrapper to be used by the FormBuilder. + config.default_wrapper = :default + + # Define the way to render check boxes / radio buttons with labels. + # Defaults to :nested for bootstrap config. + # inline: input + label + # nested: label > input + config.boolean_style = :nested + + # Default class for buttons + config.button_class = 'btn' + + # Method used to tidy up errors. Specify any Rails Array method. + # :first lists the first message for each field. + # Use :to_sentence to list all errors for each field. + # config.error_method = :first + + # Default tag used for error notification helper. + config.error_notification_tag = :div + + # CSS class to add for error notification helper. + config.error_notification_class = 'error_notification' + + # ID to add for error notification helper. + # config.error_notification_id = nil + + # Series of attempts to detect a default label method for collection. + # config.collection_label_methods = [ :to_label, :name, :title, :to_s ] + + # Series of attempts to detect a default value method for collection. + # config.collection_value_methods = [ :id, :to_s ] + + # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none. + # config.collection_wrapper_tag = nil + + # You can define the class to use on all collection wrappers. Defaulting to none. + # config.collection_wrapper_class = nil + + # You can wrap each item in a collection of radio/check boxes with a tag, + # defaulting to :span. + # config.item_wrapper_tag = :span + + # You can define a class to use in all item wrappers. Defaulting to none. + # config.item_wrapper_class = nil + + # How the label text should be generated altogether with the required text. + # config.label_text = lambda { |label, required, explicit_label| "#{required} #{label}" } + + # You can define the class to use on all labels. Default is nil. + # config.label_class = nil + + # You can define the default class to be used on forms. Can be overriden + # with `html: { :class }`. Defaulting to none. + # config.default_form_class = nil + + # You can define which elements should obtain additional classes + # config.generate_additional_classes_for = [:wrapper, :label, :input] + + # Whether attributes are required by default (or not). Default is true. + # config.required_by_default = true + + # Tell browsers whether to use the native HTML5 validations (novalidate form option). + # These validations are enabled in SimpleForm's internal config but disabled by default + # in this configuration, which is recommended due to some quirks from different browsers. + # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations, + # change this configuration to true. + config.browser_validations = false + + # Collection of methods to detect if a file type was given. + # config.file_methods = [ :mounted_as, :file?, :public_filename ] + + # Custom mappings for input types. This should be a hash containing a regexp + # to match as key, and the input type that will be used when the field name + # matches the regexp as value. + # config.input_mappings = { /count/ => :integer } + + # Custom wrappers for input types. This should be a hash containing an input + # type as key and the wrapper that will be used for all inputs with specified type. + # config.wrapper_mappings = { string: :prepend } + + # Namespaces where SimpleForm should look for custom input classes that + # override default inputs. + # config.custom_inputs_namespaces << "CustomInputs" + + # Default priority for time_zone inputs. + # config.time_zone_priority = nil + + # Default priority for country inputs. + # config.country_priority = nil + + # When false, do not use translations for labels. + # config.translate_labels = true + + # Automatically discover new inputs in Rails' autoload path. + # config.inputs_discovery = true + + # Cache SimpleForm inputs discovery + # config.cache_discovery = !Rails.env.development? + + # Default class for inputs + # config.input_class = nil + + # Define the default class of the input wrapper of the boolean input. + config.boolean_label_class = 'checkbox' + + # Defines if the default input wrapper class should be included in radio + # collection wrappers. + # config.include_default_input_wrapper_class = true + + # Defines which i18n scope will be used in Simple Form. + # config.i18n_scope = 'simple_form' +end diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb new file mode 100644 index 0000000000..109d29a370 --- /dev/null +++ b/config/initializers/simple_form_bootstrap.rb @@ -0,0 +1,149 @@ +# Use this setup block to configure all options available in SimpleForm. +SimpleForm.setup do |config| + config.error_notification_class = 'alert alert-danger' + config.button_class = 'btn btn-default' + config.boolean_label_class = nil + + config.wrappers :vertical_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :pattern + b.optional :min_max + b.optional :readonly + b.use :label, class: 'control-label' + + b.use :input, class: 'form-control' + b.use :error, wrap_with: { tag: 'span', class: 'help-block' } + b.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + + config.wrappers :vertical_file_input, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :readonly + b.use :label, class: 'control-label' + + b.use :input + b.use :error, wrap_with: { tag: 'span', class: 'help-block' } + b.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + + config.wrappers :vertical_boolean, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.optional :readonly + + b.wrapper tag: 'div', class: 'checkbox' do |ba| + ba.use :label_input + end + + b.use :error, wrap_with: { tag: 'span', class: 'help-block' } + b.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + + config.wrappers :vertical_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.optional :readonly + b.use :label, class: 'control-label' + b.use :input + b.use :error, wrap_with: { tag: 'span', class: 'help-block' } + b.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + + config.wrappers :horizontal_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :pattern + b.optional :min_max + b.optional :readonly + b.use :label, class: 'col-sm-3 control-label' + + b.wrapper tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input, class: 'form-control' + ba.use :error, wrap_with: { tag: 'span', class: 'help-block' } + ba.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + end + + config.wrappers :horizontal_file_input, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :readonly + b.use :label, class: 'col-sm-3 control-label' + + b.wrapper tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input + ba.use :error, wrap_with: { tag: 'span', class: 'help-block' } + ba.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + end + + config.wrappers :horizontal_boolean, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.optional :readonly + + b.wrapper tag: 'div', class: 'col-sm-offset-3 col-sm-9' do |wr| + wr.wrapper tag: 'div', class: 'checkbox' do |ba| + ba.use :label_input + end + + wr.use :error, wrap_with: { tag: 'span', class: 'help-block' } + wr.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + end + + config.wrappers :horizontal_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.optional :readonly + + b.use :label, class: 'col-sm-3 control-label' + + b.wrapper tag: 'div', class: 'col-sm-9' do |ba| + ba.use :input + ba.use :error, wrap_with: { tag: 'span', class: 'help-block' } + ba.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + end + + config.wrappers :inline_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.use :placeholder + b.optional :maxlength + b.optional :pattern + b.optional :min_max + b.optional :readonly + b.use :label, class: 'sr-only' + + b.use :input, class: 'form-control' + b.use :error, wrap_with: { tag: 'span', class: 'help-block' } + b.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + + config.wrappers :multi_select, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.optional :readonly + b.use :label, class: 'control-label' + b.wrapper tag: 'div', class: 'form-inline' do |ba| + ba.use :input, class: 'form-control' + ba.use :error, wrap_with: { tag: 'span', class: 'help-block' } + ba.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + end + # Wrappers for forms and inputs using the Bootstrap toolkit. + # Check the Bootstrap docs (http://getbootstrap.com) + # to learn about the different styles for forms and inputs, + # buttons and other elements. + config.default_wrapper = :vertical_form + config.wrapper_mappings = { + check_boxes: :vertical_radio_and_checkboxes, + radio_buttons: :vertical_radio_and_checkboxes, + file: :vertical_file_input, + boolean: :vertical_boolean, + datetime: :multi_select, + date: :multi_select, + time: :multi_select + } +end diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml new file mode 100644 index 0000000000..bd4c3ebc69 --- /dev/null +++ b/config/locales/devise.en.yml @@ -0,0 +1,62 @@ +# Additional translations at https://github.com/plataformatec/devise/wiki/I18n + +en: + devise: + confirmations: + confirmed: "Your email address has been successfully confirmed." + send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes." + failure: + already_authenticated: "You are already signed in." + inactive: "Your account is not activated yet." + invalid: "Invalid %{authentication_keys} or password." + locked: "Your account is locked." + last_attempt: "You have one more attempt before your account is locked." + not_found_in_database: "Invalid %{authentication_keys} or password." + timeout: "Your session expired. Please sign in again to continue." + unauthenticated: "You need to sign in or sign up before continuing." + unconfirmed: "You have to confirm your email address before continuing." + mailer: + confirmation_instructions: + subject: "Confirmation instructions" + reset_password_instructions: + subject: "Reset password instructions" + unlock_instructions: + subject: "Unlock instructions" + password_change: + subject: "Password Changed" + omniauth_callbacks: + failure: "Could not authenticate you from %{kind} because \"%{reason}\"." + success: "Successfully authenticated from %{kind} account." + passwords: + no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." + send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." + updated: "Your password has been changed successfully. You are now signed in." + updated_not_active: "Your password has been changed successfully." + registrations: + destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon." + signed_up: "Welcome! You have signed up successfully." + signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated." + signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked." + signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account." + update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address." + updated: "Your account has been updated successfully." + sessions: + signed_in: "Signed in successfully." + signed_out: "Signed out successfully." + already_signed_out: "Signed out successfully." + unlocks: + send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes." + send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes." + unlocked: "Your account has been unlocked successfully. Please sign in to continue." + errors: + messages: + already_confirmed: "was already confirmed, please try signing in" + confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one" + expired: "has expired, please request a new one" + not_found: "not found" + not_locked: "was not locked" + not_saved: + one: "1 error prohibited this %{resource} from being saved:" + other: "%{count} errors prohibited this %{resource} from being saved:" diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml new file mode 100644 index 0000000000..2374383342 --- /dev/null +++ b/config/locales/simple_form.en.yml @@ -0,0 +1,31 @@ +en: + simple_form: + "yes": 'Yes' + "no": 'No' + required: + text: 'required' + mark: '*' + # You can uncomment the line below if you need to overwrite the whole required html. + # When using html, text and mark won't be used. + # html: '*' + error_notification: + default_message: "Please review the problems below:" + # Examples + # labels: + # defaults: + # password: 'Password' + # user: + # new: + # email: 'E-mail to sign in.' + # edit: + # email: 'E-mail.' + # hints: + # defaults: + # username: 'User name to sign in.' + # password: 'No special characters, please.' + # include_blanks: + # defaults: + # age: 'Rather not say' + # prompts: + # defaults: + # age: 'Select your age' diff --git a/config/routes.rb b/config/routes.rb index 787824f888..f5f947cdb7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,43 @@ Rails.application.routes.draw do + devise_for :users # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html + root 'products#index' + + namespace :admin do + resources :products + resources :orders do + member do + post :cancel + post :ship + post :shipped + post :return + end + end + end + # 定义admin下的products路径 + + resources :products do + member do + post :add_to_cart + end + end + resources :carts do + collection do + delete :clean + post :checkout + end + end + resources :cart_items + + resources :orders do + member do + post :pay_with_alipay + post :pay_with_wechat + post :apply_to_cancel + end + end + + namespace :account do + resources :orders + end end diff --git a/db/migrate/20170213090452_devise_create_users.rb b/db/migrate/20170213090452_devise_create_users.rb new file mode 100644 index 0000000000..1fefeee7a6 --- /dev/null +++ b/db/migrate/20170213090452_devise_create_users.rb @@ -0,0 +1,42 @@ +class DeviseCreateUsers < ActiveRecord::Migration[5.0] + def change + create_table :users do |t| + ## Database authenticatable + t.string :email, null: false, default: "" + t.string :encrypted_password, null: false, default: "" + + ## Recoverable + t.string :reset_password_token + t.datetime :reset_password_sent_at + + ## Rememberable + t.datetime :remember_created_at + + ## Trackable + t.integer :sign_in_count, default: 0, null: false + t.datetime :current_sign_in_at + t.datetime :last_sign_in_at + t.string :current_sign_in_ip + t.string :last_sign_in_ip + + ## Confirmable + # t.string :confirmation_token + # t.datetime :confirmed_at + # t.datetime :confirmation_sent_at + # t.string :unconfirmed_email # Only if using reconfirmable + + ## Lockable + # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts + # t.string :unlock_token # Only if unlock strategy is :email or :both + # t.datetime :locked_at + + + t.timestamps null: false + end + + add_index :users, :email, unique: true + add_index :users, :reset_password_token, unique: true + # add_index :users, :confirmation_token, unique: true + # add_index :users, :unlock_token, unique: true + end +end diff --git a/db/migrate/20170214062758_create_products.rb b/db/migrate/20170214062758_create_products.rb new file mode 100644 index 0000000000..c03b22a679 --- /dev/null +++ b/db/migrate/20170214062758_create_products.rb @@ -0,0 +1,12 @@ +class CreateProducts < ActiveRecord::Migration[5.0] + def change + create_table :products do |t| + t.string :title + t.text :description + t.integer :quantity + t.integer :price + + t.timestamps + end + end +end diff --git a/db/migrate/20170214081556_add_image_to_product.rb b/db/migrate/20170214081556_add_image_to_product.rb new file mode 100644 index 0000000000..5aa363e06d --- /dev/null +++ b/db/migrate/20170214081556_add_image_to_product.rb @@ -0,0 +1,5 @@ +class AddImageToProduct < ActiveRecord::Migration[5.0] + def change + add_column :products, :image, :string + end +end diff --git a/db/migrate/20170214085339_add_is_admin_to_user.rb b/db/migrate/20170214085339_add_is_admin_to_user.rb new file mode 100644 index 0000000000..4b47cc61e0 --- /dev/null +++ b/db/migrate/20170214085339_add_is_admin_to_user.rb @@ -0,0 +1,5 @@ +class AddIsAdminToUser < ActiveRecord::Migration[5.0] + def change + add_column :users, :is_admin, :boolean, default: false + end +end diff --git a/db/migrate/20170215133302_create_carts.rb b/db/migrate/20170215133302_create_carts.rb new file mode 100644 index 0000000000..e029bfec87 --- /dev/null +++ b/db/migrate/20170215133302_create_carts.rb @@ -0,0 +1,8 @@ +class CreateCarts < ActiveRecord::Migration[5.0] + def change + create_table :carts do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20170215133743_create_cart_items.rb b/db/migrate/20170215133743_create_cart_items.rb new file mode 100644 index 0000000000..cfd692995b --- /dev/null +++ b/db/migrate/20170215133743_create_cart_items.rb @@ -0,0 +1,10 @@ +class CreateCartItems < ActiveRecord::Migration[5.0] + def change + create_table :cart_items do |t| + t.integer :cart_id + t.integer :product_id + t.integer :quantity, default: 1 + t.timestamps + end + end +end diff --git a/db/migrate/20170217015613_create_orders.rb b/db/migrate/20170217015613_create_orders.rb new file mode 100644 index 0000000000..f599ebf18c --- /dev/null +++ b/db/migrate/20170217015613_create_orders.rb @@ -0,0 +1,13 @@ +class CreateOrders < ActiveRecord::Migration[5.0] + def change + create_table :orders do |t| + t.integer :total, default: 0 + t.integer :user_id + t.string :billing_name + t.string :billing_address + t.string :shipping_name + t.string :shipping_address + t.timestamps + end + end +end diff --git a/db/migrate/20170217023128_create_product_lists.rb b/db/migrate/20170217023128_create_product_lists.rb new file mode 100644 index 0000000000..785e501c09 --- /dev/null +++ b/db/migrate/20170217023128_create_product_lists.rb @@ -0,0 +1,11 @@ +class CreateProductLists < ActiveRecord::Migration[5.0] + def change + create_table :product_lists do |t| + t.integer :order_id + t.integer :product_name + t.integer :product_price + t.integer :quantity + t.timestamps + end + end +end diff --git a/db/migrate/20170217025329_add_token_to_order.rb b/db/migrate/20170217025329_add_token_to_order.rb new file mode 100644 index 0000000000..b427007c25 --- /dev/null +++ b/db/migrate/20170217025329_add_token_to_order.rb @@ -0,0 +1,5 @@ +class AddTokenToOrder < ActiveRecord::Migration[5.0] + def change + add_column :orders, :token, :string + end +end diff --git a/db/migrate/20170217055419_add_is_paid_to_order.rb b/db/migrate/20170217055419_add_is_paid_to_order.rb new file mode 100644 index 0000000000..512597fc2d --- /dev/null +++ b/db/migrate/20170217055419_add_is_paid_to_order.rb @@ -0,0 +1,5 @@ +class AddIsPaidToOrder < ActiveRecord::Migration[5.0] + def change + add_column :orders, :is_paid, :boolean, default: false + end +end diff --git a/db/migrate/20170217055858_add_payment_method_to_order.rb b/db/migrate/20170217055858_add_payment_method_to_order.rb new file mode 100644 index 0000000000..d1896b741e --- /dev/null +++ b/db/migrate/20170217055858_add_payment_method_to_order.rb @@ -0,0 +1,5 @@ +class AddPaymentMethodToOrder < ActiveRecord::Migration[5.0] + def change + add_column :orders, :payment_method, :string + end +end diff --git a/db/migrate/20170217073106_add_aasm_state_to_order.rb b/db/migrate/20170217073106_add_aasm_state_to_order.rb new file mode 100644 index 0000000000..4028b8c968 --- /dev/null +++ b/db/migrate/20170217073106_add_aasm_state_to_order.rb @@ -0,0 +1,6 @@ +class AddAasmStateToOrder < ActiveRecord::Migration[5.0] + def change + add_column :orders, :aasm_state, :string, default: "order_placed" + add_index :orders, :aasm_state + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 0000000000..97d140d682 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,81 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20170217073106) do + + create_table "cart_items", force: :cascade do |t| + t.integer "cart_id" + t.integer "product_id" + t.integer "quantity", default: 1 + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "carts", force: :cascade do |t| + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "orders", force: :cascade do |t| + t.integer "total", default: 0 + t.integer "user_id" + t.string "billing_name" + t.string "billing_address" + t.string "shipping_name" + t.string "shipping_address" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "token" + t.boolean "is_paid", default: false + t.string "payment_method" + t.string "aasm_state", default: "order_placed" + t.index ["aasm_state"], name: "index_orders_on_aasm_state" + end + + create_table "product_lists", force: :cascade do |t| + t.integer "order_id" + t.integer "product_name" + t.integer "product_price" + t.integer "quantity" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "products", force: :cascade do |t| + t.string "title" + t.text "description" + t.integer "quantity" + t.integer "price" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.string "image" + end + + create_table "users", force: :cascade do |t| + t.string "email", default: "", null: false + t.string "encrypted_password", default: "", null: false + t.string "reset_password_token" + t.datetime "reset_password_sent_at" + t.datetime "remember_created_at" + t.integer "sign_in_count", default: 0, null: false + t.datetime "current_sign_in_at" + t.datetime "last_sign_in_at" + t.string "current_sign_in_ip" + t.string "last_sign_in_ip" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.boolean "is_admin", default: false + t.index ["email"], name: "index_users_on_email", unique: true + t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true + end + +end diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2accd..855b4e1866 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -5,3 +5,9 @@ # # movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) # Character.create(name: 'Luke', movie: movies.first) +u = User.new +u.email = "hanmeimei@sina.com" +u.password = "123456" +u.password_confirmation = "123456" +u.is_admin = true +u.save diff --git a/lib/templates/erb/scaffold/_form.html.erb b/lib/templates/erb/scaffold/_form.html.erb new file mode 100644 index 0000000000..201a069e2c --- /dev/null +++ b/lib/templates/erb/scaffold/_form.html.erb @@ -0,0 +1,13 @@ +<%%= simple_form_for(@<%= singular_table_name %>) do |f| %> + <%%= f.error_notification %> + +
+ <%- attributes.each do |attribute| -%> + <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %> + <%- end -%> +
+ +
+ <%%= f.button :submit %> +
+<%% end %> diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/public/uploads/product/image/1/Snip20170206_22.png b/public/uploads/product/image/1/Snip20170206_22.png new file mode 100644 index 0000000000..a775918a60 Binary files /dev/null and b/public/uploads/product/image/1/Snip20170206_22.png differ diff --git a/public/uploads/product/image/1/medium_Snip20170206_22.png b/public/uploads/product/image/1/medium_Snip20170206_22.png new file mode 100644 index 0000000000..5f110941a5 Binary files /dev/null and b/public/uploads/product/image/1/medium_Snip20170206_22.png differ diff --git a/public/uploads/product/image/1/thumb_Snip20170206_22.png b/public/uploads/product/image/1/thumb_Snip20170206_22.png new file mode 100644 index 0000000000..e014cf1c89 Binary files /dev/null and b/public/uploads/product/image/1/thumb_Snip20170206_22.png differ diff --git a/public/uploads/product/image/2/Snip20170206_24.png b/public/uploads/product/image/2/Snip20170206_24.png new file mode 100644 index 0000000000..ee71591283 Binary files /dev/null and b/public/uploads/product/image/2/Snip20170206_24.png differ diff --git a/public/uploads/product/image/2/medium_Snip20170206_24.png b/public/uploads/product/image/2/medium_Snip20170206_24.png new file mode 100644 index 0000000000..69b5175d33 Binary files /dev/null and b/public/uploads/product/image/2/medium_Snip20170206_24.png differ diff --git a/public/uploads/product/image/2/thumb_Snip20170206_24.png b/public/uploads/product/image/2/thumb_Snip20170206_24.png new file mode 100644 index 0000000000..5b983aa479 Binary files /dev/null and b/public/uploads/product/image/2/thumb_Snip20170206_24.png differ diff --git a/public/uploads/product/image/3/Snip20170206_21.png b/public/uploads/product/image/3/Snip20170206_21.png new file mode 100644 index 0000000000..f9b8bd8b05 Binary files /dev/null and b/public/uploads/product/image/3/Snip20170206_21.png differ diff --git a/public/uploads/product/image/3/medium_Snip20170206_21.png b/public/uploads/product/image/3/medium_Snip20170206_21.png new file mode 100644 index 0000000000..058ec830fb Binary files /dev/null and b/public/uploads/product/image/3/medium_Snip20170206_21.png differ diff --git a/public/uploads/product/image/3/thumb_Snip20170206_21.png b/public/uploads/product/image/3/thumb_Snip20170206_21.png new file mode 100644 index 0000000000..42fcbc5e5a Binary files /dev/null and b/public/uploads/product/image/3/thumb_Snip20170206_21.png differ diff --git a/public/uploads/product/image/4/Snip20170206_27.png b/public/uploads/product/image/4/Snip20170206_27.png new file mode 100644 index 0000000000..f681427a12 Binary files /dev/null and b/public/uploads/product/image/4/Snip20170206_27.png differ diff --git a/public/uploads/product/image/4/medium_Snip20170206_27.png b/public/uploads/product/image/4/medium_Snip20170206_27.png new file mode 100644 index 0000000000..4eff106fd6 Binary files /dev/null and b/public/uploads/product/image/4/medium_Snip20170206_27.png differ diff --git a/public/uploads/product/image/4/thumb_Snip20170206_27.png b/public/uploads/product/image/4/thumb_Snip20170206_27.png new file mode 100644 index 0000000000..cfe7b2d96e Binary files /dev/null and b/public/uploads/product/image/4/thumb_Snip20170206_27.png differ diff --git a/test/controllers/account/orders_controller_test.rb b/test/controllers/account/orders_controller_test.rb new file mode 100644 index 0000000000..0addba5790 --- /dev/null +++ b/test/controllers/account/orders_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Account::OrdersControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/admin/orders_controller_test.rb b/test/controllers/admin/orders_controller_test.rb new file mode 100644 index 0000000000..f43ce7d407 --- /dev/null +++ b/test/controllers/admin/orders_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Admin::OrdersControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/admin/products_controller_test.rb b/test/controllers/admin/products_controller_test.rb new file mode 100644 index 0000000000..250423dc51 --- /dev/null +++ b/test/controllers/admin/products_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Admin::ProductsControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/cart_items_controller_test.rb b/test/controllers/cart_items_controller_test.rb new file mode 100644 index 0000000000..70e148e47d --- /dev/null +++ b/test/controllers/cart_items_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CartItemsControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/carts_controller_test.rb b/test/controllers/carts_controller_test.rb new file mode 100644 index 0000000000..dd834b2228 --- /dev/null +++ b/test/controllers/carts_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CartsControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb new file mode 100644 index 0000000000..859039113c --- /dev/null +++ b/test/controllers/orders_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class OrdersControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb new file mode 100644 index 0000000000..bccd91d86a --- /dev/null +++ b/test/controllers/products_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class ProductsControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/welcome_controller_test.rb b/test/controllers/welcome_controller_test.rb new file mode 100644 index 0000000000..59d2d0a0a9 --- /dev/null +++ b/test/controllers/welcome_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class WelcomeControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end diff --git a/test/fixtures/cart_items.yml b/test/fixtures/cart_items.yml new file mode 100644 index 0000000000..80aed36e30 --- /dev/null +++ b/test/fixtures/cart_items.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/carts.yml b/test/fixtures/carts.yml new file mode 100644 index 0000000000..80aed36e30 --- /dev/null +++ b/test/fixtures/carts.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml new file mode 100644 index 0000000000..80aed36e30 --- /dev/null +++ b/test/fixtures/orders.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/product_lists.yml b/test/fixtures/product_lists.yml new file mode 100644 index 0000000000..80aed36e30 --- /dev/null +++ b/test/fixtures/product_lists.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml new file mode 100644 index 0000000000..467c58ee9c --- /dev/null +++ b/test/fixtures/products.yml @@ -0,0 +1,13 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + description: MyText + quantity: 1 + price: 1 + +two: + title: MyString + description: MyText + quantity: 1 + price: 1 diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 0000000000..80aed36e30 --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/mailers/order_mailer_test.rb b/test/mailers/order_mailer_test.rb new file mode 100644 index 0000000000..6e2129de09 --- /dev/null +++ b/test/mailers/order_mailer_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class OrderMailerTest < ActionMailer::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/mailers/previews/order_mailer_preview.rb b/test/mailers/previews/order_mailer_preview.rb new file mode 100644 index 0000000000..7be457e2d6 --- /dev/null +++ b/test/mailers/previews/order_mailer_preview.rb @@ -0,0 +1,4 @@ +# Preview all emails at http://localhost:3000/rails/mailers/order_mailer +class OrderMailerPreview < ActionMailer::Preview + +end diff --git a/test/models/cart_item_test.rb b/test/models/cart_item_test.rb new file mode 100644 index 0000000000..881afe1fcf --- /dev/null +++ b/test/models/cart_item_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CartItemTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/cart_test.rb b/test/models/cart_test.rb new file mode 100644 index 0000000000..9fad43a1c6 --- /dev/null +++ b/test/models/cart_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CartTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/order_test.rb b/test/models/order_test.rb new file mode 100644 index 0000000000..15b8ed1348 --- /dev/null +++ b/test/models/order_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class OrderTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/product_list_test.rb b/test/models/product_list_test.rb new file mode 100644 index 0000000000..d5aace8f43 --- /dev/null +++ b/test/models/product_list_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class ProductListTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/product_test.rb b/test/models/product_test.rb new file mode 100644 index 0000000000..211cdd0b4a --- /dev/null +++ b/test/models/product_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class ProductTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 0000000000..82f61e0109 --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class UserTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end