diff --git a/.gitignore b/.gitignore index 6a502e99..c8bb541b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,9 @@ # Ignore all logfiles and tempfiles. /log/*.log /tmp + +# ignore upload files +/public/uploads + +# ignore pravite data +/config/application.yml \ No newline at end of file diff --git a/Gemfile b/Gemfile index fba3b4e0..1969a38e 100644 --- a/Gemfile +++ b/Gemfile @@ -38,3 +38,28 @@ gem 'spring', group: :development # Use debugger # gem 'debugger', group: [:development, :test] +# Devise 提供使用者登入功能 +gem 'devise' +# 加入 bootstrap css framework +gem 'bootstrap-sass' +# Rails forms made easy +gem 'simple_form' + +# 圖片上傳 +gem 'carrierwave' +# 圖片壓縮 resize +gem 'mini_magick' +# 有線狀態機 +gem 'aasm' +# 線上刷卡 +gem 'stripe' + +gem 'settingslogic' + +gem 'ransack', github: "activerecord-hackery/ransack", branch: "rails-4.1" +gem 'will_paginate' + +group :development do + # 在本機看信 + gem "letter_opener" +end \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 53538d9b..39ce760f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,19 @@ +GIT + remote: git://github.com/activerecord-hackery/ransack.git + revision: 625e58cbb5ea5e155464ea2d79497838313352f2 + branch: rails-4.1 + specs: + ransack (1.2.4) + actionpack (>= 4.0) + activerecord (>= 4.0) + activesupport (>= 4.0) + i18n + polyamorous (~> 1.0.0) + GEM remote: https://rubygems.org/ specs: + aasm (3.2.1) actionmailer (4.1.0) actionpack (= 4.1.0) actionview (= 4.1.0) @@ -27,8 +40,19 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) + addressable (2.3.6) arel (5.0.1.20140414130214) + bcrypt (3.1.7) + bcrypt-ruby (3.1.5) + bcrypt (>= 3.1.3) + bootstrap-sass (3.1.1.1) + sass (~> 3.2) builder (3.2.2) + carrierwave (0.10.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + json (>= 1.7) + mime-types (>= 1.16) coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) @@ -36,6 +60,11 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) + devise (3.0.2) + bcrypt-ruby (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 3.2.6, < 5) + warden (~> 1.2.3) erubis (2.7.0) execjs (2.2.0) hike (1.2.3) @@ -47,12 +76,21 @@ GEM railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) + launchy (2.4.2) + addressable (~> 2.3) + letter_opener (1.2.0) + launchy (~> 2.2) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) + mini_magick (3.7.0) + subexec (~> 0.2.1) minitest (5.3.4) multi_json (1.10.1) + orm_adapter (0.5.0) + polyamorous (1.0.0) + activerecord (>= 3.0) polyglot (0.3.5) rack (1.5.2) rack-test (0.6.2) @@ -75,6 +113,8 @@ GEM rake (10.3.2) rdoc (4.1.1) json (~> 1.4) + rest-client (1.6.7) + mime-types (>= 1.16) sass (3.2.19) sass-rails (4.0.3) railties (>= 4.0.0, < 5.0) @@ -84,6 +124,10 @@ GEM sdoc (0.4.0) json (~> 1.8) rdoc (~> 4.0, < 5.0) + settingslogic (2.0.9) + simple_form (3.0.2) + actionpack (~> 4.0) + activemodel (~> 4.0) spring (1.1.3) sprockets (2.11.0) hike (~> 1.2) @@ -95,6 +139,11 @@ GEM activesupport (>= 3.0) sprockets (~> 2.8) sqlite3 (1.3.9) + stripe (1.14.0) + json (~> 1.8.1) + mime-types (~> 1.25) + rest-client (~> 1.4) + subexec (0.2.3) thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) @@ -108,18 +157,32 @@ GEM uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) + warden (1.2.3) + rack (>= 1.0) + will_paginate (3.0.3) PLATFORMS ruby DEPENDENCIES + aasm + bootstrap-sass + carrierwave coffee-rails (~> 4.0.0) + devise jbuilder (~> 2.0) jquery-rails + letter_opener + mini_magick rails (= 4.1.0) + ransack! sass-rails (~> 4.0.3) sdoc (~> 0.4.0) + settingslogic + simple_form spring sqlite3 + stripe turbolinks uglifier (>= 1.3.0) + will_paginate diff --git a/app/assets/javascripts/account/orders.js.coffee b/app/assets/javascripts/account/orders.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/account/orders.js.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.js.coffee b/app/assets/javascripts/admin/orders.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/admin/orders.js.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.js.coffee b/app/assets/javascripts/admin/products.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/admin/products.js.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 d6925fa4..77431764 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,3 +14,4 @@ //= require jquery_ujs //= require turbolinks //= require_tree . +//= require bootstrap diff --git a/app/assets/javascripts/card_charges.js.coffee b/app/assets/javascripts/card_charges.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/card_charges.js.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/cart_items.js.coffee b/app/assets/javascripts/cart_items.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/cart_items.js.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.js.coffee b/app/assets/javascripts/carts.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/carts.js.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.js.coffee b/app/assets/javascripts/orders.js.coffee new file mode 100644 index 00000000..49e71100 --- /dev/null +++ b/app/assets/javascripts/orders.js.coffee @@ -0,0 +1,35 @@ +# 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/ + +jQuery ($) -> + $("#payment-form").submit (event) -> + $form = $(this) + + # Disable the submit button to prevent repeated clicks + $form.find("button").prop "disabled", true + Stripe.createToken $form, stripeResponseHandler + + # Prevent the form from submitting with the default action + false + + return + +stripeResponseHandler = (status, response) -> + $form = $("#payment-form") + if response.error + + # Show the errors on the form + $form.find(".payment-errors").text response.error.message + $form.find("button").prop "disabled", false + else + + # token contains id, last4, and card type + token = response.id + + # Insert the token into the form so it gets submitted to the server + $form.append $("").val(token) + + # and submit + $form.get(0).submit() + return \ No newline at end of file diff --git a/app/assets/javascripts/products.js.coffee b/app/assets/javascripts/products.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/products.js.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.css.scss b/app/assets/stylesheets/account/orders.css.scss new file mode 100644 index 00000000..782d07c6 --- /dev/null +++ b/app/assets/stylesheets/account/orders.css.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.css.scss b/app/assets/stylesheets/admin/orders.css.scss new file mode 100644 index 00000000..7ed90c7e --- /dev/null +++ b/app/assets/stylesheets/admin/orders.css.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.css.scss b/app/assets/stylesheets/admin/products.css.scss new file mode 100644 index 00000000..0a32fcee --- /dev/null +++ b/app/assets/stylesheets/admin/products.css.scss @@ -0,0 +1,14 @@ +// 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/ + +.admin{ + a { + margin: 10px 5px; + } + .buttonsGroup { + background-color: #ccc; + padding: 0 10px; + margin: 5px 0 20px 0; + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css.scss similarity index 93% rename from app/assets/stylesheets/application.css rename to app/assets/stylesheets/application.css.scss index a443db34..ff72e2a3 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css.scss @@ -10,6 +10,11 @@ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new * file per style scope. * + *= require bootstrap *= require_tree . *= require_self */ + +body { + margin-top: 60px; +} \ No newline at end of file diff --git a/app/assets/stylesheets/card_charges.css.scss b/app/assets/stylesheets/card_charges.css.scss new file mode 100644 index 00000000..24adb84c --- /dev/null +++ b/app/assets/stylesheets/card_charges.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the card_charges 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/cart_items.css.scss b/app/assets/stylesheets/cart_items.css.scss new file mode 100644 index 00000000..c8ba3800 --- /dev/null +++ b/app/assets/stylesheets/cart_items.css.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.css.scss b/app/assets/stylesheets/carts.css.scss new file mode 100644 index 00000000..8b81f431 --- /dev/null +++ b/app/assets/stylesheets/carts.css.scss @@ -0,0 +1,15 @@ +// 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/ +$money-red: #c00; + +.cart, .checkout, .order, .orderlist { + th, .price, .delete, .qt, .timeAgo { + text-align: center; + } + .price, .total { + color: $money-red; + font-weight: bold; + font-size: 1.2em; + } +} \ No newline at end of file diff --git a/app/assets/stylesheets/orders.css.scss b/app/assets/stylesheets/orders.css.scss new file mode 100644 index 00000000..3b0428a9 --- /dev/null +++ b/app/assets/stylesheets/orders.css.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.css.scss b/app/assets/stylesheets/products.css.scss new file mode 100644 index 00000000..21dc5ae0 --- /dev/null +++ b/app/assets/stylesheets/products.css.scss @@ -0,0 +1,24 @@ +// 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/ + +$text-color: #888; +$title-color: #555; + +.products{ + padding: 15px; + margin-bottom: 10px; + border-bottom: 1px solid #ccc; + h3 a, h4{ + color: $title-color; + } + h4{ + margin-top: 55px; + } + p{ + color: $text-color; + } + .addToCart { + margin: 15px 0; + } +} \ No newline at end of file diff --git a/app/controllers/account/orders_controller.rb b/app/controllers/account/orders_controller.rb new file mode 100644 index 00000000..0480b30c --- /dev/null +++ b/app/controllers/account/orders_controller.rb @@ -0,0 +1,7 @@ +class Account::OrdersController < ApplicationController + + def index + @orders = current_user.orders + end + +end diff --git a/app/controllers/admin/orders_controller.rb b/app/controllers/admin/orders_controller.rb new file mode 100644 index 00000000..bcb44093 --- /dev/null +++ b/app/controllers/admin/orders_controller.rb @@ -0,0 +1,41 @@ +class Admin::OrdersController < ApplicationController + + before_filter :find_order, :except => [:index] + + def index + # TODO Pagenavi + @orders = Order.all.limit(50) + end + + def show + @order_info = @order.info + @order_items = @order.items + end + + def ship + @order.ship! + redirect_to :back + end + + def shipped + @order.deliver! + redirect_to :back + end + + def cancel + @order.cancel_order! + redirect_to :back + end + + def return + @order.return_good! + redirect_to :back + end + + protected + + def find_order + @order = Order.find_by_token(params[:id]) + end + +end \ No newline at end of file diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb new file mode 100644 index 00000000..bacefb59 --- /dev/null +++ b/app/controllers/admin/products_controller.rb @@ -0,0 +1,62 @@ +class Admin::ProductsController < ApplicationController + + # 使用者必須先登入 + before_action :authenticate_user! + + # 使用者的身份必須是 admin + # admin_required 在 applicationController 裡定義 + before_action :admin_required + + def new + @product = Product.new + # ??? + @photo = @product.photos.new + end + + def create + @product = Product.new(product_params) + + if @product.save + redirect_to admin_products_path + else + render :new + end + 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 + end + + def index + @products = Product.all + end + + def show + @product = Product.find(params[:id]) + end + + private + + def product_params + # :nested_attributes => [:關聯 Model 的欄位] + params.require(:product).permit(:title, :description, :quantity, :price, :photos_attributes => [:image]) + end + +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d83690e1..18b04976 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,4 +2,34 @@ class ApplicationController < ActionController::Base # Prevent CSRF attacks by raising an exception. # For APIs, you may want to use :null_session instead. protect_from_forgery with: :exception + + def admin_required + # 目前的使用者身份是否為 admin? + # admin? 在 user.rb 定義 + current_user.admin? + end + + # 宣告 current_cart 是一個 controller 級的 helper + helper_method :current_cart + + def current_cart + # @current_cart = cuttent_cart or find_cart + # ? + @current_cart ||= find_cart + end + + def find_cart + + cart = Cart.find_by(id: session[:cart_id]) + + unless cart.present? + # 如果 session 內沒有 cart 就生一個 + cart = Cart.create + end + + session[:cart_id] = cart.id + # return cart to current_cart + cart + end + end diff --git a/app/controllers/card_charges_controller.rb b/app/controllers/card_charges_controller.rb new file mode 100644 index 00000000..41b4dadc --- /dev/null +++ b/app/controllers/card_charges_controller.rb @@ -0,0 +1,22 @@ +class CardChargesController < ApplicationController + + before_action :authenticate_user! + + def create + + @order = current_user.orders.find_by_token(params[:order_id]) + @amount = @order.total * 100 # in cents + @card_info = params[:stripeToken] + + ChargesByCardService.new(current_user, @order, @amount, @card_info).charge_by_card! + + redirect_to order_path(@order.token), :notice => "成功完成付款" + # 寄信 + PaymentMailer.notify_payment_completed(@order).deliver + + rescue Stripe::CardError => e + flash[:error] = e.message + render "orders/pay_with_credit_card" + end + +end diff --git a/app/controllers/cart_items_controller.rb b/app/controllers/cart_items_controller.rb new file mode 100644 index 00000000..6496add2 --- /dev/null +++ b/app/controllers/cart_items_controller.rb @@ -0,0 +1,25 @@ +class CartItemsController < ApplicationController + + def update + @cart = current_cart + @item = @cart.cart_items.find(params[:id]) + @item.update(item_params) + + redirect_to carts_path + end + + def destroy + @cart = current_cart + @item = @cart.cart_items.find(params[:id]) + @item.destroy + flash[:notice] = "已經將商品移出購物車" + redirect_to :back + end + + private + + def 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 00000000..d45e1885 --- /dev/null +++ b/app/controllers/carts_controller.rb @@ -0,0 +1,14 @@ +class CartsController < ApplicationController + + # 必須登入才能結賬 + before_action :authenticate_user!, :only => [:checkout] + + def index + end + + def checkout + @order = current_user.orders.build + @info = @order.build_info + end + +end diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb new file mode 100644 index 00000000..c1e87507 --- /dev/null +++ b/app/controllers/orders_controller.rb @@ -0,0 +1,35 @@ +class OrdersController < ApplicationController + + before_action :authenticate_user! + + def create + @order = current_user.orders.build(order_params) + + if @order.save + + OrderPlacingService.new(current_cart, @order).place_order! + # 產生 token 保密訂單網址 + redirect_to order_path(@order.token) + else + # 跨 controller + render "carts/checkout" + end + end + + def show + @order = current_user.orders.find_by_token(params[:id]) + @order_info = @order.info + @order_items = @order.items + end + + def pay_with_credit_card + @order = current_user.orders.find_by_token(params[:id]) + end + + private + + def order_params + params.require(:order).permit(:info_attributes => [: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 00000000..dec7232e --- /dev/null +++ b/app/controllers/products_controller.rb @@ -0,0 +1,61 @@ +class ProductsController < ApplicationController + + before_filter :validate_search_key, :only => [:search] + + def index + # 依 ID 降冪排序（最新的產品在最上面） + @products = Product.order("id DESC") + end + + def show + @product = Product.find(params[:id]) + end + + def search + if @quert_string.present? + search_result = Product.ransack(@search_criteria).result(:distinct => true) + @products = search_result.paginate(:page => params[:page], :per_page => 20) + end + end + + def add_to_cart + + @product = Product.find(params[:id]) + + # 如果商品不存在購物車 + #（current_cart 要在 applicationController 自己造）用 helper_method :current_cart + # 這樣就能在這裡 (controller) 和 view 使用 current_cart 了 + if !current_cart.items.include?(@product) + if @product.quantity <= 0 + flash[:warning] = "很抱歉，此商品已經沒有庫存，請下次再買。" + else + # 把商品加到購物車 (cart model) + # def add_product_to_cart(product) + # items << product + # end + # 更新 add_product_to_cart method 新增數量，所以這邊預設將 1 個商品加入購物車 + current_cart.add_product_to_cart(@product, 1) + flash[:notice] = "已成功將 #{@product.title} 加入購物車" + end + else + # 再加一個商品到購物車 + current_cart.add_onemore_product_to_cart(@product, 1) + flash[:notice] = "已增加一件 #{@product.title} 進您的購物車" + end + + redirect_to :back + + end + + protected + + def validate_search_key + @query_string = params[:q].gsub(/\\|\'|\/|\?/, "") if params[:q].present? + @search_criteria = search_criteria(@query_string) + end + + def search_criteria(query_string) + { :title_cont => query_string } + end + +end diff --git a/app/helpers/account/orders_helper.rb b/app/helpers/account/orders_helper.rb new file mode 100644 index 00000000..6f690c4e --- /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 00000000..76b09744 --- /dev/null +++ b/app/helpers/admin/orders_helper.rb @@ -0,0 +1,7 @@ +module Admin::OrdersHelper + + def render_order_options_for_admin(order) + render :partial => "admin/orders/state_option", :locals => { :order => order} + end + +end diff --git a/app/helpers/admin/products_helper.rb b/app/helpers/admin/products_helper.rb new file mode 100644 index 00000000..977a242f --- /dev/null +++ b/app/helpers/admin/products_helper.rb @@ -0,0 +1,2 @@ +module Admin::ProductsHelper +end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index de6be794..fdf86a68 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,2 +1,21 @@ module ApplicationHelper + + def notice_message + alert_types = { :notice => :success, :alert => :danger } + + close_button_options = { :class => "close", "data-dismiss" => "alert", "aria-hidden" => true } + close_button = content_tag(:button, "×", close_button_options) + + alerts = flash.map do |type, message| + alert_content = close_button + message + + alert_type = alert_types[type.to_sym] || type + alert_class = "alert alert-#{alert_type} alert-dismissable" + + content_tag(:div, alert_content, :class => alert_class) + end + + alerts.join("\n").html_safe + end + end diff --git a/app/helpers/card_charges_helper.rb b/app/helpers/card_charges_helper.rb new file mode 100644 index 00000000..5c18c543 --- /dev/null +++ b/app/helpers/card_charges_helper.rb @@ -0,0 +1,2 @@ +module CardChargesHelper +end diff --git a/app/helpers/cart_items_helper.rb b/app/helpers/cart_items_helper.rb new file mode 100644 index 00000000..f30f6834 --- /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 00000000..66cf684f --- /dev/null +++ b/app/helpers/carts_helper.rb @@ -0,0 +1,11 @@ +module CartsHelper + + def cart_items_count(cart) + cart.cart_items.count + end + + def render_cart_total_price(current_cart) + current_cart.total_price + end + +end diff --git a/app/helpers/orders_helper.rb b/app/helpers/orders_helper.rb new file mode 100644 index 00000000..9aec5cdf --- /dev/null +++ b/app/helpers/orders_helper.rb @@ -0,0 +1,7 @@ +module OrdersHelper + +def render_order_state(order) + t("orders.order_state.#{order.aasm_state}") +end + +end diff --git a/app/helpers/products_helper.rb b/app/helpers/products_helper.rb new file mode 100644 index 00000000..f804f45f --- /dev/null +++ b/app/helpers/products_helper.rb @@ -0,0 +1,27 @@ +module ProductsHelper + + def render_product_photo(photo, size = "thumb") + + if photo.present? + image_url = photo.image.send(size).url + else + + case size + when :medium + volume = "300x300" + else + volume = "200x200" + end + + image_url = "http://placehold.it/#{volume}&text=No Pic" + end + + image_tag(image_url, :class => "thumbnail img-responsive") + + end + + def render_product_name(product) + product.title + end + +end \ No newline at end of file diff --git a/app/mailers/order_mailer.rb b/app/mailers/order_mailer.rb new file mode 100644 index 00000000..db29c953 --- /dev/null +++ b/app/mailers/order_mailer.rb @@ -0,0 +1,12 @@ +class OrderMailer < ActionMailer::Base + default from: "service@artstore.com" + + def notify_order_placed(order) + @order = order + @user = order.user + @order_items = @order.items + @order_info = @order.info + + mail(:to => @user.email, :subject => "[ArtStore] 感謝您完成本次下單，以下是您這次的購物明細 #{order.token}") + end +end diff --git a/app/mailers/payment_mailer.rb b/app/mailers/payment_mailer.rb new file mode 100644 index 00000000..60d79ece --- /dev/null +++ b/app/mailers/payment_mailer.rb @@ -0,0 +1,13 @@ +class PaymentMailer < ActionMailer::Base + default from: "service@artstore.com" + + def notify_payment_completed(order) + @order = order + @user = order.user + @order_items = @order.items + @order_info = @order.info + + mail(:to => @user.email, :subject => "[ArtStore] 感謝您的購買，您的訂單已經完成信用卡結賬手續，我們將盡快為您進行出貨 #{order.token}") + end + +end diff --git a/app/models/cart.rb b/app/models/cart.rb new file mode 100644 index 00000000..92c4ca17 --- /dev/null +++ b/app/models/cart.rb @@ -0,0 +1,32 @@ +class Cart < ActiveRecord::Base + + has_many :cart_items, :dependent => :destroy + # 透過 cart_items 和 items 作關聯，根據 cart_items 中的 product + has_many :items, :through => :cart_items, :source => :product + + def add_product_to_cart(product, qt) + item = cart_items.new + item.product = product + item.quantity = qt + item.save + end + + def add_onemore_product_to_cart(product, qt) + # 再加一個商品到購物車 + current_item = cart_items.find_by_product_id(product) + current_item.quantity += qt + current_item.save + end + + def total_price + cart_items.inject(0) {|sum, item| sum + item.product.price * item.quantity } + end + + # 清空購物車 + def clear! + # delete_all 是內建的 method，可一次清空 + # destroy_all 會一個一個 row 刪（？） + cart_items.delete_all + end + +end diff --git a/app/models/cart_item.rb b/app/models/cart_item.rb new file mode 100644 index 00000000..29642d20 --- /dev/null +++ b/app/models/cart_item.rb @@ -0,0 +1,6 @@ +class CartItem < ActiveRecord::Base + + belongs_to :cart + belongs_to :product + +end diff --git a/app/models/concerns/tokenable.rb b/app/models/concerns/tokenable.rb new file mode 100644 index 00000000..c2f1a9a4 --- /dev/null +++ b/app/models/concerns/tokenable.rb @@ -0,0 +1,13 @@ +module Tokenable + + extend ActiveSupport::Concern + + included do + before_create :generate_token + end + + def generate_token + self.token = SecureRandom.uuid + end + +end \ No newline at end of file diff --git a/app/models/order.rb b/app/models/order.rb new file mode 100644 index 00000000..c52a4728 --- /dev/null +++ b/app/models/order.rb @@ -0,0 +1,72 @@ +class Order < ActiveRecord::Base + + belongs_to :user + has_many :items, :class_name => "OrderItem", :dependent => :destroy + has_one :info, :class_name => "OrderInfo", :dependent => :destroy + + accepts_nested_attributes_for :info + + include Tokenable + + def build_item_cache_from_cart(cart) + cart.items.each do |cart_item| + # https://github.com/rails/rails/blob/959fb8ea651fa6638aaa7caced20d921ca2ea5c1/activerecord/lib/active_record/relation.rb#L84 + # build method is a alias of 'new' + item = items.build + item.product_name = cart_item.title + item.quantity = 1 + item.price = cart_item.price + item.save + end + end + + def caculate_total!(current_cart) + self.total = current_cart.total_price + self.save + end + + def set_payment_with!(method) + self.update_column(:payment_method, method) + end + + def pay! + self.update_column(:paid, true) + end + + include AASM + + aasm do + # 預設為 order placed + # 結賬後狀態轉為 paid + state :order_placed, :initial => true + # If you want to make sure a depending action happens only after the transaction is committed, use the after_commit callback + # 確認狀態變更後 => pay! (update column paid to t) + state :paid, :after_commit => :pay! + event :make_payment do + transitions :from => :order_placed, :to => :paid + end + + # 出貨後狀態轉為 shipping + state :shipping + event :ship do + transitions :from => :paid, :to => :shipping + end + + # 到貨後狀態轉為 shipped + state :shipped + event :deliver do + transitions :from => :shipping, :to => :shipped + end + + state :order_cancelled + event :cancel_order do + transitions :from => [:order_placed, :paid], :to => :order_cancelled + end + + state :good_returned + event :return_good do + transitions :from => :shipped, :to => :good_returned + end + end + +end diff --git a/app/models/order_info.rb b/app/models/order_info.rb new file mode 100644 index 00000000..6a99da97 --- /dev/null +++ b/app/models/order_info.rb @@ -0,0 +1,5 @@ +class OrderInfo < ActiveRecord::Base + belongs_to :order + + validates_presence_of :billing_name, :billing_address, :shipping_name, :shipping_address +end diff --git a/app/models/order_item.rb b/app/models/order_item.rb new file mode 100644 index 00000000..79691641 --- /dev/null +++ b/app/models/order_item.rb @@ -0,0 +1,3 @@ +class OrderItem < ActiveRecord::Base + belongs_to :order +end diff --git a/app/models/photo.rb b/app/models/photo.rb new file mode 100644 index 00000000..0f734e9c --- /dev/null +++ b/app/models/photo.rb @@ -0,0 +1,7 @@ +class Photo < ActiveRecord::Base + + belongs_to :product + + mount_uploader :image, ImageUploader + +end diff --git a/app/models/product.rb b/app/models/product.rb new file mode 100644 index 00000000..5272c4fb --- /dev/null +++ b/app/models/product.rb @@ -0,0 +1,17 @@ +class Product < ActiveRecord::Base + + has_many :photos + + # accepts_nested_attributes_for :MODEL + # 可以直接更新關聯 MODEL 的資料 + accepts_nested_attributes_for :photos + + # 驗證表單是否填妥 + validates_presence_of :title, :quantity + + # 定義最新的照片為 + def default_photo + photos.first + end + +end diff --git a/app/models/settings.rb b/app/models/settings.rb new file mode 100644 index 00000000..e9a7e9db --- /dev/null +++ b/app/models/settings.rb @@ -0,0 +1,4 @@ +class Settings < Settingslogic + source "#{Rails.root}/config/application.yml" + namespace Rails.env +end \ No newline at end of file diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 00000000..1ac59199 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,14 @@ +class User < ActiveRecord::Base + # Include default devise modules. Others available are: + # :token_authenticatable, :confirmable, + # :lockable, :timeoutable and :omniauthable + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :trackable, :validatable + + has_many :orders + + def admin? + is_admin + end + +end diff --git a/app/services/charges_by_card_service.rb b/app/services/charges_by_card_service.rb new file mode 100644 index 00000000..c333eadd --- /dev/null +++ b/app/services/charges_by_card_service.rb @@ -0,0 +1,29 @@ +class ChargesByCardService + def initialize(user, order, amount, card_info) + @user = user + @order = order + @amount = amount + @card_info = card_info + end + + def charge_by_card! + Stripe.api_key = Settings.stripe.secret_key + + customer = Stripe::Customer.create( + :email => @user.email, + :card => @card_info + ) + + + charge = Stripe::Charge.create( + :customer => customer.id, + :amount => @amount, + :description => @order.token , + :currency => 'twd' + ) + + @order.set_payment_with!("credit_card") + @order.make_payment! + end + +end \ No newline at end of file diff --git a/app/services/order_placing_service.rb b/app/services/order_placing_service.rb new file mode 100644 index 00000000..37993c50 --- /dev/null +++ b/app/services/order_placing_service.rb @@ -0,0 +1,13 @@ +class OrderPlacingService + def initialize(cart,order) + @order = order + @cart = cart + end + + def place_order! + @order.build_item_cache_from_cart(@cart) + @order.caculate_total!(@cart) + @cart.clear! + OrderMailer.notify_order_placed(@order).deliver + end +end \ No newline at end of file diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb new file mode 100644 index 00000000..e9c15cb6 --- /dev/null +++ b/app/uploaders/image_uploader.rb @@ -0,0 +1,61 @@ +# encoding: utf-8 + +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 + + # 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: + + # 將最長邊縮至 1024px + process :resize_to_fit => [1024, 1024] + + # 製作 250 x 250 的 1:1 方形縮圖 + version :thumb do + process :resize_to_fill => [250, 250] + end + + # 製作最長邊 500 的中等尺寸 + version :mid do + process :resize_to_fit => [500, 500] + end + + # Add a white list of extensions which are allowed to be uploaded. + # For images you might use something like this: + # def extension_white_list + # %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 00000000..0b29ca76 --- /dev/null +++ b/app/views/account/orders/index.html.erb @@ -0,0 +1,19 @@ +
+

