diff --git a/.gitignore b/.gitignore index 6a502e99..0401ac99 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,9 @@ # Ignore all logfiles and tempfiles. /log/*.log /tmp + +# Ignore image files +/public/uploads + +# Ignore rubymine config file +.idea diff --git a/Gemfile b/Gemfile index fba3b4e0..78623d87 100644 --- a/Gemfile +++ b/Gemfile @@ -38,3 +38,34 @@ gem 'spring', group: :development # Use debugger # gem 'debugger', group: [:development, :test] +#for account authentication +gem 'devise' + +#for front-end +gem 'bootstrap-sass' + +#for upload file +gem 'carrierwave' +#for process uploaded image +gem 'subexec', :git => "https://github.com/nulayer/subexec.git" +gem 'mini_magick' + +gem 'simple_form' + +#for state machines +gem "aasm" + +#for dispaly email at local +group :development do + gem "letter_opener" + gem "roadie" +end + +#for credit card payment +gem "stripe" + +#for store secure key info +gem "settingslogic" + +#for search product +gem "ransack" diff --git a/Gemfile.lock b/Gemfile.lock index 53538d9b..6d9dcfde 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,13 @@ +GIT + remote: https://github.com/nulayer/subexec.git + revision: 2e4d92870d4ad3322d6fca14416f63e6eff55cbc + specs: + subexec (0.2.3) + GEM remote: https://rubygems.org/ specs: + aasm (3.2.1) actionmailer (4.1.0) actionpack (= 4.1.0) actionview (= 4.1.0) @@ -27,8 +34,17 @@ GEM minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) + addressable (2.3.6) arel (5.0.1.20140414130214) + bcrypt (3.1.7) + bootstrap-sass (3.2.0.0) + sass (~> 3.2) builder (3.2.2) + carrierwave (0.10.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + json (>= 1.7) + mime-types (>= 1.16) coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) @@ -36,23 +52,43 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) + css_parser (1.3.5) + addressable + devise (3.2.4) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 3.2.6, < 5) + thread_safe (~> 0.1) + warden (~> 1.2.3) erubis (2.7.0) - execjs (2.2.0) + execjs (2.2.1) hike (1.2.3) i18n (0.6.9) - jbuilder (2.0.8) + jbuilder (2.1.1) activesupport (>= 3.0.0, < 5) multi_json (~> 1.2) - jquery-rails (3.1.0) + jquery-rails (3.1.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.8.1) + launchy (2.4.2) + addressable (~> 2.3) + letter_opener (1.2.0) + launchy (~> 2.2) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.25.1) - minitest (5.3.4) + mini_magick (3.7.0) + subexec (~> 0.2.1) + mini_portile (0.6.0) + minitest (5.3.5) multi_json (1.10.1) + nokogiri (1.6.2.1) + mini_portile (= 0.6.0) + 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) @@ -73,8 +109,21 @@ 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) + mime-types (>= 1.16) + roadie (2.4.3) + actionmailer (> 3.0.0, < 5.0.0) + css_parser (~> 1.3.4) + nokogiri (> 1.5.0) + sprockets sass (3.2.19) sass-rails (4.0.3) railties (>= 4.0.0, < 5.0) @@ -84,6 +133,10 @@ GEM sdoc (0.4.0) json (~> 1.8) rdoc (~> 4.0, < 5.0) + settingslogic (2.0.9) + simple_form (3.0.2) + actionpack (~> 4.0) + activemodel (~> 4.0) spring (1.1.3) sprockets (2.11.0) hike (~> 1.2) @@ -95,6 +148,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) thor (0.19.1) thread_safe (0.3.4) tilt (1.4.1) @@ -105,21 +162,35 @@ GEM coffee-rails tzinfo (1.2.1) thread_safe (~> 0.1) - uglifier (2.5.0) + uglifier (2.5.1) execjs (>= 0.3.0) json (>= 1.8.0) + warden (1.2.3) + rack (>= 1.0) PLATFORMS ruby DEPENDENCIES + aasm + bootstrap-sass + carrierwave coffee-rails (~> 4.0.0) + devise jbuilder (~> 2.0) jquery-rails + letter_opener + mini_magick rails (= 4.1.0) + ransack + roadie sass-rails (~> 4.0.3) sdoc (~> 0.4.0) + settingslogic + simple_form spring sqlite3 + stripe + subexec! turbolinks uglifier (>= 1.3.0) diff --git a/TODO b/TODO new file mode 100644 index 00000000..eeb0a1ad --- /dev/null +++ b/TODO @@ -0,0 +1,70 @@ +後台管理: + ☐ 身為商家的管理者,我要能夠在後台上架我的東西,並設定能夠販賣 + ✔ 管理者必須要有一個後台 @done (14-06-09 21:51) + ✔ 後台必須要可以新增產品 @done (14-06-09 21:51) + ✔ 新增產品必須要有標題, 數量, 價格的內容 @done(2014-06-14 09:59) + ✔ 新增產品使用simple_form @done(2014-06-11 10:11) + ✔ 產品內容必須要有標題,文字,數量 @done (14-06-09 21:52) + ✔ 產品必須要有圖片 @done(2014-06-11 08:28) + ✔ 如果沒有產品圖片,使用預設文字取代'No Pic' @done(2014-06-15 12:53) @project(後台管理) + ✔ 如果沒有產品圖片,使用No Pic圖片取代 @done(2014-06-15 01:07) @project(後台管理) + ☐ 一個產品可以有很多圖片 + ✔ 產品必須要有價格 @done(2014-06-14 01:51) + ✔ 限制圖片顯示大小 @done(2014-06-12 11:43) + ✔ 設定圖片在上傳時的大小並且提供各種大小的版本 @done(2014-06-15 02:33) @project(後台管理) + ☐ 在產品列表顯示產品的小圖片 + ✔ 身為管理者,可以在後台看到上架產品的內容 @done(2014-06-11 09:58) + ✔ 管理者可以在後台看到所有產品 @done(2014-06-11 10:17) + ✔ 管理者可以在所有產品頁面進入新增產品頁面 @done(2014-06-11 10:17) + ✔ 管理者希望看到美觀的後台管理界面, 使用bootstrap @done(2014-06-12 11:43) + ✔ 管理者希望可以在後台修改產品 @done(2014-06-14 10:33) + ✔ 管理者希望可以在後台刪除產品 @done(2014-06-14 10:32) + + + ☐ 身為商家的管理者,我要能夠在後台設定權限,權限分成管理者以及消費者 + ✔ 身為管理者,才可以進入後台 @done(2014-06-14 10:33) + ✔ 身為管理者,必須要登入且是admin @done(2014-06-11 10:00) + ✔ 管理者身份必須要被分為admin/user @done(2014-06-11 10:12) + ✔ 身為一般使用者, 需要能看到所有產品 @done(2014-06-15 03:02) + + ✔ 身為商家的管理者,可以在後台看到所有訂單 @done(2014-06-19 08:55) + ✔ 身為商家的管理者,可以在後台的訂單列表看到每張訂單的狀態 @done(2014-06-19 08:55) + ✔ 身為商家的管理者,可以在後台每張訂單內按照狀態圖改變狀態 @done(2014-06-19 08:55) + + + +購物: + ✔ 任何使用者都能在navbar點擊進入商品選單區. @done(2014-06-15 03:27) @project(購物) + ☐ 作為一個消費者,我要在前台能夠找到商品並結賬 + ✔ 身為消費者,我要在前台能夠找到商品並加到購物⾞ @done(2014-06-16 09:58) @project(購物) + ✔ ⾝為消費者,我要在前台能看到購物⾞明細 @done(2014-06-16 09:58) @project(購物) + ☐ ⾝為消費者,我要在前台能夠將多樣商品加到購物車,並生成一張訂單 + ✔ ⾝為消費者,當系統生成一張訂單前,我可以填寫寄送資訊 @done(2014-06-16 09:58) @project(購物) + ✔ 身為消費者,當系統⽣生成⼀張訂單後,我可以用信用卡結帳 @done(2014-06-16 09:58) @project(購物) + ☐ ⾝為消費者,當我用信用卡結帳後,我的信箱要能收到一張訂單確認信 + ✔ 信用卡付款成功後也要收到通知信 @done(2014-06-25 12:18) @project(購物) + ✔ 將通知信用的key放入SettingLogic提供的yml內 @done(2014-06-25 11:30) @project(購物) + ✔ 將信用卡繳費用的key放入SettingLogic提供的yml內 @done(2014-06-25 09:58) @project(購物) + ✔ 身為消費者, 可以從信中連結到訂單網頁 @done(2014-06-25 12:35) @project(購物) + ✔ 身為消費者,當訂單成立後,購物車需要清空 @done(2014-06-18 10:21) @project(購物) + ✔ 身為消費者,需要在訂單頁面看到正確的商品數量 @done(2014-06-18 10:21) @project(購物) + ☐ 美化訂單畫面 + ✔ 身為消費者,需要可以在購物車內刪除商品 @done(2014-06-17 10:11) @project(購物) + ✔ 身為消費者,可以選擇商品數量,加入購物車 @done(2014-06-18 08:33) @project(購物) + ✔ 身為消費者, 能看在購物車看到正確的總額(商品數量X商品價格) @done(2014-06-18 09:36) @project(購物) + ✔ 身為消費者, 不能將數量為0的商品加入購物車 @done(2014-06-18 09:50) @project(購物) + ✔ 身為消費者, 能在account/orders看到過去的訂單記錄 @done(2014-06-18 10:45) @project(購物) + ✔ 身為消費者, 能夠在結賬後自動跳轉到account/orders#index @done(2014-06-18 10:51) @project(購物) + ✔ 身為消費者, 能夠搜尋標題及價格範圍找到想要的產品 @done(2014-06-26 11:40) @project(購物) + + +系統訊息: + ☐ 身為使用者, 我需要在頁面上看見包含error以外其他種類的通知訊息. + ☐ 身為使用者, 我需要在頁面上看到詳細的model validate error. + + +重構: + ✔ 將application.html中的nav bar和error message 用partial抽出 @done(2014-06-14 12:29) @project(Refactoring) + ✔ 簡化admin/order#show狀態轉換的code, 包含viwe, controller @done(2014-06-20 02:44) @project(重構) + ✔ 將加入/移除購物車功能, 轉移到cart_items controller相對應的create/destroy action @done(2014-06-22 10:58) @project(重構) + ✔ 將card_charges controller內過多的程式碼移出. @done(2014-06-26 09:57) @project(重構) diff --git a/app/assets/javascripts/account/orders.js.coffee b/app/assets/javascripts/account/orders.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/account/orders.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/admin/orders.js.coffee b/app/assets/javascripts/admin/orders.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/admin/orders.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/admin/products.js.coffee b/app/assets/javascripts/admin/products.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/admin/products.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d6925fa4..021f6930 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,3 +14,5 @@ //= require jquery_ujs //= require turbolinks //= require_tree . +//= require bootstrap +//= require orders diff --git a/app/assets/javascripts/card_charges.js.coffee b/app/assets/javascripts/card_charges.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/card_charges.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/cart_items.js.coffee b/app/assets/javascripts/cart_items.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/cart_items.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/carts.js.coffee b/app/assets/javascripts/carts.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/carts.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/javascripts/orders.js.coffee b/app/assets/javascripts/orders.js.coffee new file mode 100644 index 00000000..86698481 --- /dev/null +++ b/app/assets/javascripts/orders.js.coffee @@ -0,0 +1,35 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ + +jQuery ($) -> + $("#payment-form").submit (event) -> + $form = $(this) + + # Disable the submit button to prevent repeated clicks + $form.find("button").prop "disabled", true + Stripe.createToken $form, stripeResponseHandler + + # Prevent the form from submitting with the default action + false + + return + +stripeResponseHandler = (status, response) -> + $form = $("#payment-form") + if response.error + + # Show the errors on the form + $form.find(".payment-errors").text response.error.message + $form.find("button").prop "disabled", false + else + + # token contains id, last4, and card type + token = response.id + + # Insert the token into the form so it gets submitted to the server + $form.append $("").val(token) + + # and submit + $form.get(0).submit() + return diff --git a/app/assets/javascripts/pages.js.coffee b/app/assets/javascripts/pages.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/pages.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/products.js.coffee b/app/assets/javascripts/products.js.coffee new file mode 100644 index 00000000..24f83d18 --- /dev/null +++ b/app/assets/javascripts/products.js.coffee @@ -0,0 +1,3 @@ +# Place all the behaviors and hooks related to the matching controller here. +# All this logic will automatically be available in application.js. +# You can use CoffeeScript in this file: http://coffeescript.org/ diff --git a/app/assets/stylesheets/account/orders.css.scss b/app/assets/stylesheets/account/orders.css.scss new file mode 100644 index 00000000..782d07c6 --- /dev/null +++ b/app/assets/stylesheets/account/orders.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the account::orders controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/admin/orders.css.scss b/app/assets/stylesheets/admin/orders.css.scss new file mode 100644 index 00000000..7ed90c7e --- /dev/null +++ b/app/assets/stylesheets/admin/orders.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the admin::orders controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/admin/products.css.scss b/app/assets/stylesheets/admin/products.css.scss new file mode 100644 index 00000000..978c2716 --- /dev/null +++ b/app/assets/stylesheets/admin/products.css.scss @@ -0,0 +1,6 @@ +// 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/ +img{ + max-width: 100%; +} diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index a443db34..18ec2450 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -12,4 +12,40 @@ * *= require_tree . *= require_self + *= require bootstrap */ + +.form-signin { + max-width: 330px; + padding: 15px; + margin: 0 auto; +} +.form-signin .form-signin-heading, +.form-signin .checkbox { + margin-bottom: 10px; +} +.form-signin .checkbox { + font-weight: normal; +} +.form-signin .form-control { + position: relative; + height: auto; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + padding: 10px; + font-size: 16px; +} +.form-signin .form-control:focus { + z-index: 2; +} +.form-signin input[type="email"] { + margin-bottom: -1px; + border-bottom-right-radius: 0; + border-bottom-left-radius: 0; +} +.form-signin input[type="password"] { + margin-bottom: 10px; + border-top-left-radius: 0; + border-top-right-radius: 0; +} diff --git a/app/assets/stylesheets/card_charges.css.scss b/app/assets/stylesheets/card_charges.css.scss new file mode 100644 index 00000000..24adb84c --- /dev/null +++ b/app/assets/stylesheets/card_charges.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the card_charges controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/cart_items.css.scss b/app/assets/stylesheets/cart_items.css.scss new file mode 100644 index 00000000..c8ba3800 --- /dev/null +++ b/app/assets/stylesheets/cart_items.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the cart_items controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/carts.css.scss b/app/assets/stylesheets/carts.css.scss new file mode 100644 index 00000000..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/assets/stylesheets/orders.css.scss b/app/assets/stylesheets/orders.css.scss new file mode 100644 index 00000000..3b0428a9 --- /dev/null +++ b/app/assets/stylesheets/orders.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the orders controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/pages.css.scss b/app/assets/stylesheets/pages.css.scss new file mode 100644 index 00000000..0d6878aa --- /dev/null +++ b/app/assets/stylesheets/pages.css.scss @@ -0,0 +1,3 @@ +// Place all the styles related to the pages controller here. +// They will automatically be included in application.css. +// You can use Sass (SCSS) here: http://sass-lang.com/ diff --git a/app/assets/stylesheets/products.css.scss b/app/assets/stylesheets/products.css.scss new file mode 100644 index 00000000..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/account/orders_controller.rb b/app/controllers/account/orders_controller.rb new file mode 100644 index 00000000..1380fda9 --- /dev/null +++ b/app/controllers/account/orders_controller.rb @@ -0,0 +1,7 @@ +class Account::OrdersController < ApplicationController + before_action :authenticate_user! + + def index + @orders = current_user.orders + end +end diff --git a/app/controllers/admin/orders_controller.rb b/app/controllers/admin/orders_controller.rb new file mode 100644 index 00000000..0ac0769b --- /dev/null +++ b/app/controllers/admin/orders_controller.rb @@ -0,0 +1,30 @@ +class Admin::OrdersController < ApplicationController + before_action :authenticate_user! + before_action :admin_required + before_action :find_order, except: [:index] + + def show + + @order_info = @order.info + @order_items = @order.items + end + + def index + @orders = Order.all + end + + def state_transition + @order.send(params[:event]) + save_and_redirect_to_show + end + + private + def find_order + @order = Order.find(params[:id]) + end + + def save_and_redirect_to_show + @order.save + redirect_to admin_order_path(@order) + end +end diff --git a/app/controllers/admin/products_controller.rb b/app/controllers/admin/products_controller.rb new file mode 100644 index 00000000..8171bcad --- /dev/null +++ b/app/controllers/admin/products_controller.rb @@ -0,0 +1,53 @@ +class Admin::ProductsController < ApplicationController + before_action :authenticate_user! + before_action :admin_required + before_action :find_product, only: [:show, :edit, :update, :destroy] + + def index + @products = Product.all + end + + def new + @product = Product.new + @product.photos.build + end + + def show + end + + def create + @product = Product.new(product_params) + + if @product.save + redirect_to admin_products_path + else + render :new + end + end + + def edit + + end + + def update + if @product.update(product_params) + redirect_to admin_product_path(@product) + else + render :edit + end + end + + def destroy + @product.destroy + redirect_to admin_products_path + end + + private + def find_product + @product = Product.find(params[:id]) + end + + def product_params + params.require(:product).permit(:title, :description, :quantity, :price, :photos_attributes => [:image]) + end +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d83690e1..eaa8f07d 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,4 +2,29 @@ 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 + unless (current_user && current_user.is_admin?) + redirect_to root_path, :flash => { :error => "no permission" } + end + end + + #for view and controller access + helper_method :current_cart + + def current_cart + @current_cart ||= find_cart + end + + def find_cart + + cart = Cart.find_by(id: session[:cart_id]) + + unless cart.present? + cart = Cart.create + end + + session[:cart_id] = cart.id + cart + end end diff --git a/app/controllers/card_charges_controller.rb b/app/controllers/card_charges_controller.rb new file mode 100644 index 00000000..67cd3d9f --- /dev/null +++ b/app/controllers/card_charges_controller.rb @@ -0,0 +1,20 @@ +class CardChargesController < ApplicationController + + before_action :authenticate_user! + + def create + + error = CreditCardService.charge(current_user, params) + @order = current_user.orders.find_by_token(params[:order_id]) + if error + flash[:error] = error + render "orders/pay_with_credit_card" + else + @order.set_payment_with!("credit_card") + @order.make_payment! + OrderMailer.notify_card_paid(@order).deliver + + redirect_to order_path(@order.token), :notice => "成功完成付款" + end + end +end diff --git a/app/controllers/cart_items_controller.rb b/app/controllers/cart_items_controller.rb new file mode 100644 index 00000000..2a498fb0 --- /dev/null +++ b/app/controllers/cart_items_controller.rb @@ -0,0 +1,48 @@ +class CartItemsController < ApplicationController + + def create + @cart_item = current_cart.cart_items.build(cart_item_params) + + if !current_cart.items.include?(@cart_item.product) + add_product_to_cart + else + flash[:warning] = "你的購物車內已有此物品" + end + + redirect_to :back + end + + def update + @cart_item = current_cart.cart_items.find(params[:id]) + @cart_item.update(cart_item_params) + + redirect_to carts_path + end + + def destroy + @cart_item = current_cart.cart_items.find(params[:id]) + if @cart_item.present? + @cart_item.destroy + flash[:notice] = "你已成功將 #{@cart_item.product.title} 移除" + else + flash[:warning] = "你的購物車沒有此物品" + end + + redirect_to carts_path + end + + private + def add_product_to_cart + + + if @cart_item.save + flash[:notice] = "你已成功將 #{@cart_item.product.title} 加入購物車" + else + flash[:warning] = "你輸入的數量不正確" + end + end + + def cart_item_params + params.require(:cart_item).permit(:quantity, :product_id) + end +end diff --git a/app/controllers/carts_controller.rb b/app/controllers/carts_controller.rb new file mode 100644 index 00000000..3a4789f6 --- /dev/null +++ b/app/controllers/carts_controller.rb @@ -0,0 +1,13 @@ +class CartsController < ApplicationController + before_action :authenticate_user!, :only => [:checkout] + + def index + end + + def checkout + @order = current_user.orders.build + @info = @order.build_info + end + + +end diff --git a/app/controllers/orders_controller.rb b/app/controllers/orders_controller.rb new file mode 100644 index 00000000..1dae6ed2 --- /dev/null +++ b/app/controllers/orders_controller.rb @@ -0,0 +1,29 @@ +class OrdersController < ApplicationController + before_action :authenticate_user! + def show + @order = current_user.orders.find_by_token(params[:id]) + @order_info = @order.info + @order_items = @order.items + end + + def create + @order = current_user.orders.build(order_params) + + if @order.save + OrderPlacingService.new(current_cart, @order).place_order! + redirect_to order_path(@order.token) + else + render "carts/index" + end + end + + def pay_with_credit_card + @order = current_user.orders.find_by_token(params[:id]) + end + + private + + def order_params + params.require(:order).permit(:info_attributes => [:billing_name, :billing_address,:shipping_name, :shipping_address] ) + end +end diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb new file mode 100644 index 00000000..45f463e4 --- /dev/null +++ b/app/controllers/pages_controller.rb @@ -0,0 +1,4 @@ +class PagesController < ApplicationController + def home + end +end diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb new file mode 100644 index 00000000..8f1a9898 --- /dev/null +++ b/app/controllers/products_controller.rb @@ -0,0 +1,13 @@ +class ProductsController < ApplicationController + + def index + @q = Product.search(params[:q]) + @products = @q.result(distinct: true) + end + + def show + @product = Product.find(params[:id]) + @cart_item = current_cart.cart_items.build(quantity: 1) + end + +end diff --git a/app/helpers/account/orders_helper.rb b/app/helpers/account/orders_helper.rb new file mode 100644 index 00000000..6f690c4e --- /dev/null +++ b/app/helpers/account/orders_helper.rb @@ -0,0 +1,2 @@ +module Account::OrdersHelper +end diff --git a/app/helpers/admin/orders_helper.rb b/app/helpers/admin/orders_helper.rb new file mode 100644 index 00000000..145257ce --- /dev/null +++ b/app/helpers/admin/orders_helper.rb @@ -0,0 +1,5 @@ +module Admin::OrdersHelper + def render_state_transition_btn(label, order, event) + link_to(label, state_transition_admin_order_path(order, event: event), method: :post, :class => "btn btn-primary") + end +end diff --git a/app/helpers/admin/products_helper.rb b/app/helpers/admin/products_helper.rb new file mode 100644 index 00000000..977a242f --- /dev/null +++ b/app/helpers/admin/products_helper.rb @@ -0,0 +1,2 @@ +module Admin::ProductsHelper +end diff --git a/app/helpers/card_charges_helper.rb b/app/helpers/card_charges_helper.rb new file mode 100644 index 00000000..5c18c543 --- /dev/null +++ b/app/helpers/card_charges_helper.rb @@ -0,0 +1,2 @@ +module CardChargesHelper +end diff --git a/app/helpers/cart_items_helper.rb b/app/helpers/cart_items_helper.rb new file mode 100644 index 00000000..f30f6834 --- /dev/null +++ b/app/helpers/cart_items_helper.rb @@ -0,0 +1,2 @@ +module CartItemsHelper +end diff --git a/app/helpers/carts_helper.rb b/app/helpers/carts_helper.rb new file mode 100644 index 00000000..2b9e96f7 --- /dev/null +++ b/app/helpers/carts_helper.rb @@ -0,0 +1,9 @@ +module CartsHelper + def cart_item_count(cart) + cart.cart_items.count + end + + def render_cart_total_price(current_cart) + current_cart.total_price + end +end diff --git a/app/helpers/orders_helper.rb b/app/helpers/orders_helper.rb new file mode 100644 index 00000000..66bbf267 --- /dev/null +++ b/app/helpers/orders_helper.rb @@ -0,0 +1,21 @@ +module OrdersHelper + def render_order_total(order) + order.total + end + + def render_order_paid(order) + if order.paid + "已付款" + else + "未付款" + end + end + + def render_order_created_at(order) + order.created_at + end + + def render_order_aasm_state(order) + order.aasm_state + end +end diff --git a/app/helpers/pages_helper.rb b/app/helpers/pages_helper.rb new file mode 100644 index 00000000..2c057fd0 --- /dev/null +++ b/app/helpers/pages_helper.rb @@ -0,0 +1,2 @@ +module PagesHelper +end diff --git a/app/helpers/products_helper.rb b/app/helpers/products_helper.rb new file mode 100644 index 00000000..3219fb7b --- /dev/null +++ b/app/helpers/products_helper.rb @@ -0,0 +1,11 @@ +module ProductsHelper + def product_render_photo(product, size = "thumb") + if product.default_photo.present? + image_url = product.default_photo.image.send(size).url + else + image_url = "http://placehold.it/200x200&text=No Pic" + end + + image_tag image_url, :class => "img-rounded", :alt => product.title + end +end diff --git a/app/inputs/fake_input.rb b/app/inputs/fake_input.rb new file mode 100644 index 00000000..1ed641e4 --- /dev/null +++ b/app/inputs/fake_input.rb @@ -0,0 +1,6 @@ +class FakeInput < SimpleForm::Inputs::StringInput + # This method only create a basic input without reading any value from object + def input + template.text_field_tag(attribute_name, nil, input_html_options) + end +end diff --git a/app/mailers/order_mailer.rb b/app/mailers/order_mailer.rb new file mode 100644 index 00000000..c1268a7e --- /dev/null +++ b/app/mailers/order_mailer.rb @@ -0,0 +1,20 @@ +class OrderMailer < ActionMailer::Base + default from: "staff@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 + + def notify_card_paid(order) + @order = order + @user = order.user + + mail(:to => @user.email , :subject => " [ArtStore] 完成付款通知 #{order.token}") + end +end diff --git a/app/models/cart.rb b/app/models/cart.rb new file mode 100644 index 00000000..0d63340c --- /dev/null +++ b/app/models/cart.rb @@ -0,0 +1,13 @@ +class Cart < ActiveRecord::Base + has_many :cart_items, :dependent => :destroy + has_many :items, :through => :cart_items, :source => :product + + + def total_price + cart_items.inject(0) {|sum, item| sum + (item.product.price * item.quantity) } + end + + def clear! + cart_items.delete_all + end +end diff --git a/app/models/cart_item.rb b/app/models/cart_item.rb new file mode 100644 index 00000000..2744c44a --- /dev/null +++ b/app/models/cart_item.rb @@ -0,0 +1,15 @@ +class CartItem < ActiveRecord::Base + belongs_to :cart + belongs_to :product + + validates :quantity, numericality: { only_integer: true, greater_than_or_equal_to: 1} + validate :check_product_quantity + + private + def check_product_quantity + + if quantity == nil || product.quantity < quantity + errors.add(:quantity, "You order too many") + end + end +end diff --git a/app/models/order.rb b/app/models/order.rb new file mode 100644 index 00000000..d762e743 --- /dev/null +++ b/app/models/order.rb @@ -0,0 +1,66 @@ +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 + before_create :generate_token + + def set_payment_with!(method) + self.update_column(:payment_method, method) + end + + def pay! + self.update_column(:paid, true) + end + + def generate_token + self.token = SecureRandom.uuid + end + + def build_item_cache_from_cart(cart) + cart.cart_items.each do |cart_item| + item = items.build + item.product_name = cart_item.product.title + item.quantity = cart_item.quantity + item.price = cart_item.product.price + item.save + end + end + + def calculate_total!(current_cart) + self.total = current_cart.total_price + self.save + end + + include AASM + + aasm do + state :order_placed, :initial => true + state :paid, :after_commit => :pay! + event :make_payment do + transitions :from => :order_placed, :to => :paid + end + + state :shipping + event :ship do + transitions :from => :paid, :to => :shipping + end + + state :shipped + event :deliver do + transitions :from => :shipping, :to => :shipped + end + + state :order_canceled + event :cancel_order do + transitions :from => [:order_placed, :paid ], :to => :order_canceled + end + + state :good_returned + event :return_good do + transitions :from => [:shipped ], :to => :good_returned + end + + end +end diff --git a/app/models/order_info.rb b/app/models/order_info.rb new file mode 100644 index 00000000..84db7728 --- /dev/null +++ b/app/models/order_info.rb @@ -0,0 +1,9 @@ +class OrderInfo < ActiveRecord::Base + belongs_to :order + + + validates :billing_name , :presence => true + validates :billing_address , :presence => true + validates :shipping_name , :presence => true + validates :shipping_address , :presence => true +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/models/photo.rb b/app/models/photo.rb new file mode 100644 index 00000000..513fc4cc --- /dev/null +++ b/app/models/photo.rb @@ -0,0 +1,5 @@ + +class Photo < ActiveRecord::Base + belongs_to :product + mount_uploader :image, PhotoUploader +end diff --git a/app/models/product.rb b/app/models/product.rb new file mode 100644 index 00000000..afb118c5 --- /dev/null +++ b/app/models/product.rb @@ -0,0 +1,12 @@ +class Product < ActiveRecord::Base + has_many :photos + accepts_nested_attributes_for :photos + + validates :title, :presence => true + validates :quantity, :presence => true + validates :price, :presence => true + + def default_photo + photos.first + end +end diff --git a/app/models/setting.rb b/app/models/setting.rb new file mode 100644 index 00000000..9460739d --- /dev/null +++ b/app/models/setting.rb @@ -0,0 +1,5 @@ +# -*- encoding : utf-8 -*- +class Setting < Settingslogic + source "#{Rails.root}/config/config.yml" + namespace Rails.env +end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 00000000..6d19022a --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,11 @@ +class User < ActiveRecord::Base + # Include default devise modules. Others available are: + # :confirmable, :lockable, :timeoutable and :omniauthable + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :trackable, :validatable + has_many :orders + + def admin? + is_admin + end +end diff --git a/app/services/credit_card_service.rb b/app/services/credit_card_service.rb new file mode 100644 index 00000000..554940e9 --- /dev/null +++ b/app/services/credit_card_service.rb @@ -0,0 +1,25 @@ +class CreditCardService + def self.charge(current_user, params) + @order = current_user.orders.find_by_token(params[:order_id]) + @amount = @order.total * 100 # in cents + + Stripe.api_key = Setting.stripe.api_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' + ) + + nil + rescue Stripe::CardError => e + e.message + end +end diff --git a/app/services/order_placing_service.rb b/app/services/order_placing_service.rb new file mode 100644 index 00000000..ff06bf7b --- /dev/null +++ b/app/services/order_placing_service.rb @@ -0,0 +1,14 @@ +class OrderPlacingService + + def initialize(cart, order) + @cart = cart + @order = order + end + + def place_order! + @order.build_item_cache_from_cart(@cart) + @order.calculate_total!(@cart) + @cart.clear! + OrderMailer.notify_order_placed(@order).deliver + end +end diff --git a/app/uploaders/photo_uploader.rb b/app/uploaders/photo_uploader.rb new file mode 100644 index 00000000..398bc25a --- /dev/null +++ b/app/uploaders/photo_uploader.rb @@ -0,0 +1,55 @@ +# encoding: utf-8 + +class PhotoUploader < 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 :resize_to_fit => [800, 800] + # + # def scale(width, height) + # # do something + # end + + # Create different versions of your uploaded files: + version :thumb do + process :resize_to_fill => [200, 200] + end + + version :medium do + process :resize_to_fill => [400, 400] + end + + # Add a white list of extensions which are allowed to be uploaded. + # For images you might use something like this: + # def extension_white_list + # %w(jpg jpeg gif png) + # end + + # Override the filename of the uploaded files: + # Avoid using model.id or version_name here, see uploader/store.rb for details. + # def filename + # "something.jpg" if original_filename + # end + +end diff --git a/app/views/account/orders/index.html.erb b/app/views/account/orders/index.html.erb new file mode 100644 index 00000000..9097c9b7 --- /dev/null +++ b/app/views/account/orders/index.html.erb @@ -0,0 +1,38 @@ +
+ + + + + + + + + + + <% @orders.each_with_index do |order, idx| %> + + + + + + + <% end %> + +
+ # + + 總價 + + 訂單狀態 + + 訂單日期 +
+ <%= idx+1 %> + + <%= render_order_total(order) %> + + <%= render_order_aasm_state(order) %> + + <%= render_order_created_at(order) %> +
+
diff --git a/app/views/admin/orders/index.html.erb b/app/views/admin/orders/index.html.erb new file mode 100644 index 00000000..b27b2ee3 --- /dev/null +++ b/app/views/admin/orders/index.html.erb @@ -0,0 +1,41 @@ +
+ + + + + + + + + + + <% @orders.each_with_index do |order, idx| %> + + + + + + + + <% end %> + +
+ # + + 總價 + + 狀態 + + 訂單日期 +
+ <%= idx+1 %> + + <%= render_order_total(order) %> + + <%= render_order_aasm_state(order) %> + + <%= render_order_created_at(order) %> + + <%= link_to("前往", admin_order_path(order), class: "btn btn-primary") %> +
+
diff --git a/app/views/admin/orders/show.html.erb b/app/views/admin/orders/show.html.erb new file mode 100644 index 00000000..9c77d30a --- /dev/null +++ b/app/views/admin/orders/show.html.erb @@ -0,0 +1,67 @@ +
+
+
+

