Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qiniu #2597

Open
wants to merge 44 commits into
base: master
Choose a base branch
from
Open

Qiniu #2597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
3e39a37
add bootstrap to project
cpbabyblue Nov 15, 2017
07f973c
add the welcome page
cpbabyblue Nov 16, 2017
87af5db
add devise
cpbabyblue Nov 16, 2017
9cc2fc8
only admin can access backend panel
cpbabyblue Nov 22, 2017
a6629ca
add bootstrap flash function
cpbabyblue Nov 23, 2017
b0b2d78
install font-awesome-rails
cpbabyblue Nov 23, 2017
7dc9488
implement backend CRUD
cpbabyblue Nov 23, 2017
e1f4cfc
only admin can access backend panel
cpbabyblue Nov 23, 2017
a0ae366
implement image upload
cpbabyblue Nov 26, 2017
366c41b
implement product show
cpbabyblue Nov 26, 2017
5e948c8
change admin/product backend panel
cpbabyblue Nov 26, 2017
ab0c240
add add_to_cart button
cpbabyblue Nov 26, 2017
eda1937
implement add_product_to_cart function
cpbabyblue Nov 26, 2017
62e0b4e
implement current_cart function
cpbabyblue Nov 26, 2017
5ef1f8e
implement carts index function
cpbabyblue Nov 27, 2017
5dd0c99
implement cart_total_price function
cpbabyblue Nov 27, 2017
1d7f1ea
emppty cart
cpbabyblue Nov 27, 2017
09ea113
delete an item from cart
cpbabyblue Nov 27, 2017
96b3a76
change quantity in cart
cpbabyblue Nov 27, 2017
b398e9b
cannot add item with quantity 0
cpbabyblue Nov 27, 2017
98424f8
cannot change quantity which exceed stock
cpbabyblue Nov 27, 2017
d36ac90
cannot add same item in cart
cpbabyblue Nov 27, 2017
01deca4
add checkout routing
cpbabyblue Nov 28, 2017
4b33e2c
add order model
cpbabyblue Nov 28, 2017
55e3a21
touch app/views/cart/checkout.html.erb
cpbabyblue Nov 28, 2017
4939cc1
add order controller
cpbabyblue Nov 28, 2017
cdc30c0
add product_list model
cpbabyblue Nov 28, 2017
2ce1cae
add orders show function
cpbabyblue Nov 28, 2017
eaded1b
add token to order
cpbabyblue Nov 28, 2017
cb78f01
add token to order
cpbabyblue Nov 28, 2017
edf98e8
users can see their orders
cpbabyblue Nov 28, 2017
21efe33
add payment_method function
cpbabyblue Nov 28, 2017
a445703
add OrderMailer function
cpbabyblue Nov 29, 2017
7705798
add aasm_state to order
cpbabyblue Nov 29, 2017
4f49524
add admin/order
cpbabyblue Nov 29, 2017
c0ffec4
implement admin/orders show function
cpbabyblue Nov 29, 2017
470eccd
add ship/shippied/cancel/return action to admin/orders_controller
cpbabyblue Nov 29, 2017
2fd7397
add admin/orders/state_option button
cpbabyblue Nov 29, 2017
ac1678a
add apply_cancel function
cpbabyblue Nov 29, 2017
a6adf82
add notify_cancel/ship function
cpbabyblue Nov 30, 2017
4639de7
config qiniu
cpbabyblue Dec 2, 2017
67ea7b6
figaro
cpbabyblue Dec 2, 2017
040712f
move sqlite3 to dev group & add pg to production group
cpbabyblue Dec 2, 2017
d1bb5eb
sendcloud settings
cpbabyblue Dec 2, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,7 @@
# Ignore Byebug command history file.
.byebug_history
config/database.yml
public/uploads

# Ignore application configuration
/config/application.yml
23 changes: 19 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.0.0'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'

# Use Puma as the app server
gem 'puma', '~> 3.0'
# Use SCSS for stylesheets
Expand All @@ -29,20 +29,35 @@ gem 'jbuilder', '~> 2.5'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

gem 'bootstrap-sass'
gem 'devise'
gem 'simple_form'
gem 'font-awesome-rails'
gem 'carrierwave'
gem 'mini_magick'
gem 'letter_opener', group: :development
gem 'aasm'
gem 'carrierwave-qiniu'
gem 'qiniu-rs'
gem 'figaro'
group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platform: :mri
gem 'sqlite3'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console'
gem 'listen', '~> 3.0.5'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
# gem 'spring'
# gem 'spring-watcher-listen', '~> 2.0.0'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

group :production do
gem 'pg'
end
Loading