訂單列表

+ + + + + + + + + <% @orders.each do |order| %> + + + + + <% end %> + +
訂單序號訂單時間
<%= link_to order.token, order_path(order.token) %> <%= time_ago_in_words(order.created_at) %> 之前
+
\ No newline at end of file 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 00000000..2e3857c4 --- /dev/null +++ b/app/views/admin/orders/_state_option.html.erb @@ -0,0 +1,21 @@ +
+ <% case order.aasm_state %> + <% when "order_placed" %> + <%= link_to("取消訂單", cancel_admin_order_path(order.token) , :class => "btn btn-default btn-sm", :method => :post) %> + + <% when "paid" %> + <%= link_to("取消訂單", cancel_admin_order_path(order.token) , :class => "btn btn-default btn-sm", :method => :post) %> + <%= link_to("出貨", ship_admin_order_path(order.token) , :class => "btn btn-default btn-sm", :method => :post) %> + <% when "shipping" %> + <%= link_to("設為已出貨", shipped_admin_order_path(order.token), :class => "btn btn-default btn-sm", :method => :post) %> + <% when "shipped" %> + <%= link_to("退貨", return_admin_order_path(order.token), :class => "btn btn-default btn-sm", :method => :post) %> + + <% when "order_cancelled" %> + 訂單已取消 + <% when "good_returned" %> + 已退貨 + + <% end %> + +
\ No newline at end of file diff --git a/app/views/admin/orders/index.html.erb b/app/views/admin/orders/index.html.erb new file mode 100644 index 00000000..2acc45c6 --- /dev/null +++ b/app/views/admin/orders/index.html.erb @@ -0,0 +1,39 @@ +
+