訂單明細

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

寄送資訊

+ + + + + + + + + + + + + + + +
訂購人
+ <%= @order_info.billing_name %> - <%= @order_info.billing_address %> +
訂購人
+ <%= @order_info.billing_name %> - <%= @order_info.billing_address %> +
+

狀態:<%= @order.aasm_state %>

+ <% if @order.may_ship? %> + <%= render_state_transition_btn("出貨", @order, :ship) %> + <% end %> + <% if @order.may_deliver? %> + <%= render_state_transition_btn("到貨", @order, :deliver) %> + <% end %> + <% if @order.may_cancel_order? %> + <%= render_state_transition_btn("取消訂單", @order, :cancel_order) %> + <% end %> + <% if @order.may_return_good? %> + <%= render_state_transition_btn("退貨", @order, :return_good) %> + <% 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..a4d7af31 --- /dev/null +++ b/app/views/admin/products/edit.html.erb @@ -0,0 +1,23 @@ +
+ <%= simple_form_for [:admin, @product], html: { role: 'form' } do |f| %> +
+ <%= f.input :title, label: "標題", :input_html => {:class => "form-control"} %> +
+ +
+ <%= f.input :description, label: "敘述", :input_html => {:class => "form-control"} %> +
+ +
+ <%= f.input :quantity, label: "數量", :input_html => {:class => "form-control"} %> +
+ +
+ <%= f.input :price, label: "價格", :input_html => {:class => "form-control"} %> +
+ +
+ <%= f.button :submit, :disable_with => 'Submiting....', class: "btn btn-primary" %> +
+ <% end %> +
diff --git a/app/views/admin/products/index.html.erb b/app/views/admin/products/index.html.erb new file mode 100644 index 00000000..25ce5c72 --- /dev/null +++ b/app/views/admin/products/index.html.erb @@ -0,0 +1,22 @@ +
+ <%= link_to("新增", new_admin_product_path, :class => "btn btn-primary") %> + + + + + + + + + <% @products.each do |product| %> + + + + + <% end %> + +
產品連結
<%= product.title %> + <%= link_to('Show', admin_product_path(product), :class => "btn btn-info") %> + <%= link_to('Delete', admin_product_path(product), :method => :delete, :data=>{:confirm=>"Are you sure?"}, :class => "btn btn-warning") %> +
+
diff --git a/app/views/admin/products/new.html.erb b/app/views/admin/products/new.html.erb new file mode 100644 index 00000000..8da69f4d --- /dev/null +++ b/app/views/admin/products/new.html.erb @@ -0,0 +1,26 @@ +
+ <%= simple_form_for [:admin, @product], html: { role: 'form' } do |f| %> +
+ <%= f.input :title, label: "標題", :input_html => {:class => "form-control"} %> +
+ +
+ <%= f.input :description, label: "敘述", :input_html => {:class => "form-control"} %> +
+ +
+ <%= f.input :quantity, label: "數量", :input_html => {:class => "form-control"} %> +
+
+ <%= f.input :price, label: "價格", :input_html => {:class => "form-control"} %> +
+
+ <%= f.fields_for :photos do |photo| %> + <%= photo.input :image, label: "圖片", as: :file, :input_html => {:class => "form-control"} %> + <% end %> +
+
+ <%= f.button :submit, :disable_with => 'Submiting....', class: "btn btn-primary" %> +
+ <% end %> +
diff --git a/app/views/admin/products/show.html.erb b/app/views/admin/products/show.html.erb new file mode 100644 index 00000000..924f301a --- /dev/null +++ b/app/views/admin/products/show.html.erb @@ -0,0 +1,19 @@ +
+ <%= link_to("編輯", edit_admin_product_path(@product), :class => "btn btn-primary") %> +
+
+

