Code

Aws#2592

Code

Open

gaomingzhen wants to merge 35 commits intoquanzhanying:masterquanzhanying/jdstore:masterfrom gaomingzhen:awsgaomingzhen/jdstore:awsCopy head branch name to clipboard

+2,858-6

Commits

Commits on Oct 25, 2017

• 穿衣服

  gaomingzhen

  committed
  45906cb

Commits on Oct 28, 2017

• admin/product CRUD

  gaomingzhen

  committed
  6616a67

• only admin can access backend panel

  gaomingzhen

  committed
  fceabd8

• implement image upload

  gaomingzhen

  committed
  066a55d

• implement product show

  gaomingzhen

  committed
  bd6e6eb

• decorate admin/product backend panel

  gaomingzhen

  committed
  bf4286f

Commits on Oct 30, 2017

• implement add_product_to_cart function

  gaomingzhen

  committed
  540d143

• implement current_cart function

  gaomingzhen

  committed
  51f14fb

• implement carts index function

  gaomingzhen

  committed
  8867162

• implement cart_total_price function

  gaomingzhen

  committed
  a55d16c

Commits on Oct 31, 2017

• empty cart

  gaomingzhen

  committed
  1dcaeca

• delete an item from cart

  gaomingzhen

  committed
  f722fb0

Commits on Nov 3, 2017

• cannot add same item in cart

  gaomingzhen

  committed
  142a0cb

• change quantity in cart

  gaomingzhen

  committed
  0920022

• cannot add item with quantity

  gaomingzhen

  committed
  0495a3c

• cannot change quantity which exceed stock

  gaomingzhen

  committed
  246e94d

• add checkout routing

  gaomingzhen

  committed
  72a4bbf

• add order model

  gaomingzhen

  committed
  155f1a6

• touch checkout html

  gaomingzhen

  committed
  0fcc522

• add order controller

  gaomingzhen

  committed
  dbfa6f1

Commits on Nov 4, 2017

• add product_list model

  gaomingzhen

  committed
  408fc94

• add orders show function

  gaomingzhen

  committed
  f082d1b

• add token to order

  gaomingzhen

  committed
  baea514

Commits on Nov 5, 2017

• users can see their orders

  gaomingzhen

  committed
  b59e4fa

• add payment_method function

  gaomingzhen

  committed
  23aaf8f

• add OrderMailer function

  gaomingzhen

  committed
  bdcc572

• add aasm_state to order

  gaomingzhen

  committed
  335671c

• implement admin/orders show function

  gaomingzhen

  committed
  afc071b

• add ship/shipped/cancel/return action to admin/orders_controller

  gaomingzhen

  committed
  8890c3f

• add admin/orders/state_option button

  gaomingzhen

  committed
  5e0ca8b

• add apply_cancel function

  gaomingzhen

  committed
  22db663

• add notify_cancel/ship function

  gaomingzhen

  committed
  59c8570

Commits on Nov 8, 2017

• figaro

  gaomingzhen

  committed
  165b4af

Commits on Nov 11, 2017

• install fog

  gaomingzhen

  committed
  afde246

• ready for heroku

  gaomingzhen

  committed
  a414a78