訂單列表

+ + + + + + + + + + + + + <% @orders.each do |order| %> + + + + + + + + + <% end %> + +
訂單序號訂單時間使用者帳號付款方式訂單狀態訂單選項
<%= link_to order.token, admin_order_path(order.token) %> <%= time_ago_in_words(order.created_at) %> 之前 <%= order.user.email %> <%= order.payment_method %> <%= render_order_state(order) %> + <% case order.aasm_state %> + <% when "order_placed" %> + <%= link_to "取消訂單", cancel_admin_order_path(order.token), :class => "btn btn-default btn-sm", :method => :post %> + <% when "paid" %> + <%= link_to "出貨", ship_admin_order_path(order.token), :class => "btn btn-default btn-sm", :method => :post %> + <%= link_to "取消訂單", cancel_admin_order_path(order.token), :class => "btn btn-default btn-sm", :method => :post %> + <% when "shipping" %> + <%= link_to "已到貨", shipped_admin_order_path(order.token), :class => "btn btn-default btn-sm", :method => :post %> + <% when "shipped" %> + <%= link_to "退貨", return_admin_order_path(order.token), :class => "btn btn-default btn-sm", :method => :post %> + <% end %> +
+
\ No newline at end of file diff --git a/app/views/admin/orders/show.html.erb b/app/views/admin/orders/show.html.erb new file mode 100644 index 00000000..e19ff858 --- /dev/null +++ b/app/views/admin/orders/show.html.erb @@ -0,0 +1,89 @@ +
+
+ +