<%= @product.title %>

+
+
+
+
+ <%= product_render_photo(@product, :medium) %> +
+
+

<%= @product.title %>

+

<%= @product.description %>

+

數量:<%= @product.quantity %>

+

價格:<%= @product.price %>

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

購物明細

+ + + + + + + + + + <% current_cart.cart_items.each do |cart_item| %> + + + + + + <% end %> + +
商品明細數量單價
+ <%= link_to(cart_item.product.title, admin_product_path(cart_item.product)) %> + <%= cart_item.quantity %> <%= cart_item.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 %> +
+
+
+
diff --git a/app/views/carts/index.html.erb b/app/views/carts/index.html.erb new file mode 100644 index 00000000..dbd0bd57 --- /dev/null +++ b/app/views/carts/index.html.erb @@ -0,0 +1,50 @@ +
+
+
+

購物車

+ + + + + + + + + + + + <% current_cart.cart_items.each do |cart_item| %> + + + + + + + + <% end %> + +
商品資訊單價數量
<%= product_render_photo(cart_item.product) %> + <%= link_to(cart_item.product.title, product_path(cart_item.product)) %> + <%= cart_item.product.price %> + <%= simple_form_for cart_item, html: { role: 'form', class: 'form-inline' } do |f| %> +
+ <%= f.input :quantity, label: false, collection: 1..cart_item.product.quantity, :input_html => {:class => "form-control"} %> +
+
+ <%= f.button :submit, :value => "更新", :disable_with => 'Submiting....', class: "btn btn-primary" %> +
+ <% end %> +
<%= link_to("刪除", cart_item_path(cart_item), :method => :delete, :class => "btn btn-primary") %>
+
+ + 總計 <%= render_cart_total_price(current_cart) %> NTD + + +
+
+
+ <%= link_to("確認結賬", checkout_cart_path(current_cart) , :method => :post , :class => "btn btn-primary btn-lg btn-danger pull-right") %> +
+
+
+
diff --git a/app/views/common/_flash_msg.html.erb b/app/views/common/_flash_msg.html.erb new file mode 100644 index 00000000..a822d955 --- /dev/null +++ b/app/views/common/_flash_msg.html.erb @@ -0,0 +1,15 @@ +<% if flash[:error] %> +
+

