From 9943f341437cea3965848b2af5af0066eed46579 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 10 Jun 2014 16:32:57 +0800 Subject: [PATCH 01/71] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20Todo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- todo | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 todo diff --git a/todo b/todo new file mode 100644 index 00000000..49cd0546 --- /dev/null +++ b/todo @@ -0,0 +1,13 @@ + ☐ 身為商家的管理者，我要能夠在後台上架我的東西，並設定能夠販賣。 + ☐ 管理者需要有一個後台 + ☐ 在後台必須可以新增商品 + ☐ 商品必須有各種必要的屬性欄位 + ☐ 商品名稱 + ☐ 商品描述 + ☐ 商品圖片 + ☐ 商品庫存數量 + + ☐ 身為商家的管理者，我要能在後台設定權限，權限分為管理者和消費者。 + ☐ 後台必須要有登入的功能 + ☐ 使用者身份分為「管理者」和「消費者」兩種 + ☐ 只有「管理者」身份的使用者可以進入後台頁面 From 340072d80da5d156880021c583481f6c08730915 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 10 Jun 2014 17:35:49 +0800 Subject: [PATCH 02/71] =?UTF-8?q?=E5=BB=BA=E7=AB=8Badmin=20=E4=B8=8B?= =?UTF-8?q?=E7=9A=84=20products=20controller,=20=E4=B8=A6=E8=A8=AD?= =?UTF-8?q?=E5=AE=9A=20routes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/javascripts/admin/products.js.coffee | 3 +++ app/assets/stylesheets/admin/products.css.scss | 3 +++ app/controllers/admin/products_controller.rb | 2 ++ app/helpers/admin/products_helper.rb | 2 ++ config/routes.rb | 4 ++++ test/controllers/admin/products_controller_test.rb | 7 +++++++ test/helpers/admin/products_helper_test.rb | 4 ++++ 7 files changed, 25 insertions(+) create mode 100644 app/assets/javascripts/admin/products.js.coffee create mode 100644 app/assets/stylesheets/admin/products.css.scss create mode 100644 app/controllers/admin/products_controller.rb create mode 100644 app/helpers/admin/products_helper.rb create mode 100644 test/controllers/admin/products_controller_test.rb create mode 100644 test/helpers/admin/products_helper_test.rb 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/stylesheets/admin/products.css.scss b/app/assets/stylesheets/admin/products.css.scss new file mode 100644 index 00000000..da8969d1 --- /dev/null +++ b/app/assets/stylesheets/admin/products.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the admin::products controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb new file mode 100644 index 00000000..b7b829ce --- /dev/null +++ b/app/controllers/admin/products_controller.rb @@ -0,0 +1,2 @@ +class Admin::ProductsController < ApplicationController +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/config/routes.rb b/config/routes.rb index 3f66539d..9306cd6d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,8 @@ Rails.application.routes.draw do + + namespace :admin do + resources :products + end # 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/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/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 From 92428a9e9b26f67fe35842f917f11c0bf0b5f7ae Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 10 Jun 2014 18:08:15 +0800 Subject: [PATCH 03/71] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=BE=8C=E5=8F=B0?= =?UTF-8?q?=E7=9A=84=20new=20=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin/products_controller.rb | 21 +++++++++++++++++ app/models/product.rb | 2 ++ app/views/admin/products/new.html.erb | 16 +++++++++++++ db/migrate/20140610094630_create_products.rb | 11 +++++++++ db/schema.rb | 24 ++++++++++++++++++++ test/fixtures/products.yml | 11 +++++++++ test/models/product_test.rb | 7 ++++++ 7 files changed, 92 insertions(+) create mode 100644 app/models/product.rb create mode 100644 app/views/admin/products/new.html.erb create mode 100644 db/migrate/20140610094630_create_products.rb create mode 100644 db/schema.rb create mode 100644 test/fixtures/products.yml create mode 100644 test/models/product_test.rb diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb index b7b829ce..c25e5789 100644 --- a/app/controllers/admin/products_controller.rb +++ b/app/controllers/admin/products_controller.rb @@ -1,2 +1,23 @@ class Admin::ProductsController < ApplicationController + + def new + @product = Product.new + end + + def create + @product = Product.new(product_params) + + if @product.save + redirect_to admin_products_path + else + render :new + end + end + + private + + def product_params + params.require(:product).permit(:title, :description,:quantity) + end + end diff --git a/app/models/product.rb b/app/models/product.rb new file mode 100644 index 00000000..077a8197 --- /dev/null +++ b/app/models/product.rb @@ -0,0 +1,2 @@ +class Product < ActiveRecord::Base +end diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb new file mode 100644 index 00000000..fed9a340 --- /dev/null +++ b/app/views/admin/products/new.html.erb @@ -0,0 +1,16 @@ +<%= form_for [:admin, @product] do |f| %> +
+ <%= f.label("標題") %> + <%= f.text_field :title %> +
+
+ <%= f.label("敘述") %> + <%= f.text_area :description %> +
+
+ <%= f.label("數量") %> + <%= f.text_field :quantity %> +
+ + <%= f.submit "Submit", :disable_with => 'Submiting...' %> +<% end %> \ No newline at end of file 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/schema.rb b/db/schema.rb new file mode 100644 index 00000000..760e9c18 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,24 @@ +# 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: 20140610094630) do + + create_table "products", force: true do |t| + t.string "title" + t.text "description" + t.integer "quantity" + t.datetime "created_at" + t.datetime "updated_at" + end + +end 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/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 From f91c02430efec6d87a5d850c5fe15ff03e81e28b Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 10 Jun 2014 18:22:07 +0800 Subject: [PATCH 04/71] =?UTF-8?q?=E5=AE=8C=E6=88=90admin/products=20?= =?UTF-8?q?=E7=9A=84=20index?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin/products_controller.rb | 4 ++++ app/views/admin/products/index.html.erb | 7 +++++++ 2 files changed, 11 insertions(+) create mode 100644 app/views/admin/products/index.html.erb diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb index c25e5789..3f35624b 100644 --- a/app/controllers/admin/products_controller.rb +++ b/app/controllers/admin/products_controller.rb @@ -14,6 +14,10 @@ def create end end + def index + @products = Product.all + end + private def product_params diff --git a/app/views/admin/products/index.html.erb b/app/views/admin/products/index.html.erb new file mode 100644 index 00000000..31faac96 --- /dev/null +++ b/app/views/admin/products/index.html.erb @@ -0,0 +1,7 @@ +
    + <% @products.each do |product| %> +
  • + <%= link_to(product.title, admin_products_path(product)) %> +
    • + <% end %> +
\ No newline at end of file From 3504bb783c96cddd5834f1b6c7ce85b9ec9586d0 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 10 Jun 2014 18:29:00 +0800 Subject: [PATCH 05/71] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20todo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- todo | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/todo b/todo index 49cd0546..8aac200e 100644 --- a/todo +++ b/todo @@ -1,11 +1,11 @@ ☐ 身為商家的管理者，我要能夠在後台上架我的東西，並設定能夠販賣。 - ☐ 管理者需要有一個後台 - ☐ 在後台必須可以新增商品 + ✔ 管理者需要有一個後台 @done (14-06-10 18:27) + ✔ 在後台必須可以新增商品 @done (14-06-10 18:27) ☐ 商品必須有各種必要的屬性欄位 - ☐ 商品名稱 - ☐ 商品描述 + ✔ 商品名稱 @done (14-06-10 18:27) + ✔ 商品描述 @done (14-06-10 18:27) ☐ 商品圖片 - ☐ 商品庫存數量 + ✔ 商品庫存數量 @done (14-06-10 18:27) ☐ 身為商家的管理者，我要能在後台設定權限，權限分為管理者和消費者。 ☐ 後台必須要有登入的功能 From fd13fa3524c6cf8e1e16bf78c8a4466d3180ad91 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 10 Jun 2014 20:16:02 +0800 Subject: [PATCH 06/71] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E8=80=85=E7=99=BB=E5=85=A5=E5=8A=9F=E8=83=BD=E8=88=87=E6=AC=8A?= =?UTF-8?q?=E9=99=90=E5=8D=80=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 + Gemfile.lock | 12 + app/controllers/admin/products_controller.rb | 7 + app/controllers/application_controller.rb | 7 + app/models/user.rb | 12 + app/views/layouts/application.html.erb | 6 + config/initializers/devise.rb | 252 ++++++++++++++++++ config/locales/devise.en.yml | 59 ++++ config/routes.rb | 2 + .../20140610112037_devise_create_users.rb | 46 ++++ .../20140610113852_add_is_admin_to_user.rb | 5 + db/schema.rb | 21 +- test/fixtures/users.yml | 11 + test/models/user_test.rb | 7 + todo | 8 +- 15 files changed, 452 insertions(+), 5 deletions(-) create mode 100644 app/models/user.rb create mode 100644 config/initializers/devise.rb create mode 100644 config/locales/devise.en.yml create mode 100644 db/migrate/20140610112037_devise_create_users.rb create mode 100644 db/migrate/20140610113852_add_is_admin_to_user.rb create mode 100644 test/fixtures/users.yml create mode 100644 test/models/user_test.rb diff --git a/Gemfile b/Gemfile index fba3b4e0..7e68779d 100644 --- a/Gemfile +++ b/Gemfile @@ -38,3 +38,5 @@ gem 'spring', group: :development # Use debugger # gem 'debugger', group: [:development, :test] +# Devise 提供使用者登入功能 +gem 'devise' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 53538d9b..575bfb92 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,6 +28,9 @@ GEM thread_safe (~> 0.1) tzinfo (~> 1.1) arel (5.0.1.20140414130214) + bcrypt (3.1.7) + bcrypt-ruby (3.1.5) + bcrypt (>= 3.1.3) builder (3.2.2) coffee-rails (4.0.1) coffee-script (>= 2.2.0) @@ -36,6 +39,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) @@ -53,6 +61,7 @@ GEM mime-types (1.25.1) minitest (5.3.4) multi_json (1.10.1) + orm_adapter (0.5.0) polyglot (0.3.5) rack (1.5.2) rack-test (0.6.2) @@ -108,12 +117,15 @@ GEM uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) + warden (1.2.3) + rack (>= 1.0) PLATFORMS ruby DEPENDENCIES coffee-rails (~> 4.0.0) + devise jbuilder (~> 2.0) jquery-rails rails (= 4.1.0) diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb index 3f35624b..80cb13e2 100644 --- a/app/controllers/admin/products_controller.rb +++ b/app/controllers/admin/products_controller.rb @@ -1,5 +1,12 @@ class Admin::ProductsController < ApplicationController + # 使用者必須先登入 + before_action :authenticate_user! + + # 使用者的身份必須是 admin + # admin_required 在 applicationController 裡定義 + before_action :admin_required + def new @product = Product.new end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d83690e1..95c15b73 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,4 +2,11 @@ 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 + end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 00000000..9375287a --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,12 @@ +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 + + def admin? + is_admin + end + +end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index da9769de..ab2e355f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,6 +8,12 @@ + <% if !current_user %> + <%= link_to("登入", new_user_session_path) %> + <% else %> + <%= link_to("登出", destroy_user_session_path, :method => :delete) %> + <% end %> + <%= yield %> 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/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/routes.rb b/config/routes.rb index 9306cd6d..57f4bce2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,7 @@ Rails.application.routes.draw do + devise_for :users + namespace :admin do resources :products 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/schema.rb b/db/schema.rb index 760e9c18..265247a0 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140610094630) do +ActiveRecord::Schema.define(version: 20140610113852) do create_table "products", force: true do |t| t.string "title" @@ -21,4 +21,23 @@ t.datetime "updated_at" 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/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/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 index 8aac200e..581cc38f 100644 --- a/todo +++ b/todo @@ -7,7 +7,7 @@ ☐ 商品圖片 ✔ 商品庫存數量 @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) From 77d426190ded80379a0cb51ae3e2f3e47147c16c Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 10 Jun 2014 21:23:09 +0800 Subject: [PATCH 07/71] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20simple=20form=20gem,?= =?UTF-8?q?=20=E6=8A=8A=20admin/products/new=20=E7=9A=84=20form=5Ffor=20?= =?UTF-8?q?=E6=94=B9=E6=88=90=20simple=5Fform=5Ffor.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 6 +- Gemfile.lock | 7 + app/assets/stylesheets/application.css | 1 + app/views/admin/products/new.html.erb | 12 +- config/initializers/simple_form.rb | 145 +++++++++++++++++++ config/initializers/simple_form_bootstrap.rb | 45 ++++++ config/locales/simple_form.en.yml | 26 ++++ lib/templates/erb/scaffold/_form.html.erb | 13 ++ 8 files changed, 253 insertions(+), 2 deletions(-) create mode 100644 config/initializers/simple_form.rb create mode 100644 config/initializers/simple_form_bootstrap.rb create mode 100644 config/locales/simple_form.en.yml create mode 100644 lib/templates/erb/scaffold/_form.html.erb diff --git a/Gemfile b/Gemfile index 7e68779d..1c371acb 100644 --- a/Gemfile +++ b/Gemfile @@ -39,4 +39,8 @@ gem 'spring', group: :development # gem 'debugger', group: [:development, :test] # Devise 提供使用者登入功能 -gem 'devise' \ No newline at end of file +gem 'devise' +# 加入 bootstrap css framework +gem 'bootstrap-sass' +# Rails forms made easy +gem 'simple_form' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 575bfb92..455fdf07 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -31,6 +31,8 @@ GEM 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) coffee-rails (4.0.1) coffee-script (>= 2.2.0) @@ -93,6 +95,9 @@ GEM sdoc (0.4.0) json (~> 1.8) rdoc (~> 4.0, < 5.0) + simple_form (3.0.2) + actionpack (~> 4.0) + activemodel (~> 4.0) spring (1.1.3) sprockets (2.11.0) hike (~> 1.2) @@ -124,6 +129,7 @@ PLATFORMS ruby DEPENDENCIES + bootstrap-sass coffee-rails (~> 4.0.0) devise jbuilder (~> 2.0) @@ -131,6 +137,7 @@ DEPENDENCIES rails (= 4.1.0) sass-rails (~> 4.0.3) sdoc (~> 0.4.0) + simple_form spring sqlite3 turbolinks diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index a443db34..bcdb41c0 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -12,4 +12,5 @@ * *= require_tree . *= require_self + *= require bootstrap */ diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb index fed9a340..dcec482a 100644 --- a/app/views/admin/products/new.html.erb +++ b/app/views/admin/products/new.html.erb @@ -1,3 +1,12 @@ + +<%= simple_form_for [:admin, @product] do |f| %> + <%= f.input :title, label: '標題' %> + <%= f.input :description, label: '產品敘述' %> + <%= f.input :quantity, label: '數量' %> +<% end %> + + + \ No newline at end of file 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..ad4ca74c --- /dev/null +++ b/config/initializers/simple_form_bootstrap.rb @@ -0,0 +1,45 @@ +# Use this setup block to configure all options available in SimpleForm. +SimpleForm.setup do |config| + config.wrappers :bootstrap, tag: 'div', class: 'control-group', error_class: 'error' do |b| + b.use :html5 + b.use :placeholder + b.use :label + b.wrapper tag: 'div', class: 'controls' do |ba| + ba.use :input + ba.use :error, wrap_with: { tag: 'span', class: 'help-inline' } + ba.use :hint, wrap_with: { tag: 'p', class: 'help-block' } + end + end + + config.wrappers :prepend, tag: 'div', class: "control-group", error_class: 'error' do |b| + b.use :html5 + b.use :placeholder + b.use :label + b.wrapper tag: 'div', class: 'controls' do |input| + input.wrapper tag: 'div', class: 'input-prepend' do |prepend| + prepend.use :input + end + input.use :hint, wrap_with: { tag: 'span', class: 'help-block' } + input.use :error, wrap_with: { tag: 'span', class: 'help-inline' } + end + end + + config.wrappers :append, tag: 'div', class: "control-group", error_class: 'error' do |b| + b.use :html5 + b.use :placeholder + b.use :label + b.wrapper tag: 'div', class: 'controls' do |input| + input.wrapper tag: 'div', class: 'input-append' do |append| + append.use :input + end + input.use :hint, wrap_with: { tag: 'span', class: 'help-block' } + input.use :error, wrap_with: { tag: 'span', class: 'help-inline' } + end + end + + # Wrappers for forms and inputs using the Twitter Bootstrap toolkit. + # Check the Bootstrap docs (http://twitter.github.com/bootstrap) + # to learn about the different styles for forms and inputs, + # buttons and other elements. + config.default_wrapper = :bootstrap +end 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/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 %> From 41e2e038aa4c4f16d3281c955c36e51c980a7c36 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 10 Jun 2014 21:39:32 +0800 Subject: [PATCH 08/71] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20simple=5Fform=5Fboot?= =?UTF-8?q?strap.rb=20=E7=82=BA=20bootstrap=203=20=E9=81=A9=E7=94=A8?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/initializers/simple_form_bootstrap.rb | 84 +++++++++++++++----- 1 file changed, 65 insertions(+), 19 deletions(-) diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb index ad4ca74c..cb31bf7f 100644 --- a/config/initializers/simple_form_bootstrap.rb +++ b/config/initializers/simple_form_bootstrap.rb @@ -1,45 +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.wrappers :bootstrap, tag: 'div', class: 'control-group', error_class: 'error' do |b| + 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.use :label - b.wrapper tag: 'div', class: 'controls' do |ba| - ba.use :input - ba.use :error, wrap_with: { tag: 'span', class: 'help-inline' } - ba.use :hint, wrap_with: { tag: 'p', class: 'help-block' } - end + + 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: "control-group", error_class: 'error' do |b| + config.wrappers :prepend, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| b.use :html5 b.use :placeholder - b.use :label b.wrapper tag: 'div', class: 'controls' do |input| - input.wrapper tag: 'div', class: 'input-prepend' do |prepend| + 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-inline' } + input.use :error, wrap_with: { tag: 'span', class: 'help-block has-error' } end end - config.wrappers :append, tag: 'div', class: "control-group", error_class: 'error' do |b| + config.wrappers :append, tag: 'div', class: 'form-group', error_class: 'has-error' do |b| b.use :html5 b.use :placeholder - b.use :label b.wrapper tag: 'div', class: 'controls' do |input| - input.wrapper tag: 'div', class: 'input-append' do |append| - append.use :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-inline' } + 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://twitter.github.com/bootstrap) + # Check the Bootstrap docs (http://getbootstrap.com/) # to learn about the different styles for forms and inputs, # buttons and other elements. - config.default_wrapper = :bootstrap -end + config.default_wrapper = :bootstrap3 +end \ No newline at end of file From 111f34256b59a819e2de71a660f4b3d1b967a80f Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 10 Jun 2014 21:57:02 +0800 Subject: [PATCH 09/71] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20todo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- todo | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/todo b/todo index 581cc38f..c6b182b5 100644 --- a/todo +++ b/todo @@ -11,3 +11,10 @@ ✔ 後台必須要有登入的功能 @done (14-06-10 20:14) ✔ 使用者身份分為「管理者」和「消費者」兩種 @done (14-06-10 20:14) ✔ 只有「管理者」身份的使用者可以進入後台頁面 @done (14-06-10 20:14) + + ☐ Week1 Homework + ☐ 寫後台的 User Story + ☐ 實作圖片上傳 + ☐ 用 Bootstrap 做一個「有 navbar」的 layout + ✔ 使用 simple_form 換掉 form_for @done (14-06-10 21:44) + ☐ products/show, products, index 實作 \ No newline at end of file From ad6a554e86e99cd0d52a2b2e5d2e1408861d37ab Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 13 Jun 2014 13:13:15 +0800 Subject: [PATCH 10/71] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Todo=E3=80=81mount?= =?UTF-8?q?=20bootstrap=20javascript=E3=80=81=E6=8A=8A=20application.css?= =?UTF-8?q?=20=E6=94=B9=E6=88=90=20scss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/javascripts/application.js | 1 + .../{application.css => application.css.scss} | 2 +- todo | 27 ++++++++++++++----- 3 files changed, 23 insertions(+), 7 deletions(-) rename app/assets/stylesheets/{application.css => application.css.scss} (99%) 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/stylesheets/application.css b/app/assets/stylesheets/application.css.scss similarity index 99% rename from app/assets/stylesheets/application.css rename to app/assets/stylesheets/application.css.scss index bcdb41c0..44ca45cc 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css.scss @@ -13,4 +13,4 @@ *= require_tree . *= require_self *= require bootstrap - */ + */ \ No newline at end of file diff --git a/todo b/todo index c6b182b5..2bc4fac9 100644 --- a/todo +++ b/todo @@ -12,9 +12,24 @@ ✔ 使用者身份分為「管理者」和「消費者」兩種 @done (14-06-10 20:14) ✔ 只有「管理者」身份的使用者可以進入後台頁面 @done (14-06-10 20:14) - ☐ Week1 Homework - ☐ 寫後台的 User Story - ☐ 實作圖片上傳 - ☐ 用 Bootstrap 做一個「有 navbar」的 layout - ✔ 使用 simple_form 換掉 form_for @done (14-06-10 21:44) - ☐ products/show, products, index 實作 \ No newline at end of file +[ 後台 ] + ☐ 管理者登入後必須要有選單，以選擇想要進行的作業 + ☐ 管理商品 + ☐ 管理訂單 + ☐ 訂單必須有「未結賬」、「已結賬」、「出貨中」、「已出貨（消費者收到商品）」、「退貨申請」、「已退貨（已收到退貨商品）」等狀態。 + ☐ 消費者結賬後必須收到 mail 確認 + ☐ 商品出貨後消費者也必須收到 mail 確認 + ☐ 商品出貨後，該商品的庫存數量必須隨出貨量變更 + ☐ 管理者應該要可以管理訂單狀態 + +[ 前台 ] + ☐ 消費者應該要能看到所有商品 + + +[ 作業 ] + ☐ Week1 Homework + ☐ 寫後台的 User Story + ☐ 實作圖片上傳 + ☐ 用 Bootstrap 做一個「有 navbar」的 layout + ✔ 使用 simple_form 換掉 form_for @done (14-06-10 21:44) + ☐ products/show, products, index 實作 \ No newline at end of file From 105d5622be062e5de6f5fc985178ef921c6fd2b8 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 13 Jun 2014 15:05:38 +0800 Subject: [PATCH 11/71] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20TODO=20=E5=8A=A0?= =?UTF-8?q?=E4=B8=8A=E5=BE=8C=E5=8F=B0=20User=20story.=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20products=20controller=20=E5=8A=A0=E5=85=A5=20index?= =?UTF-8?q?=20action?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/javascripts/products.js.coffee | 3 +++ app/assets/stylesheets/products.css.scss | 3 +++ app/controllers/products_controller.rb | 7 +++++++ app/helpers/products_helper.rb | 2 ++ app/views/admin/products/new.html.erb | 1 + app/views/products/index.html.erb | 7 +++++++ config/routes.rb | 5 +++++ test/controllers/products_controller_test.rb | 7 +++++++ test/helpers/products_helper_test.rb | 4 ++++ todo | 14 +++++++++++++- 10 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/products.js.coffee create mode 100644 app/assets/stylesheets/products.css.scss create mode 100644 app/controllers/products_controller.rb create mode 100644 app/helpers/products_helper.rb create mode 100644 app/views/products/index.html.erb create mode 100644 test/controllers/products_controller_test.rb create mode 100644 test/helpers/products_helper_test.rb 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/products.css.scss b/app/assets/stylesheets/products.css.scss new file mode 100644 index 00000000..89e2e8db --- /dev/null +++ b/app/assets/stylesheets/products.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the products controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb new file mode 100644 index 00000000..c54e6456 --- /dev/null +++ b/app/controllers/products_controller.rb @@ -0,0 +1,7 @@ +class ProductsController < ApplicationController + + def index + @products = Product.all + end + +end diff --git a/app/helpers/products_helper.rb b/app/helpers/products_helper.rb new file mode 100644 index 00000000..ab5c42b3 --- /dev/null +++ b/app/helpers/products_helper.rb @@ -0,0 +1,2 @@ +module ProductsHelper +end diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb index dcec482a..bf8d7eeb 100644 --- a/app/views/admin/products/new.html.erb +++ b/app/views/admin/products/new.html.erb @@ -3,6 +3,7 @@ <%= f.input :title, label: '標題' %> <%= f.input :description, label: '產品敘述' %> <%= f.input :quantity, label: '數量' %> + <%= f.submit "Submit", :disable_with => 'Submiting...' %> <% end %> diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb new file mode 100644 index 00000000..8b4a4b17 --- /dev/null +++ b/app/views/products/index.html.erb @@ -0,0 +1,7 @@ +
    + <% @products.each do |product| %> +
  • + <%= link_to(product.title, products_path(product)) %> +
    • + <% end %> +
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 57f4bce2..58a05ae7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,11 @@ namespace :admin do resources :products end + + resources :products + + # 暫時先把 root 放到這邊 + root :to => "products#index" # 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/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/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/todo b/todo index 2bc4fac9..03db352e 100644 --- a/todo +++ b/todo @@ -5,6 +5,7 @@ ✔ 商品名稱 @done (14-06-10 18:27) ✔ 商品描述 @done (14-06-10 18:27) ☐ 商品圖片 + ☐ 商品價格 ✔ 商品庫存數量 @done (14-06-10 18:27) ✔ 身為商家的管理者，我要能在後台設定權限，權限分為管理者和消費者。 @done (14-06-10 20:14) @@ -15,7 +16,14 @@ [ 後台 ] ☐ 管理者登入後必須要有選單，以選擇想要進行的作業 ☐ 管理商品 + ✔ 顯示列表 @done (14-06-13 13:24) + ✔ 新增 @done (14-06-13 13:23) + ☐ 修改 + ☐ 刪除 ☐ 管理訂單 + ☐ 顯示列表 + ☐ 變更狀態 + ☐ 刪除訂單 ☐ 訂單必須有「未結賬」、「已結賬」、「出貨中」、「已出貨（消費者收到商品）」、「退貨申請」、「已退貨（已收到退貨商品）」等狀態。 ☐ 消費者結賬後必須收到 mail 確認 ☐ 商品出貨後消費者也必須收到 mail 確認 @@ -24,11 +32,15 @@ [ 前台 ] ☐ 消費者應該要能看到所有商品 + ☐ 消費者要能將商品加到購物車 + ☐ 消費者要能確認購買、填寫資料並產生訂單 + ☐ 消費者要能進行結賬的動作 + ☐ 結賬後要能收到 mail 確認 [ 作業 ] ☐ Week1 Homework - ☐ 寫後台的 User Story + ✔ 寫後台的 User Story @done (14-06-13 13:45) ☐ 實作圖片上傳 ☐ 用 Bootstrap 做一個「有 navbar」的 layout ✔ 使用 simple_form 換掉 form_for @done (14-06-10 21:44) From ff1c3e1e78123daa41caefdf957726920ca8199f Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 13 Jun 2014 15:56:26 +0800 Subject: [PATCH 12/71] =?UTF-8?q?=E5=AE=8C=E6=88=90=20products=20index,=20?= =?UTF-8?q?show.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/products_controller.rb | 4 ++++ app/views/admin/products/new.html.erb | 1 + app/views/products/index.html.erb | 2 +- app/views/products/show.html.erb | 13 +++++++++++++ todo | 2 +- 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 app/views/products/show.html.erb diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index c54e6456..fd7028d8 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -4,4 +4,8 @@ def index @products = Product.all end + def show + @product = Product.find(params[:id]) + end + end diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb index bf8d7eeb..e86e37a7 100644 --- a/app/views/admin/products/new.html.erb +++ b/app/views/admin/products/new.html.erb @@ -3,6 +3,7 @@ <%= f.input :title, label: '標題' %> <%= f.input :description, label: '產品敘述' %> <%= f.input :quantity, label: '數量' %> + <%= f.submit "Submit", :disable_with => 'Submiting...' %> <% end %> diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index 8b4a4b17..f08e2452 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -1,7 +1,7 @@
    <% @products.each do |product| %>
  • - <%= link_to(product.title, products_path(product)) %> + <%= link_to(product.title, product_path(product)) %>
    • <% end %>