訂單明細

+ + <%= render_order_options_for_admin(@order) %> + + + + + + + + + + + <% @order_items.each do |order_item| %> + + + + + + <% end %> + + +
商品明細單價數量
+ <%= order_item.product_name %> + <%= order_item.price %> <%= order_item.quantity %>
+ +
+ + 總計 <%= @order.total %> NTD + +
+ +
+ +

寄送資訊

+ + + + + + + + + + + + + + + + + + + + + + + +
訂購人
+ <%= @order_info.billing_name %> - <%= @order_info.billing_address %> +
訂購人
+ <%= @order_info.billing_name %> - <%= @order_info.billing_address %> +
+ + + <% if !@order.paid? %> + +
+ <%= link_to("以信用卡付款", pay_with_credit_card_order_path(@order.token), :class => "btn btn-primary btn-lg") %> + + <%= link_to("以 ATM 付款", "#", :class => "btn btn-primary btn-lg") %> +
+ + <% else %> + + 此訂單已完成付款 + + <% end %> + + + + +
+ + +
\ No newline at end of file diff --git a/app/views/admin/products/edit.html.erb b/app/views/admin/products/edit.html.erb new file mode 100644 index 00000000..9375e090 --- /dev/null +++ b/app/views/admin/products/edit.html.erb @@ -0,0 +1,10 @@ +<%= simple_form_for [:admin, @product] do |f| %> + <%= f.input :title, label: '標題' %> + <%= f.input :description, label: '產品敘述' %> + <%= f.input :quantity, label: '數量' %> + <%= f.simple_fields_for :photos do |c| %> + <%= c.input :image , :as => :file %> + <% end %> + <%= f.input :price, label: '價格' %> + <%= f.submit "Submit", :disable_with => 'Submiting...' %> +<% end %> \ No newline at end of file diff --git a/app/views/admin/products/index.html.erb b/app/views/admin/products/index.html.erb new file mode 100644 index 00000000..27c40be9 --- /dev/null +++ b/app/views/admin/products/index.html.erb @@ -0,0 +1,17 @@ +
+
+ <%= link_to("新增產品", new_admin_product_path, :class => "btn btn-primary btn-sm pull-right") %> + <%= link_to("查看客戶訂單", admin_orders_path, :class => "btn btn-primary btn-sm pull-right") %> +
+ +
\ No newline at end of file diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb new file mode 100644 index 00000000..a17e0322 --- /dev/null +++ b/app/views/admin/products/new.html.erb @@ -0,0 +1,36 @@ + +<%= simple_form_for [:admin, @product] do |f| %> + <%= f.input :title, label: '標題' %> + <%= f.input :description, label: '產品敘述' %> + <%= f.input :quantity, label: '數量' %> + + <%= f.simple_fields_for :photos do |c| %> + <%= c.input :image , :as => :file %> + <% end %> + <%= f.input :price, label: '價格' %> + <%= f.submit "Submit", :disable_with => 'Submiting...' %> +<% end %> + + + \ No newline at end of file diff --git a/app/views/carts/checkout.html.erb b/app/views/carts/checkout.html.erb new file mode 100644 index 00000000..5a7af042 --- /dev/null +++ b/app/views/carts/checkout.html.erb @@ -0,0 +1,76 @@ +
+
+ +

購物明細

+ + + + + + + + + + + <% current_cart.cart_items.each do |item| %> + + + + + + <% end %> + + +
商品名稱單價數量
+ + <%= link_to(item.product.title, product_path(item.product)) %> + <%= item.product.price %> <%= item.quantity %>
+ +
+ + 總計 <%= render_cart_total_price(current_cart) %> NTD + +
+ +
+ +

訂單資訊

+ + +
+ + <%= simple_form_for @order do |f| %> + + <%= f.simple_fields_for :info do |c| %> + + 訂購人 + +
+ <%= c.input :billing_name %> +
+
+ <%= c.input :billing_address %> +
+ + 收貨人 +
+ <%= c.input :shipping_name %> +
+
+ <%= c.input :shipping_address %> +
+ <% end %> + +
+ <%= f.submit "生成訂單", :class => "btn btn-primary btn-lg btn-danger pull-right", :disable_with => 'Submiting...' %> +
+ + <% end %> +
+ + + +
+ + +
\ No newline at end of file diff --git a/app/views/carts/index.html.erb b/app/views/carts/index.html.erb new file mode 100644 index 00000000..e81d0bbc --- /dev/null +++ b/app/views/carts/index.html.erb @@ -0,0 +1,46 @@ +
+
+ <%= link_to("清空購物車", "#", :class => "pull-right btn btn-primary btn-sm") %> +

購物車

+ + + + + + + + + + + + <% current_cart.cart_items.each do |item| %> + + + + + + + + <% end %> + +
商品資訊單價數量刪除商品
<%= render_product_photo(item.product.default_photo) %><%= link_to(item.product.title, product_path(item.product)) %> <%= item.product.price %> + <%= simple_form_for item, :url => cart_item_path(item), defaults: {label: false} do |f| %> + <%= f.input :quantity, :value => item.quantity, :class => "col-md-10" %> + <%= f.submit "變更數量", :disable_with => 'Submiting...' %> + <% end -%> + <%= link_to("x", cart_item_path(item), :method => :delete, :class => "btn btn-xs btn-default") %>
+ +
+ + 總計 <%= render_cart_total_price(current_cart) %> NTD + +
+ +
+
+ <%= link_to("確認結賬", checkout_carts_path , :method => :post , :class => "btn btn-lg btn-danger pull-right") %> +
+
+ + +
\ No newline at end of file diff --git a/app/views/common/_footer.html.erb b/app/views/common/_footer.html.erb new file mode 100644 index 00000000..e69de29b diff --git a/app/views/common/_navbar.html.erb b/app/views/common/_navbar.html.erb new file mode 100644 index 00000000..6558e45a --- /dev/null +++ b/app/views/common/_navbar.html.erb @@ -0,0 +1,95 @@ + \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index da9769de..8f1c3f7f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,7 +8,18 @@ -<%= yield %> + +<%= render :partial => "common/navbar" %> + + +
+ <%= notice_message %> + + <%= yield %> +
+ + +<%= render :partial => "common/footer" %> 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 00000000..2d195c82 --- /dev/null +++ b/app/views/order_mailer/notify_order_placed.html.erb @@ -0,0 +1,74 @@ + + +
+
+ +