<%= flash[:error] %>

+
+<% end %> +<% if flash[:notice] %> +
+

<%= flash[:notice] %>

+
+<% end %> +<% if flash[:warning] %> +
+

<%= flash[:warning] %>

+
+<% end %> diff --git a/app/views/common/_nav_bar.html.erb b/app/views/common/_nav_bar.html.erb new file mode 100644 index 00000000..6852ee22 --- /dev/null +++ b/app/views/common/_nav_bar.html.erb @@ -0,0 +1,34 @@ + diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb new file mode 100644 index 00000000..c80829ad --- /dev/null +++ b/app/views/devise/confirmations/new.html.erb @@ -0,0 +1,16 @@ +

Resend confirmation instructions

+ +<%= simple_form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %> + <%= f.error_notification %> + <%= f.full_error :confirmation_token %> + +
+ <%= f.input :email, :required => true, :autofocus => true %> +
+ +
+ <%= f.button :submit, "Resend confirmation instructions" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb new file mode 100644 index 00000000..36670f91 --- /dev/null +++ b/app/views/devise/mailer/confirmation_instructions.html.erb @@ -0,0 +1,5 @@ +

Welcome <%= @email %>!

+ +

You can confirm your account email through the link below:

+ +

<%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @token) %>

diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb new file mode 100644 index 00000000..93de6d05 --- /dev/null +++ b/app/views/devise/mailer/reset_password_instructions.html.erb @@ -0,0 +1,8 @@ +

Hello <%= @resource.email %>!

+ +

Someone has requested a link to change your password. You can do this through the link below.

+ +

<%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %>

+ +

If you didn't request this, please ignore this email.

+

Your password won't change until you access the link above and create a new one.

diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb new file mode 100644 index 00000000..f59615fe --- /dev/null +++ b/app/views/devise/mailer/unlock_instructions.html.erb @@ -0,0 +1,7 @@ +

Hello <%= @resource.email %>!

+ +

Your account has been locked due to an excessive number of unsuccessful sign in attempts.

+ +

Click the link below to unlock your account:

+ +

<%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token) %>

diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb new file mode 100644 index 00000000..5a2442a6 --- /dev/null +++ b/app/views/devise/passwords/edit.html.erb @@ -0,0 +1,19 @@ +

Change your password

+ +<%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %> + <%= f.error_notification %> + + <%= f.input :reset_password_token, :as => :hidden %> + <%= f.full_error :reset_password_token %> + +
+ <%= f.input :password, :label => "New password", :required => true, :autofocus => true %> + <%= f.input :password_confirmation, :label => "Confirm your new password", :required => true %> +
+ +
+ <%= f.button :submit, "Change my password" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb new file mode 100644 index 00000000..b196bc90 --- /dev/null +++ b/app/views/devise/passwords/new.html.erb @@ -0,0 +1,15 @@ +

Forgot your password?

+ +<%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %> + <%= f.error_notification %> + +
+ <%= f.input :email, :required => true, :autofocus => true %> +
+ +
+ <%= f.button :submit, "Send me reset password instructions" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb new file mode 100644 index 00000000..6955c2c7 --- /dev/null +++ b/app/views/devise/registrations/edit.html.erb @@ -0,0 +1,27 @@ +

Edit <%= resource_name.to_s.humanize %>

+ +<%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %> + <%= f.error_notification %> + +
+ <%= f.input :email, :required => true, :autofocus => true %> + + <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> +

Currently waiting confirmation for: <%= resource.unconfirmed_email %>

+ <% end %> + + <%= f.input :password, :autocomplete => "off", :hint => "leave it blank if you don't want to change it", :required => false %> + <%= f.input :password_confirmation, :required => false %> + <%= f.input :current_password, :hint => "we need your current password to confirm your changes", :required => true %> +
+ +
+ <%= f.button :submit, "Update" %> +
+<% end %> + +

Cancel my account

+ +

Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %>

+ +<%= link_to "Back", :back %> diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb new file mode 100644 index 00000000..5ffdd534 --- /dev/null +++ b/app/views/devise/registrations/new.html.erb @@ -0,0 +1,16 @@ +
+ <%= simple_form_for(resource, :as => resource_name, html: { class: 'form-signin', role: 'form' }, :url => registration_path(resource_name)) do |f| %> + <%= f.error_notification %> +

Sign up

+
+ <%= f.input :email, :required => true, :autofocus => true, :input_html => {:class => "form-control"} %> + <%= f.input :password, :required => true, :input_html => {:class => "form-control"} %> + <%= f.input :password_confirmation, :required => true, :input_html => {:class => "form-control"} %> +
+ +
+ <%= f.button :submit, "Sign up", class: "btn btn-lg btn-primary btn-block" %> +
+ <%= render "devise/shared/links" %> + <% end %> +
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb new file mode 100644 index 00000000..b5a37ad8 --- /dev/null +++ b/app/views/devise/sessions/new.html.erb @@ -0,0 +1,16 @@ +
+ <%= simple_form_for(resource, :as => resource_name, html: { class: 'form-signin', role: 'form' }, :url => session_path(resource_name)) do |f| %> +