\ 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..6745e864 --- /dev/null +++ b/app/views/products/show.html.erb @@ -0,0 +1,13 @@ +

+ <%= @product.title %> +

+ +

產品描述

+

+ <%= @product.description %> +

+ +

剩餘數量

+

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

\ No newline at end of file diff --git a/todo b/todo index 03db352e..dce2ceeb 100644 --- a/todo +++ b/todo @@ -44,4 +44,4 @@ ☐ 實作圖片上傳 ☐ 用 Bootstrap 做一個「有 navbar」的 layout ✔ 使用 simple_form 換掉 form_for @done (14-06-10 21:44) - ☐ products/show, products, index 實作 \ No newline at end of file + ✔ products/show, products, index 實作 @done (14-06-13 15:34) \ No newline at end of file From 34b41e05b5c92216fdddcefd0295b7a8439a2ff8 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 13 Jun 2014 17:57:31 +0800 Subject: [PATCH 13/71] =?UTF-8?q?=E5=AE=8C=E6=88=90=20navbar=20=E8=88=87?= =?UTF-8?q?=20dropdown=20=E9=81=B8=E5=96=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/application.css.scss | 8 ++- app/views/common/_footer.html.erb | 0 app/views/common/_navbar.html.erb | 80 +++++++++++++++++++++ app/views/layouts/application.html.erb | 15 ++-- todo | 4 +- 5 files changed, 97 insertions(+), 10 deletions(-) create mode 100644 app/views/common/_footer.html.erb create mode 100644 app/views/common/_navbar.html.erb diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 44ca45cc..ff72e2a3 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -10,7 +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 - *= require bootstrap - */ \ No newline at end of file + */ + +body { + margin-top: 60px; +} \ 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..dcdf7d06 --- /dev/null +++ b/app/views/common/_navbar.html.erb @@ -0,0 +1,80 @@ + \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index ab2e355f..83153dcd 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,13 +8,16 @@ - <% if !current_user %> - <%= link_to("登入", new_user_session_path) %> - <% else %> - <%= link_to("登出", destroy_user_session_path, :method => :delete) %> - <% end %> + +<%= render :partial => "common/navbar" %> -<%= yield %> + +
+ <%= yield %> +
+ + +<%= render :partial => "common/footer" %> diff --git a/todo b/todo index dce2ceeb..ea7d7490 100644 --- a/todo +++ b/todo @@ -31,7 +31,7 @@ ☐ 管理者應該要可以管理訂單狀態 [ 前台 ] - ☐ 消費者應該要能看到所有商品 + ✔ 消費者應該要能看到所有商品 @done (14-06-13 16:05) ☐ 消費者要能將商品加到購物車 ☐ 消費者要能確認購買、填寫資料並產生訂單 ☐ 消費者要能進行結賬的動作 @@ -42,6 +42,6 @@ ☐ Week1 Homework ✔ 寫後台的 User Story @done (14-06-13 13:45) ☐ 實作圖片上傳 - ☐ 用 Bootstrap 做一個「有 navbar」的 layout + ✔ 用 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) \ No newline at end of file From 8419cd751c499503c1cf0636ba65dd9e8232219f Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Mon, 16 Jun 2014 00:42:18 +0800 Subject: [PATCH 14/71] trying carrierwave 4th time --- Gemfile | 7 ++++++- Gemfile.lock | 10 ++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 1c371acb..92454149 100644 --- a/Gemfile +++ b/Gemfile @@ -43,4 +43,9 @@ gem 'devise' # 加入 bootstrap css framework gem 'bootstrap-sass' # Rails forms made easy -gem 'simple_form' \ No newline at end of file +gem 'simple_form' + +# 圖片上傳 +gem 'carrierwave' +# 圖片壓縮 resize +gem 'mini_magick' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 455fdf07..58a6678d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -34,6 +34,11 @@ GEM 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) @@ -61,6 +66,8 @@ GEM 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) @@ -109,6 +116,7 @@ GEM activesupport (>= 3.0) sprockets (~> 2.8) sqlite3 (1.3.9) + subexec (0.2.3) thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) @@ -130,10 +138,12 @@ PLATFORMS DEPENDENCIES bootstrap-sass + carrierwave coffee-rails (~> 4.0.0) devise jbuilder (~> 2.0) jquery-rails + mini_magick rails (= 4.1.0) sass-rails (~> 4.0.3) sdoc (~> 0.4.0) From f31356c2f12f8e78209204e5f9449a22cd4d811d Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Mon, 16 Jun 2014 02:11:50 +0800 Subject: [PATCH 15/71] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=9C=96=E7=89=87?= =?UTF-8?q?=E4=B8=8A=E5=82=B3=E5=8A=9F=E8=83=BD...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 + app/controllers/admin/products_controller.rb | 5 +- app/controllers/products_controller.rb | 32 ++++++++++ app/models/photo.rb | 7 +++ app/models/product.rb | 10 ++++ app/uploaders/image_uploader.rb | 61 ++++++++++++++++++++ app/views/admin/products/new.html.erb | 9 ++- db/migrate/20140615164554_create_photos.rb | 10 ++++ db/schema.rb | 9 ++- test/fixtures/photos.yml | 9 +++ test/models/photo_test.rb | 7 +++ todo | 6 +- 12 files changed, 162 insertions(+), 6 deletions(-) create mode 100644 app/models/photo.rb create mode 100644 app/uploaders/image_uploader.rb create mode 100644 db/migrate/20140615164554_create_photos.rb create mode 100644 test/fixtures/photos.yml create mode 100644 test/models/photo_test.rb diff --git a/.gitignore b/.gitignore index 6a502e99..8e356b6b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,6 @@ # Ignore all logfiles and tempfiles. /log/*.log /tmp + +# ignore upload files +/public/uploads \ No newline at end of file diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb index 80cb13e2..6c013de4 100644 --- a/app/controllers/admin/products_controller.rb +++ b/app/controllers/admin/products_controller.rb @@ -9,6 +9,8 @@ class Admin::ProductsController < ApplicationController def new @product = Product.new + # ??? + @photo = @product.photos.new end def create @@ -28,7 +30,8 @@ def index private def product_params - params.require(:product).permit(:title, :description,:quantity) + # :nested_attributes => [:關聯 Model 的欄位] + params.require(:product).permit(:title, :description, :quantity, :photos_attributes => [:image]) end end diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index fd7028d8..ed637204 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -8,4 +8,36 @@ def show @product = Product.find(params[:id]) end + # 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") + + # end + + # def render_product_name(product) + # product.title + # end + + # def render_product_desc(product) + # simple_format(product.description) + # end + + # def render_product_quantity(product) + # product.quantity + # end + 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 index 077a8197..1a2b4bcf 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -1,2 +1,12 @@ class Product < ActiveRecord::Base + + has_many :photos + + # accepts_nested_attributes_for :MODEL + # 可以直接更新關聯 MODEL 的資料 + accepts_nested_attributes_for :photos + + # 驗證表單是否填妥 + validates_presence_of :title, :quantity + end diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb new file mode 100644 index 00000000..7d0d4a74 --- /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 :midum 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/admin/products/new.html.erb b/app/views/admin/products/new.html.erb index e86e37a7..7f330859 100644 --- a/app/views/admin/products/new.html.erb +++ b/app/views/admin/products/new.html.erb @@ -3,7 +3,14 @@ <%= 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.submit "Submit", :disable_with => 'Submiting...' %> <% 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/schema.rb b/db/schema.rb index 265247a0..c95cf271 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,14 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140610113852) do +ActiveRecord::Schema.define(version: 20140615164554) do + + 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" 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/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/todo b/todo index ea7d7490..63de6624 100644 --- a/todo +++ b/todo @@ -4,7 +4,7 @@ ☐ 商品必須有各種必要的屬性欄位 ✔ 商品名稱 @done (14-06-10 18:27) ✔ 商品描述 @done (14-06-10 18:27) - ☐ 商品圖片 + ✔ 商品圖片 @done (14-06-16 02:06) ☐ 商品價格 ✔ 商品庫存數量 @done (14-06-10 18:27) @@ -39,9 +39,9 @@ [ 作業 ] - ☐ Week1 Homework + ✔ 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) \ No newline at end of file From ad4514c80f52867cb004c5cd6fecc8b598e71802 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Mon, 16 Jun 2014 03:07:46 +0800 Subject: [PATCH 16/71] =?UTF-8?q?product#show=20=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=A1=AF=E7=A4=BA=E5=9C=96=E7=89=87=EF=BC=8C=E4=BD=86=20produc?= =?UTF-8?q?t=20=E6=B2=92=E5=9C=96=E7=89=87=E6=99=82=E6=9C=83=20error.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/products_controller.rb | 32 -------------------------- app/helpers/products_helper.rb | 2 +- app/uploaders/image_uploader.rb | 2 +- app/views/products/show.html.erb | 3 ++- 4 files changed, 4 insertions(+), 35 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index ed637204..fd7028d8 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -8,36 +8,4 @@ def show @product = Product.find(params[:id]) end - # 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") - - # end - - # def render_product_name(product) - # product.title - # end - - # def render_product_desc(product) - # simple_format(product.description) - # end - - # def render_product_quantity(product) - # product.quantity - # end - end diff --git a/app/helpers/products_helper.rb b/app/helpers/products_helper.rb index ab5c42b3..50ad52c9 100644 --- a/app/helpers/products_helper.rb +++ b/app/helpers/products_helper.rb @@ -1,2 +1,2 @@ module ProductsHelper -end +end \ No newline at end of file diff --git a/app/uploaders/image_uploader.rb b/app/uploaders/image_uploader.rb index 7d0d4a74..e9c15cb6 100644 --- a/app/uploaders/image_uploader.rb +++ b/app/uploaders/image_uploader.rb @@ -42,7 +42,7 @@ def store_dir end # 製作最長邊 500 的中等尺寸 - version :midum do + version :mid do process :resize_to_fit => [500, 500] end diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 6745e864..f3e48f70 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -10,4 +10,5 @@

剩餘數量

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

\ No newline at end of file +