訂單明細

+ + + + + + + + + + <% @order_items.each do |order_item| %> + + + + + <% end %> + + +
商品明細單價
+ <%= order_item.product_name %> + <%= order_item.price %>
+ + +
+ + 總計 <%= @order.total %> NTD + +
+ +
+ +

寄送資訊

+ + + + + + + + + + + + + + + + + + + + + + + +
訂購人
+ <%= @order_info.billing_name %> - <%= @order_info.billing_address %> +
收貨人
+ <%= @order_info.billing_name %> - <%= @order_info.billing_address %> +
+ + <%= link_to "查看訂單", order_url(@order.token) %> + + + +
+ + +
\ No newline at end of file diff --git a/app/views/orders/pay_with_credit_card.html.erb b/app/views/orders/pay_with_credit_card.html.erb new file mode 100644 index 00000000..552b987e --- /dev/null +++ b/app/views/orders/pay_with_credit_card.html.erb @@ -0,0 +1,49 @@ + + + + + + +<%= form_tag order_card_charges_path(@order.token), :id => "payment-form", :class => "form form-horizontal" do %> + + + +
+
+ + +
+
+ +
+
+ + +
+
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ + + + +<% end %> \ No newline at end of file diff --git a/app/views/orders/show.html.erb b/app/views/orders/show.html.erb new file mode 100644 index 00000000..da90dfc3 --- /dev/null +++ b/app/views/orders/show.html.erb @@ -0,0 +1,85 @@ +
+
+ +

訂單明細

+ + + + + + + + + + + <% @order_items.each do |order_item| %> + + + + + + <% end %> + + +
商品明細單價數量
<%= order_item.product_name %> <%= order_item.price %> <%= order_item.quantity %>
+ +
+ + 總計 <%= @order.total %> NTD + +
+ +
+ +

寄送資訊

+ + + + + + + + + + + + + + + + + + + + + + + +
訂購人
+ <%= @order_info.billing_name %> - <%= @order_info.billing_address %> +
訂購人
+ <%= @order_info.billing_name %> - <%= @order_info.billing_address %> +
+ + + <% if !@order.paid? %> + +
+ <%= link_to("以信用卡付款", pay_with_credit_card_order_path(@order.token), :class => "btn btn-primary btn-lg btn-danger ") %> + + <%= link_to("以 ATM 付款", "#", :class => "btn btn-primary btn-lg btn-danger ") %> +
+ + <% else %> + + 此訂單已完成付款 + + <% end %> + + + + +
+ + +
\ No newline at end of file diff --git a/app/views/payment_mailer/notify_payment_completed.html.erb b/app/views/payment_mailer/notify_payment_completed.html.erb new file mode 100644 index 00000000..ab3190b7 --- /dev/null +++ b/app/views/payment_mailer/notify_payment_completed.html.erb @@ -0,0 +1,74 @@ + + +
+
+ +

您購買的商品

+ + + + + + + + + + <% @order_items.each do |order_item| %> + + + + + <% end %> + + +
商品明細單價
+ <%= order_item.product_name %> + <%= order_item.price %>
+ + +
+ + 總計 <%= @order.total %> NTD + +
+ +
+ +

寄送資訊

+ + + + + + + + + + + + + + + + + + + + + + + +
訂購人
+ <%= @order_info.billing_name %> - <%= @order_info.billing_address %> +
收貨人
+ <%= @order_info.billing_name %> - <%= @order_info.billing_address %> +
+ + + <%= link_to "查看訂單", order_url(@order.token) %> + + +
+ + +
\ No newline at end of file diff --git a/app/views/products/_product_item.html.erb b/app/views/products/_product_item.html.erb new file mode 100644 index 00000000..dc79be86 --- /dev/null +++ b/app/views/products/_product_item.html.erb @@ -0,0 +1,13 @@ +
+ +
+ <%= link_to product_path(product) do %> + <%= render_product_photo(product.default_photo) %> + <% end %> + +
+ + <%= render_product_name(product) %> + + +
\ No newline at end of file diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb new file mode 100644 index 00000000..87627ff9 --- /dev/null +++ b/app/views/products/index.html.erb @@ -0,0 +1,40 @@ +
+ <%= form_tag(search_products_path, {:class => "form-inline pull-right"}) do %> +
+ +
+ + <% end -%> +
+ +<% @products.each do |product| %> +
+
+ +
+
+

<%= link_to(render_product_name(product), product_path(product)) %>

+
+
+ <%= render_product_photo(product.default_photo) %> +
+
+ +
+
+

產品資訊

+
+
+ +

<%= product.description %>

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Exercitationem, tenetur, provident, consequuntur, obcaecati non assumenda sunt voluptatibus accusamus expedita praesentium corrupti saepe quo neque dignissimos quia quidem voluptatem possimus officiis. + Laborum, necessitatibus fugiat non optio iusto ullam blanditiis inventore harum explicabo neque ex atque iure eos quibusdam vel porro nobis quaerat omnis praesentium tenetur reprehenderit. Modi odio eveniet ullam praesentium. + Illum, animi, alias odit hic eum doloribus aliquam rerum iusto libero temporibus autem officiis sint ea saepe molestiae nemo illo recusandae labore similique blanditiis unde mollitia quibusdam. Enim, doloribus, quod!

+
+
+
+
+ <%= link_to("產品細節", product_path(product), :class => "addToCart btn btn-info pull-right") %> +
+
+<% end %> \ No newline at end of file diff --git a/app/views/products/search.html.erb b/app/views/products/search.html.erb new file mode 100644 index 00000000..332d3064 --- /dev/null +++ b/app/views/products/search.html.erb @@ -0,0 +1,9 @@ +
+ +

搜尋字串: <%= @query_string %>

+ +
+ + <%= render :partial => "product_item", :collection => @products , :as => :product %> + +
\ No newline at end of file diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb new file mode 100644 index 00000000..68bdd1e9 --- /dev/null +++ b/app/views/products/show.html.erb @@ -0,0 +1,36 @@ +
+
+ +
+
+

<%= render_product_name(@product) %>

+
+
+ <%= render_product_photo(@product.default_photo) %> +
+
+ +
+
+

產品資訊

+
+
+

<%= @product.description %>

+

Lorem ipsum dolor sit amet, consectetur adipisicing elit. Exercitationem, tenetur, provident, consequuntur, obcaecati non assumenda sunt voluptatibus accusamus expedita praesentium corrupti saepe quo neque dignissimos quia quidem voluptatem possimus officiis. + Illum, animi, alias odit hic eum doloribus aliquam rerum iusto libero temporibus autem officiis sint ea saepe molestiae nemo illo recusandae labore similique blanditiis unde mollitia quibusdam. Enim, doloribus, quod!

+
+
+
剩餘數量
+

還有 <%= @product.quantity %> 件商品

+
+
+
售價
+

$ <%= @product.price %> 元