Sign in

+
+ <%= f.input :email, :placeholder => "Email", :label => false, :required => true, :autofocus => true, :input_html => {:class => "form-control"} %> + <%= f.input :password, :placeholder => "Password", :label => false, :required => true, :input_html => {:class => "form-control"} %> + <%= f.input :remember_me, :as => :boolean if devise_mapping.rememberable? %> +
+ +
+ <%= f.button :submit, "Sign in", class: "btn btn-lg btn-primary btn-block" %> +
+ + <%= render "devise/shared/links" %> + <% end %> +
diff --git a/app/views/devise/shared/_links.erb b/app/views/devise/shared/_links.erb new file mode 100644 index 00000000..d84bdde9 --- /dev/null +++ b/app/views/devise/shared/_links.erb @@ -0,0 +1,25 @@ +<%- if controller_name != 'sessions' %> + <%= link_to "Sign in", new_session_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.registerable? && controller_name != 'registrations' %> + <%= link_to "Sign up", new_registration_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> + <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> + <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> + <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.omniauthable? %> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %>
+ <% end -%> +<% end -%> diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb new file mode 100644 index 00000000..66495d6a --- /dev/null +++ b/app/views/devise/unlocks/new.html.erb @@ -0,0 +1,16 @@ +

Resend unlock instructions

+ +<%= simple_form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %> + <%= f.error_notification %> + <%= f.full_error :unlock_token %> + +
+ <%= f.input :email, :required => true, :autofocus => true %> +
+ +
+ <%= f.button :submit, "Resend unlock instructions" %> +
+<% end %> + +<%= render "devise/shared/links" %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index da9769de..12d53781 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,6 +7,8 @@ <%= csrf_meta_tags %> + <%= render "common/nav_bar" %> + <%= render "common/flash_msg" %> <%= yield %> diff --git a/app/views/order_mailer/notify_card_paid.html.erb b/app/views/order_mailer/notify_card_paid.html.erb new file mode 100644 index 00000000..79876e15 --- /dev/null +++ b/app/views/order_mailer/notify_card_paid.html.erb @@ -0,0 +1,4 @@ + +

您的消費總額<%= @order.total %>已完成付款

+ <%= link_to("訂單連結", order_url(@order.token)) %> + 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..b4c490bd --- /dev/null +++ b/app/views/order_mailer/notify_order_placed.html.erb @@ -0,0 +1,52 @@ + +
+
+

訂單明細

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

寄送資訊

+ + + + + + + + + + + + + + + +
訂購人
+ <%= @order_info.billing_name %> - <%= @order_info.billing_address %> +
收貨人
+ <%= @order_info.billing_name %> - <%= @order_info.billing_address %> +
+ <%= link_to("訂單連結", order_url(@order.token)) %> +
+
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..89a69828 --- /dev/null +++ b/app/views/orders/pay_with_credit_card.html.erb @@ -0,0 +1,37 @@ + + +<%= form_tag order_card_charges_path(@order.token), :id => "payment-form", :class => "form form-horizontal" do %> + +
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+ +
+
+
+
+ +
+
+ +
+
+
+ +<% end %> +
diff --git a/app/views/orders/show.html.erb b/app/views/orders/show.html.erb new file mode 100644 index 00000000..8805bbbd --- /dev/null +++ b/app/views/orders/show.html.erb @@ -0,0 +1,62 @@ +
+
+
+

訂單明細

+ + + + + + + + + + <% @order_items.each do |order_item| %> + + + + + + <% end %> + +
商品明細數量單價
+ <%= order_item.product_name %> + <%= order_item.quantity %> <%= 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 %> +
+
+
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb new file mode 100644 index 00000000..29abd012 --- /dev/null +++ b/app/views/pages/home.html.erb @@ -0,0 +1,3 @@ +
+

Welcome

+
diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb new file mode 100644 index 00000000..c60bd134 --- /dev/null +++ b/app/views/products/index.html.erb @@ -0,0 +1,47 @@ +
+
+
+ <%= search_form_for @q do |f| %> +
+ <%= f.label :title_cont, class: "control-label" %> + <%= f.search_field :title_cont, class: "form-control" %> +
+
+ <%= f.label :price_in, class: "control-label" %> +
+
+ <%= f.search_field :price_gteq, class: "form-control" %> +
+
+

~

+
+
+ <%= f.search_field :price_lteq, class: "form-control" %> +
+
+
+ <%= f.submit class: "btn btn-primary pull-right"%> + <% end %> +
+
+ + + + + + + + + <% @products.each do |product| %> + + + + + <% end %> + +
產品連結
<%= product.title %> + <%= link_to('Show', product_path(product), :class => "btn btn-info") %> +
+
+
+
diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb new file mode 100644 index 00000000..f2f38dd1 --- /dev/null +++ b/app/views/products/show.html.erb @@ -0,0 +1,27 @@ +
+
+
+

<%= @product.title %>

+
+
+
+
+ <%= product_render_photo(@product, :medium) %> +
+
+

<%= @product.title %>

+

<%= @product.description %>

+

庫存:<%= @product.quantity %>

+

價格:<%= @product.price %>