+<%= image_tag @product.photos.first.image_url %> \ No newline at end of file From 6dc8103aa5ce583092ba530c3151879d237b0921 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Mon, 16 Jun 2014 03:57:57 +0800 Subject: [PATCH 17/71] =?UTF-8?q?index=20=E5=9C=96=E7=89=87=E9=A1=AF?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=87=BA=E4=BE=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admin/products/index.html.erb | 2 ++ app/views/products/index.html.erb | 2 ++ app/views/products/show.html.erb | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/admin/products/index.html.erb b/app/views/admin/products/index.html.erb index 31faac96..95ca44b6 100644 --- a/app/views/admin/products/index.html.erb +++ b/app/views/admin/products/index.html.erb @@ -3,5 +3,7 @@
  • <%= link_to(product.title, admin_products_path(product)) %>
    • + + <%= image_tag product.photos.first.image_url(:thumb) %> <% end %> \ No newline at end of file diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index f08e2452..d1476d2c 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -3,5 +3,7 @@
  • <%= link_to(product.title, product_path(product)) %>
    • + + <%= image_tag product.photos.first.image_url(:thumb) %> <% end %> \ No newline at end of file diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index f3e48f70..f9114ef5 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -11,4 +11,4 @@

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

    -<%= image_tag @product.photos.first.image_url %> \ No newline at end of file +<%= image_tag @product.photos.first.image_url(:thumb) %> \ No newline at end of file From 1c74a4dd3a9caf40d8d2138704ba887dfe1c2a7e Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Mon, 16 Jun 2014 16:22:25 +0800 Subject: [PATCH 18/71] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20price=20=E6=AC=84?= =?UTF-8?q?=E4=BD=8D=EF=BC=8C=E8=AE=8A=E6=9B=B4=E6=95=B8=E9=87=8F=E7=9A=84?= =?UTF-8?q?=E9=A0=90=E8=A8=AD=E5=80=BC=E7=82=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20140616080727_add_price_to_product.rb | 5 +++++ .../20140616081302_change_price_and_quantity_default.rb | 5 +++++ db/schema.rb | 5 +++-- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20140616080727_add_price_to_product.rb create mode 100644 db/migrate/20140616081302_change_price_and_quantity_default.rb 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/schema.rb b/db/schema.rb index c95cf271..b8dc388d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140615164554) do +ActiveRecord::Schema.define(version: 20140616081302) do create_table "photos", force: true do |t| t.integer "product_id" @@ -23,9 +23,10 @@ create_table "products", force: true do |t| t.string "title" t.text "description" - t.integer "quantity" + 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| From 0db371a57615740bac50716bde916ad6da42f708 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Mon, 16 Jun 2014 16:59:56 +0800 Subject: [PATCH 19/71] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20edit=20=E8=88=87?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=20view?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin/products_controller.rb | 14 +++++++++++++- app/views/admin/products/edit.html.erb | 10 ++++++++++ app/views/admin/products/index.html.erb | 3 +-- app/views/admin/products/new.html.erb | 1 + todo | 6 +++--- 5 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 app/views/admin/products/edit.html.erb diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb index 6c013de4..b5b8240b 100644 --- a/app/controllers/admin/products_controller.rb +++ b/app/controllers/admin/products_controller.rb @@ -23,6 +23,18 @@ def create end end + def edit + @product = Product.find(params[:id]) + end + + def update + if @product.update(product_params) + redirect_to admin_products_path + else + render :edit + end + end + def index @products = Product.all end @@ -31,7 +43,7 @@ def index def product_params # :nested_attributes => [:關聯 Model 的欄位] - params.require(:product).permit(:title, :description, :quantity, :photos_attributes => [:image]) + params.require(:product).permit(:title, :description, :quantity, :price, :photos_attributes => [:image]) end end 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 index 95ca44b6..5677dd44 100644 --- a/app/views/admin/products/index.html.erb +++ b/app/views/admin/products/index.html.erb @@ -1,9 +1,8 @@
      <% @products.each do |product| %>
    • - <%= link_to(product.title, admin_products_path(product)) %> + <%= link_to(product.title, admin_products_path(product)) %> | <%= link_to "EDIT", edit_admin_product_path(product) %>
      • - <%= image_tag product.photos.first.image_url(:thumb) %> <% end %>
    \ No newline at end of file diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb index 7f330859..a17e0322 100644 --- a/app/views/admin/products/new.html.erb +++ b/app/views/admin/products/new.html.erb @@ -11,6 +11,7 @@ <%= f.simple_fields_for :photos do |c| %> <%= c.input :image , :as => :file %> <% end %> + <%= f.input :price, label: '價格' %> <%= f.submit "Submit", :disable_with => 'Submiting...' %> <% end %> diff --git a/todo b/todo index 63de6624..de3ccd65 100644 --- a/todo +++ b/todo @@ -1,11 +1,11 @@ - ☐ 身為商家的管理者，我要能夠在後台上架我的東西，並設定能夠販賣。 + ✔ 身為商家的管理者，我要能夠在後台上架我的東西，並設定能夠販賣。 @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) From 78bc6ee50a3c8933fee9718c3dfb11657a9d407f Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Mon, 16 Jun 2014 17:12:26 +0800 Subject: [PATCH 20/71] =?UTF-8?q?=E5=BE=8C=E5=8F=B0=E5=A2=9E=E5=8A=A0=20DE?= =?UTF-8?q?LET=20=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin/products_controller.rb | 6 ++++++ app/views/admin/products/index.html.erb | 2 +- app/views/products/index.html.erb | 1 - todo | 6 +++--- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb index b5b8240b..5a7acdbb 100644 --- a/app/controllers/admin/products_controller.rb +++ b/app/controllers/admin/products_controller.rb @@ -35,6 +35,12 @@ def update end end + def destroy + @product = Product.find(params[:id]) + @product.destroy + redirect_to admin_products_path + end + def index @products = Product.all end diff --git a/app/views/admin/products/index.html.erb b/app/views/admin/products/index.html.erb index 5677dd44..796a50af 100644 --- a/app/views/admin/products/index.html.erb +++ b/app/views/admin/products/index.html.erb @@ -1,7 +1,7 @@
      <% @products.each do |product| %>
    • - <%= link_to(product.title, admin_products_path(product)) %> | <%= link_to "EDIT", edit_admin_product_path(product) %> + <%= link_to(product.title, admin_products_path(product)) %> | <%= link_to "EDIT", edit_admin_product_path(product) %> | <%= link_to "刪除", admin_product_path(product), :method => :delete, :confirm => "確定刪除產品？" %>
      • <% end %> diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index d1476d2c..75f36843 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -4,6 +4,5 @@ <%= link_to(product.title, product_path(product)) %> - <%= image_tag product.photos.first.image_url(:thumb) %> <% end %>
    \ No newline at end of file diff --git a/todo b/todo index de3ccd65..1d02523c 100644 --- a/todo +++ b/todo @@ -15,11 +15,11 @@ [ 後台 ] ☐ 管理者登入後必須要有選單，以選擇想要進行的作業 - ☐ 管理商品 + ✔ 管理商品 @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) ☐ 管理訂單 ☐ 顯示列表 ☐ 變更狀態 From 7d0040ce7eca76ebcd89cbb012f604b3d19dc45a Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Mon, 16 Jun 2014 17:31:01 +0800 Subject: [PATCH 21/71] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=9C=96=E7=89=87?= =?UTF-8?q?=E9=A1=AF=E7=A4=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin/products_controller.rb | 4 ++++ app/helpers/products_helper.rb | 9 +++++++++ app/models/product.rb | 5 +++++ app/views/admin/products/index.html.erb | 3 +++ app/views/products/show.html.erb | 2 +- todo | 5 ++++- 6 files changed, 26 insertions(+), 2 deletions(-) diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb index 5a7acdbb..374dcfb3 100644 --- a/app/controllers/admin/products_controller.rb +++ b/app/controllers/admin/products_controller.rb @@ -45,6 +45,10 @@ def index @products = Product.all end + def show + @product = Product.find(params[:id]) + end + private def product_params diff --git a/app/helpers/products_helper.rb b/app/helpers/products_helper.rb index 50ad52c9..862d2fae 100644 --- a/app/helpers/products_helper.rb +++ b/app/helpers/products_helper.rb @@ -1,2 +1,11 @@ module ProductsHelper + + def render_product_photo(photo) + if photo.present? #產品是否有照片 + image_tag(photo.image.thumb.url) + else + "no pic" + end + end + end \ No newline at end of file diff --git a/app/models/product.rb b/app/models/product.rb index 1a2b4bcf..5272c4fb 100644 --- a/app/models/product.rb +++ b/app/models/product.rb @@ -9,4 +9,9 @@ class Product < ActiveRecord::Base # 驗證表單是否填妥 validates_presence_of :title, :quantity + # 定義最新的照片為 + def default_photo + photos.first + end + end diff --git a/app/views/admin/products/index.html.erb b/app/views/admin/products/index.html.erb index 796a50af..f652ff6f 100644 --- a/app/views/admin/products/index.html.erb +++ b/app/views/admin/products/index.html.erb @@ -2,6 +2,9 @@ <% @products.each do |product| %>
  • <%= link_to(product.title, admin_products_path(product)) %> | <%= link_to "EDIT", edit_admin_product_path(product) %> | <%= link_to "刪除", admin_product_path(product), :method => :delete, :confirm => "確定刪除產品？" %> +
    + <%= render_product_photo(product.default_photo) %> +

    • <% end %> diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index f9114ef5..9ddb5a2f 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -11,4 +11,4 @@

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

    -<%= image_tag @product.photos.first.image_url(:thumb) %> \ No newline at end of file +<%= render_product_photo(@product.default_photo) %> \ No newline at end of file diff --git a/todo b/todo index 1d02523c..fec26b82 100644 --- a/todo +++ b/todo @@ -44,4 +44,7 @@ ✔ 實作圖片上傳 @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) \ No newline at end of file + ✔ products/show, products, index 實作 @done (14-06-13 15:34) + ☐ 搞不定參考答案做的部分 + ✔ 修復圖片顯示功能 @done (14-06-16 17:27) + ✔ 資料庫中有「沒有圖片的產品」也要能正常顯示 index，要能判斷產品有沒有照片 @done (14-06-16 17:27) \ No newline at end of file From 3045b18cd86a5b6d2624402a40fa15b6b2498cb2 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Mon, 16 Jun 2014 17:56:22 +0800 Subject: [PATCH 22/71] update products view --- app/controllers/products_controller.rb | 3 ++- app/helpers/products_helper.rb | 2 +- app/views/products/index.html.erb | 5 +++++ app/views/products/show.html.erb | 5 ++++- todo | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index fd7028d8..24e2a274 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,7 +1,8 @@ class ProductsController < ApplicationController def index - @products = Product.all + # 依 ID 降冪排序（最新的產品在最上面） + @products = Product.order("id DESC") end def show diff --git a/app/helpers/products_helper.rb b/app/helpers/products_helper.rb index 862d2fae..ff1daab8 100644 --- a/app/helpers/products_helper.rb +++ b/app/helpers/products_helper.rb @@ -4,7 +4,7 @@ def render_product_photo(photo) if photo.present? #產品是否有照片 image_tag(photo.image.thumb.url) else - "no pic" + image_tag("http://placehold.it/250x250&text=No Pic") end end diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index 75f36843..03b1f521 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -2,6 +2,11 @@ <% @products.each do |product| %>
  • <%= link_to(product.title, product_path(product)) %> +
    + <%= link_to product_path(product) do %> + <%= render_product_photo(product.default_photo) %> + <% end %> +

    • <% end %> diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 9ddb5a2f..9889e55d 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -11,4 +11,7 @@

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

    -<%= render_product_photo(@product.default_photo) %> \ No newline at end of file +<%= render_product_photo(@product.default_photo) %> +

    + <%= link_to "回到商品列表", products_path %> +

    diff --git a/todo b/todo index fec26b82..11fd948d 100644 --- a/todo +++ b/todo @@ -45,6 +45,6 @@ ✔ 用 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) \ No newline at end of file From 261f8ff8d79190c823e0fe183854aba5451dad84 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Mon, 16 Jun 2014 18:14:49 +0800 Subject: [PATCH 23/71] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=B3=BC=E7=89=A9?= =?UTF-8?q?=E8=BB=8A=E6=8C=89=E9=88=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/common/_navbar.html.erb | 5 +++++ app/views/products/show.html.erb | 6 ++++++ config/routes.rb | 6 +++++- todo | 3 +++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/views/common/_navbar.html.erb b/app/views/common/_navbar.html.erb index dcdf7d06..a9ec7ad6 100644 --- a/app/views/common/_navbar.html.erb +++ b/app/views/common/_navbar.html.erb @@ -42,6 +42,11 @@
      +
    • + <%= link_to "#" do %> + 購物車 (0) + <% end %> +
      • <% if !current_user %>
    • <%= link_to "註冊", new_user_registration_path %>
    • <%= link_to "登入", new_user_session_path %>
      • diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 9889e55d..00963117 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -12,6 +12,12 @@ 尚有 <%= @product.quantity %> 件商品

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

      + <%= link_to("加入購物車", "#", :class => "btn btn-danger") %> + +

      +

      <%= link_to "回到商品列表", products_path %>

      diff --git a/config/routes.rb b/config/routes.rb index 58a05ae7..d4848b10 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,7 +6,11 @@ resources :products end - resources :products + resources :products do + member do + post :add_to_cart + end + end # 暫時先把 root 放到這邊 root :to => "products#index" diff --git a/todo b/todo index 11fd948d..3793b110 100644 --- a/todo +++ b/todo @@ -33,6 +33,9 @@ [ 前台 ] ✔ 消費者應該要能看到所有商品 @done (14-06-13 16:05) ☐ 消費者要能將商品加到購物車 + ✔ 購物車狀態 @done (14-06-16 18:12) + ✔ 加入購物車按鈕 @done (14-06-16 18:12) + ☐ MODEL ☐ 消費者要能確認購買、填寫資料並產生訂單 ☐ 消費者要能進行結賬的動作 ☐ 結賬後要能收到 mail 確認 From a58986532c9890adc9f9b16a656cdd8fb7508b16 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 17 Jun 2014 16:13:55 +0800 Subject: [PATCH 24/71] update views and helper --- app/assets/stylesheets/products.css.scss | 21 ++++++++++++ app/helpers/products_helper.rb | 24 +++++++++++--- app/views/products/index.html.erb | 42 ++++++++++++++++-------- 3 files changed, 70 insertions(+), 17 deletions(-) diff --git a/app/assets/stylesheets/products.css.scss b/app/assets/stylesheets/products.css.scss index 89e2e8db..21dc5ae0 100644 --- a/app/assets/stylesheets/products.css.scss +++ b/app/assets/stylesheets/products.css.scss @@ -1,3 +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/helpers/products_helper.rb b/app/helpers/products_helper.rb index ff1daab8..d4b267ad 100644 --- a/app/helpers/products_helper.rb +++ b/app/helpers/products_helper.rb @@ -1,11 +1,27 @@ module ProductsHelper - def render_product_photo(photo) - if photo.present? #產品是否有照片 - image_tag(photo.image.thumb.url) + def render_product_photo(photo, size = "thumb") + + if photo.present? + image_url = photo.image.send(size).url else - image_tag("http://placehold.it/250x250&text=No Pic") + + 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") + + end + + def render_product_name(product) + product.title end end \ No newline at end of file diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index 03b1f521..fc7f0c3d 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -1,13 +1,29 @@ -
        - <% @products.each do |product| %> -
      • - <%= link_to(product.title, product_path(product)) %> -
        - <%= link_to product_path(product) do %> - <%= render_product_photo(product.default_photo) %> - <% end %> -

        -
        • - - <% end %> -
      \ No newline at end of file +<% @products.each do |product| %> +
      +
      + +
      +
      +

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

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

      產品資訊

      +
      +
      +

      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 From 82fa92916c01c1e268eb97b6c3f99ac4f2b2e920 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 17 Jun 2014 16:30:49 +0800 Subject: [PATCH 25/71] update views and helper --- app/helpers/products_helper.rb | 4 +-- app/views/products/index.html.erb | 2 ++ app/views/products/show.html.erb | 58 +++++++++++++++++++------------ 3 files changed, 39 insertions(+), 25 deletions(-) diff --git a/app/helpers/products_helper.rb b/app/helpers/products_helper.rb index d4b267ad..208e52f6 100644 --- a/app/helpers/products_helper.rb +++ b/app/helpers/products_helper.rb @@ -13,10 +13,10 @@ def render_product_photo(photo, size = "thumb") volume = "200x200" end - image_url = "http://placehold.it/#{volume}&text=No Pic" + image_url = "http://placehold.it/300x300&text=No Pic" end - image_tag(image_url, :class => "thumbnail") + image_tag(image_url, :class => "thumbnail img-responsive") end diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index fc7f0c3d..75248c7e 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -16,6 +16,8 @@

      產品資訊

      + +

      <%= 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!

      diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 00963117..713ce0e1 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -1,23 +1,35 @@ -

      - <%= @product.title %> -

      - -

      產品描述

      -

      - <%= @product.description %> -

      - -

      剩餘數量

      -

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

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

      - <%= link_to("加入購物車", "#", :class => "btn btn-danger") %> - -

      - -

      - <%= link_to "回到商品列表", products_path %> -

      +
      +
      + +
      +
      +

      <%= 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("加入購物車", "#", :class => "addToCart btn btn-danger pull-right") %> +
      +
      \ No newline at end of file From 4869d942173b35f7cf22e6f32f7815498f99c40f Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 17 Jun 2014 16:42:44 +0800 Subject: [PATCH 26/71] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9E=E7=94=A2?= =?UTF-8?q?=E5=93=81=20option=20in=20navbar=20and=20admin=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/products_helper.rb | 2 +- app/views/admin/products/index.html.erb | 1 + app/views/common/_navbar.html.erb | 5 +++++ app/views/products/show.html.erb | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/helpers/products_helper.rb b/app/helpers/products_helper.rb index 208e52f6..f804f45f 100644 --- a/app/helpers/products_helper.rb +++ b/app/helpers/products_helper.rb @@ -13,7 +13,7 @@ def render_product_photo(photo, size = "thumb") volume = "200x200" end - image_url = "http://placehold.it/300x300&text=No Pic" + image_url = "http://placehold.it/#{volume}&text=No Pic" end image_tag(image_url, :class => "thumbnail img-responsive") diff --git a/app/views/admin/products/index.html.erb b/app/views/admin/products/index.html.erb index f652ff6f..6831f265 100644 --- a/app/views/admin/products/index.html.erb +++ b/app/views/admin/products/index.html.erb @@ -1,3 +1,4 @@ +<%= link_to("新增產品", new_admin_product_path, :class => "btn btn-primary btn-sm pull-right") %>
        <% @products.each do |product| %>
      • diff --git a/app/views/common/_navbar.html.erb b/app/views/common/_navbar.html.erb index a9ec7ad6..2788577b 100644 --- a/app/views/common/_navbar.html.erb +++ b/app/views/common/_navbar.html.erb @@ -60,6 +60,11 @@ 管理界面 <% end %>
        • +
      • + <%= link_to new_admin_product_path do %> + 新增產品 + <% end %> +
        • <% end %>
      • <%= link_to( destroy_user_session_path, :method => :delete ) do %> diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index 713ce0e1..ceb28e46 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -30,6 +30,6 @@
      - <%= link_to("加入購物車", "#", :class => "addToCart btn btn-danger pull-right") %> + <%= link_to("加入購物車", add_to_cart_product_path(@product), :class => "addToCart btn btn-danger pull-right") %>
      \ No newline at end of file From 1c9e0454c89e952192485939a94c4b6dc00566c9 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 17 Jun 2014 16:50:22 +0800 Subject: [PATCH 27/71] add notice message --- app/helpers/application_helper.rb | 19 +++++++++++++++++++ app/views/layouts/application.html.erb | 2 ++ 2 files changed, 21 insertions(+) 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/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 83153dcd..8f1c3f7f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,6 +13,8 @@
      + <%= notice_message %> + <%= yield %>
      From e2b60ef03811e4d9b005e1b42ff8ebf444f98c99 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 17 Jun 2014 17:04:05 +0800 Subject: [PATCH 28/71] add cart and cartItem model --- app/models/cart.rb | 2 ++ app/models/cart_item.rb | 2 ++ db/migrate/20140617090000_create_carts.rb | 8 ++++++++ db/migrate/20140617090119_create_cart_items.rb | 10 ++++++++++ db/schema.rb | 14 +++++++++++++- test/fixtures/cart_items.yml | 9 +++++++++ test/fixtures/carts.yml | 11 +++++++++++ test/models/cart_item_test.rb | 7 +++++++ test/models/cart_test.rb | 7 +++++++ 9 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 app/models/cart.rb create mode 100644 app/models/cart_item.rb create mode 100644 db/migrate/20140617090000_create_carts.rb create mode 100644 db/migrate/20140617090119_create_cart_items.rb create mode 100644 test/fixtures/cart_items.yml create mode 100644 test/fixtures/carts.yml create mode 100644 test/models/cart_item_test.rb create mode 100644 test/models/cart_test.rb diff --git a/app/models/cart.rb b/app/models/cart.rb new file mode 100644 index 00000000..3f5c3724 --- /dev/null +++ b/app/models/cart.rb @@ -0,0 +1,2 @@ +class Cart < ActiveRecord::Base +end diff --git a/app/models/cart_item.rb b/app/models/cart_item.rb new file mode 100644 index 00000000..1811da2c --- /dev/null +++ b/app/models/cart_item.rb @@ -0,0 +1,2 @@ +class CartItem < ActiveRecord::Base +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/schema.rb b/db/schema.rb index b8dc388d..af026dd6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,19 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140616081302) do +ActiveRecord::Schema.define(version: 20140617090119) 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" + end + + create_table "carts", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end create_table "photos", force: true do |t| t.integer "product_id" 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/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 From b325586b2decdba04a9b1a0012624b70cc8f8bdc Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 17 Jun 2014 17:06:29 +0800 Subject: [PATCH 29/71] fix admin::productController update action --- app/controllers/admin/products_controller.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb index 374dcfb3..bacefb59 100644 --- a/app/controllers/admin/products_controller.rb +++ b/app/controllers/admin/products_controller.rb @@ -28,6 +28,9 @@ def edit end def update + + @product = Product.find(params[:id]) + if @product.update(product_params) redirect_to admin_products_path else From 8292f709d9f14d5d66d93b8531c91fd6cd386f8d Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 17 Jun 2014 17:59:55 +0800 Subject: [PATCH 30/71] add to cart --- app/controllers/application_controller.rb | 23 +++++++++++++++++++++++ app/controllers/products_controller.rb | 23 +++++++++++++++++++++++ app/models/cart.rb | 10 ++++++++++ app/models/cart_item.rb | 4 ++++ 4 files changed, 60 insertions(+) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 95c15b73..18b04976 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -9,4 +9,27 @@ def admin_required 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/products_controller.rb b/app/controllers/products_controller.rb index 24e2a274..7b5b7eec 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -9,4 +9,27 @@ def show @product = Product.find(params[:id]) 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) + + # 把商品加到購物車 (cart model) + # def add_product_to_cart(product) + # items << product + # end + current_cart.add_product_to_cart(@product) + flash[:notice] = "你已成功將 #{@product.title} 加入購物車" + else + flash[:warning] = "你的購物車內已有此物品" + end + + redirect_to :back + + end + end diff --git a/app/models/cart.rb b/app/models/cart.rb index 3f5c3724..36cdfffb 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -1,2 +1,12 @@ 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) + # ？ + items << product + end + end diff --git a/app/models/cart_item.rb b/app/models/cart_item.rb index 1811da2c..29642d20 100644 --- a/app/models/cart_item.rb +++ b/app/models/cart_item.rb @@ -1,2 +1,6 @@ class CartItem < ActiveRecord::Base + + belongs_to :cart + belongs_to :product + end From 7f2f5826db3132ce421a05291db166d35c6e98e4 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 17 Jun 2014 18:28:16 +0800 Subject: [PATCH 31/71] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=8A=A0=E5=88=B0?= =?UTF-8?q?=E8=B3=BC=E7=89=A9=E8=BB=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/javascripts/carts.js.coffee | 3 ++ app/assets/stylesheets/carts.css.scss | 3 ++ app/controllers/carts_controller.rb | 2 + app/controllers/products_controller.rb | 4 +- app/helpers/carts_helper.rb | 11 ++++++ app/models/cart.rb | 4 ++ app/views/carts/index.html.erb | 46 +++++++++++++++++++++++ app/views/common/_navbar.html.erb | 4 +- app/views/products/show.html.erb | 3 +- config/routes.rb | 2 + test/controllers/carts_controller_test.rb | 7 ++++ test/helpers/carts_helper_test.rb | 4 ++ 12 files changed, 88 insertions(+), 5 deletions(-) create mode 100644 app/assets/javascripts/carts.js.coffee create mode 100644 app/assets/stylesheets/carts.css.scss create mode 100644 app/controllers/carts_controller.rb create mode 100644 app/helpers/carts_helper.rb create mode 100644 app/views/carts/index.html.erb create mode 100644 test/controllers/carts_controller_test.rb create mode 100644 test/helpers/carts_helper_test.rb 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/stylesheets/carts.css.scss b/app/assets/stylesheets/carts.css.scss new file mode 100644 index 00000000..62647c9d --- /dev/null +++ b/app/assets/stylesheets/carts.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the carts controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb new file mode 100644 index 00000000..db5babd3 --- /dev/null +++ b/app/controllers/carts_controller.rb @@ -0,0 +1,2 @@ +class CartsController < ApplicationController +end diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 7b5b7eec..5c19466d 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -23,9 +23,9 @@ def add_to_cart # items << product # end current_cart.add_product_to_cart(@product) - flash[:notice] = "你已成功將 #{@product.title} 加入購物車" + flash[:notice] = "已成功將 #{@product.title} 加入購物車" else - flash[:warning] = "你的購物車內已有此物品" + flash[:warning] = "購物車內已有此物品" end redirect_to :back 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/models/cart.rb b/app/models/cart.rb index 36cdfffb..162cb5da 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -9,4 +9,8 @@ def add_product_to_cart(product) items << product end + def total_price + items.inject(0) {|sum, item| sum + item.price } + end + end diff --git a/app/views/carts/index.html.erb b/app/views/carts/index.html.erb new file mode 100644 index 00000000..256e7e15 --- /dev/null +++ b/app/views/carts/index.html.erb @@ -0,0 +1,46 @@ +
      +
      + +

      購物車

      + + + + + + + + + + + <% current_cart.items.each do |product| %> + + + + + + + <% end %> + + +
      商品資訊單價
      <%= render_product_photo(product.default_photo) %> + + + <%= link_to(product.title, admin_product_path(product)) %> + <%= product.price %>
      + +
      + + 總計 <%= render_cart_total_price(current_cart) %> NTD + +
      + +
      +
      + <%= link_to("確認結賬", "#" , :method => :post , :class => "btn btn-primary btn-lg btn-danger pull-right") %> +
      + + +
      + + +
      \ No newline at end of file diff --git a/app/views/common/_navbar.html.erb b/app/views/common/_navbar.html.erb index 2788577b..a51363ea 100644 --- a/app/views/common/_navbar.html.erb +++ b/app/views/common/_navbar.html.erb @@ -43,8 +43,8 @@
      • - <%= link_to "#" do %> - 購物車 (0) + <%= link_to carts_path do %> + 購物車 (<%= cart_items_count(current_cart) %>) <% end %>
        • <% if !current_user %> diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb index ceb28e46..68bdd1e9 100644 --- a/app/views/products/show.html.erb +++ b/app/views/products/show.html.erb @@ -30,6 +30,7 @@
        - <%= link_to("加入購物車", add_to_cart_product_path(@product), :class => "addToCart btn btn-danger pull-right") %> + + <%= 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/routes.rb b/config/routes.rb index d4848b10..476fcff2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -12,6 +12,8 @@ end end + resources :carts + # 暫時先把 root 放到這邊 root :to => "products#index" # The priority is based upon order of creation: first created -> highest priority. 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/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 From 0074af1e6a318275864f587728e39b6150e3b7bb Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 17 Jun 2014 18:49:02 +0800 Subject: [PATCH 32/71] rails#4 p38 --- app/controllers/carts_controller.rb | 12 +++ app/models/order.rb | 2 + app/models/order_info.rb | 2 + app/models/order_item.rb | 2 + app/views/carts/checkout.html.erb | 74 +++++++++++++++++++ app/views/carts/index.html.erb | 2 +- config/routes.rb | 6 +- db/migrate/20140617104038_create_orders.rb | 10 +++ .../20140617104151_create_order_infos.rb | 13 ++++ .../20140617104247_create_order_items.rb | 11 +++ test/fixtures/order_infos.yml | 11 +++ test/fixtures/order_items.yml | 11 +++ test/fixtures/orders.yml | 11 +++ test/models/order_info_test.rb | 7 ++ test/models/order_item_test.rb | 7 ++ test/models/order_test.rb | 7 ++ todo | 3 +- 17 files changed, 187 insertions(+), 4 deletions(-) create mode 100644 app/models/order.rb create mode 100644 app/models/order_info.rb create mode 100644 app/models/order_item.rb create mode 100644 app/views/carts/checkout.html.erb create mode 100644 db/migrate/20140617104038_create_orders.rb create mode 100644 db/migrate/20140617104151_create_order_infos.rb create mode 100644 db/migrate/20140617104247_create_order_items.rb create mode 100644 test/fixtures/order_infos.yml create mode 100644 test/fixtures/order_items.yml create mode 100644 test/fixtures/orders.yml create mode 100644 test/models/order_info_test.rb create mode 100644 test/models/order_item_test.rb create mode 100644 test/models/order_test.rb diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb index db5babd3..d45e1885 100644 --- a/app/controllers/carts_controller.rb +++ b/app/controllers/carts_controller.rb @@ -1,2 +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/models/order.rb b/app/models/order.rb new file mode 100644 index 00000000..0bcb1583 --- /dev/null +++ b/app/models/order.rb @@ -0,0 +1,2 @@ +class Order < ActiveRecord::Base +end diff --git a/app/models/order_info.rb b/app/models/order_info.rb new file mode 100644 index 00000000..464dd2da --- /dev/null +++ b/app/models/order_info.rb @@ -0,0 +1,2 @@ +class OrderInfo < ActiveRecord::Base +end diff --git a/app/models/order_item.rb b/app/models/order_item.rb new file mode 100644 index 00000000..7d3194a5 --- /dev/null +++ b/app/models/order_item.rb @@ -0,0 +1,2 @@ +class OrderItem < ActiveRecord::Base +end diff --git a/app/views/carts/checkout.html.erb b/app/views/carts/checkout.html.erb new file mode 100644 index 00000000..7d20b260 --- /dev/null +++ b/app/views/carts/checkout.html.erb @@ -0,0 +1,74 @@ +
        +
        + +

        購物明細

        + + + + + + + + + + <% current_cart.items.each do |product| %> + + + + + <% end %> + + +
        商品明細單價
        + + <%= link_to(product.title, admin_product_path(product)) %> + <%= product.price %>
        + +
        + + 總計 <%= 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 index 256e7e15..00433943 100644 --- a/app/views/carts/index.html.erb +++ b/app/views/carts/index.html.erb @@ -36,7 +36,7 @@
        - <%= link_to("確認結賬", "#" , :method => :post , :class => "btn btn-primary btn-lg btn-danger pull-right") %> + <%= link_to("確認結賬", checkout_carts_path , :method => :post , :class => "btn btn-primary btn-lg btn-danger pull-right") %>
        diff --git a/config/routes.rb b/config/routes.rb index 476fcff2..6abdddde 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -12,7 +12,11 @@ end end - resources :carts + resources :carts do + collection do + post 'checkout' + end + end # 暫時先把 root 放到這邊 root :to => "products#index" 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/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/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/todo b/todo index 3793b110..3496709e 100644 --- a/todo +++ b/todo @@ -32,10 +32,9 @@ [ 前台 ] ✔ 消費者應該要能看到所有商品 @done (14-06-13 16:05) - ☐ 消費者要能將商品加到購物車 + ✔ 消費者要能將商品加到購物車 @done (14-06-17 18:29) ✔ 購物車狀態 @done (14-06-16 18:12) ✔ 加入購物車按鈕 @done (14-06-16 18:12) - ☐ MODEL ☐ 消費者要能確認購買、填寫資料並產生訂單 ☐ 消費者要能進行結賬的動作 ☐ 結賬後要能收到 mail 確認 From 321b176fbb4692ebca3e27efc2e9eeb16e0bcd5f Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 17 Jun 2014 21:27:56 +0800 Subject: [PATCH 33/71] rails#4 p48 --- app/assets/javascripts/orders.js.coffee | 3 ++ app/assets/stylesheets/orders.css.scss | 3 ++ app/controllers/orders_controller.rb | 24 ++++++++++++++ app/helpers/orders_helper.rb | 2 ++ app/models/cart.rb | 7 ++++ app/models/order.rb | 22 +++++++++++++ app/models/order_info.rb | 3 ++ app/models/order_item.rb | 1 + app/models/user.rb | 2 ++ app/views/carts/checkout.html.erb | 38 +++++++++++----------- config/routes.rb | 2 ++ db/schema.rb | 29 ++++++++++++++++- test/controllers/orders_controller_test.rb | 7 ++++ test/helpers/orders_helper_test.rb | 4 +++ 14 files changed, 127 insertions(+), 20 deletions(-) create mode 100644 app/assets/javascripts/orders.js.coffee create mode 100644 app/assets/stylesheets/orders.css.scss create mode 100644 app/controllers/orders_controller.rb create mode 100644 app/helpers/orders_helper.rb create mode 100644 test/controllers/orders_controller_test.rb create mode 100644 test/helpers/orders_helper_test.rb diff --git a/app/assets/javascripts/orders.js.coffee b/app/assets/javascripts/orders.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/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/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/controllers/orders_controller.rb b/app/controllers/orders_controller.rb new file mode 100644 index 00000000..e166b4e2 --- /dev/null +++ b/app/controllers/orders_controller.rb @@ -0,0 +1,24 @@ +class OrdersController < ApplicationController + + before_action :authenticate_user! + + def create + @order = current_user.orders.build(order_params) + + if @order.save + @order.build_item_cache_from_cart(current_cart) + @order.caculate_total!(current_cart) + redirect_to root_path + else + # 跨 controller + render "carts/checkout" + end + 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/helpers/orders_helper.rb b/app/helpers/orders_helper.rb new file mode 100644 index 00000000..443227fd --- /dev/null +++ b/app/helpers/orders_helper.rb @@ -0,0 +1,2 @@ +module OrdersHelper +end diff --git a/app/models/cart.rb b/app/models/cart.rb index 162cb5da..7c600dc4 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -13,4 +13,11 @@ def total_price items.inject(0) {|sum, item| sum + item.price } end + # 清空購物車 + def clear! + # delete_all 是內建的 method + # 查一下和 destroy_all 的差別 + cart_items.delete_all + end + end diff --git a/app/models/order.rb b/app/models/order.rb index 0bcb1583..665f28f5 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -1,2 +1,24 @@ 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 + + def build_item_cache_from_cart(cart) + cart.items.each do |cart_item| + item = items.build + item.product_name = cart_item.title + item.quantity = 1 + item.price = cart_item.price + item.save + end + end + + def calculate_total!(current_cart) + self.total = current_cart.total_price + self.save + end + end diff --git a/app/models/order_info.rb b/app/models/order_info.rb index 464dd2da..6a99da97 100644 --- a/app/models/order_info.rb +++ b/app/models/order_info.rb @@ -1,2 +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 index 7d3194a5..79691641 100644 --- a/app/models/order_item.rb +++ b/app/models/order_item.rb @@ -1,2 +1,3 @@ class OrderItem < ActiveRecord::Base + belongs_to :order end diff --git a/app/models/user.rb b/app/models/user.rb index 9375287a..1ac59199 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -5,6 +5,8 @@ class User < ActiveRecord::Base devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable + has_many :orders + def admin? is_admin end diff --git a/app/views/carts/checkout.html.erb b/app/views/carts/checkout.html.erb index 7d20b260..d02b7c72 100644 --- a/app/views/carts/checkout.html.erb +++ b/app/views/carts/checkout.html.erb @@ -14,8 +14,8 @@ <% current_cart.items.each do |product| %> - - <%= link_to(product.title, admin_product_path(product)) %> + + <%= link_to(product.title, product_path(product)) %> <%= product.price %> @@ -41,23 +41,23 @@ <%= f.simple_fields_for :info do |c| %> - 訂購人 - -
        - <%= c.input :billing_name %> -
        -
        - <%= c.input :billing_address %> -
        - - 收貨人 -
        - <%= c.input :shipping_name %> -
        -
        - <%= c.input :shipping_address %> -
        - <% end %> + 訂購人 + +
        + <%= 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...' %> diff --git a/config/routes.rb b/config/routes.rb index 6abdddde..a4a8fd84 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -18,6 +18,8 @@ end end + resources :orders + # 暫時先把 root 放到這邊 root :to => "products#index" # The priority is based upon order of creation: first created -> highest priority. diff --git a/db/schema.rb b/db/schema.rb index af026dd6..240ac02b 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140617090119) do +ActiveRecord::Schema.define(version: 20140617104247) do create_table "cart_items", force: true do |t| t.integer "cart_id" @@ -25,6 +25,33 @@ 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" + end + create_table "photos", force: true do |t| t.integer "product_id" t.string "image" 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/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 From 4b6b14d8bca180f13dc088f1d1fb30ec2cb2558a Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Thu, 19 Jun 2014 14:29:25 +0800 Subject: [PATCH 34/71] generate random url for orders --- app/controllers/orders_controller.rb | 9 ++++++++- app/models/order.rb | 11 +++++++++++ db/migrate/20140619061027_add_token_to_order.rb | 6 ++++++ db/schema.rb | 5 ++++- todo | 14 +++++++++++++- 5 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20140619061027_add_token_to_order.rb diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index e166b4e2..f28d3ccc 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -8,13 +8,20 @@ def create if @order.save @order.build_item_cache_from_cart(current_cart) @order.caculate_total!(current_cart) - redirect_to root_path + # 產生 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 + private def order_params diff --git a/app/models/order.rb b/app/models/order.rb index 665f28f5..3616d500 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -8,6 +8,8 @@ class Order < ActiveRecord::Base 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 @@ -21,4 +23,13 @@ def calculate_total!(current_cart) self.save end + before_create :generate_token + + def generate_token + # http://ruby-doc.org/stdlib-2.1.0/libdoc/securerandom/rdoc/SecureRandom.html + self.token = SecureRandom.uuid + end + + + end 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/schema.rb b/db/schema.rb index 240ac02b..7cf683f2 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140617104247) do +ActiveRecord::Schema.define(version: 20140619061027) do create_table "cart_items", force: true do |t| t.integer "cart_id" @@ -50,8 +50,11 @@ t.boolean "paid", default: false t.datetime "created_at" t.datetime "updated_at" + t.string "token" end + add_index "orders", ["token"], name: "index_orders_on_token" + create_table "photos", force: true do |t| t.integer "product_id" t.string "image" diff --git a/todo b/todo index 3496709e..e521aeb3 100644 --- a/todo +++ b/todo @@ -35,7 +35,9 @@ ✔ 消費者要能將商品加到購物車 @done (14-06-17 18:29) ✔ 購物車狀態 @done (14-06-16 18:12) ✔ 加入購物車按鈕 @done (14-06-16 18:12) + ✔ 消費者要能看到購物車明細 @done (14-06-19 14:02) ☐ 消費者要能確認購買、填寫資料並產生訂單 + ☐ 可以填寫寄送資訊 ☐ 消費者要能進行結賬的動作 ☐ 結賬後要能收到 mail 確認 @@ -49,4 +51,14 @@ ✔ 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) \ No newline at end of file + ✔ 資料庫中有「沒有圖片的產品」也要能正常顯示 index，要能判斷產品有沒有照片 @done (14-06-16 17:27) + + ☐ Week2 Homework + ☐ 清空購物車 + ☐ 從購物車內刪掉某些物品 + ☐ 購物車加入數量設計 + ☐ 購物車的總價 => 小計 * 數量 + ☐ 數量為零的貨物不能購買 + ☐ 支援多重購買數量 + ☐ 修改訂單畫面 + ☐ 訂單畫面美化 \ No newline at end of file From 6530495e5ee23fd2418896b53f74bb8d4ce9016e Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Thu, 19 Jun 2014 15:29:26 +0800 Subject: [PATCH 35/71] =?UTF-8?q?=E6=B6=88=E8=B2=BB=E8=80=85=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E9=81=B8=E6=93=87=E7=94=A8=E4=BF=A1=E7=94=A8=E5=8D=A1?= =?UTF-8?q?=E7=B5=90=E8=B3=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/orders_controller.rb | 8 ++ app/models/order.rb | 8 +- app/views/orders/show.html.erb | 85 +++++++++++++++++++ config/routes.rb | 6 +- ...40619070542_add_payment_method_to_order.rb | 5 ++ db/schema.rb | 5 +- todo | 10 ++- 7 files changed, 119 insertions(+), 8 deletions(-) create mode 100644 app/views/orders/show.html.erb create mode 100644 db/migrate/20140619070542_add_payment_method_to_order.rb diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index f28d3ccc..adc0a34c 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -22,6 +22,14 @@ def show @order_items = @order.items end + def pay_with_credit_card + @order = current_user.orders.find_by_token(params[:id]) + @order.set_payment_with!("credit_card") + @order.pay! + + redirect_to root_path, :notice => "成功完成付款" + end + private def order_params diff --git a/app/models/order.rb b/app/models/order.rb index 3616d500..c4c48139 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -18,7 +18,7 @@ def build_item_cache_from_cart(cart) end end - def calculate_total!(current_cart) + def caculate_total!(current_cart) self.total = current_cart.total_price self.save end @@ -30,6 +30,12 @@ def generate_token self.token = SecureRandom.uuid end + def set_payment_with!(method) + self.update_column(:payment_method, method) + end + def pay! + self.update_column(:paid, true) + end end diff --git a/app/views/orders/show.html.erb b/app/views/orders/show.html.erb new file mode 100644 index 00000000..5e4b7124 --- /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.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/config/routes.rb b/config/routes.rb index a4a8fd84..71e63925 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -18,7 +18,11 @@ end end - resources :orders + resources :orders do + member do + get :pay_with_credit_card + end + end # 暫時先把 root 放到這邊 root :to => "products#index" 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/schema.rb b/db/schema.rb index 7cf683f2..e6ded942 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140619061027) do +ActiveRecord::Schema.define(version: 20140619070542) do create_table "cart_items", force: true do |t| t.integer "cart_id" @@ -47,10 +47,11 @@ create_table "orders", force: true do |t| t.integer "user_id" t.integer "total" - t.boolean "paid", default: false + t.boolean "paid", default: false t.datetime "created_at" t.datetime "updated_at" t.string "token" + t.string "payment_method" end add_index "orders", ["token"], name: "index_orders_on_token" diff --git a/todo b/todo index e521aeb3..36d941e5 100644 --- a/todo +++ b/todo @@ -36,9 +36,9 @@ ✔ 購物車狀態 @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 確認 @@ -61,4 +61,6 @@ ☐ 數量為零的貨物不能購買 ☐ 支援多重購買數量 ☐ 修改訂單畫面 - ☐ 訂單畫面美化 \ No newline at end of file + ☐ 訂單畫面美化 + ☐ 建立 account/orders 可以看到該使用者過去所有訂單 + ☐ 結賬後跳轉到 account/orders#index \ No newline at end of file From 87f9ebc60d53789885668a88b907700c7b2a9b24 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Thu, 19 Jun 2014 15:55:04 +0800 Subject: [PATCH 36/71] setting up aasm --- Gemfile | 4 ++- Gemfile.lock | 2 ++ app/models/order.rb | 35 +++++++++++++++++++ ...20140619074900_add_aasm_state_to_orders.rb | 6 ++++ db/schema.rb | 4 ++- 5 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20140619074900_add_aasm_state_to_orders.rb diff --git a/Gemfile b/Gemfile index 92454149..23a2da30 100644 --- a/Gemfile +++ b/Gemfile @@ -48,4 +48,6 @@ gem 'simple_form' # 圖片上傳 gem 'carrierwave' # 圖片壓縮 resize -gem 'mini_magick' \ No newline at end of file +gem 'mini_magick' +# 有線狀態機 +gem 'aasm' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 58a6678d..9ae31ab7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,7 @@ GEM remote: https://rubygems.org/ specs: + aasm (3.2.1) actionmailer (4.1.0) actionpack (= 4.1.0) actionview (= 4.1.0) @@ -137,6 +138,7 @@ PLATFORMS ruby DEPENDENCIES + aasm bootstrap-sass carrierwave coffee-rails (~> 4.0.0) diff --git a/app/models/order.rb b/app/models/order.rb index c4c48139..03a8f4c9 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -38,4 +38,39 @@ 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 + 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/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/schema.rb b/db/schema.rb index e6ded942..a4a106be 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140619070542) do +ActiveRecord::Schema.define(version: 20140619074900) do create_table "cart_items", force: true do |t| t.integer "cart_id" @@ -52,8 +52,10 @@ 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| From b0ee469457a7a303359906b603df37e9fdac9805 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Thu, 19 Jun 2014 17:16:55 +0800 Subject: [PATCH 37/71] =?UTF-8?q?=E8=AA=B2=E7=A8=8B=E7=B7=B4=E7=BF=92done?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/orders_controller.rb | 4 +++- app/models/order.rb | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index adc0a34c..e52b5bc7 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -25,7 +25,9 @@ def show def pay_with_credit_card @order = current_user.orders.find_by_token(params[:id]) @order.set_payment_with!("credit_card") - @order.pay! + # @order.pay! + # 在 aasm 設定中 make payment 提交後會執行 pay! 的內容所以這邊不用寫了 + @order.make_payment! redirect_to root_path, :notice => "成功完成付款" end diff --git a/app/models/order.rb b/app/models/order.rb index 03a8f4c9..efb5c925 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -45,6 +45,7 @@ def pay! # 結賬後狀態轉為 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 From 6db10537603949b41fd9f075ca751f90ff8d75ac Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Thu, 19 Jun 2014 22:26:32 +0800 Subject: [PATCH 38/71] =?UTF-8?q?=E7=B5=90=E8=B3=AC=E7=94=A2=E7=94=9F?= =?UTF-8?q?=E8=A8=82=E5=96=AE=E5=BE=8C=E6=B8=85=E9=99=A4=E8=B3=BC=E7=89=A9?= =?UTF-8?q?=E8=BB=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/orders_controller.rb | 2 ++ app/models/cart.rb | 6 +++--- todo | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index e52b5bc7..21a094e3 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -8,6 +8,8 @@ def create if @order.save @order.build_item_cache_from_cart(current_cart) @order.caculate_total!(current_cart) + # 確認結賬、訂單產生後後清空購物車 + current_cart.clear # 產生 token 保密訂單網址 redirect_to order_path(@order.token) else diff --git a/app/models/cart.rb b/app/models/cart.rb index 7c600dc4..79b908ee 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -14,9 +14,9 @@ def total_price end # 清空購物車 - def clear! - # delete_all 是內建的 method - # 查一下和 destroy_all 的差別 + def clear + # delete_all 是內建的 method，可一次清空 + # destroy_all 會一個一個 row 刪（？） cart_items.delete_all end diff --git a/todo b/todo index 36d941e5..c234e454 100644 --- a/todo +++ b/todo @@ -54,7 +54,7 @@ ✔ 資料庫中有「沒有圖片的產品」也要能正常顯示 index，要能判斷產品有沒有照片 @done (14-06-16 17:27) ☐ Week2 Homework - ☐ 清空購物車 + ✔ 清空購物車（結賬後） @done (14-06-19 22:24) ☐ 從購物車內刪掉某些物品 ☐ 購物車加入數量設計 ☐ 購物車的總價 => 小計 * 數量 From cea63aef38fe41970883ebb1d09b155e99f2912e Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Thu, 19 Jun 2014 23:04:24 +0800 Subject: [PATCH 39/71] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=8C=89=E9=88=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/carts.css.scss | 12 ++++++ app/views/carts/index.html.erb | 53 ++++++++++++--------------- todo | 3 ++ 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/app/assets/stylesheets/carts.css.scss b/app/assets/stylesheets/carts.css.scss index 62647c9d..ede839c4 100644 --- a/app/assets/stylesheets/carts.css.scss +++ b/app/assets/stylesheets/carts.css.scss @@ -1,3 +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 { + th, .price, .delete { + 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/views/carts/index.html.erb b/app/views/carts/index.html.erb index 00433943..52d2d1ab 100644 --- a/app/views/carts/index.html.erb +++ b/app/views/carts/index.html.erb @@ -1,45 +1,38 @@ -
        +
        - + <%= link_to("清空購物車", "#", :class => "pull-right btn btn-primary btn-sm") %>

        購物車

        - +
        - - + + <% current_cart.items.each do |product| %> - - - - - + + + + + - <% end %> - - -
        商品資訊商品資訊 單價刪除商品
        <%= render_product_photo(product.default_photo) %> - - - <%= link_to(product.title, admin_product_path(product)) %> - <%= product.price %>
        <%= render_product_photo(product.default_photo) %><%= link_to(product.title, admin_product_path(product)) %> <%= product.price %> <%= link_to("x", "#", :class => "btn btn-xs btn-default") %>
        - -
        - - 總計 <%= render_cart_total_price(current_cart) %> NTD - -
        - -
        -
        - <%= link_to("確認結賬", checkout_carts_path , :method => :post , :class => "btn btn-primary btn-lg btn-danger pull-right") %> -
        - + <% end %> + + + +
        + + 總計 <%= render_cart_total_price(current_cart) %> NTD + +
        +
        +
        + <%= link_to("確認結賬", checkout_carts_path , :method => :post , :class => "btn btn-lg btn-danger pull-right") %> +
        diff --git a/todo b/todo index c234e454..9a2fcb3e 100644 --- a/todo +++ b/todo @@ -56,6 +56,9 @@ ☐ Week2 Homework ✔ 清空購物車（結賬後） @done (14-06-19 22:24) ☐ 從購物車內刪掉某些物品 + ✔ 增加移除商品按鈕 @done (14-06-19 23:03) + ☐ 增加 cart_items_controller + ☐ 建立 destroy action ☐ 購物車加入數量設計 ☐ 購物車的總價 => 小計 * 數量 ☐ 數量為零的貨物不能購買 From 69e5cb8f45e7f6c3e8813d02408d5152d9f0aa0b Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Thu, 19 Jun 2014 23:11:49 +0800 Subject: [PATCH 40/71] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20controller=20?= =?UTF-8?q?=E4=B8=A6=E5=A2=9E=E5=8A=A0=20routes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/javascripts/cart_items.js.coffee | 3 +++ app/assets/stylesheets/cart_items.css.scss | 3 +++ app/controllers/cart_items_controller.rb | 2 ++ app/helpers/cart_items_helper.rb | 2 ++ config/routes.rb | 2 ++ test/controllers/cart_items_controller_test.rb | 7 +++++++ test/helpers/cart_items_helper_test.rb | 4 ++++ todo | 3 ++- 8 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/cart_items.js.coffee create mode 100644 app/assets/stylesheets/cart_items.css.scss create mode 100644 app/controllers/cart_items_controller.rb create mode 100644 app/helpers/cart_items_helper.rb create mode 100644 test/controllers/cart_items_controller_test.rb create mode 100644 test/helpers/cart_items_helper_test.rb 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/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/controllers/cart_items_controller.rb b/app/controllers/cart_items_controller.rb new file mode 100644 index 00000000..36c6e6ed --- /dev/null +++ b/app/controllers/cart_items_controller.rb @@ -0,0 +1,2 @@ +class CartItemsController < ApplicationController +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/config/routes.rb b/config/routes.rb index 71e63925..da6cc467 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -24,6 +24,8 @@ end end + resources :cart_items, :only => [:destroy] + # 暫時先把 root 放到這邊 root :to => "products#index" # The priority is based upon order of creation: first created -> highest priority. 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/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/todo b/todo index 9a2fcb3e..500821d8 100644 --- a/todo +++ b/todo @@ -57,8 +57,9 @@ ✔ 清空購物車（結賬後） @done (14-06-19 22:24) ☐ 從購物車內刪掉某些物品 ✔ 增加移除商品按鈕 @done (14-06-19 23:03) - ☐ 增加 cart_items_controller + ✔ 增加 cart_items_controller @done (14-06-19 23:10) ☐ 建立 destroy action + ✔ 加上正確 routes @done (14-06-19 23:10) ☐ 購物車加入數量設計 ☐ 購物車的總價 => 小計 * 數量 ☐ 數量為零的貨物不能購買 From 666f94de9b556afa3ccc3b4d3ca2a66519c8b43c Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Thu, 19 Jun 2014 23:37:13 +0800 Subject: [PATCH 41/71] =?UTF-8?q?=E5=BB=BA=E7=AB=8B=20destroy=20action,=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=8C=89=E9=88=95=E9=80=A3=E7=B5=90=EF=BC=8C?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=80=85=E5=8F=AF=E4=BB=A5=E5=BE=9E=E8=B3=BC?= =?UTF-8?q?=E7=89=A9=E8=BB=8A=E5=85=A7=E5=88=AA=E6=8E=89=E4=B8=80=E4=BB=B6?= =?UTF-8?q?=E7=89=A9=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/cart_items_controller.rb | 9 +++++++++ app/views/carts/index.html.erb | 10 +++++----- todo | 4 ++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/controllers/cart_items_controller.rb b/app/controllers/cart_items_controller.rb index 36c6e6ed..0c7ba9c5 100644 --- a/app/controllers/cart_items_controller.rb +++ b/app/controllers/cart_items_controller.rb @@ -1,2 +1,11 @@ class CartItemsController < ApplicationController + + def destroy + @cart = current_cart + @item = @cart.cart_items.find(params[:id]) + @item.destroy + flash[:notice] = "已經將商品移出購物車" + redirect_to :back + end + end diff --git a/app/views/carts/index.html.erb b/app/views/carts/index.html.erb index 52d2d1ab..61f8f996 100644 --- a/app/views/carts/index.html.erb +++ b/app/views/carts/index.html.erb @@ -12,12 +12,12 @@ - <% current_cart.items.each do |product| %> + <% current_cart.cart_items.each do |item| %> - <%= render_product_photo(product.default_photo) %> - <%= link_to(product.title, admin_product_path(product)) %> - <%= product.price %> - <%= link_to("x", "#", :class => "btn btn-xs btn-default") %> + <%= render_product_photo(item.product.default_photo) %> + <%= link_to(item.product.title, admin_product_path(item.product)) %> + <%= item.product.price %> + <%= link_to("x", cart_item_path(item), :method => :delete, :class => "btn btn-xs btn-default") %> <% end %> diff --git a/todo b/todo index 500821d8..f6aa2343 100644 --- a/todo +++ b/todo @@ -55,10 +55,10 @@ ☐ Week2 Homework ✔ 清空購物車（結賬後） @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 + ✔ 建立 destroy action @done (14-06-19 23:34) ✔ 加上正確 routes @done (14-06-19 23:10) ☐ 購物車加入數量設計 ☐ 購物車的總價 => 小計 * 數量 From b1bd0cb63ff48759c8db0594ec866bceed3b9ad0 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Thu, 19 Jun 2014 23:49:55 +0800 Subject: [PATCH 42/71] add quantity column to cart_items --- db/migrate/20140619154722_add_quantity_to_cart_items.rb | 5 +++++ db/schema.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20140619154722_add_quantity_to_cart_items.rb 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 index a4a106be..e5571889 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,13 +11,14 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20140619074900) do +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| From 2d8290ea0f0bfa597f6b6b47eac99a850f145b0c Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 20 Jun 2014 01:02:39 +0800 Subject: [PATCH 43/71] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20add=5Fproduct=5Fto?= =?UTF-8?q?=5Fcart=20method?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/carts.css.scss | 2 +- app/controllers/products_controller.rb | 6 +++++- app/models/cart.rb | 13 ++++++++++--- app/views/carts/index.html.erb | 4 +++- 4 files changed, 19 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/carts.css.scss b/app/assets/stylesheets/carts.css.scss index ede839c4..c5cd47c4 100644 --- a/app/assets/stylesheets/carts.css.scss +++ b/app/assets/stylesheets/carts.css.scss @@ -4,7 +4,7 @@ $money-red: #c00; .cart { - th, .price, .delete { + th, .price, .delete, .qt { text-align: center; } .price, .total { diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 5c19466d..7eee7820 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -22,9 +22,13 @@ def add_to_cart # def add_product_to_cart(product) # items << product # end - current_cart.add_product_to_cart(@product) + + # 更新 add_product_to_cart method 新增數量，所以這邊預設將 1 個商品加入購物車 + current_cart.add_product_to_cart(@product, 1) flash[:notice] = "已成功將 #{@product.title} 加入購物車" else + # 再加一個商品到購物車 + current_cart.add_onemore_product_to_cart(@product) flash[:warning] = "購物車內已有此物品" end diff --git a/app/models/cart.rb b/app/models/cart.rb index 79b908ee..bdf5bb4f 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -4,9 +4,16 @@ class Cart < ActiveRecord::Base # 透過 cart_items 和 items 作關聯，根據 cart_items 中的 product has_many :items, :through => :cart_items, :source => :product - def add_product_to_cart(product) - # ？ - items << 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) + # 再加一個商品到購物車 + # cart_items.product.quantity += qt end def total_price diff --git a/app/views/carts/index.html.erb b/app/views/carts/index.html.erb index 61f8f996..12cd70fc 100644 --- a/app/views/carts/index.html.erb +++ b/app/views/carts/index.html.erb @@ -8,6 +8,7 @@ 商品資訊 單價 + 數量 刪除商品 @@ -15,8 +16,9 @@ <% current_cart.cart_items.each do |item| %> <%= render_product_photo(item.product.default_photo) %> - <%= link_to(item.product.title, admin_product_path(item.product)) %> + <%= link_to(item.product.title, admin_product_path(item.product)) %> <%= item.product.price %> + <%= item.quantity %> <%= link_to("x", cart_item_path(item), :method => :delete, :class => "btn btn-xs btn-default") %> <% end %> From 79daa3d8810c14bf77d2215bb9b22dc4da46cb38 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 20 Jun 2014 02:12:29 +0800 Subject: [PATCH 44/71] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=80=85=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=A4=9A=E9=87=8D=E8=B3=BC=E8=B2=B7=EF=BC=8C=E4=B8=A6?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=9C=A8=E8=B3=BC=E7=89=A9=E8=BB=8A=E7=9C=8B?= =?UTF-8?q?=E5=88=B0=E6=AD=A3=E7=A2=BA=E7=9A=84=E6=95=B8=E9=87=8F=E8=88=87?= =?UTF-8?q?=E7=B8=BD=E5=83=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/products_controller.rb | 4 ++-- app/models/cart.rb | 6 ++++-- todo | 7 ++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 7eee7820..adc7bd9b 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -28,8 +28,8 @@ def add_to_cart flash[:notice] = "已成功將 #{@product.title} 加入購物車" else # 再加一個商品到購物車 - current_cart.add_onemore_product_to_cart(@product) - flash[:warning] = "購物車內已有此物品" + current_cart.add_onemore_product_to_cart(@product, 1) + flash[:notice] = "已增加一件 #{@product.title} 進您的購物車" end redirect_to :back diff --git a/app/models/cart.rb b/app/models/cart.rb index bdf5bb4f..a0f753b1 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -13,11 +13,13 @@ def add_product_to_cart(product, qt) def add_onemore_product_to_cart(product, qt) # 再加一個商品到購物車 - # cart_items.product.quantity += qt + current_item = cart_items.find_by_product_id(product) + current_item.quantity += qt + current_item.save end def total_price - items.inject(0) {|sum, item| sum + item.price } + cart_items.inject(0) {|sum, item| sum + item.product.price * item.quantity } end # 清空購物車 diff --git a/todo b/todo index f6aa2343..b32a31bc 100644 --- a/todo +++ b/todo @@ -60,10 +60,11 @@ ✔ 增加 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 02:07) ☐ 數量為零的貨物不能購買 - ☐ 支援多重購買數量 + ✔ 支援多重購買數量 @done (14-06-20 02:04) ☐ 修改訂單畫面 ☐ 訂單畫面美化 ☐ 建立 account/orders 可以看到該使用者過去所有訂單 From 02095f15ae50de8a6fa3cee2894b48dbcac9ae62 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 20 Jun 2014 02:20:10 +0800 Subject: [PATCH 45/71] =?UTF-8?q?=E5=BA=AB=E5=AD=98=E7=82=BA0=E7=9A=84?= =?UTF-8?q?=E5=95=86=E5=93=81=E4=B8=8D=E8=83=BD=E8=B3=BC=E8=B2=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/products_controller.rb | 20 +++++++++++--------- todo | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index adc7bd9b..2cb79a6f 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -17,15 +17,17 @@ def add_to_cart #（current_cart 要在 applicationController 自己造）用 helper_method :current_cart # 這樣就能在這裡 (controller) 和 view 使用 current_cart 了 if !current_cart.items.include?(@product) - - # 把商品加到購物車 (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} 加入購物車" + 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) diff --git a/todo b/todo index b32a31bc..6c34314e 100644 --- a/todo +++ b/todo @@ -63,7 +63,7 @@ ✔ 購物車加入數量設計 @done (14-06-20 02:00) ☐ 使用者可以變更數量 ✔ 購物車的總價 => 小計 * 數量 @done (14-06-20 02:07) - ☐ 數量為零的貨物不能購買 + ✔ 數量為零的貨物不能購買 @done (14-06-20 02:19) ✔ 支援多重購買數量 @done (14-06-20 02:04) ☐ 修改訂單畫面 ☐ 訂單畫面美化 From b0a0652abb0f2e9728f583debb1056e3b0e2e0a6 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 20 Jun 2014 03:23:16 +0800 Subject: [PATCH 46/71] =?UTF-8?q?=E4=BD=BF=E7=94=A8=E8=80=85=E5=9C=A8?= =?UTF-8?q?=E8=B3=BC=E7=89=A9=E8=BB=8A=E5=8F=AF=E4=BB=A5=E8=AE=8A=E6=9B=B4?= =?UTF-8?q?=E6=95=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/cart_items_controller.rb | 14 ++++++++++++++ app/views/carts/index.html.erb | 7 ++++++- config/routes.rb | 2 +- todo | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/app/controllers/cart_items_controller.rb b/app/controllers/cart_items_controller.rb index 0c7ba9c5..6496add2 100644 --- a/app/controllers/cart_items_controller.rb +++ b/app/controllers/cart_items_controller.rb @@ -1,5 +1,13 @@ 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]) @@ -8,4 +16,10 @@ def destroy redirect_to :back end + private + + def item_params + params.require(:cart_item).permit(:quantity) + end + end diff --git a/app/views/carts/index.html.erb b/app/views/carts/index.html.erb index 12cd70fc..89de1228 100644 --- a/app/views/carts/index.html.erb +++ b/app/views/carts/index.html.erb @@ -18,7 +18,12 @@ <%= render_product_photo(item.product.default_photo) %> <%= link_to(item.product.title, admin_product_path(item.product)) %> <%= item.product.price %> - <%= item.quantity %> + + <%= 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") %> <% end %> diff --git a/config/routes.rb b/config/routes.rb index da6cc467..48beed48 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -24,7 +24,7 @@ end end - resources :cart_items, :only => [:destroy] + resources :cart_items, :only => [:destroy, :update] # 暫時先把 root 放到這邊 root :to => "products#index" diff --git a/todo b/todo index 6c34314e..533e17f4 100644 --- a/todo +++ b/todo @@ -61,7 +61,7 @@ ✔ 建立 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) From 39b29b9cf9f756f0d40deb22f0845a8567e8a7f8 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 20 Jun 2014 03:45:26 +0800 Subject: [PATCH 47/71] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A8=82=E5=96=AE=20ch?= =?UTF-8?q?eckout=20view?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/carts.css.scss | 2 +- app/views/carts/checkout.html.erb | 16 +++++++++------- app/views/carts/index.html.erb | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/carts.css.scss b/app/assets/stylesheets/carts.css.scss index c5cd47c4..c25380fd 100644 --- a/app/assets/stylesheets/carts.css.scss +++ b/app/assets/stylesheets/carts.css.scss @@ -3,7 +3,7 @@ // You can use Sass (SCSS) here: http://sass-lang.com/ $money-red: #c00; -.cart { +.cart, .checkout { th, .price, .delete, .qt { text-align: center; } diff --git a/app/views/carts/checkout.html.erb b/app/views/carts/checkout.html.erb index d02b7c72..5a7af042 100644 --- a/app/views/carts/checkout.html.erb +++ b/app/views/carts/checkout.html.erb @@ -1,4 +1,4 @@ -
        +

        購物明細

        @@ -6,27 +6,29 @@ - + + - <% current_cart.items.each do |product| %> + <% current_cart.cart_items.each do |item| %> - + + <% end %>
        商品明細商品名稱 單價數量
        - <%= link_to(product.title, product_path(product)) %> + <%= link_to(item.product.title, product_path(item.product)) %> <%= product.price %> <%= item.product.price %> <%= item.quantity %>
        -
        +
        - 總計 <%= render_cart_total_price(current_cart) %> NTD + 總計 <%= render_cart_total_price(current_cart) %> NTD
        diff --git a/app/views/carts/index.html.erb b/app/views/carts/index.html.erb index 89de1228..e81d0bbc 100644 --- a/app/views/carts/index.html.erb +++ b/app/views/carts/index.html.erb @@ -16,7 +16,7 @@ <% current_cart.cart_items.each do |item| %> <%= render_product_photo(item.product.default_photo) %> - <%= link_to(item.product.title, admin_product_path(item.product)) %> + <%= 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| %> From 0308846e3f12ea7c0ce159645c29badd7dcad0f2 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 20 Jun 2014 03:55:23 +0800 Subject: [PATCH 48/71] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A8=82=E5=96=AE?= =?UTF-8?q?=E7=95=AB=E9=9D=A2=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=95=B8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/stylesheets/carts.css.scss | 2 +- app/views/orders/show.html.erb | 14 +++++++------- todo | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/carts.css.scss b/app/assets/stylesheets/carts.css.scss index c25380fd..c2f054d6 100644 --- a/app/assets/stylesheets/carts.css.scss +++ b/app/assets/stylesheets/carts.css.scss @@ -3,7 +3,7 @@ // You can use Sass (SCSS) here: http://sass-lang.com/ $money-red: #c00; -.cart, .checkout { +.cart, .checkout, .order { th, .price, .delete, .qt { text-align: center; } diff --git a/app/views/orders/show.html.erb b/app/views/orders/show.html.erb index 5e4b7124..da90dfc3 100644 --- a/app/views/orders/show.html.erb +++ b/app/views/orders/show.html.erb @@ -1,4 +1,4 @@ -
        +

        訂單明細

        @@ -8,24 +8,24 @@ 商品明細 單價 + 數量 <% @order_items.each do |order_item| %> - - <%= order_item.product_name %> - - <%= order_item.price %> + <%= order_item.product_name %> + <%= order_item.price %> + <%= order_item.quantity %> <% end %> -
        +
        - 總計 <%= @order.total %> NTD + 總計 <%= @order.total %> NTD
        diff --git a/todo b/todo index 533e17f4..dfcd5036 100644 --- a/todo +++ b/todo @@ -65,7 +65,7 @@ ✔ 購物車的總價 => 小計 * 數量 @done (14-06-20 02:07) ✔ 數量為零的貨物不能購買 @done (14-06-20 02:19) ✔ 支援多重購買數量 @done (14-06-20 02:04) - ☐ 修改訂單畫面 + ✔ 修改訂單畫面 @done (14-06-20 03:51) ☐ 訂單畫面美化 ☐ 建立 account/orders 可以看到該使用者過去所有訂單 ☐ 結賬後跳轉到 account/orders#index \ No newline at end of file From a310278384618e746a6b7d552c56887640aa950b Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 20 Jun 2014 04:38:20 +0800 Subject: [PATCH 49/71] =?UTF-8?q?=E5=BB=BA=E7=AB=8B=20account/orders#index?= =?UTF-8?q?=20=E5=8F=AF=E4=BB=A5=E6=9F=A5=E8=A9=A2=E6=89=80=E6=9C=89?= =?UTF-8?q?=E8=A8=82=E5=96=AE=EF=BC=8C=E7=B5=90=E8=B3=AC=E5=BE=8C=E8=B7=B3?= =?UTF-8?q?=E8=BD=89=E8=87=B3=E6=AD=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../javascripts/account/orders.js.coffee | 3 +++ .../stylesheets/account/orders.css.scss | 3 +++ app/assets/stylesheets/carts.css.scss | 4 ++-- app/controllers/account/orders_controller.rb | 7 +++++++ app/controllers/orders_controller.rb | 2 +- app/helpers/account/orders_helper.rb | 2 ++ app/views/account/orders/index.html.erb | 19 +++++++++++++++++++ app/views/common/_navbar.html.erb | 5 +++++ config/routes.rb | 4 ++++ .../account/orders_controller_test.rb | 7 +++++++ test/helpers/account/orders_helper_test.rb | 4 ++++ todo | 4 ++-- 12 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 app/assets/javascripts/account/orders.js.coffee create mode 100644 app/assets/stylesheets/account/orders.css.scss create mode 100644 app/controllers/account/orders_controller.rb create mode 100644 app/helpers/account/orders_helper.rb create mode 100644 app/views/account/orders/index.html.erb create mode 100644 test/controllers/account/orders_controller_test.rb create mode 100644 test/helpers/account/orders_helper_test.rb 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/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/carts.css.scss b/app/assets/stylesheets/carts.css.scss index c2f054d6..8b81f431 100644 --- a/app/assets/stylesheets/carts.css.scss +++ b/app/assets/stylesheets/carts.css.scss @@ -3,8 +3,8 @@ // You can use Sass (SCSS) here: http://sass-lang.com/ $money-red: #c00; -.cart, .checkout, .order { - th, .price, .delete, .qt { +.cart, .checkout, .order, .orderlist { + th, .price, .delete, .qt, .timeAgo { text-align: center; } .price, .total { 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/orders_controller.rb b/app/controllers/orders_controller.rb index 21a094e3..1d84b9fe 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -31,7 +31,7 @@ def pay_with_credit_card # 在 aasm 設定中 make payment 提交後會執行 pay! 的內容所以這邊不用寫了 @order.make_payment! - redirect_to root_path, :notice => "成功完成付款" + redirect_to account_orders_path, :notice => "成功完成付款" end private 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/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/common/_navbar.html.erb b/app/views/common/_navbar.html.erb index a51363ea..4e590011 100644 --- a/app/views/common/_navbar.html.erb +++ b/app/views/common/_navbar.html.erb @@ -66,6 +66,11 @@ <% end %> <% end %> +
      • + <%= link_to account_orders_path do %> + 查訂單 + <% end %> +
      • <%= link_to( destroy_user_session_path, :method => :delete ) do %> 會員登出 diff --git a/config/routes.rb b/config/routes.rb index 48beed48..4f883ed0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -26,6 +26,10 @@ resources :cart_items, :only => [:destroy, :update] + namespace :account do + resources :orders, :only => [:index] + end + # 暫時先把 root 放到這邊 root :to => "products#index" # The priority is based upon order of creation: first created -> highest priority. 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/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/todo b/todo index dfcd5036..bead2497 100644 --- a/todo +++ b/todo @@ -67,5 +67,5 @@ ✔ 支援多重購買數量 @done (14-06-20 02:04) ✔ 修改訂單畫面 @done (14-06-20 03:51) ☐ 訂單畫面美化 - ☐ 建立 account/orders 可以看到該使用者過去所有訂單 - ☐ 結賬後跳轉到 account/orders#index \ No newline at end of file + ✔ 建立 account/orders 可以看到該使用者過去所有訂單 @done (14-06-20 04:34) + ✔ 結賬後跳轉到 account/orders#index @done (14-06-20 04:34) \ No newline at end of file From 8aa3e9e85bd0205f2adfbbf2f80758562767bee0 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 20 Jun 2014 04:49:57 +0800 Subject: [PATCH 50/71] =?UTF-8?q?=E6=BA=96=E5=82=99=E5=BB=BA=E7=AB=8B=20ad?= =?UTF-8?q?min/orders?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/javascripts/admin/orders.js.coffee | 3 +++ app/assets/stylesheets/admin/orders.css.scss | 3 +++ app/controllers/admin/orders_controller.rb | 2 ++ app/helpers/admin/orders_helper.rb | 2 ++ app/views/admin/orders/index.html.erb | 0 config/routes.rb | 1 + test/controllers/admin/orders_controller_test.rb | 7 +++++++ test/helpers/admin/orders_helper_test.rb | 4 ++++ todo | 9 ++++++++- 9 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/admin/orders.js.coffee create mode 100644 app/assets/stylesheets/admin/orders.css.scss create mode 100644 app/controllers/admin/orders_controller.rb create mode 100644 app/helpers/admin/orders_helper.rb create mode 100644 app/views/admin/orders/index.html.erb create mode 100644 test/controllers/admin/orders_controller_test.rb create mode 100644 test/helpers/admin/orders_helper_test.rb 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/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/controllers/admin/orders_controller.rb b/app/controllers/admin/orders_controller.rb new file mode 100644 index 00000000..0afc0f1a --- /dev/null +++ b/app/controllers/admin/orders_controller.rb @@ -0,0 +1,2 @@ +class Admin::OrdersController < ApplicationController +end diff --git a/app/helpers/admin/orders_helper.rb b/app/helpers/admin/orders_helper.rb new file mode 100644 index 00000000..863374ff --- /dev/null +++ b/app/helpers/admin/orders_helper.rb @@ -0,0 +1,2 @@ +module Admin::OrdersHelper +end diff --git a/app/views/admin/orders/index.html.erb b/app/views/admin/orders/index.html.erb new file mode 100644 index 00000000..e69de29b diff --git a/config/routes.rb b/config/routes.rb index 4f883ed0..2f13d2e9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,6 +4,7 @@ namespace :admin do resources :products + resources :orders, :only => [:index] end resources :products do 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/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/todo b/todo index bead2497..1377db2e 100644 --- a/todo +++ b/todo @@ -68,4 +68,11 @@ ✔ 修改訂單畫面 @done (14-06-20 03:51) ☐ 訂單畫面美化 ✔ 建立 account/orders 可以看到該使用者過去所有訂單 @done (14-06-20 04:34) - ✔ 結賬後跳轉到 account/orders#index @done (14-06-20 04:34) \ No newline at end of file + ✔ 結賬後跳轉到 account/orders#index @done (14-06-20 04:34) + ☐ 建立 admin/orders 可以看到系統內所有訂單 + ✔ 新增 resources @done (14-06-20 04:45) + ✔ 新增 admin::orders controller @done (14-06-20 04:45) + ☐ def index action + ☐ create index view + ☐ admin 的 order 列表要能顯示訂單狀態 + ☐ 單張 order 應該要可以依照狀態圖改變狀態 From dc35331eb5e3ff1d68e59ab751020d773dddc18c Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 20 Jun 2014 13:15:51 +0800 Subject: [PATCH 51/71] =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=80=85=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E7=9C=8B=E5=88=B0=E7=B3=BB=E7=B5=B1=E5=85=A7=E6=89=80?= =?UTF-8?q?=E6=9C=89=E8=A8=82=E5=96=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stylesheets/admin/products.css.scss | 11 +++++++ app/controllers/admin/orders_controller.rb | 6 ++++ app/views/admin/orders/index.html.erb | 19 ++++++++++++ app/views/admin/products/index.html.erb | 29 +++++++++++-------- todo | 6 ++-- 5 files changed, 56 insertions(+), 15 deletions(-) diff --git a/app/assets/stylesheets/admin/products.css.scss b/app/assets/stylesheets/admin/products.css.scss index da8969d1..0a32fcee 100644 --- a/app/assets/stylesheets/admin/products.css.scss +++ b/app/assets/stylesheets/admin/products.css.scss @@ -1,3 +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/controllers/admin/orders_controller.rb b/app/controllers/admin/orders_controller.rb index 0afc0f1a..45a15bf9 100644 --- a/app/controllers/admin/orders_controller.rb +++ b/app/controllers/admin/orders_controller.rb @@ -1,2 +1,8 @@ class Admin::OrdersController < ApplicationController + + def index + # TODO Pagenavi + @orders = Order.all.limit(10) + end + end diff --git a/app/views/admin/orders/index.html.erb b/app/views/admin/orders/index.html.erb index e69de29b..0b29ca76 100644 --- a/app/views/admin/orders/index.html.erb +++ b/app/views/admin/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/products/index.html.erb b/app/views/admin/products/index.html.erb index 6831f265..27c40be9 100644 --- a/app/views/admin/products/index.html.erb +++ b/app/views/admin/products/index.html.erb @@ -1,12 +1,17 @@ -<%= link_to("新增產品", new_admin_product_path, :class => "btn btn-primary btn-sm pull-right") %> -
          - <% @products.each do |product| %> -
        • - <%= link_to(product.title, admin_products_path(product)) %> | <%= link_to "EDIT", edit_admin_product_path(product) %> | <%= link_to "刪除", admin_product_path(product), :method => :delete, :confirm => "確定刪除產品？" %> -
          - <%= render_product_photo(product.default_photo) %> -

          -
          • - - <% end %> -
        \ No newline at end of file +
        +
        + <%= 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") %> +
        +
          + <% @products.each do |product| %> +
        • + <%= link_to(product.title, admin_products_path(product)) %> | <%= link_to "EDIT", edit_admin_product_path(product) %> | <%= link_to "刪除", admin_product_path(product), :method => :delete, :confirm => "確定刪除產品？" %> +
          + <%= render_product_photo(product.default_photo) %> +

          +
          • + + <% end %> +
        +
        \ No newline at end of file diff --git a/todo b/todo index 1377db2e..283c1f45 100644 --- a/todo +++ b/todo @@ -69,10 +69,10 @@ ☐ 訂單畫面美化 ✔ 建立 account/orders 可以看到該使用者過去所有訂單 @done (14-06-20 04:34) ✔ 結賬後跳轉到 account/orders#index @done (14-06-20 04:34) - ☐ 建立 admin/orders 可以看到系統內所有訂單 + ✔ 建立 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 - ☐ create index view + ✔ def index action @done (14-06-20 13:15) + ✔ create index view @done (14-06-20 13:15) ☐ admin 的 order 列表要能顯示訂單狀態 ☐ 單張 order 應該要可以依照狀態圖改變狀態 From 81c39aefe44fa70ebe9b055d2ee5ae9eab8ba4f6 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 20 Jun 2014 13:29:53 +0800 Subject: [PATCH 52/71] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=A1=AF=E7=A4=BA=E8=A8=82=E8=B3=BC=E8=80=85=E3=80=81=E4=BB=98?= =?UTF-8?q?=E6=AC=BE=E6=96=B9=E5=BC=8F=E3=80=81=E8=88=87=E8=A8=82=E5=96=AE?= =?UTF-8?q?=E7=8B=80=E6=85=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/admin/orders/index.html.erb | 8 +++++++- todo | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/admin/orders/index.html.erb b/app/views/admin/orders/index.html.erb index 0b29ca76..b9cbf4cf 100644 --- a/app/views/admin/orders/index.html.erb +++ b/app/views/admin/orders/index.html.erb @@ -1,10 +1,13 @@

        訂單列表

        - +
        + + + @@ -12,6 +15,9 @@ + + + <% end %> diff --git a/todo b/todo index 283c1f45..57cb482c 100644 --- a/todo +++ b/todo @@ -74,5 +74,5 @@ ✔ 新增 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 列表要能顯示訂單狀態 + ✔ admin 的 order 列表要能顯示訂單狀態 @done (14-06-20 13:26) ☐ 單張 order 應該要可以依照狀態圖改變狀態 From 23f593ad90832c0c504977f41707f3a382175e42 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 20 Jun 2014 14:19:24 +0800 Subject: [PATCH 53/71] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20admin=20=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E8=A8=82=E5=96=AE=E9=81=B8=E9=A0=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin/orders_controller.rb | 13 +++++++++++++ app/controllers/orders_controller.rb | 2 ++ app/views/admin/orders/index.html.erb | 14 ++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/app/controllers/admin/orders_controller.rb b/app/controllers/admin/orders_controller.rb index 45a15bf9..bc152de6 100644 --- a/app/controllers/admin/orders_controller.rb +++ b/app/controllers/admin/orders_controller.rb @@ -5,4 +5,17 @@ def index @orders = Order.all.limit(10) end + def change_state_to(state) + case state + when "ship" + @orders.ship! + when "deliver" + @orders.deliver! + when "cancel" + @orders.cancel_order! + when "return" + @orders.return_good! + end + end + end diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 1d84b9fe..a299e700 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -29,6 +29,8 @@ def pay_with_credit_card @order.set_payment_with!("credit_card") # @order.pay! # 在 aasm 設定中 make payment 提交後會執行 pay! 的內容所以這邊不用寫了 + + # ⬇️ @order.make_payment! redirect_to account_orders_path, :notice => "成功完成付款" diff --git a/app/views/admin/orders/index.html.erb b/app/views/admin/orders/index.html.erb index b9cbf4cf..1df323b3 100644 --- a/app/views/admin/orders/index.html.erb +++ b/app/views/admin/orders/index.html.erb @@ -8,6 +8,7 @@ + @@ -18,6 +19,19 @@ + <% end %> From dfa96c582f7c005e6d58b5e027148cab4d13bcdd Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 20 Jun 2014 16:25:01 +0800 Subject: [PATCH 54/71] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20route?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin/orders_controller.rb | 9 +++++++-- app/views/admin/orders/index.html.erb | 10 +++++----- config/routes.rb | 6 +++++- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/controllers/admin/orders_controller.rb b/app/controllers/admin/orders_controller.rb index bc152de6..bfedcbce 100644 --- a/app/controllers/admin/orders_controller.rb +++ b/app/controllers/admin/orders_controller.rb @@ -5,16 +5,21 @@ def index @orders = Order.all.limit(10) end - def change_state_to(state) - case state + def change_state + @order = Order.find_by_token(params[:id]) + case @order.aasm_state when "ship" @orders.ship! + redirect_to :back when "deliver" @orders.deliver! + redirect_to :back when "cancel" @orders.cancel_order! + redirect_to :back when "return" @orders.return_good! + redirect_to :back end end diff --git a/app/views/admin/orders/index.html.erb b/app/views/admin/orders/index.html.erb index 1df323b3..ddc26aa5 100644 --- a/app/views/admin/orders/index.html.erb +++ b/app/views/admin/orders/index.html.erb @@ -22,14 +22,14 @@ diff --git a/config/routes.rb b/config/routes.rb index 2f13d2e9..78aeb6bf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,7 +4,11 @@ namespace :admin do resources :products - resources :orders, :only => [:index] + resources :orders, :only => [:index] do + member do + post :change_state + end + end end resources :products do From 71dcfeb17b150618cffa35e7cb457c395ac3c477 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 20 Jun 2014 16:44:20 +0800 Subject: [PATCH 55/71] =?UTF-8?q?=E6=9B=B4=E6=96=B0change=5Fstate=5Fadmin?= =?UTF-8?q?=5Forders=5Fpath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin/orders_controller.rb | 3 ++- app/views/admin/orders/index.html.erb | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/controllers/admin/orders_controller.rb b/app/controllers/admin/orders_controller.rb index bfedcbce..9b1946b1 100644 --- a/app/controllers/admin/orders_controller.rb +++ b/app/controllers/admin/orders_controller.rb @@ -7,7 +7,8 @@ def index def change_state @order = Order.find_by_token(params[:id]) - case @order.aasm_state + @state = @order.aasm_state + case @state when "ship" @orders.ship! redirect_to :back diff --git a/app/views/admin/orders/index.html.erb b/app/views/admin/orders/index.html.erb index ddc26aa5..90c3340c 100644 --- a/app/views/admin/orders/index.html.erb +++ b/app/views/admin/orders/index.html.erb @@ -22,14 +22,14 @@ From da2ef7a0ed9725d381f75ee83cc0924976f8adf1 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Mon, 23 Jun 2014 17:23:37 +0800 Subject: [PATCH 56/71] can change state now --- app/controllers/admin/orders_controller.rb | 50 +++++++---- app/helpers/admin/orders_helper.rb | 5 ++ app/views/admin/orders/_state_option.html.erb | 21 +++++ app/views/admin/orders/index.html.erb | 12 +-- app/views/admin/orders/show.html.erb | 89 +++++++++++++++++++ config/routes.rb | 7 +- todo | 18 ++-- 7 files changed, 167 insertions(+), 35 deletions(-) create mode 100644 app/views/admin/orders/_state_option.html.erb create mode 100644 app/views/admin/orders/show.html.erb diff --git a/app/controllers/admin/orders_controller.rb b/app/controllers/admin/orders_controller.rb index 9b1946b1..bcb44093 100644 --- a/app/controllers/admin/orders_controller.rb +++ b/app/controllers/admin/orders_controller.rb @@ -1,27 +1,41 @@ class Admin::OrdersController < ApplicationController + before_filter :find_order, :except => [:index] + def index # TODO Pagenavi - @orders = Order.all.limit(10) + @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 change_state + def return + @order.return_good! + redirect_to :back + end + + protected + + def find_order @order = Order.find_by_token(params[:id]) - @state = @order.aasm_state - case @state - when "ship" - @orders.ship! - redirect_to :back - when "deliver" - @orders.deliver! - redirect_to :back - when "cancel" - @orders.cancel_order! - redirect_to :back - when "return" - @orders.return_good! - redirect_to :back - end end -end +end \ No newline at end of file diff --git a/app/helpers/admin/orders_helper.rb b/app/helpers/admin/orders_helper.rb index 863374ff..76b09744 100644 --- a/app/helpers/admin/orders_helper.rb +++ b/app/helpers/admin/orders_helper.rb @@ -1,2 +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/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 index 90c3340c..2a6c9b5d 100644 --- a/app/views/admin/orders/index.html.erb +++ b/app/views/admin/orders/index.html.erb @@ -14,7 +14,7 @@         <% @orders.each do |order| %> - + @@ -22,14 +22,14 @@ 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) %> + +
        訂單序號 訂單時間使用者帳號付款方式訂單狀態
        <%= link_to order.token, order_path(order.token) %> <%= time_ago_in_words(order.created_at) %> 之前 <%= order.user.email %> <%= order.payment_method %> <%= order.aasm_state %>
        使用者帳號 付款方式 訂單狀態訂單選項
        <%= order.user.email %> <%= order.payment_method %> <%= order.aasm_state %> + <% case order.aasm_state %> + <% when "order_placed" %> + <%= link_to "取消訂單", "#cancel", :class => "btn btn-default btn-sm" %> + <% when "paid" %> + <%= link_to "出貨", "#ship", :class => "btn btn-default btn-sm" %> + <%= link_to "取消訂單", "#cancel", :class => "btn btn-default btn-sm" %> + <% when "shipping" %> + <%= link_to "已到貨", "#deliver", :class => "btn btn-default btn-sm" %> + <% when "shipped" %> + <%= link_to "退貨", "#return", :class => "btn btn-default btn-sm" %> + <% end %> +
        <% case order.aasm_state %> <% when "order_placed" %> - <%= link_to "取消訂單", "#cancel", :class => "btn btn-default btn-sm" %> + <%= link_to "取消訂單", "#cancel", :class => "btn btn-default btn-sm", :method => :post %> <% when "paid" %> - <%= link_to "出貨", "#ship", :class => "btn btn-default btn-sm" %> - <%= link_to "取消訂單", "#cancel", :class => "btn btn-default btn-sm" %> + <%= link_to "出貨", "#ship", :class => "btn btn-default btn-sm", :method => :post %> + <%= link_to "取消訂單", "#cancel", :class => "btn btn-default btn-sm", :method => :post %> <% when "shipping" %> - <%= link_to "已到貨", "#deliver", :class => "btn btn-default btn-sm" %> + <%= link_to "已到貨", "#deliver", :class => "btn btn-default btn-sm", :method => :post %> <% when "shipped" %> - <%= link_to "退貨", "#return", :class => "btn btn-default btn-sm" %> + <%= link_to "退貨", "#return", :class => "btn btn-default btn-sm", :method => :post %> <% end %>
        <% case order.aasm_state %> <% when "order_placed" %> - <%= link_to "取消訂單", "#cancel", :class => "btn btn-default btn-sm", :method => :post %> + <%= link_to "取消訂單", change_state_admin_order_path(order.token), :class => "btn btn-default btn-sm", :method => :post %> <% when "paid" %> - <%= link_to "出貨", "#ship", :class => "btn btn-default btn-sm", :method => :post %> - <%= link_to "取消訂單", "#cancel", :class => "btn btn-default btn-sm", :method => :post %> + <%= link_to "出貨", change_state_admin_order_path(order.token), :class => "btn btn-default btn-sm", :method => :post %> + <%= link_to "取消訂單", change_state_admin_order_path(order.token), :class => "btn btn-default btn-sm", :method => :post %> <% when "shipping" %> - <%= link_to "已到貨", "#deliver", :class => "btn btn-default btn-sm", :method => :post %> + <%= link_to "已到貨", change_state_admin_order_path(order.token), :class => "btn btn-default btn-sm", :method => :post %> <% when "shipped" %> - <%= link_to "退貨", "#return", :class => "btn btn-default btn-sm", :method => :post %> + <%= link_to "退貨", change_state_admin_order_path(order.token), :class => "btn btn-default btn-sm", :method => :post %> <% end %>
        <%= link_to order.token, order_path(order.token) %> <%= link_to order.token, admin_order_path(order.token) %> <%= time_ago_in_words(order.created_at) %> 之前 <%= order.user.email %> <%= order.payment_method %> <% case order.aasm_state %> <% when "order_placed" %> - <%= link_to "取消訂單", change_state_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 "paid" %> - <%= link_to "出貨", change_state_admin_order_path(order.token), :class => "btn btn-default btn-sm", :method => :post %> - <%= link_to "取消訂單", change_state_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 %> + <%= link_to "取消訂單", cancel_admin_order_path(order.token), :class => "btn btn-default btn-sm", :method => :post %> <% when "shipping" %> - <%= link_to "已到貨", change_state_admin_order_path(order.token), :class => "btn btn-default btn-sm", :method => :post %> + <%= link_to "已到貨", shipped_admin_order_path(order.token), :class => "btn btn-default btn-sm", :method => :post %> <% when "shipped" %> - <%= link_to "退貨", change_state_admin_order_path(order.token), :class => "btn btn-default btn-sm", :method => :post %> + <%= link_to "退貨", return_admin_order_path(order.token), :class => "btn btn-default btn-sm", :method => :post %> <% end %>
        + + + + + + + + + <% @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/config/routes.rb b/config/routes.rb index 78aeb6bf..231b7aa6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,9 +4,12 @@ namespace :admin do resources :products - resources :orders, :only => [:index] do + resources :orders, :only => [:index, :show] do member do - post :change_state + post :cancel + post :ship + post :shipped + post :return end end end diff --git a/todo b/todo index 57cb482c..5c6d3aaa 100644 --- a/todo +++ b/todo @@ -14,17 +14,17 @@ ✔ 只有「管理者」身份的使用者可以進入後台頁面 @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 確認 ☐ 商品出貨後消費者也必須收到 mail 確認 ☐ 商品出貨後，該商品的庫存數量必須隨出貨量變更 @@ -53,7 +53,7 @@ ✔ 修復圖片顯示功能 @done (14-06-16 17:27) ✔ 資料庫中有「沒有圖片的產品」也要能正常顯示 index，要能判斷產品有沒有照片 @done (14-06-16 17:27) - ☐ Week2 Homework + ✔ 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) @@ -66,7 +66,7 @@ ✔ 數量為零的貨物不能購買 @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) @@ -75,4 +75,4 @@ ✔ 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 應該要可以依照狀態圖改變狀態 + ✔ 單張 order 應該要可以依照狀態圖改變狀態 @done (14-06-23 17:22) From 023afce0ebe79f5e63cc7de0816b903d011a899c Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Mon, 23 Jun 2014 17:28:52 +0800 Subject: [PATCH 57/71] locals/en.yml --- app/helpers/orders_helper.rb | 5 +++++ app/views/admin/orders/index.html.erb | 2 +- config/locales/en.yml | 9 +++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/helpers/orders_helper.rb b/app/helpers/orders_helper.rb index 443227fd..9aec5cdf 100644 --- a/app/helpers/orders_helper.rb +++ b/app/helpers/orders_helper.rb @@ -1,2 +1,7 @@ module OrdersHelper + +def render_order_state(order) + t("orders.order_state.#{order.aasm_state}") +end + end diff --git a/app/views/admin/orders/index.html.erb b/app/views/admin/orders/index.html.erb index 2a6c9b5d..2acc45c6 100644 --- a/app/views/admin/orders/index.html.erb +++ b/app/views/admin/orders/index.html.erb @@ -18,7 +18,7 @@ <%= time_ago_in_words(order.created_at) %> 之前 <%= order.user.email %> <%= order.payment_method %> - <%= order.aasm_state %> + <%= render_order_state(order) %> <% case order.aasm_state %> <% when "order_placed" %> 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 From 81da366a60191ca37ad20c7a11da2a22a01a8338 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 24 Jun 2014 13:49:52 +0800 Subject: [PATCH 58/71] add stripe gem --- Gemfile | 4 +++- Gemfile.lock | 7 +++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 23a2da30..264f303f 100644 --- a/Gemfile +++ b/Gemfile @@ -50,4 +50,6 @@ gem 'carrierwave' # 圖片壓縮 resize gem 'mini_magick' # 有線狀態機 -gem 'aasm' \ No newline at end of file +gem 'aasm' +# 線上刷卡 +gem 'stripe' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 9ae31ab7..e5b97c0f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -94,6 +94,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) @@ -117,6 +119,10 @@ 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) @@ -152,5 +158,6 @@ DEPENDENCIES simple_form spring sqlite3 + stripe turbolinks uglifier (>= 1.3.0) From 317945546eb764ab87bdcf352029ba12268a15e3 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 24 Jun 2014 14:01:00 +0800 Subject: [PATCH 59/71] =?UTF-8?q?=E4=B8=8B=E5=96=AE=E5=BE=8C=E5=8F=AF?= =?UTF-8?q?=E6=94=B6=E5=88=B0=E9=83=B5=E4=BB=B6=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 7 +- Gemfile.lock | 6 ++ app/controllers/orders_controller.rb | 3 + app/mailers/order_mailer.rb | 12 +++ .../order_mailer/notify_order_placed.html.erb | 74 +++++++++++++++++++ config/environments/development.rb | 2 + test/mailers/order_mailer_test.rb | 7 ++ test/mailers/previews/order_mailer_preview.rb | 4 + 8 files changed, 114 insertions(+), 1 deletion(-) create mode 100644 app/mailers/order_mailer.rb create mode 100644 app/views/order_mailer/notify_order_placed.html.erb create mode 100644 test/mailers/order_mailer_test.rb create mode 100644 test/mailers/previews/order_mailer_preview.rb diff --git a/Gemfile b/Gemfile index 264f303f..df2fc267 100644 --- a/Gemfile +++ b/Gemfile @@ -52,4 +52,9 @@ gem 'mini_magick' # 有線狀態機 gem 'aasm' # 線上刷卡 -gem 'stripe' \ No newline at end of file +gem 'stripe' + +group :development do + # 在本機看信 + gem "letter_opener" +end \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index e5b97c0f..276e8d26 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -28,6 +28,7 @@ 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) @@ -63,6 +64,10 @@ 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) @@ -151,6 +156,7 @@ DEPENDENCIES devise jbuilder (~> 2.0) jquery-rails + letter_opener mini_magick rails (= 4.1.0) sass-rails (~> 4.0.3) diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index a299e700..0be7e980 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -8,6 +8,9 @@ def create if @order.save @order.build_item_cache_from_cart(current_cart) @order.caculate_total!(current_cart) + + # 寄信 + OrderMailer.notify_order_placed(@order).deliver # 確認結賬、訂單產生後後清空購物車 current_cart.clear # 產生 token 保密訂單網址 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/views/order_mailer/notify_order_placed.html.erb b/app/views/order_mailer/notify_order_placed.html.erb new file mode 100644 index 00000000..fcdc205c --- /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 %> +
        + + + + + +
        + + +
        \ No newline at end of file diff --git a/config/environments/development.rb b/config/environments/development.rb index ddf0e90c..f532d2b6 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -34,4 +34,6 @@ # Raises error for missing translations # config.action_view.raise_on_missing_translations = true + + config.action_mailer.delivery_method = :letter_opener 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/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 From ebd5533e319e37e0b5a722aa38e8c8661172bb89 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 24 Jun 2014 17:02:25 +0800 Subject: [PATCH 60/71] =?UTF-8?q?=E5=AE=8C=E6=88=90=20stripe=20charge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/javascripts/card_charges.js.coffee | 3 ++ app/assets/javascripts/orders.js.coffee | 32 ++++++++++++ app/assets/stylesheets/card_charges.css.scss | 3 ++ app/controllers/card_charges_controller.rb | 35 +++++++++++++ app/controllers/orders_controller.rb | 8 --- app/helpers/card_charges_helper.rb | 2 + .../orders/pay_with_credit_card.html.erb | 49 +++++++++++++++++++ config/routes.rb | 1 + .../card_charges_controller_test.rb | 7 +++ test/helpers/card_charges_helper_test.rb | 4 ++ todo | 6 +-- 11 files changed, 139 insertions(+), 11 deletions(-) create mode 100644 app/assets/javascripts/card_charges.js.coffee create mode 100644 app/assets/stylesheets/card_charges.css.scss create mode 100644 app/controllers/card_charges_controller.rb create mode 100644 app/helpers/card_charges_helper.rb create mode 100644 app/views/orders/pay_with_credit_card.html.erb create mode 100644 test/controllers/card_charges_controller_test.rb create mode 100644 test/helpers/card_charges_helper_test.rb 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/orders.js.coffee b/app/assets/javascripts/orders.js.coffee index 24f83d18..49e71100 100644 --- a/app/assets/javascripts/orders.js.coffee +++ b/app/assets/javascripts/orders.js.coffee @@ -1,3 +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/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/controllers/card_charges_controller.rb b/app/controllers/card_charges_controller.rb new file mode 100644 index 00000000..96ed7405 --- /dev/null +++ b/app/controllers/card_charges_controller.rb @@ -0,0 +1,35 @@ +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 + + Stripe.api_key = 'sk_test_iKVDr2bdAyVf8x8BTnfmbRNh' + + customer = Stripe::Customer.create( + :email => current_user.email, + :card => params[:stripeToken] + ) + + + charge = Stripe::Charge.create( + :customer => customer.id, + :amount => @amount, + :description => @order.token , + :currency => 'usd' + ) + + @order.set_payment_with!("credit_card") + @order.make_payment! + + redirect_to order_path(@order.token), :notice => "成功完成付款" + + rescue Stripe::CardError => e + flash[:error] = e.message + render "orders/pay_with_credit_card" + end + +end diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 0be7e980..6aeb8080 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -29,14 +29,6 @@ def show def pay_with_credit_card @order = current_user.orders.find_by_token(params[:id]) - @order.set_payment_with!("credit_card") - # @order.pay! - # 在 aasm 設定中 make payment 提交後會執行 pay! 的內容所以這邊不用寫了 - - # ⬇️ - @order.make_payment! - - redirect_to account_orders_path, :notice => "成功完成付款" end private 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/views/orders/pay_with_credit_card.html.erb b/app/views/orders/pay_with_credit_card.html.erb new file mode 100644 index 00000000..af0b269c --- /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/config/routes.rb b/config/routes.rb index 231b7aa6..7b0e2146 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -30,6 +30,7 @@ member do get :pay_with_credit_card end + resources :card_charges end resources :cart_items, :only => [:destroy, :update] 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/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/todo b/todo index 5c6d3aaa..fec30291 100644 --- a/todo +++ b/todo @@ -25,10 +25,10 @@ ✔ 變更狀態 @done (14-06-23 17:22) ✔ 刪除訂單 @done (14-06-23 17:22) ✔ 訂單必須有「未結賬」、「已結賬」、「出貨中」、「已出貨（消費者收到商品）」、「退貨申請」、「已退貨（已收到退貨商品）」等狀態。 @done (14-06-23 17:22) - ☐ 消費者結賬後必須收到 mail 確認 + ✔ 消費者結賬後必須收到 mail 確認 @done (14-06-24 14:01) ☐ 商品出貨後消費者也必須收到 mail 確認 ☐ 商品出貨後，該商品的庫存數量必須隨出貨量變更 - ☐ 管理者應該要可以管理訂單狀態 + ✔ 管理者應該要可以管理訂單狀態 @done (14-06-24 14:01) [ 前台 ] ✔ 消費者應該要能看到所有商品 @done (14-06-13 16:05) @@ -39,7 +39,7 @@ ✔ 消費者要能確認購買、填寫資料並產生訂單 @done (14-06-19 15:27) ✔ 可以填寫寄送資訊 @done (14-06-19 15:28) ✔ 消費者要能選擇用信用卡進行結賬的動作 @done (14-06-19 15:28) - ☐ 結賬後要能收到 mail 確認 + ✔ 結賬後要能收到 mail 確認 @done (14-06-24 14:01) [ 作業 ] From 6cc808aaaf34b515900e2dd8f9d84aac4d24e74e Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 24 Jun 2014 17:07:20 +0800 Subject: [PATCH 61/71] =?UTF-8?q?=E4=BD=BF=E7=94=A8=20mailgun=20=E5=AF=84?= =?UTF-8?q?=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/environments/development.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/config/environments/development.rb b/config/environments/development.rb index f532d2b6..35196a1d 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -36,4 +36,15 @@ # 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 => 'postmaster@sandbox3ea8215494a741b1bad6c8ca8707ddd3.mailgun.org', + :password => '7286oeub43d9', + :domain => 'sandbox3ea8215494a741b1bad6c8ca8707ddd3.mailgun.org', + :authentication => :plain, + } + + config.action_mailer.delivery_method = :smtp + end From d986355676a9d2a0bec697518e30c645f4a8de00 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 24 Jun 2014 17:47:03 +0800 Subject: [PATCH 62/71] =?UTF-8?q?=E6=8A=8A=20place=20order=20=E6=94=B6?= =?UTF-8?q?=E7=B4=8D=E6=88=90=20Service=20object?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/orders_controller.rb | 7 +------ app/models/cart.rb | 2 +- app/services/order_placing_service.rb | 13 +++++++++++++ 3 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 app/services/order_placing_service.rb diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb index 6aeb8080..c1e87507 100644 --- a/app/controllers/orders_controller.rb +++ b/app/controllers/orders_controller.rb @@ -6,13 +6,8 @@ def create @order = current_user.orders.build(order_params) if @order.save - @order.build_item_cache_from_cart(current_cart) - @order.caculate_total!(current_cart) - # 寄信 - OrderMailer.notify_order_placed(@order).deliver - # 確認結賬、訂單產生後後清空購物車 - current_cart.clear + OrderPlacingService.new(current_cart, @order).place_order! # 產生 token 保密訂單網址 redirect_to order_path(@order.token) else diff --git a/app/models/cart.rb b/app/models/cart.rb index a0f753b1..92c4ca17 100644 --- a/app/models/cart.rb +++ b/app/models/cart.rb @@ -23,7 +23,7 @@ def total_price end # 清空購物車 - def clear + def clear! # delete_all 是內建的 method，可一次清空 # destroy_all 會一個一個 row 刪（？） cart_items.delete_all 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 From 9022105747d8e69509f4b0d9a95273712c319747 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 24 Jun 2014 17:55:20 +0800 Subject: [PATCH 63/71] =?UTF-8?q?=E6=8A=8Agenerate=5Ftoken=20=E6=94=B6?= =?UTF-8?q?=E7=B4=8D=E5=88=B0=20concerns?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/concerns/tokenable.rb | 13 +++++++++++++ app/models/order.rb | 9 ++------- 2 files changed, 15 insertions(+), 7 deletions(-) create mode 100644 app/models/concerns/tokenable.rb 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 index efb5c925..c52a4728 100644 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -6,6 +6,8 @@ class Order < ActiveRecord::Base 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 @@ -23,13 +25,6 @@ def caculate_total!(current_cart) self.save end - before_create :generate_token - - def generate_token - # http://ruby-doc.org/stdlib-2.1.0/libdoc/securerandom/rdoc/SecureRandom.html - self.token = SecureRandom.uuid - end - def set_payment_with!(method) self.update_column(:payment_method, method) end From 87d6c07d95f9863adc8d8594fb925d09cf5249ac Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 24 Jun 2014 20:44:48 +0800 Subject: [PATCH 64/71] =?UTF-8?q?=E2=9C=94=20=E4=BF=A1=E7=94=A8=E5=8D=A1?= =?UTF-8?q?=E4=BB=98=E6=AC=BE=E6=88=90=E5=8A=9F=E4=B9=9F=E8=A6=81=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=AF=84=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/card_charges_controller.rb | 2 + app/mailers/payment_mailer.rb | 13 ++++ .../notify_payment_completed.html.erb | 74 +++++++++++++++++++ .../notify_payment_completed.html.erb | 74 +++++++++++++++++++ test/mailers/payment_mailer_test.rb | 7 ++ .../previews/payment_mailer_preview.rb | 4 + todo | 3 + 7 files changed, 177 insertions(+) create mode 100644 app/mailers/payment_mailer.rb create mode 100644 app/views/order_mailer/notify_payment_completed.html.erb create mode 100644 app/views/payment_mailer/notify_payment_completed.html.erb create mode 100644 test/mailers/payment_mailer_test.rb create mode 100644 test/mailers/previews/payment_mailer_preview.rb diff --git a/app/controllers/card_charges_controller.rb b/app/controllers/card_charges_controller.rb index 96ed7405..86cfc9e7 100644 --- a/app/controllers/card_charges_controller.rb +++ b/app/controllers/card_charges_controller.rb @@ -26,6 +26,8 @@ def create @order.make_payment! redirect_to order_path(@order.token), :notice => "成功完成付款" + # 寄信 + PaymentMailer.notify_payment_completed(@order).deliver rescue Stripe::CardError => e flash[:error] = e.message 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/views/order_mailer/notify_payment_completed.html.erb b/app/views/order_mailer/notify_payment_completed.html.erb new file mode 100644 index 00000000..d922a1d8 --- /dev/null +++ b/app/views/order_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 %> +
        + + + + + +
        + + +
        \ 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..d922a1d8 --- /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 %> +
        + + + + + +
        + + +
        \ No newline at end of file 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/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/todo b/todo index fec30291..bd7b8183 100644 --- a/todo +++ b/todo @@ -76,3 +76,6 @@ ✔ 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 + ☐ 信用卡付款成功也要可以寄信 + ☐ 消費者可以透過 email 裡的連結檢視原先的 order \ No newline at end of file From b7ff48255fd4c43a77867a547887fe98760e0af5 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Tue, 24 Jun 2014 21:15:04 +0800 Subject: [PATCH 65/71] =?UTF-8?q?=E2=9C=94=20=E6=B6=88=E8=B2=BB=E8=80=85?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E9=80=8F=E9=81=8E=20email=20=E8=A3=A1?= =?UTF-8?q?=E7=9A=84=E9=80=A3=E7=B5=90=E6=AA=A2=E8=A6=96=E5=8E=9F=E5=85=88?= =?UTF-8?q?=E7=9A=84=20order?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order_mailer/notify_order_placed.html.erb | 2 +- .../notify_payment_completed.html.erb | 74 ------------------- .../notify_payment_completed.html.erb | 2 +- config/routes.rb | 3 + todo | 6 +- 5 files changed, 9 insertions(+), 78 deletions(-) delete mode 100644 app/views/order_mailer/notify_payment_completed.html.erb diff --git a/app/views/order_mailer/notify_order_placed.html.erb b/app/views/order_mailer/notify_order_placed.html.erb index fcdc205c..2d195c82 100644 --- a/app/views/order_mailer/notify_order_placed.html.erb +++ b/app/views/order_mailer/notify_order_placed.html.erb @@ -64,7 +64,7 @@ - + <%= link_to "查看訂單", order_url(@order.token) %> diff --git a/app/views/order_mailer/notify_payment_completed.html.erb b/app/views/order_mailer/notify_payment_completed.html.erb deleted file mode 100644 index d922a1d8..00000000 --- a/app/views/order_mailer/notify_payment_completed.html.erb +++ /dev/null @@ -1,74 +0,0 @@ - - -
        -
        - -

        您購買的商品

        - - - - - - - - - - <% @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 %> -
        - - - - - -
        - - -
        \ 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 index d922a1d8..ab3190b7 100644 --- a/app/views/payment_mailer/notify_payment_completed.html.erb +++ b/app/views/payment_mailer/notify_payment_completed.html.erb @@ -65,7 +65,7 @@ - + <%= link_to "查看訂單", order_url(@order.token) %>
        diff --git a/config/routes.rb b/config/routes.rb index 7b0e2146..1a2b689d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -41,6 +41,9 @@ # 暫時先把 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/todo b/todo index bd7b8183..1c532f9e 100644 --- a/todo +++ b/todo @@ -77,5 +77,7 @@ ✔ admin 的 order 列表要能顯示訂單狀態 @done (14-06-20 13:26) ✔ 單張 order 應該要可以依照狀態圖改變狀態 @done (14-06-23 17:22) ☐ Week3 Homework - ☐ 信用卡付款成功也要可以寄信 - ☐ 消費者可以透過 email 裡的連結檢視原先的 order \ No newline at end of file + ✔ 信用卡付款成功也要可以寄信 @done (14-06-24 20:43) + ✔ 消費者可以透過 email 裡的連結檢視原先的 order @done (14-06-24 21:12) + ☐ 安裝 SettingsLogic + ☐ 把 key 放到 SettingsLogic 的 yml 裏面 \ No newline at end of file From 7eb6f4447bdfdd59c185fc3cfe2efbab0d8d671e Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Wed, 25 Jun 2014 14:52:40 +0800 Subject: [PATCH 66/71] add gem --- Gemfile | 2 ++ Gemfile.lock | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Gemfile b/Gemfile index df2fc267..d9650bd2 100644 --- a/Gemfile +++ b/Gemfile @@ -54,6 +54,8 @@ gem 'aasm' # 線上刷卡 gem 'stripe' +gem 'settingslogic' + group :development do # 在本機看信 gem "letter_opener" diff --git a/Gemfile.lock b/Gemfile.lock index 276e8d26..00887a3e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -110,6 +110,7 @@ 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) @@ -161,6 +162,7 @@ DEPENDENCIES rails (= 4.1.0) sass-rails (~> 4.0.3) sdoc (~> 0.4.0) + settingslogic simple_form spring sqlite3 From 6cd28cdc5d45ce7f9c5bfdf3f4a0c272cf6fb09b Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 27 Jun 2014 16:08:20 +0800 Subject: [PATCH 67/71] =?UTF-8?q?=E5=B0=87=E6=95=8F=E6=84=9F=E8=B3=87?= =?UTF-8?q?=E6=96=99=E6=94=BE=E5=88=B0=20yml=20=E8=A3=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 5 ++++- app/controllers/card_charges_controller.rb | 2 +- app/models/settings.rb | 4 ++++ app/views/orders/pay_with_credit_card.html.erb | 2 +- config/environments/development.rb | 6 +++--- todo | 6 ++++-- 6 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 app/models/settings.rb diff --git a/.gitignore b/.gitignore index 8e356b6b..c8bb541b 100644 --- a/.gitignore +++ b/.gitignore @@ -16,4 +16,7 @@ /tmp # ignore upload files -/public/uploads \ No newline at end of file +/public/uploads + +# ignore pravite data +/config/application.yml \ No newline at end of file diff --git a/app/controllers/card_charges_controller.rb b/app/controllers/card_charges_controller.rb index 86cfc9e7..2d5c87af 100644 --- a/app/controllers/card_charges_controller.rb +++ b/app/controllers/card_charges_controller.rb @@ -7,7 +7,7 @@ def create @order = current_user.orders.find_by_token(params[:order_id]) @amount = @order.total * 100 # in cents - Stripe.api_key = 'sk_test_iKVDr2bdAyVf8x8BTnfmbRNh' + Stripe.api_key = Settings.strip.secret_key customer = Stripe::Customer.create( :email => current_user.email, 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/views/orders/pay_with_credit_card.html.erb b/app/views/orders/pay_with_credit_card.html.erb index af0b269c..6673b111 100644 --- a/app/views/orders/pay_with_credit_card.html.erb +++ b/app/views/orders/pay_with_credit_card.html.erb @@ -1,7 +1,7 @@ diff --git a/config/environments/development.rb b/config/environments/development.rb index 35196a1d..ef4f4689 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -39,9 +39,9 @@ config.action_mailer.smtp_settings = { :port => 587, :address => 'smtp.mailgun.org', - :user_name => 'postmaster@sandbox3ea8215494a741b1bad6c8ca8707ddd3.mailgun.org', - :password => '7286oeub43d9', - :domain => 'sandbox3ea8215494a741b1bad6c8ca8707ddd3.mailgun.org', + :user_name => Settings.mailgun.user, + :password => Settings.mailgun.password, + :domain => Settings.mailgun.domain, :authentication => :plain, } diff --git a/todo b/todo index 1c532f9e..24745765 100644 --- a/todo +++ b/todo @@ -79,5 +79,7 @@ ☐ Week3 Homework ✔ 信用卡付款成功也要可以寄信 @done (14-06-24 20:43) ✔ 消費者可以透過 email 裡的連結檢視原先的 order @done (14-06-24 21:12) - ☐ 安裝 SettingsLogic - ☐ 把 key 放到 SettingsLogic 的 yml 裏面 \ No newline at end of file + ✔ 安裝 SettingsLogic @done (14-06-27 16:03) + ✔ 把 key 放到 SettingsLogic 的 yml 裏面 @done (14-06-27 16:03) + ☐ 把 OrderChargesController 收納成 Service Object + ☐ 用 ransack 實作搜尋產品功能 \ No newline at end of file From 70ee15b3466bc04b81015f577c3e981bd4591c98 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 27 Jun 2014 19:28:15 +0800 Subject: [PATCH 68/71] =?UTF-8?q?=E2=9C=94=20=E6=8A=8A=20CardChargesContro?= =?UTF-8?q?ller=20=E6=94=B6=E7=B4=8D=E6=88=90=20Service=20Object?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/card_charges_controller.rb | 19 ++---------- app/services/charges_by_card_service.rb | 29 +++++++++++++++++++ .../orders/pay_with_credit_card.html.erb | 2 +- todo | 2 +- 4 files changed, 33 insertions(+), 19 deletions(-) create mode 100644 app/services/charges_by_card_service.rb diff --git a/app/controllers/card_charges_controller.rb b/app/controllers/card_charges_controller.rb index 2d5c87af..41b4dadc 100644 --- a/app/controllers/card_charges_controller.rb +++ b/app/controllers/card_charges_controller.rb @@ -6,24 +6,9 @@ def create @order = current_user.orders.find_by_token(params[:order_id]) @amount = @order.total * 100 # in cents + @card_info = params[:stripeToken] - Stripe.api_key = Settings.strip.secret_key - - customer = Stripe::Customer.create( - :email => current_user.email, - :card => params[:stripeToken] - ) - - - charge = Stripe::Charge.create( - :customer => customer.id, - :amount => @amount, - :description => @order.token , - :currency => 'usd' - ) - - @order.set_payment_with!("credit_card") - @order.make_payment! + ChargesByCardService.new(current_user, @order, @amount, @card_info).charge_by_card! redirect_to order_path(@order.token), :notice => "成功完成付款" # 寄信 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/views/orders/pay_with_credit_card.html.erb b/app/views/orders/pay_with_credit_card.html.erb index 6673b111..552b987e 100644 --- a/app/views/orders/pay_with_credit_card.html.erb +++ b/app/views/orders/pay_with_credit_card.html.erb @@ -1,7 +1,7 @@ diff --git a/todo b/todo index 24745765..942871e2 100644 --- a/todo +++ b/todo @@ -81,5 +81,5 @@ ✔ 消費者可以透過 email 裡的連結檢視原先的 order @done (14-06-24 21:12) ✔ 安裝 SettingsLogic @done (14-06-27 16:03) ✔ 把 key 放到 SettingsLogic 的 yml 裏面 @done (14-06-27 16:03) - ☐ 把 OrderChargesController 收納成 Service Object + ☐ 把 CardChargesController 收納成 Service Object ☐ 用 ransack 實作搜尋產品功能 \ No newline at end of file From a5d7ee1e0814ff2df4679a6c002766adc3bc6eff Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 27 Jun 2014 19:29:19 +0800 Subject: [PATCH 69/71] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20gam=20ransack?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 ++ Gemfile.lock | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/Gemfile b/Gemfile index d9650bd2..b259f5b1 100644 --- a/Gemfile +++ b/Gemfile @@ -56,6 +56,8 @@ gem 'stripe' gem 'settingslogic' +gem 'ransack' + group :development do # 在本機看信 gem "letter_opener" diff --git a/Gemfile.lock b/Gemfile.lock index 00887a3e..b3fcc131 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -77,6 +77,8 @@ GEM 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) @@ -97,6 +99,12 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.3.2) + ransack (1.2.3) + actionpack (>= 3.0) + activerecord (>= 3.0) + activesupport (>= 3.0) + i18n + polyamorous (~> 1.0.0) rdoc (4.1.1) json (~> 1.4) rest-client (1.6.7) @@ -160,6 +168,7 @@ DEPENDENCIES letter_opener mini_magick rails (= 4.1.0) + ransack sass-rails (~> 4.0.3) sdoc (~> 0.4.0) settingslogic From e4018e35bc5d0dbaa199181cb146384aa69e42f2 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Fri, 27 Jun 2014 23:47:10 +0800 Subject: [PATCH 70/71] adding search form --- Gemfile | 2 +- Gemfile.lock | 20 +++++++++++++------- app/views/common/_navbar.html.erb | 2 +- app/views/products/index.html.erb | 9 +++++++++ todo | 2 +- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index b259f5b1..846bcbba 100644 --- a/Gemfile +++ b/Gemfile @@ -56,7 +56,7 @@ gem 'stripe' gem 'settingslogic' -gem 'ransack' +gem 'ransack', github: "activerecord-hackery/ransack", branch: "rails-4.1" group :development do # 在本機看信 diff --git a/Gemfile.lock b/Gemfile.lock index b3fcc131..6a4b0ad2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,15 @@ +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: @@ -99,12 +111,6 @@ GEM rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.3.2) - ransack (1.2.3) - actionpack (>= 3.0) - activerecord (>= 3.0) - activesupport (>= 3.0) - i18n - polyamorous (~> 1.0.0) rdoc (4.1.1) json (~> 1.4) rest-client (1.6.7) @@ -168,7 +174,7 @@ DEPENDENCIES letter_opener mini_magick rails (= 4.1.0) - ransack + ransack! sass-rails (~> 4.0.3) sdoc (~> 0.4.0) settingslogic diff --git a/app/views/common/_navbar.html.erb b/app/views/common/_navbar.html.erb index 4e590011..6558e45a 100644 --- a/app/views/common/_navbar.html.erb +++ b/app/views/common/_navbar.html.erb @@ -44,7 +44,7 @@
        • <%= link_to carts_path do %> - 購物車 (<%= cart_items_count(current_cart) %>) + 購物車 <%= cart_items_count(current_cart) %> <% end %>
          • <% if !current_user %> diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index 75248c7e..9bbdcc38 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -1,3 +1,12 @@ +
          +
          +
          + +
          + +
          +
          + <% @products.each do |product| %>
          diff --git a/todo b/todo index 942871e2..8fd26b87 100644 --- a/todo +++ b/todo @@ -81,5 +81,5 @@ ✔ 消費者可以透過 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 + ✔ 把 CardChargesController 收納成 Service Object @done (14-06-27 19:28) ☐ 用 ransack 實作搜尋產品功能 \ No newline at end of file From 74f5e90af624d3e8bc181ecab855c2f681270610 Mon Sep 17 00:00:00 2001 From: FunnyQ Date: Mon, 30 Jun 2014 18:00:10 +0800 Subject: [PATCH 71/71] ransack --- Gemfile | 1 + Gemfile.lock | 2 ++ app/controllers/products_controller.rb | 20 ++++++++++++++++++++ app/views/products/_product_item.html.erb | 13 +++++++++++++ app/views/products/index.html.erb | 6 +++--- app/views/products/search.html.erb | 9 +++++++++ config/routes.rb | 3 +++ todo | 2 +- 8 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 app/views/products/_product_item.html.erb create mode 100644 app/views/products/search.html.erb diff --git a/Gemfile b/Gemfile index 846bcbba..1969a38e 100644 --- a/Gemfile +++ b/Gemfile @@ -57,6 +57,7 @@ gem 'stripe' gem 'settingslogic' gem 'ransack', github: "activerecord-hackery/ransack", branch: "rails-4.1" +gem 'will_paginate' group :development do # 在本機看信 diff --git a/Gemfile.lock b/Gemfile.lock index 6a4b0ad2..39ce760f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -159,6 +159,7 @@ GEM json (>= 1.8.0) warden (1.2.3) rack (>= 1.0) + will_paginate (3.0.3) PLATFORMS ruby @@ -184,3 +185,4 @@ DEPENDENCIES stripe turbolinks uglifier (>= 1.3.0) + will_paginate diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 2cb79a6f..dec7232e 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,5 +1,7 @@ class ProductsController < ApplicationController + before_filter :validate_search_key, :only => [:search] + def index # 依 ID 降冪排序（最新的產品在最上面） @products = Product.order("id DESC") @@ -9,6 +11,13 @@ 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]) @@ -38,4 +47,15 @@ def add_to_cart 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/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 index 9bbdcc38..87627ff9 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -1,10 +1,10 @@
          -
          + <%= form_tag(search_products_path, {:class => "form-inline pull-right"}) do %>
          - +
          -
          + <% end -%>
          <% @products.each do |product| %> 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/config/routes.rb b/config/routes.rb index 1a2b689d..cc92edb6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -18,6 +18,9 @@ member do post :add_to_cart end + collection do + post :search + end end resources :carts do diff --git a/todo b/todo index 8fd26b87..eee17972 100644 --- a/todo +++ b/todo @@ -82,4 +82,4 @@ ✔ 安裝 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 實作搜尋產品功能 \ No newline at end of file + ✔ 用 ransack 實作搜尋產品功能 @done (14-06-30 17:59) \ No newline at end of file