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.

Sign up for GitHub

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

Jump to bottom

Story5-完成购物网站 #2603

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

Story5-完成购物网站 #2603

wants to merge 39 commits into from

Commits on Mar 14, 2019

  1. add bootstrap to project

    @zhangyuwen12
    zhangyuwen12 committed Mar 14, 2019
    Configuration menu
    Copy the full SHA
    9d7f9ca View commit details
    Browse the repository at this point in the history

  2. add bootstrap html

    @zhangyuwen12
    zhangyuwen12 committed Mar 14, 2019
    Configuration menu
    Copy the full SHA
    019fcec View commit details
    Browse the repository at this point in the history

  3. add bootstrap flash function

    @zhangyuwen12
    zhangyuwen12 committed Mar 14, 2019
    Configuration menu
    Copy the full SHA
    968ae3e View commit details
    Browse the repository at this point in the history

  4. user can login/logout/signup

    @zhangyuwen12
    zhangyuwen12 committed Mar 14, 2019
    Configuration menu
    Copy the full SHA
    abc6f8b View commit details
    Browse the repository at this point in the history

  5. install simpleform with bootstrap

    @zhangyuwen12
    zhangyuwen12 committed Mar 14, 2019
    Configuration menu
    Copy the full SHA
    0bee2d8 View commit details
    Browse the repository at this point in the history

  6. install font-awesome-rails

    @zhangyuwen12
    zhangyuwen12 committed Mar 14, 2019
    Configuration menu
    Copy the full SHA
    d9ddb5f View commit details
    Browse the repository at this point in the history

  7. implement backend CRUD

    @zhangyuwen12
    zhangyuwen12 committed Mar 14, 2019
    Configuration menu
    Copy the full SHA
    e76f80a View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2019

  1. only admin can access backend panel

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    4f4cec1 View commit details
    Browse the repository at this point in the history

  2. implement image upload

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    2b11690 View commit details
    Browse the repository at this point in the history

  3. implement product show

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    85bb26c View commit details
    Browse the repository at this point in the history

  4. change admin/product backend panel

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    7ecfdb6 View commit details
    Browse the repository at this point in the history

  5. add add_to_cart button

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    4d28ab3 View commit details
    Browse the repository at this point in the history

  6. implement add_product_to_cart function

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    34aa17f View commit details
    Browse the repository at this point in the history

  7. implement current_cart function

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    4d92690 View commit details
    Browse the repository at this point in the history

  8. implement carts index function

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    0285203 View commit details
    Browse the repository at this point in the history

  9. implement cart_total_price function

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    2de55a6 View commit details
    Browse the repository at this point in the history

  10. empty cart

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    09c8984 View commit details
    Browse the repository at this point in the history

  11. delete an item from cart

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    7067234 View commit details
    Browse the repository at this point in the history

  12. cannot add same item in cart

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    9389e6f View commit details
    Browse the repository at this point in the history

  13. change quantity in cart

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    07176e2 View commit details
    Browse the repository at this point in the history

  14. cannot add item with quantity 0

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    e325815 View commit details
    Browse the repository at this point in the history

  15. cannot change quantity which exceed stock

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    1260215 View commit details
    Browse the repository at this point in the history

  16. add checkout routing

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    334e7e9 View commit details
    Browse the repository at this point in the history

  17. add order model

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    cbac94c View commit details
    Browse the repository at this point in the history

  18. touch app/views/carts/checkout.html.erb

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    407fee5 View commit details
    Browse the repository at this point in the history

  19. add order controller

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    7c4d1ff View commit details
    Browse the repository at this point in the history

  20. add product_list model

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    dbd263d View commit details
    Browse the repository at this point in the history

  21. add orders show function

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    b307a04 View commit details
    Browse the repository at this point in the history

  22. add token to order

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    d823c6c View commit details
    Browse the repository at this point in the history

  23. users can see their orders

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    07d0c89 View commit details
    Browse the repository at this point in the history

  24. add payment_method function

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    1172230 View commit details
    Browse the repository at this point in the history

  25. add OrderMailer function

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    2d2050d View commit details
    Browse the repository at this point in the history

  26. add admin/orders

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    c87baea View commit details
    Browse the repository at this point in the history

  27. implement admin/orders show function

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    f66f610 View commit details
    Browse the repository at this point in the history

  28. add ship/shipped/cancel/return action to admin/orders_controller

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    a06e061 View commit details
    Browse the repository at this point in the history

  29. add admin/orders/state_option button

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    0a4d918 View commit details
    Browse the repository at this point in the history

  30. add apply_cancel function

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    f7ae1f8 View commit details
    Browse the repository at this point in the history

  31. add notify_cancel/ship function

    @zhangyuwen12
    zhangyuwen12 committed Mar 15, 2019
    Configuration menu
    Copy the full SHA
    768ba08 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2019

  1. stroy5

    @zhangyuwen12
    zhangyuwen12 committed Mar 20, 2019
    Configuration menu
    Copy the full SHA
    38747b2 View commit details
    Browse the repository at this point in the history