+
+
+
+
+ + <%= link_to("加入購物車", add_to_cart_product_path(@product), :method => :post, :class => "addToCart btn btn-danger pull-right") %> +
+
\ No newline at end of file diff --git a/config/environments/development.rb b/config/environments/development.rb index ddf0e90c..ef4f4689 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -34,4 +34,17 @@ # Raises error for missing translations # config.action_view.raise_on_missing_translations = true + + config.action_mailer.delivery_method = :letter_opener + config.action_mailer.smtp_settings = { + :port => 587, + :address => 'smtp.mailgun.org', + :user_name => Settings.mailgun.user, + :password => Settings.mailgun.password, + :domain => Settings.mailgun.domain, + :authentication => :plain, + } + + config.action_mailer.delivery_method = :smtp + end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb new file mode 100644 index 00000000..ef3a3c7c --- /dev/null +++ b/config/initializers/devise.rb @@ -0,0 +1,252 @@ +# 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| + # ==> 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" + + # ==> 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 = [:token]` will + # enable it only for token authentication. The supported strategies are: + # :database = Support basic authentication with authentication key + password + # :token = Support basic authentication with token authentication key + # :token_options = Support token authentication with options as defined in + # http://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Token.html + # config.http_authenticatable = false + + # If http headers 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 + # :http_auth and :token_auth by adding those symbols to the array below. + # 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 + + # ==> Configuration for :database_authenticatable + # For bcrypt, this is the cost for hashing the password and defaults to 10. If + # using other encryptors, it sets how many times you want the password re-encrypted. + # + # 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. + config.stretches = Rails.env.test? ? 1 : 10 + + # Setup a pepper to generate the encrypted password. + # config.pepper = "37dc20c6b7be0969ab82faba55fc0b386a1f916703955e86242ddd87ffd3ed40cb63b1d4c5c60902053c5ecbd3b2bc3d0fc2c6857b98c11f27c99fa4e3adb82f" + + # ==> Configuration for :confirmable + # A period that the user is allowed to access the website even without + # confirming his account. For instance, if set to 2.days, the user will be + # able to access the website for two days without confirming his account, + # access will be blocked just in the third day. Default is 0.days, meaning + # the user cannot access the website without confirming his 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 + + # 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. Default is 8..128. + config.password_length = 8..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[^@]+@[^@]+\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 + + # If true, expires auth token on session timeout. + # config.expire_auth_token_on_timeout = false + + # ==> 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 + + # ==> 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 + + # ==> Configuration for :encryptable + # Allow you to use another encryption algorithm besides bcrypt (default). You can use + # :sha1, :sha512 or encryptors 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 + + # ==> Configuration for :token_authenticatable + # Defines name of the authentication token params key + # config.token_authentication_key = :auth_token + + # ==> 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 00000000..6986de98 --- /dev/null +++ b/config/initializers/simple_form.rb @@ -0,0 +1,145 @@ +# 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 => :lookup` + # to the input. If so, they will retrieve the values from the model + # if any exists. If you want to enable the lookup for 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 } + 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 = 'alert alert-error' + + # 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. Please note that when using :boolean_style = :nested, + # SimpleForm will force this option to be a label. + # 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| "#{required} #{label}" } + + # You can define the class to use on all labels. Default is nil. + config.label_class = 'control-label' + + # You can define the class to use on all forms. Default is simple_form. + # config.form_class = :simple_form + + # 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 } + + # 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 +end diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb new file mode 100644 index 00000000..cb31bf7f --- /dev/null +++ b/config/initializers/simple_form_bootstrap.rb @@ -0,0 +1,91 @@ +inputs = %w[ + CollectionSelectInput + DateTimeInput + FileInput + GroupedCollectionSelectInput + NumericInput + PasswordInput + RangeInput + StringInput + TextInput +] + +inputs.each do |input_type| + superclass = "SimpleForm::Inputs::#{input_type}".constantize + + new_class = Class.new(superclass) do + def input_html_classes + super.push('form-control') + end + end + + Object.const_set(input_type, new_class) +end + +# Use this setup block to configure all options available in SimpleForm. +SimpleForm.setup do |config| + config.boolean_style = :nested + + config.wrappers :bootstrap3, tag: 'div', class: 'form-group', error_class: 'has-error', + defaults: { input_html: { class: 'default_class' } } do |b| + + b.use :html5 + b.use :min_max + b.use :maxlength + b.use :placeholder + + b.optional :pattern + b.optional :readonly + + b.use :label_input + b.use :hint, wrap_with: { tag: 'span', class: 'help-block' } + b.use :error, wrap_with: { tag: 'span', class: 'help-block has-error' } + end + + config.wrappers :prepend, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.use :placeholder + b.wrapper tag: 'div', class: 'controls' do |input| + input.wrapper tag: 'div', class: 'input-group' do |prepend| + prepend.use :label , class: 'input-group-addon' ###Please note setting class here fro the label does not currently work (let me know if you know a workaround as this is the final hurdle) + prepend.use :input + end + input.use :hint, wrap_with: { tag: 'span', class: 'help-block' } + input.use :error, wrap_with: { tag: 'span', class: 'help-block has-error' } + end + end + + config.wrappers :append, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| + b.use :html5 + b.use :placeholder + b.wrapper tag: 'div', class: 'controls' do |input| + input.wrapper tag: 'div', class: 'input-group' do |prepend| + prepend.use :input + prepend.use :label , class: 'input-group-addon' ###Please note setting class here fro the label does not currently work (let me know if you know a workaround as this is the final hurdle) + end + input.use :hint, wrap_with: { tag: 'span', class: 'help-block' } + input.use :error, wrap_with: { tag: 'span', class: 'help-block has-error' } + end + end + + config.wrappers :checkbox, tag: :div, class: "checkbox", error_class: "has-error" do |b| + + # Form extensions + b.use :html5 + + # Form components + b.wrapper tag: :label do |ba| + ba.use :input + ba.use :label_text + end + + b.use :hint, wrap_with: { tag: :p, class: "help-block" } + b.use :error, wrap_with: { tag: :span, class: "help-block text-danger" } + end + + # Wrappers for forms and inputs using the Twitter 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 = :bootstrap3 +end \ No newline at end of file diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml new file mode 100644 index 00000000..d01f375c --- /dev/null +++ b/config/locales/devise.en.yml @@ -0,0 +1,59 @@ +# Additional translations at https://github.com/plataformatec/devise/wiki/I18n + +en: + devise: + confirmations: + confirmed: "Your account was successfully confirmed. You are now signed in." + send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes." + failure: + already_authenticated: "You are already signed in." + inactive: "Your account was not activated yet." + invalid: "Invalid email or password." + invalid_token: "Invalid authentication token." + locked: "Your account is locked." + not_found_in_database: "Invalid email 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 account before continuing." + mailer: + confirmation_instructions: + subject: "Confirmation instructions" + reset_password_instructions: + subject: "Reset password instructions" + unlock_instructions: + subject: "Unlock Instructions" + 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 about 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 was changed successfully. You are now signed in." + updated_not_active: "Your password was changed successfully." + registrations: + destroyed: "Bye! Your account was 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 open 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 click on the confirm link to finalize confirming your new email address." + updated: "You updated your account successfully." + sessions: + signed_in: "Signed in successfully." + signed_out: "Signed out successfully." + unlocks: + send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes." + send_paranoid_instructions: "If your account exists, you will receive an email with instructions about 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/en.yml b/config/locales/en.yml index 06539571..d86d6b82 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -21,3 +21,12 @@ en: hello: "Hello world" + +orders: + order_state: + order_placed: 已下單 + paid: 已付款 + shipping: 出貨中 + shipped: 已到貨 + order_cancelled: 取消訂單 + good_returned: 退貨 \ No newline at end of file diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml new file mode 100644 index 00000000..0df11fe0 --- /dev/null +++ b/config/locales/simple_form.en.yml @@ -0,0 +1,26 @@ +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:" + # Labels and hints 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.' + diff --git a/config/routes.rb b/config/routes.rb index 3f66539d..cc92edb6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,52 @@ Rails.application.routes.draw do + + devise_for :users + + namespace :admin do + resources :products + resources :orders, :only => [:index, :show] do + member do + post :cancel + post :ship + post :shipped + post :return + end + end + end + + resources :products do + member do + post :add_to_cart + end + collection do + post :search + end + end + + resources :carts do + collection do + post 'checkout' + end + end + + resources :orders do + member do + get :pay_with_credit_card + end + resources :card_charges + end + + resources :cart_items, :only => [:destroy, :update] + + namespace :account do + resources :orders, :only => [:index] + end + + # 暫時先把 root 放到這邊 + root :to => "products#index" + + # 設定 host url + default_url_options :host => "artstore.dev" # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/db/migrate/20140610094630_create_products.rb b/db/migrate/20140610094630_create_products.rb new file mode 100644 index 00000000..805c9766 --- /dev/null +++ b/db/migrate/20140610094630_create_products.rb @@ -0,0 +1,11 @@ +class CreateProducts < ActiveRecord::Migration + def change + create_table :products do |t| + t.string :title + t.text :description + t.integer :quantity + + t.timestamps + end + end +end diff --git a/db/migrate/20140610112037_devise_create_users.rb b/db/migrate/20140610112037_devise_create_users.rb new file mode 100644 index 00000000..2099d998 --- /dev/null +++ b/db/migrate/20140610112037_devise_create_users.rb @@ -0,0 +1,46 @@ +class DeviseCreateUsers < ActiveRecord::Migration + 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 + 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 # Only if lock strategy is :failed_attempts + # t.string :unlock_token # Only if unlock strategy is :email or :both + # t.datetime :locked_at + + ## Token authenticatable + # t.string :authentication_token + + + t.timestamps + 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 + # add_index :users, :authentication_token, :unique => true + end +end diff --git a/db/migrate/20140610113852_add_is_admin_to_user.rb b/db/migrate/20140610113852_add_is_admin_to_user.rb new file mode 100644 index 00000000..1ef84cff --- /dev/null +++ b/db/migrate/20140610113852_add_is_admin_to_user.rb @@ -0,0 +1,5 @@ +class AddIsAdminToUser < ActiveRecord::Migration + def change + add_column :users, :is_admin, :boolean, :default => false + end +end diff --git a/db/migrate/20140615164554_create_photos.rb b/db/migrate/20140615164554_create_photos.rb new file mode 100644 index 00000000..de592bf4 --- /dev/null +++ b/db/migrate/20140615164554_create_photos.rb @@ -0,0 +1,10 @@ +class CreatePhotos < ActiveRecord::Migration + def change + create_table :photos do |t| + t.integer :product_id + t.string :image + + t.timestamps + end + end +end diff --git a/db/migrate/20140616080727_add_price_to_product.rb b/db/migrate/20140616080727_add_price_to_product.rb new file mode 100644 index 00000000..f662c64f --- /dev/null +++ b/db/migrate/20140616080727_add_price_to_product.rb @@ -0,0 +1,5 @@ +class AddPriceToProduct < ActiveRecord::Migration + def change + add_column :products, :price, :float, :default => 0 + end +end diff --git a/db/migrate/20140616081302_change_price_and_quantity_default.rb b/db/migrate/20140616081302_change_price_and_quantity_default.rb new file mode 100644 index 00000000..b2f99e32 --- /dev/null +++ b/db/migrate/20140616081302_change_price_and_quantity_default.rb @@ -0,0 +1,5 @@ +class ChangePriceAndQuantityDefault < ActiveRecord::Migration + def change + change_column :products, :quantity, :integer, :default => 0 + end +end diff --git a/db/migrate/20140617090000_create_carts.rb b/db/migrate/20140617090000_create_carts.rb new file mode 100644 index 00000000..8e66adb5 --- /dev/null +++ b/db/migrate/20140617090000_create_carts.rb @@ -0,0 +1,8 @@ +class CreateCarts < ActiveRecord::Migration + def change + create_table :carts do |t| + + t.timestamps + end + end +end diff --git a/db/migrate/20140617090119_create_cart_items.rb b/db/migrate/20140617090119_create_cart_items.rb new file mode 100644 index 00000000..0fb13b18 --- /dev/null +++ b/db/migrate/20140617090119_create_cart_items.rb @@ -0,0 +1,10 @@ +class CreateCartItems < ActiveRecord::Migration + def change + create_table :cart_items do |t| + t.integer :cart_id + t.integer :product_id + + t.timestamps + end + end +end diff --git a/db/migrate/20140617104038_create_orders.rb b/db/migrate/20140617104038_create_orders.rb new file mode 100644 index 00000000..d9af4224 --- /dev/null +++ b/db/migrate/20140617104038_create_orders.rb @@ -0,0 +1,10 @@ +class CreateOrders < ActiveRecord::Migration + def change + create_table :orders do |t| + t.integer :user_id + t.integer :total + t.boolean :paid, :default => false + t.timestamps + end + end +end \ No newline at end of file diff --git a/db/migrate/20140617104151_create_order_infos.rb b/db/migrate/20140617104151_create_order_infos.rb new file mode 100644 index 00000000..ce021dd1 --- /dev/null +++ b/db/migrate/20140617104151_create_order_infos.rb @@ -0,0 +1,13 @@ +class CreateOrderInfos < ActiveRecord::Migration + def change + create_table :order_infos do |t| + t.integer :order_id + t.string :billing_name + t.string :billing_address + + t.string :shipping_name + t.string :shipping_address + t.timestamps + end + end +end \ No newline at end of file diff --git a/db/migrate/20140617104247_create_order_items.rb b/db/migrate/20140617104247_create_order_items.rb new file mode 100644 index 00000000..f38c96fb --- /dev/null +++ b/db/migrate/20140617104247_create_order_items.rb @@ -0,0 +1,11 @@ +class CreateOrderItems < ActiveRecord::Migration + def change + create_table :order_items do |t| + t.string :product_name + t.float :price + t.integer :quantity + t.integer :order_id + t.timestamps + end + end +end \ No newline at end of file diff --git a/db/migrate/20140619061027_add_token_to_order.rb b/db/migrate/20140619061027_add_token_to_order.rb new file mode 100644 index 00000000..cb455b41 --- /dev/null +++ b/db/migrate/20140619061027_add_token_to_order.rb @@ -0,0 +1,6 @@ +class AddTokenToOrder < ActiveRecord::Migration + def change + add_column :orders, :token, :string + add_index :orders, :token + end +end diff --git a/db/migrate/20140619070542_add_payment_method_to_order.rb b/db/migrate/20140619070542_add_payment_method_to_order.rb new file mode 100644 index 00000000..e7eb536a --- /dev/null +++ b/db/migrate/20140619070542_add_payment_method_to_order.rb @@ -0,0 +1,5 @@ +class AddPaymentMethodToOrder < ActiveRecord::Migration + def change + add_column :orders, :payment_method, :string + end +end diff --git a/db/migrate/20140619074900_add_aasm_state_to_orders.rb b/db/migrate/20140619074900_add_aasm_state_to_orders.rb new file mode 100644 index 00000000..e2f54fbe --- /dev/null +++ b/db/migrate/20140619074900_add_aasm_state_to_orders.rb @@ -0,0 +1,6 @@ +class AddAasmStateToOrders < ActiveRecord::Migration + def change + add_column :orders, :aasm_state, :string, :default => "order_placed" + add_index :orders , :aasm_state + end +end diff --git a/db/migrate/20140619154722_add_quantity_to_cart_items.rb b/db/migrate/20140619154722_add_quantity_to_cart_items.rb new file mode 100644 index 00000000..328dfdba --- /dev/null +++ b/db/migrate/20140619154722_add_quantity_to_cart_items.rb @@ -0,0 +1,5 @@ +class AddQuantityToCartItems < ActiveRecord::Migration + def change + add_column :cart_items, :quantity, :integer, :default => 1 + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 00000000..e5571889 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,97 @@ +# encoding: UTF-8 +# 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: 20140619154722) do + + create_table "cart_items", force: true do |t| + t.integer "cart_id" + t.integer "product_id" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "quantity", default: 1 + end + + create_table "carts", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "order_infos", force: true do |t| + t.integer "order_id" + t.string "billing_name" + t.string "billing_address" + t.string "shipping_name" + t.string "shipping_address" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "order_items", force: true do |t| + t.string "product_name" + t.float "price" + t.integer "quantity" + t.integer "order_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "orders", force: true do |t| + t.integer "user_id" + t.integer "total" + t.boolean "paid", default: false + t.datetime "created_at" + t.datetime "updated_at" + t.string "token" + t.string "payment_method" + t.string "aasm_state", default: "order_placed" + end + + add_index "orders", ["aasm_state"], name: "index_orders_on_aasm_state" + add_index "orders", ["token"], name: "index_orders_on_token" + + create_table "photos", force: true do |t| + t.integer "product_id" + t.string "image" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "products", force: true do |t| + t.string "title" + t.text "description" + t.integer "quantity", default: 0 + t.datetime "created_at" + t.datetime "updated_at" + t.float "price", default: 0.0 + end + + create_table "users", force: true 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 + 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" + t.datetime "updated_at" + t.boolean "is_admin", default: false + end + + add_index "users", ["email"], name: "index_users_on_email", unique: true + add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true + +end diff --git a/lib/templates/erb/scaffold/_form.html.erb b/lib/templates/erb/scaffold/_form.html.erb new file mode 100644 index 00000000..201a069e --- /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/test/controllers/account/orders_controller_test.rb b/test/controllers/account/orders_controller_test.rb new file mode 100644 index 00000000..b0419411 --- /dev/null +++ b/test/controllers/account/orders_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Account::OrdersControllerTest < ActionController::TestCase + # 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 00000000..8af7f0c9 --- /dev/null +++ b/test/controllers/admin/orders_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Admin::OrdersControllerTest < ActionController::TestCase + # 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 00000000..508fe6b7 --- /dev/null +++ b/test/controllers/admin/products_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Admin::ProductsControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/card_charges_controller_test.rb b/test/controllers/card_charges_controller_test.rb new file mode 100644 index 00000000..c5002f27 --- /dev/null +++ b/test/controllers/card_charges_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CardChargesControllerTest < ActionController::TestCase + # 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 00000000..76b2b022 --- /dev/null +++ b/test/controllers/cart_items_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CartItemsControllerTest < ActionController::TestCase + # 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 00000000..1e748b83 --- /dev/null +++ b/test/controllers/carts_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CartsControllerTest < ActionController::TestCase + # 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 00000000..0afece19 --- /dev/null +++ b/test/controllers/orders_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class OrdersControllerTest < ActionController::TestCase + # 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 00000000..c881fa68 --- /dev/null +++ b/test/controllers/products_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class ProductsControllerTest < ActionController::TestCase + # 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 00000000..a0de2cb5 --- /dev/null +++ b/test/fixtures/cart_items.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + cart_id: 1 + product_id: 1 + +two: + cart_id: 1 + product_id: 1 diff --git a/test/fixtures/carts.yml b/test/fixtures/carts.yml new file mode 100644 index 00000000..937a0c00 --- /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/order_infos.yml b/test/fixtures/order_infos.yml new file mode 100644 index 00000000..937a0c00 --- /dev/null +++ b/test/fixtures/order_infos.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/order_items.yml b/test/fixtures/order_items.yml new file mode 100644 index 00000000..937a0c00 --- /dev/null +++ b/test/fixtures/order_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/orders.yml b/test/fixtures/orders.yml new file mode 100644 index 00000000..937a0c00 --- /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/photos.yml b/test/fixtures/photos.yml new file mode 100644 index 00000000..5cc49b72 --- /dev/null +++ b/test/fixtures/photos.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + product_id: 1 + image: MyString + +two: + product_id: 1 + image: MyString diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml new file mode 100644 index 00000000..c3b9bc15 --- /dev/null +++ b/test/fixtures/products.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + description: MyText + quantity: 1 + +two: + title: MyString + description: MyText + quantity: 1 diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 00000000..937a0c00 --- /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/helpers/account/orders_helper_test.rb b/test/helpers/account/orders_helper_test.rb new file mode 100644 index 00000000..60734209 --- /dev/null +++ b/test/helpers/account/orders_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class Account::OrdersHelperTest < ActionView::TestCase +end diff --git a/test/helpers/admin/orders_helper_test.rb b/test/helpers/admin/orders_helper_test.rb new file mode 100644 index 00000000..8511d6d4 --- /dev/null +++ b/test/helpers/admin/orders_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class Admin::OrdersHelperTest < ActionView::TestCase +end diff --git a/test/helpers/admin/products_helper_test.rb b/test/helpers/admin/products_helper_test.rb new file mode 100644 index 00000000..0b696b1f --- /dev/null +++ b/test/helpers/admin/products_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class Admin::ProductsHelperTest < ActionView::TestCase +end diff --git a/test/helpers/card_charges_helper_test.rb b/test/helpers/card_charges_helper_test.rb new file mode 100644 index 00000000..1fe502e7 --- /dev/null +++ b/test/helpers/card_charges_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class CardChargesHelperTest < ActionView::TestCase +end diff --git a/test/helpers/cart_items_helper_test.rb b/test/helpers/cart_items_helper_test.rb new file mode 100644 index 00000000..4cfc7e99 --- /dev/null +++ b/test/helpers/cart_items_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class CartItemsHelperTest < ActionView::TestCase +end diff --git a/test/helpers/carts_helper_test.rb b/test/helpers/carts_helper_test.rb new file mode 100644 index 00000000..0fac3c4e --- /dev/null +++ b/test/helpers/carts_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class CartsHelperTest < ActionView::TestCase +end diff --git a/test/helpers/orders_helper_test.rb b/test/helpers/orders_helper_test.rb new file mode 100644 index 00000000..52dacae1 --- /dev/null +++ b/test/helpers/orders_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class OrdersHelperTest < ActionView::TestCase +end diff --git a/test/helpers/products_helper_test.rb b/test/helpers/products_helper_test.rb new file mode 100644 index 00000000..0f5beab7 --- /dev/null +++ b/test/helpers/products_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class ProductsHelperTest < ActionView::TestCase +end diff --git a/test/mailers/order_mailer_test.rb b/test/mailers/order_mailer_test.rb new file mode 100644 index 00000000..6e2129de --- /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/payment_mailer_test.rb b/test/mailers/payment_mailer_test.rb new file mode 100644 index 00000000..758a42ae --- /dev/null +++ b/test/mailers/payment_mailer_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PaymentMailerTest < 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 00000000..7be457e2 --- /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/mailers/previews/payment_mailer_preview.rb b/test/mailers/previews/payment_mailer_preview.rb new file mode 100644 index 00000000..55781884 --- /dev/null +++ b/test/mailers/previews/payment_mailer_preview.rb @@ -0,0 +1,4 @@ +# Preview all emails at http://localhost:3000/rails/mailers/payment_mailer +class PaymentMailerPreview < ActionMailer::Preview + +end diff --git a/test/models/cart_item_test.rb b/test/models/cart_item_test.rb new file mode 100644 index 00000000..881afe1f --- /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 00000000..9fad43a1 --- /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_info_test.rb b/test/models/order_info_test.rb new file mode 100644 index 00000000..e2689117 --- /dev/null +++ b/test/models/order_info_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class OrderInfoTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/order_item_test.rb b/test/models/order_item_test.rb new file mode 100644 index 00000000..e473b9e2 --- /dev/null +++ b/test/models/order_item_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class OrderItemTest < 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 00000000..15b8ed13 --- /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/photo_test.rb b/test/models/photo_test.rb new file mode 100644 index 00000000..e2ec03a1 --- /dev/null +++ b/test/models/photo_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PhotoTest < 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 00000000..211cdd0b --- /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 00000000..82f61e01 --- /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 diff --git a/todo b/todo new file mode 100644 index 00000000..eee17972 --- /dev/null +++ b/todo @@ -0,0 +1,85 @@ + ✔ 身為商家的管理者，我要能夠在後台上架我的東西，並設定能夠販賣。 @done (14-06-16 16:54) + ✔ 管理者需要有一個後台 @done (14-06-10 18:27) + ✔ 在後台必須可以新增商品 @done (14-06-10 18:27) + ✔ 商品必須有各種必要的屬性欄位 @done (14-06-16 16:54) + ✔ 商品名稱 @done (14-06-10 18:27) + ✔ 商品描述 @done (14-06-10 18:27) + ✔ 商品圖片 @done (14-06-16 02:06) + ✔ 商品價格 @done (14-06-16 16:54) + ✔ 商品庫存數量 @done (14-06-10 18:27) + + ✔ 身為商家的管理者，我要能在後台設定權限，權限分為管理者和消費者。 @done (14-06-10 20:14) + ✔ 後台必須要有登入的功能 @done (14-06-10 20:14) + ✔ 使用者身份分為「管理者」和「消費者」兩種 @done (14-06-10 20:14) + ✔ 只有「管理者」身份的使用者可以進入後台頁面 @done (14-06-10 20:14) + +[ 後台 ] + ✔ 管理者登入後必須要有選單，以選擇想要進行的作業 @done (14-06-23 17:22) + ✔ 管理商品 @done (14-06-16 17:11) + ✔ 顯示列表 @done (14-06-13 13:24) + ✔ 新增 @done (14-06-13 13:23) + ✔ 修改 @done (14-06-16 17:01) + ✔ 刪除 @done (14-06-16 17:11) + ✔ 管理訂單 @done (14-06-23 17:22) + ✔ 顯示列表 @done (14-06-23 17:22) + ✔ 變更狀態 @done (14-06-23 17:22) + ✔ 刪除訂單 @done (14-06-23 17:22) + ✔ 訂單必須有「未結賬」、「已結賬」、「出貨中」、「已出貨（消費者收到商品）」、「退貨申請」、「已退貨（已收到退貨商品）」等狀態。 @done (14-06-23 17:22) + ✔ 消費者結賬後必須收到 mail 確認 @done (14-06-24 14:01) + ☐ 商品出貨後消費者也必須收到 mail 確認 + ☐ 商品出貨後，該商品的庫存數量必須隨出貨量變更 + ✔ 管理者應該要可以管理訂單狀態 @done (14-06-24 14:01) + +[ 前台 ] + ✔ 消費者應該要能看到所有商品 @done (14-06-13 16:05) + ✔ 消費者要能將商品加到購物車 @done (14-06-17 18:29) + ✔ 購物車狀態 @done (14-06-16 18:12) + ✔ 加入購物車按鈕 @done (14-06-16 18:12) + ✔ 消費者要能看到購物車明細 @done (14-06-19 14:02) + ✔ 消費者要能確認購買、填寫資料並產生訂單 @done (14-06-19 15:27) + ✔ 可以填寫寄送資訊 @done (14-06-19 15:28) + ✔ 消費者要能選擇用信用卡進行結賬的動作 @done (14-06-19 15:28) + ✔ 結賬後要能收到 mail 確認 @done (14-06-24 14:01) + + +[ 作業 ] + ✔ Week1 Homework @done (14-06-16 02:06) + ✔ 寫後台的 User Story @done (14-06-13 13:45) + ✔ 實作圖片上傳 @done (14-06-16 02:06) + ✔ 用 Bootstrap 做一個「有 navbar」的 layout @done (14-06-13 17:54) + ✔ 使用 simple_form 換掉 form_for @done (14-06-10 21:44) + ✔ products/show, products, index 實作 @done (14-06-13 15:34) + ✔ 搞不定參考答案做的部分 @done (14-06-16 17:53) + ✔ 修復圖片顯示功能 @done (14-06-16 17:27) + ✔ 資料庫中有「沒有圖片的產品」也要能正常顯示 index，要能判斷產品有沒有照片 @done (14-06-16 17:27) + + ✔ Week2 Homework @done (14-06-23 17:22) + ✔ 清空購物車（結賬後） @done (14-06-19 22:24) + ✔ 從購物車內刪掉某些物品 @done (14-06-19 23:36) + ✔ 增加移除商品按鈕 @done (14-06-19 23:03) + ✔ 增加 cart_items_controller @done (14-06-19 23:10) + ✔ 建立 destroy action @done (14-06-19 23:34) + ✔ 加上正確 routes @done (14-06-19 23:10) + ✔ 購物車加入數量設計 @done (14-06-20 02:00) + ✔ 使用者可以變更數量 @done (14-06-20 03:22) + ✔ 購物車的總價 => 小計 * 數量 @done (14-06-20 02:07) + ✔ 數量為零的貨物不能購買 @done (14-06-20 02:19) + ✔ 支援多重購買數量 @done (14-06-20 02:04) + ✔ 修改訂單畫面 @done (14-06-20 03:51) + ✔ 訂單畫面美化 @done (14-06-23 17:22) + ✔ 建立 account/orders 可以看到該使用者過去所有訂單 @done (14-06-20 04:34) + ✔ 結賬後跳轉到 account/orders#index @done (14-06-20 04:34) + ✔ 建立 admin/orders 可以看到系統內所有訂單 @done (14-06-20 13:15) + ✔ 新增 resources @done (14-06-20 04:45) + ✔ 新增 admin::orders controller @done (14-06-20 04:45) + ✔ def index action @done (14-06-20 13:15) + ✔ create index view @done (14-06-20 13:15) + ✔ admin 的 order 列表要能顯示訂單狀態 @done (14-06-20 13:26) + ✔ 單張 order 應該要可以依照狀態圖改變狀態 @done (14-06-23 17:22) + ☐ Week3 Homework + ✔ 信用卡付款成功也要可以寄信 @done (14-06-24 20:43) + ✔ 消費者可以透過 email 裡的連結檢視原先的 order @done (14-06-24 21:12) + ✔ 安裝 SettingsLogic @done (14-06-27 16:03) + ✔ 把 key 放到 SettingsLogic 的 yml 裏面 @done (14-06-27 16:03) + ✔ 把 CardChargesController 收納成 Service Object @done (14-06-27 19:28) + ✔ 用 ransack 實作搜尋產品功能 @done (14-06-30 17:59) \ No newline at end of file