+ <%= simple_form_for @cart_item, html: { role: 'form', class: 'form-inline' } do |f| %> +
+ <%= f.input :quantity, label: "數量:", collection: 1..@product.quantity, :input_html => {:class => "form-control"} %> + <%= f.input :product_id, as: :hidden, :input_html => { :value => @product.id }%> +
+
+ <%= f.button :submit, :value => "加入購物車", :disable_with => 'Submiting....', class: "btn btn-primary" %> +
+ <% end %> +
+
+
diff --git a/config/application.rb b/config/application.rb index d21f3302..44592989 100644 --- a/config/application.rb +++ b/config/application.rb @@ -18,6 +18,6 @@ class Application < Rails::Application # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - # config.i18n.default_locale = :de + config.i18n.default_locale = "zh-TW" end end diff --git a/config/config.yml b/config/config.yml new file mode 100644 index 00000000..87e93275 --- /dev/null +++ b/config/config.yml @@ -0,0 +1,17 @@ +defaults: &defaults + mail: + user_name: "postmaster@sandboxc429a9c3e2a6491da69d4593dc8fcf34.mailgun.org" + password: "9dtq9y2j4n23" + domain: "sandboxc429a9c3e2a6491da69d4593dc8fcf34.mailgun.org" + stripe: + api_key: 'sk_test_oRx3n1ew0kZIkY9hLvPMV8Dy' + public_key: 'pk_test_jS6BKf6bMnfVZ9BiaUf533kd' + +development: + <<: *defaults + +test: + <<: *defaults + +production: + <<: *defaults diff --git a/config/environments/development.rb b/config/environments/development.rb index ddf0e90c..f2a1ef8c 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -16,6 +16,17 @@ # Don't care if the mailer can't send. config.action_mailer.raise_delivery_errors = false + #config.action_mailer.delivery_method = :letter_opener + config.action_mailer.smtp_settings = { + :port => 587, + :address => "smtp.mailgun.org", + :user_name => Setting.mail.user_name, + :password => Setting.mail.password, + :domain => Setting.mail.domain, + :authentication => :plain + } + config.action_mailer.delivery_method = :smtp + # Print deprecation notices to the Rails logger. config.active_support.deprecation = :log @@ -34,4 +45,6 @@ # Raises error for missing translations # config.action_view.raise_on_missing_translations = true + + config.action_mailer.default_url_options = { :host => "localhost:3000" } end diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb new file mode 100644 index 00000000..4231307b --- /dev/null +++ b/config/initializers/devise.rb @@ -0,0 +1,258 @@ +# Use this hook to configure devise mailer, warden hooks and so forth. +# Many of these configuration options can be set straight in your model. +Devise.setup do |config| + # The secret key used by Devise. Devise uses this key to generate + # random tokens. Changing this key will render invalid all existing + # confirmation, reset password and unlock tokens in the database. + config.secret_key = 'b73208e071daf7f996f2c7e3a2ad65d19cb5f4292fcfa716f654f58d822220b72ceb80f3733ff3e64418fd322e3f63b4fb14ddb0d04cefae1102581a962271bd' + + # ==> 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 = '1960bcbc1ea2b29b7a7b01b5a48d8c8b15732ee10ed5e39fdf9d48b64585e1d748acd6491e514733b0762ffa278b18883ae1cb2b732b20040a6436be3737d12a' + + # ==> Configuration for :confirmable + # A period that the user is allowed to access the website even without + # confirming his account. For instance, if set to 2.days, the user will be + # able to access the website for two days without confirming his account, + # access will be blocked just in the third day. Default is 0.days, meaning + # the user cannot access the website without confirming his account. + # config.allow_unconfirmed_access_for = 2.days + + # A period that the user is allowed to confirm their account before their + # token becomes invalid. For example, if set to 3.days, the user can confirm + # their account within 3 days after the mail was sent, but on the fourth day + # their account can't be confirmed with the token any more. + # Default is nil, meaning there is no restriction on how long a user can take + # before confirming their account. + # config.confirm_within = 3.days + + # If true, requires any email changes to be confirmed (exactly the same way as + # initial account confirmation) to be applied. Requires additional unconfirmed_email + # db field (see migrations). Until confirmed new email is stored in + # unconfirmed email column, and copied to email column on successful confirmation. + config.reconfirmable = true + + # Defines which key will be used when confirming an account + # config.confirmation_keys = [ :email ] + + # ==> Configuration for :rememberable + # The time the user will be remembered without asking for credentials again. + # config.remember_for = 2.weeks + + # If true, extends the user's remember period when remembered via cookie. + # config.extend_remember_period = false + + # Options to be passed to the created cookie. For instance, you can set + # :secure => true in order to force SSL only cookies. + # config.rememberable_options = {} + + # ==> Configuration for :validatable + # Range for password length. Default is 8..128. + config.password_length = 8..128 + + # Email regex used to validate email formats. It simply asserts that + # one (and only one) @ exists in the given string. This is mainly + # to give user feedback and not to assert the e-mail validity. + # config.email_regexp = /\A[^@]+@[^@]+\z/ + + # ==> Configuration for :timeoutable + # The time you want to timeout the user session without activity. After this + # time the user will be asked for credentials again. Default is 30 minutes. + # config.timeout_in = 30.minutes + + # If true, expires auth token on session timeout. + # config.expire_auth_token_on_timeout = false + + # ==> Configuration for :lockable + # Defines which strategy will be used to lock an account. + # :failed_attempts = Locks an account after a number of failed attempts to sign in. + # :none = No lock strategy. You should handle locking by yourself. + # config.lock_strategy = :failed_attempts + + # Defines which key will be used when locking and unlocking an account + # config.unlock_keys = [ :email ] + + # Defines which strategy will be used to unlock an account. + # :email = Sends an unlock link to the user email + # :time = Re-enables login after a certain amount of time (see :unlock_in below) + # :both = Enables both strategies + # :none = No unlock strategy. You should handle unlocking by yourself. + # config.unlock_strategy = :both + + # Number of authentication tries before locking an account if lock_strategy + # is failed attempts. + # config.maximum_attempts = 20 + + # Time interval to unlock the account if :time is enabled as unlock_strategy. + # config.unlock_in = 1.hour + + # ==> Configuration for :recoverable + # + # Defines which key will be used when recovering the password for an account + # config.reset_password_keys = [ :email ] + + # Time interval you can reset your password with a reset password key. + # Don't put a too small interval or your users won't have the time to + # change their passwords. + config.reset_password_within = 6.hours + + # ==> Configuration for :encryptable + # Allow you to use another encryption algorithm besides bcrypt (default). You can use + # :sha1, :sha512 or encryptors from others authentication tools as :clearance_sha1, + # :authlogic_sha512 (then you should set stretches above to 20 for default behavior) + # and :restful_authentication_sha1 (then you should set stretches to 10, and copy + # REST_AUTH_SITE_KEY to pepper). + # + # Require the `devise-encryptable` gem when using anything other than bcrypt + # config.encryptor = :sha512 + + # ==> Configuration for :token_authenticatable + # Defines name of the authentication token params key + # config.token_authentication_key = :auth_token + + # ==> Scopes configuration + # Turn scoped views on. Before rendering "sessions/new", it will first check for + # "users/sessions/new". It's turned off by default because it's slower if you + # are using only default views. + # config.scoped_views = false + + # Configure the default scope given to Warden. By default it's the first + # devise role declared in your routes (usually :user). + # config.default_scope = :user + + # Set this configuration to false if you want /users/sign_out to sign out + # only the current scope. By default, Devise signs out all scopes. + # config.sign_out_all_scopes = true + + # ==> Navigation configuration + # Lists the formats that should be treated as navigational. Formats like + # :html, should redirect to the sign in page when the user does not have + # access, but formats like :xml or :json, should return 401. + # + # If you have any extra navigational formats, like :iphone or :mobile, you + # should add them to the navigational formats lists. + # + # The "*/*" below is required to match Internet Explorer requests. + # config.navigational_formats = ['*/*', :html] + + # The default HTTP method used to sign out a resource. Default is :delete. + config.sign_out_via = :delete + + # ==> OmniAuth + # Add a new OmniAuth provider. Check the wiki for more information on setting + # up on your models and hooks. + # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo' + + # ==> Warden configuration + # If you want to use other strategies, that are not supported by Devise, or + # change the failure app, you can configure them inside the config.warden block. + # + # config.warden do |manager| + # manager.intercept_401 = false + # manager.default_strategies(:scope => :user).unshift :some_external_strategy + # end + + # ==> Mountable engine configurations + # When using Devise inside an engine, let's call it `MyEngine`, and this engine + # is mountable, there are some extra configurations to be taken into account. + # The following options are available, assuming the engine is mounted as: + # + # mount MyEngine, at: '/my_engine' + # + # The router that invoked `devise_for`, in the example above, would be: + # config.router_name = :my_engine + # + # When using omniauth, Devise cannot automatically set Omniauth path, + # so you need to do it manually. For the users scope, it would be: + # config.omniauth_path_prefix = '/my_engine/users/auth' +end diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb new file mode 100644 index 00000000..6986de98 --- /dev/null +++ b/config/initializers/simple_form.rb @@ -0,0 +1,145 @@ +# Use this setup block to configure all options available in SimpleForm. +SimpleForm.setup do |config| + # Wrappers are used by the form builder to generate a + # complete input. You can remove any component from the + # wrapper, change the order or even add your own to the + # stack. The options given below are used to wrap the + # whole input. + config.wrappers :default, class: :input, + hint_class: :field_with_hint, error_class: :field_with_errors do |b| + ## Extensions enabled by default + # Any of these extensions can be disabled for a + # given input by passing: `f.input EXTENSION_NAME => false`. + # You can make any of these extensions optional by + # renaming `b.use` to `b.optional`. + + # Determines whether to use HTML5 (:email, :url, ...) + # and required attributes + b.use :html5 + + # Calculates placeholders automatically from I18n + # You can also pass a string as f.input placeholder: "Placeholder" + b.use :placeholder + + ## Optional extensions + # They are disabled unless you pass `f.input EXTENSION_NAME => :lookup` + # to the input. If so, they will retrieve the values from the model + # if any exists. If you want to enable the lookup for any of those + # extensions by default, you can change `b.optional` to `b.use`. + + # Calculates maxlength from length validations for string inputs + b.optional :maxlength + + # Calculates pattern from format validations for string inputs + b.optional :pattern + + # Calculates min and max from length validations for numeric inputs + b.optional :min_max + + # Calculates readonly automatically from readonly attributes + b.optional :readonly + + ## Inputs + b.use :label_input + b.use :hint, wrap_with: { tag: :span, class: :hint } + b.use :error, wrap_with: { tag: :span, class: :error } + end + + # The default wrapper to be used by the FormBuilder. + config.default_wrapper = :default + + # Define the way to render check boxes / radio buttons with labels. + # Defaults to :nested for bootstrap config. + # inline: input + label + # nested: label > input + config.boolean_style = :nested + + # Default class for buttons + config.button_class = 'btn' + + # Method used to tidy up errors. Specify any Rails Array method. + # :first lists the first message for each field. + # Use :to_sentence to list all errors for each field. + # config.error_method = :first + + # Default tag used for error notification helper. + config.error_notification_tag = :div + + # CSS class to add for error notification helper. + config.error_notification_class = 'alert alert-error' + + # ID to add for error notification helper. + # config.error_notification_id = nil + + # Series of attempts to detect a default label method for collection. + # config.collection_label_methods = [ :to_label, :name, :title, :to_s ] + + # Series of attempts to detect a default value method for collection. + # config.collection_value_methods = [ :id, :to_s ] + + # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none. + # config.collection_wrapper_tag = nil + + # You can define the class to use on all collection wrappers. Defaulting to none. + # config.collection_wrapper_class = nil + + # You can wrap each item in a collection of radio/check boxes with a tag, + # defaulting to :span. Please note that when using :boolean_style = :nested, + # SimpleForm will force this option to be a label. + # config.item_wrapper_tag = :span + + # You can define a class to use in all item wrappers. Defaulting to none. + # config.item_wrapper_class = nil + + # How the label text should be generated altogether with the required text. + # config.label_text = lambda { |label, required| "#{required} #{label}" } + + # You can define the class to use on all labels. Default is nil. + config.label_class = 'control-label' + + # You can define the class to use on all forms. Default is simple_form. + # config.form_class = :simple_form + + # You can define which elements should obtain additional classes + # config.generate_additional_classes_for = [:wrapper, :label, :input] + + # Whether attributes are required by default (or not). Default is true. + # config.required_by_default = true + + # Tell browsers whether to use the native HTML5 validations (novalidate form option). + # These validations are enabled in SimpleForm's internal config but disabled by default + # in this configuration, which is recommended due to some quirks from different browsers. + # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations, + # change this configuration to true. + config.browser_validations = false + + # Collection of methods to detect if a file type was given. + # config.file_methods = [ :mounted_as, :file?, :public_filename ] + + # Custom mappings for input types. This should be a hash containing a regexp + # to match as key, and the input type that will be used when the field name + # matches the regexp as value. + # config.input_mappings = { /count/ => :integer } + + # Custom wrappers for input types. This should be a hash containing an input + # type as key and the wrapper that will be used for all inputs with specified type. + # config.wrapper_mappings = { string: :prepend } + + # Default priority for time_zone inputs. + # config.time_zone_priority = nil + + # Default priority for country inputs. + # config.country_priority = nil + + # When false, do not use translations for labels. + # config.translate_labels = true + + # Automatically discover new inputs in Rails' autoload path. + # config.inputs_discovery = true + + # Cache SimpleForm inputs discovery + # config.cache_discovery = !Rails.env.development? + + # Default class for inputs + # config.input_class = nil +end diff --git a/config/initializers/simple_form_bootstrap.rb b/config/initializers/simple_form_bootstrap.rb new file mode 100644 index 00000000..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/devise.en.yml b/config/locales/devise.en.yml new file mode 100644 index 00000000..e7445b31 --- /dev/null +++ b/config/locales/devise.en.yml @@ -0,0 +1,60 @@ +# Additional translations at https://github.com/plataformatec/devise/wiki/I18n + +en: + devise: + confirmations: + confirmed: "Your account was successfully confirmed. Please sign in." + confirmed_and_signed_in: "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 is not activated yet." + invalid: "Invalid email or password." + invalid_token: "Invalid authentication token." + locked: "Your account is locked." + not_found_in_database: "Invalid email or password." + timeout: "Your session expired. Please sign in again to continue." + unauthenticated: "You need to sign in or sign up before continuing." + unconfirmed: "You have to confirm your account before continuing." + mailer: + confirmation_instructions: + subject: "Confirmation instructions" + reset_password_instructions: + subject: "Reset password instructions" + unlock_instructions: + subject: "Unlock Instructions" + omniauth_callbacks: + failure: "Could not authenticate you from %{kind} because \"%{reason}\"." + success: "Successfully authenticated from %{kind} account." + passwords: + no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." + send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." + updated: "Your password was changed successfully. You are now signed in." + updated_not_active: "Your password was changed successfully." + registrations: + destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon." + signed_up: "Welcome! You have signed up successfully." + signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated." + signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked." + signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account." + update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address." + updated: "You updated your account successfully." + sessions: + signed_in: "Signed in successfully." + signed_out: "Signed out successfully." + unlocks: + send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes." + send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes." + unlocked: "Your account has been unlocked successfully. Please sign in to continue." + errors: + messages: + already_confirmed: "was already confirmed, please try signing in" + confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one" + expired: "has expired, please request a new one" + not_found: "not found" + not_locked: "was not locked" + not_saved: + one: "1 error prohibited this %{resource} from being saved:" + other: "%{count} errors prohibited this %{resource} from being saved:" diff --git a/config/locales/devise.zh-TW.yml b/config/locales/devise.zh-TW.yml new file mode 100644 index 00000000..548a25c7 --- /dev/null +++ b/config/locales/devise.zh-TW.yml @@ -0,0 +1,57 @@ +zh-TW: + devise: + confirmations: + confirmed: 您的帳號已經通過確認。 + send_instructions: 您將在幾分鐘後收到一封電子郵件,內有確認帳號的步驟說明。 + send_paranoid_instructions: 如果此電子郵件信箱真存在於資料庫中的話,您將在幾分鐘後收到一封電子郵件, 說明確認帳號的手續。 + failure: + already_authenticated: 您已經登入。 + inactive: 您的帳號尚未被啟用。 + invalid: Email 或密碼是無效的。 + last_attempt: 帳號鎖定前的最後一次嘗試。 + locked: 您的帳號已被鎖定。 + not_found_in_database: Email 或密碼是無效的。 + timeout: 您的登入時效過期,請重新登入,才能繼續。 + unauthenticated: 您需要先註冊,登入後才能繼續。 + unconfirmed: 您的帳號需需要經過確認後,才能繼續。 + mailer: + confirmation_instructions: + subject: 確認步驟 + reset_password_instructions: + subject: 重設密碼步驟 + unlock_instructions: + subject: 解鎖步驟 + omniauth_callbacks: + failure: 因為「%{reason}」,無法認證您的 %{kind} 帳戶 + success: 已成功認證您的 %{kind} 帳戶 + passwords: + no_token: 您暫時不能訪問此頁面。您需要通過密碼重置郵件中的重置鏈接來訪問此頁面,如果您正是通過重置鏈接訪問,請確定鏈接的正確性。 + send_instructions: 您將在幾分鐘後收到一封電子郵件,內有重新設定密碼的步驟說明。 + send_paranoid_instructions: 如果此電子郵件信箱真存在於資料庫中的話,您將在幾分鐘後收到一封電子郵件,內有回復密碼專用的網址。 + updated: 您的密碼已被修改,而您現在已重新登入。 + updated_not_active: 您的密碼已被修改。 + registrations: + destroyed: 再會!您的帳號已被註銷。有緣再會。 + signed_up: 歡迎!您已經成功註冊。 + signed_up_but_inactive: 您已經成功註冊。但因帳號尚未啟用,目前暫時不能登入。 + signed_up_but_locked: 您已經成功註冊。可是,因為帳號被鎖住,目前暫時不能登入。 + signed_up_but_unconfirmed: 已傳送帳號確認信件至您的 Email 信箱,請收信、並點擊信中確認網址,以便啟用您的帳號。 + update_needs_confirmation: 您的帳號資料已成功更新,但您的新 Email 信箱需要再次被確認。請收信、並點擊信中確認用的網址,以便完成信箱確認手續。 + updated: 您已經成功的更新帳號資訊。 + sessions: + signed_in: 成功登入了。 + signed_out: 成功登出了。 + unlocks: + send_instructions: 您將在幾分鐘後收到一封電子郵件,內有將帳號解除鎖定的步驟說明。 + send_paranoid_instructions: 如果此帳號真的存在的話,您將在幾分鐘後收到一封電子郵件,內有將帳號解除鎖定的步驟說明。 + unlocked: 您的帳號已被解鎖,現在您已成功登入。 + errors: + messages: + already_confirmed: 已被確認過了,請試著登入看看 + confirmation_period_expired: 需要在%{period}以內確認,請再要一個新的。 + expired: 已經過期了,請再要一個新的 + not_found: 沒有找到 + not_locked: 沒有被鎖定 + not_saved: + one: 有一個錯誤導致%{resource}不能被儲存: + other: 有 %{count} 個錯誤導致%{resource}不能被儲存: diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml new file mode 100644 index 00000000..0df11fe0 --- /dev/null +++ b/config/locales/simple_form.en.yml @@ -0,0 +1,26 @@ +en: + simple_form: + "yes": 'Yes' + "no": 'No' + required: + text: 'required' + mark: '*' + # You can uncomment the line below if you need to overwrite the whole required html. + # When using html, text and mark won't be used. + # html: '*' + error_notification: + default_message: "Please review the problems below:" + # Labels and hints examples + # labels: + # defaults: + # password: 'Password' + # user: + # new: + # email: 'E-mail to sign in.' + # edit: + # email: 'E-mail.' + # hints: + # defaults: + # username: 'User name to sign in.' + # password: 'No special characters, please.' + diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml new file mode 100644 index 00000000..3811beed --- /dev/null +++ b/config/locales/zh-TW.yml @@ -0,0 +1,9 @@ +zh-TW: + ransack: + predicates: + cont: "包含" + in: "範圍" + attributes: + product: + title: "標題" + price: "價格" diff --git a/config/routes.rb b/config/routes.rb index 3f66539d..2dd75897 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,56 +1,37 @@ Rails.application.routes.draw do - # The priority is based upon order of creation: first created -> highest priority. - # See how all your routes lay out with "rake routes". - - # You can have the root of your site routed with "root" - # root 'welcome#index' - - # Example of regular route: - # get 'products/:id' => 'catalog#view' - - # Example of named route that can be invoked with purchase_url(id: product.id) - # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase - - # Example resource route (maps HTTP verbs to controller actions automatically): - # resources :products - - # Example resource route with options: - # resources :products do - # member do - # get 'short' - # post 'toggle' - # end - # - # collection do - # get 'sold' - # end - # end - - # Example resource route with sub-resources: - # resources :products do - # resources :comments, :sales - # resource :seller - # end - - # Example resource route with more complex sub-resources: - # resources :products do - # resources :comments - # resources :sales do - # get 'recent', on: :collection - # end - # end - - # Example resource route with concerns: - # concern :toggleable do - # post 'toggle' - # end - # resources :posts, concerns: :toggleable - # resources :photos, concerns: :toggleable - - # Example resource route within a namespace: - # namespace :admin do - # # Directs /admin/products/* to Admin::ProductsController - # # (app/controllers/admin/products_controller.rb) - # resources :products - # end + root to: "pages#home" + devise_for :users + namespace :admin do + resources :products + resources :orders do + member do + post :ship + post :deliver + post :cancel_order + post :return_good + post :state_transition + end + end + end + + resources :products + + resources :carts do + member do + post :checkout + end + end + + resources :orders do + member do + get :pay_with_credit_card + end + resources :card_charges + end + + namespace :account do + resources :orders + end + + resources :cart_items end diff --git a/db/migrate/20140609120041_create_products.rb b/db/migrate/20140609120041_create_products.rb new file mode 100644 index 00000000..805c9766 --- /dev/null +++ b/db/migrate/20140609120041_create_products.rb @@ -0,0 +1,11 @@ +class CreateProducts < ActiveRecord::Migration + def change + create_table :products do |t| + t.string :title + t.text :description + t.integer :quantity + + t.timestamps + end + end +end diff --git a/db/migrate/20140609122603_devise_create_users.rb b/db/migrate/20140609122603_devise_create_users.rb new file mode 100644 index 00000000..ab71c3d1 --- /dev/null +++ b/db/migrate/20140609122603_devise_create_users.rb @@ -0,0 +1,42 @@ +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, :null => false + t.datetime :current_sign_in_at + t.datetime :last_sign_in_at + t.string :current_sign_in_ip + t.string :last_sign_in_ip + + ## Confirmable + # t.string :confirmation_token + # t.datetime :confirmed_at + # t.datetime :confirmation_sent_at + # t.string :unconfirmed_email # Only if using reconfirmable + + ## Lockable + # t.integer :failed_attempts, :default => 0, :null => false # Only if lock strategy is :failed_attempts + # t.string :unlock_token # Only if unlock strategy is :email or :both + # t.datetime :locked_at + + + t.timestamps + end + + add_index :users, :email, :unique => true + add_index :users, :reset_password_token, :unique => true + # add_index :users, :confirmation_token, :unique => true + # add_index :users, :unlock_token, :unique => true + end +end diff --git a/db/migrate/20140609124047_add_is_admin_to_user.rb b/db/migrate/20140609124047_add_is_admin_to_user.rb new file mode 100644 index 00000000..1ef84cff --- /dev/null +++ b/db/migrate/20140609124047_add_is_admin_to_user.rb @@ -0,0 +1,5 @@ +class AddIsAdminToUser < ActiveRecord::Migration + def change + add_column :users, :is_admin, :boolean, :default => false + end +end diff --git a/db/migrate/20140611120235_add_photo_to_products.rb b/db/migrate/20140611120235_add_photo_to_products.rb new file mode 100644 index 00000000..bae28f4b --- /dev/null +++ b/db/migrate/20140611120235_add_photo_to_products.rb @@ -0,0 +1,5 @@ +class AddPhotoToProducts < ActiveRecord::Migration + def change + add_column :products, :photo, :string + end +end diff --git a/db/migrate/20140611124013_delete_photo_from_product.rb b/db/migrate/20140611124013_delete_photo_from_product.rb new file mode 100644 index 00000000..4efda5b4 --- /dev/null +++ b/db/migrate/20140611124013_delete_photo_from_product.rb @@ -0,0 +1,5 @@ +class DeletePhotoFromProduct < ActiveRecord::Migration + def change + remove_column :products, :photo, :string + end +end diff --git a/db/migrate/20140611125349_create_photos.rb b/db/migrate/20140611125349_create_photos.rb new file mode 100644 index 00000000..de592bf4 --- /dev/null +++ b/db/migrate/20140611125349_create_photos.rb @@ -0,0 +1,10 @@ +class CreatePhotos < ActiveRecord::Migration + def change + create_table :photos do |t| + t.integer :product_id + t.string :image + + t.timestamps + end + end +end diff --git a/db/migrate/20140613173818_add_price_to_product.rb b/db/migrate/20140613173818_add_price_to_product.rb new file mode 100644 index 00000000..af2edf14 --- /dev/null +++ b/db/migrate/20140613173818_add_price_to_product.rb @@ -0,0 +1,5 @@ +class AddPriceToProduct < ActiveRecord::Migration + def change + add_column :products, :price, :integer + end +end diff --git a/db/migrate/20140616111149_create_carts.rb b/db/migrate/20140616111149_create_carts.rb new file mode 100644 index 00000000..8e66adb5 --- /dev/null +++ b/db/migrate/20140616111149_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/20140616111230_create_cart_items.rb b/db/migrate/20140616111230_create_cart_items.rb new file mode 100644 index 00000000..0fb13b18 --- /dev/null +++ b/db/migrate/20140616111230_create_cart_items.rb @@ -0,0 +1,10 @@ +class CreateCartItems < ActiveRecord::Migration + def change + create_table :cart_items do |t| + t.integer :cart_id + t.integer :product_id + + t.timestamps + end + end +end diff --git a/db/migrate/20140616120514_create_orders.rb b/db/migrate/20140616120514_create_orders.rb new file mode 100644 index 00000000..12bf480d --- /dev/null +++ b/db/migrate/20140616120514_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 diff --git a/db/migrate/20140616120611_create_order_infos.rb b/db/migrate/20140616120611_create_order_infos.rb new file mode 100644 index 00000000..09d63314 --- /dev/null +++ b/db/migrate/20140616120611_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 diff --git a/db/migrate/20140616120619_create_order_items.rb b/db/migrate/20140616120619_create_order_items.rb new file mode 100644 index 00000000..cebcd4f4 --- /dev/null +++ b/db/migrate/20140616120619_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 diff --git a/db/migrate/20140616123020_add_token_to_order.rb b/db/migrate/20140616123020_add_token_to_order.rb new file mode 100644 index 00000000..cb455b41 --- /dev/null +++ b/db/migrate/20140616123020_add_token_to_order.rb @@ -0,0 +1,6 @@ +class AddTokenToOrder < ActiveRecord::Migration + def change + add_column :orders, :token, :string + add_index :orders, :token + end +end diff --git a/db/migrate/20140616124153_add_payment_method_to_order.rb b/db/migrate/20140616124153_add_payment_method_to_order.rb new file mode 100644 index 00000000..e7eb536a --- /dev/null +++ b/db/migrate/20140616124153_add_payment_method_to_order.rb @@ -0,0 +1,5 @@ +class AddPaymentMethodToOrder < ActiveRecord::Migration + def change + add_column :orders, :payment_method, :string + end +end diff --git a/db/migrate/20140616132404_add_aasm_state_to_orders.rb b/db/migrate/20140616132404_add_aasm_state_to_orders.rb new file mode 100644 index 00000000..37097caa --- /dev/null +++ b/db/migrate/20140616132404_add_aasm_state_to_orders.rb @@ -0,0 +1,6 @@ +class AddAasmStateToOrders < ActiveRecord::Migration + def change + add_column :orders, :aasm_state, :string, :default => "order_placed" + add_index :orders, :aasm_state + end +end diff --git a/db/migrate/20140617171148_add_quantity_to_cart_item.rb b/db/migrate/20140617171148_add_quantity_to_cart_item.rb new file mode 100644 index 00000000..25205eb4 --- /dev/null +++ b/db/migrate/20140617171148_add_quantity_to_cart_item.rb @@ -0,0 +1,5 @@ +class AddQuantityToCartItem < ActiveRecord::Migration + def change + add_column :cart_items, :quantity, :integer, default: 0 + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 00000000..a07dd4eb --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,97 @@ +# encoding: UTF-8 +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# Note that this schema.rb definition is the authoritative source for your +# database schema. If you need to create the application database on another +# system, you should be using db:schema:load, not running all the migrations +# from scratch. The latter is a flawed and unsustainable approach (the more migrations +# you'll amass, the slower it'll run and the greater likelihood for issues). +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 20140617171148) 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: 0 + end + + create_table "carts", force: true do |t| + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "order_infos", force: true do |t| + t.integer "order_id" + t.string "billing_name" + t.string "billing_address" + t.string "shipping_name" + t.string "shipping_address" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "order_items", force: true do |t| + t.string "product_name" + t.float "price" + t.integer "quantity" + t.integer "order_id" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "orders", force: true do |t| + t.integer "user_id" + t.integer "total" + t.boolean "paid", default: false + t.datetime "created_at" + t.datetime "updated_at" + t.string "token" + t.string "payment_method" + t.string "aasm_state", default: "order_placed" + end + + add_index "orders", ["aasm_state"], name: "index_orders_on_aasm_state" + add_index "orders", ["token"], name: "index_orders_on_token" + + create_table "photos", force: true do |t| + t.integer "product_id" + t.string "image" + t.datetime "created_at" + t.datetime "updated_at" + end + + create_table "products", force: true do |t| + t.string "title" + t.text "description" + t.integer "quantity" + t.datetime "created_at" + t.datetime "updated_at" + t.integer "price" + 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, null: false + t.datetime "current_sign_in_at" + t.datetime "last_sign_in_at" + t.string "current_sign_in_ip" + t.string "last_sign_in_ip" + t.datetime "created_at" + t.datetime "updated_at" + t.boolean "is_admin", default: false + end + + add_index "users", ["email"], name: "index_users_on_email", unique: true + add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true + +end diff --git a/lib/templates/erb/scaffold/_form.html.erb b/lib/templates/erb/scaffold/_form.html.erb new file mode 100644 index 00000000..201a069e --- /dev/null +++ b/lib/templates/erb/scaffold/_form.html.erb @@ -0,0 +1,13 @@ +<%%= simple_form_for(@<%= singular_table_name %>) do |f| %> + <%%= f.error_notification %> + +
+ <%- attributes.each do |attribute| -%> + <%%= f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> %> + <%- end -%> +
+ +
+ <%%= f.button :submit %> +
+<%% end %> diff --git a/test/controllers/account/orders_controller_test.rb b/test/controllers/account/orders_controller_test.rb new file mode 100644 index 00000000..b0419411 --- /dev/null +++ b/test/controllers/account/orders_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Account::OrdersControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/admin/orders_controller_test.rb b/test/controllers/admin/orders_controller_test.rb new file mode 100644 index 00000000..8af7f0c9 --- /dev/null +++ b/test/controllers/admin/orders_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Admin::OrdersControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/admin/products_controller_test.rb b/test/controllers/admin/products_controller_test.rb new file mode 100644 index 00000000..508fe6b7 --- /dev/null +++ b/test/controllers/admin/products_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Admin::ProductsControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/card_charges_controller_test.rb b/test/controllers/card_charges_controller_test.rb new file mode 100644 index 00000000..c5002f27 --- /dev/null +++ b/test/controllers/card_charges_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CardChargesControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/cart_items_controller_test.rb b/test/controllers/cart_items_controller_test.rb new file mode 100644 index 00000000..76b2b022 --- /dev/null +++ b/test/controllers/cart_items_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CartItemsControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/carts_controller_test.rb b/test/controllers/carts_controller_test.rb new file mode 100644 index 00000000..1e748b83 --- /dev/null +++ b/test/controllers/carts_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CartsControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb new file mode 100644 index 00000000..0afece19 --- /dev/null +++ b/test/controllers/orders_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class OrdersControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/pages_controller_test.rb b/test/controllers/pages_controller_test.rb new file mode 100644 index 00000000..bb843221 --- /dev/null +++ b/test/controllers/pages_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PagesControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb new file mode 100644 index 00000000..c881fa68 --- /dev/null +++ b/test/controllers/products_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class ProductsControllerTest < ActionController::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/fixtures/cart_items.yml b/test/fixtures/cart_items.yml new file mode 100644 index 00000000..a0de2cb5 --- /dev/null +++ b/test/fixtures/cart_items.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + cart_id: 1 + product_id: 1 + +two: + cart_id: 1 + product_id: 1 diff --git a/test/fixtures/carts.yml b/test/fixtures/carts.yml new file mode 100644 index 00000000..937a0c00 --- /dev/null +++ b/test/fixtures/carts.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/order_infos.yml b/test/fixtures/order_infos.yml new file mode 100644 index 00000000..937a0c00 --- /dev/null +++ b/test/fixtures/order_infos.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/order_items.yml b/test/fixtures/order_items.yml new file mode 100644 index 00000000..937a0c00 --- /dev/null +++ b/test/fixtures/order_items.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml new file mode 100644 index 00000000..937a0c00 --- /dev/null +++ b/test/fixtures/orders.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/fixtures/photos.yml b/test/fixtures/photos.yml new file mode 100644 index 00000000..5cc49b72 --- /dev/null +++ b/test/fixtures/photos.yml @@ -0,0 +1,9 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + product_id: 1 + image: MyString + +two: + product_id: 1 + image: MyString diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml new file mode 100644 index 00000000..c3b9bc15 --- /dev/null +++ b/test/fixtures/products.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + description: MyText + quantity: 1 + +two: + title: MyString + description: MyText + quantity: 1 diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml new file mode 100644 index 00000000..937a0c00 --- /dev/null +++ b/test/fixtures/users.yml @@ -0,0 +1,11 @@ +# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +# This model initially had no columns defined. If you add columns to the +# model remove the '{}' from the fixture names and add the columns immediately +# below each fixture, per the syntax in the comments below +# +one: {} +# column: value +# +two: {} +# column: value diff --git a/test/helpers/account/orders_helper_test.rb b/test/helpers/account/orders_helper_test.rb new file mode 100644 index 00000000..60734209 --- /dev/null +++ b/test/helpers/account/orders_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class Account::OrdersHelperTest < ActionView::TestCase +end diff --git a/test/helpers/admin/orders_helper_test.rb b/test/helpers/admin/orders_helper_test.rb new file mode 100644 index 00000000..8511d6d4 --- /dev/null +++ b/test/helpers/admin/orders_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class Admin::OrdersHelperTest < ActionView::TestCase +end diff --git a/test/helpers/admin/products_helper_test.rb b/test/helpers/admin/products_helper_test.rb new file mode 100644 index 00000000..0b696b1f --- /dev/null +++ b/test/helpers/admin/products_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class Admin::ProductsHelperTest < ActionView::TestCase +end diff --git a/test/helpers/card_charges_helper_test.rb b/test/helpers/card_charges_helper_test.rb new file mode 100644 index 00000000..1fe502e7 --- /dev/null +++ b/test/helpers/card_charges_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class CardChargesHelperTest < ActionView::TestCase +end diff --git a/test/helpers/cart_items_helper_test.rb b/test/helpers/cart_items_helper_test.rb new file mode 100644 index 00000000..4cfc7e99 --- /dev/null +++ b/test/helpers/cart_items_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class CartItemsHelperTest < ActionView::TestCase +end diff --git a/test/helpers/carts_helper_test.rb b/test/helpers/carts_helper_test.rb new file mode 100644 index 00000000..0fac3c4e --- /dev/null +++ b/test/helpers/carts_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class CartsHelperTest < ActionView::TestCase +end diff --git a/test/helpers/orders_helper_test.rb b/test/helpers/orders_helper_test.rb new file mode 100644 index 00000000..52dacae1 --- /dev/null +++ b/test/helpers/orders_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class OrdersHelperTest < ActionView::TestCase +end diff --git a/test/helpers/pages_helper_test.rb b/test/helpers/pages_helper_test.rb new file mode 100644 index 00000000..535dfe17 --- /dev/null +++ b/test/helpers/pages_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class PagesHelperTest < ActionView::TestCase +end diff --git a/test/helpers/products_helper_test.rb b/test/helpers/products_helper_test.rb new file mode 100644 index 00000000..0f5beab7 --- /dev/null +++ b/test/helpers/products_helper_test.rb @@ -0,0 +1,4 @@ +require 'test_helper' + +class ProductsHelperTest < ActionView::TestCase +end diff --git a/test/mailers/order_mailer_test.rb b/test/mailers/order_mailer_test.rb new file mode 100644 index 00000000..6e2129de --- /dev/null +++ b/test/mailers/order_mailer_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class OrderMailerTest < ActionMailer::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/mailers/previews/order_mailer_preview.rb b/test/mailers/previews/order_mailer_preview.rb new file mode 100644 index 00000000..7be457e2 --- /dev/null +++ b/test/mailers/previews/order_mailer_preview.rb @@ -0,0 +1,4 @@ +# Preview all emails at http://localhost:3000/rails/mailers/order_mailer +class OrderMailerPreview < ActionMailer::Preview + +end diff --git a/test/models/cart_item_test.rb b/test/models/cart_item_test.rb new file mode 100644 index 00000000..881afe1f --- /dev/null +++ b/test/models/cart_item_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CartItemTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/cart_test.rb b/test/models/cart_test.rb new file mode 100644 index 00000000..9fad43a1 --- /dev/null +++ b/test/models/cart_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CartTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/order_info_test.rb b/test/models/order_info_test.rb new file mode 100644 index 00000000..e2689117 --- /dev/null +++ b/test/models/order_info_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class OrderInfoTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/order_items_test.rb b/test/models/order_items_test.rb new file mode 100644 index 00000000..d3b5302c --- /dev/null +++ b/test/models/order_items_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class OrderItemsTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/order_test.rb b/test/models/order_test.rb new file mode 100644 index 00000000..15b8ed13 --- /dev/null +++ b/test/models/order_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class OrderTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/photo_test.rb b/test/models/photo_test.rb new file mode 100644 index 00000000..e2ec03a1 --- /dev/null +++ b/test/models/photo_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PhotoTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/product_test.rb b/test/models/product_test.rb new file mode 100644 index 00000000..211cdd0b --- /dev/null +++ b/test/models/product_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class ProductTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/user_test.rb b/test/models/user_test.rb new file mode 100644 index 00000000..82f61e01 --- /dev/null +++ b/test/models/user_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class UserTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end