Code

Qiniu#2597

Code

Open

cpbabyblue wants to merge 44 commits intoquanzhanying:masterquanzhanying/jdstore:masterfrom cpbabyblue:qiniucpbabyblue/jdstore:qiniuCopy head branch name to clipboard

+2,829-102

Commits

Commits on Nov 15, 2017

• add bootstrap to project

  cpbabyblue

  committed
  3e39a37

  Copy full SHA for 3e39a37

Commits on Nov 16, 2017

• add the welcome page

  cpbabyblue

  committed
  07f973c

  Copy full SHA for 07f973c

• add devise

  cpbabyblue

  committed
  87af5db

  Copy full SHA for 87af5db

Commits on Nov 22, 2017

• only admin can access backend panel

  cpbabyblue

  committed
  9cc2fc8

  Copy full SHA for 9cc2fc8

Commits on Nov 23, 2017

• add bootstrap flash function

  cpbabyblue

  committed
  a6629ca

  Copy full SHA for a6629ca

• install font-awesome-rails

  cpbabyblue

  committed
  b0b2d78

  Copy full SHA for b0b2d78

• implement backend CRUD

  cpbabyblue

  committed
  7dc9488

  Copy full SHA for 7dc9488

• only admin can access backend panel

  cpbabyblue

  committed
  e1f4cfc

  Copy full SHA for e1f4cfc

Commits on Nov 26, 2017

• implement image upload

  cpbabyblue

  committed
  a0ae366

  Copy full SHA for a0ae366

• implement product show

  cpbabyblue

  committed
  366c41b

  Copy full SHA for 366c41b

• change admin/product backend panel

  cpbabyblue

  committed
  5e948c8

  Copy full SHA for 5e948c8

• add add_to_cart button

  cpbabyblue

  committed
  ab0c240

  Copy full SHA for ab0c240

• implement add_product_to_cart function

  cpbabyblue

  committed
  eda1937

  Copy full SHA for eda1937

• implement current_cart function

  cpbabyblue

  committed
  62e0b4e

  Copy full SHA for 62e0b4e

Commits on Nov 27, 2017

• implement carts index function

  cpbabyblue

  committed
  5ef1f8e

  Copy full SHA for 5ef1f8e

• implement cart_total_price function

  cpbabyblue

  committed
  5dd0c99

  Copy full SHA for 5dd0c99

• emppty cart

  cpbabyblue

  committed
  1d7f1ea

  Copy full SHA for 1d7f1ea

• delete an item from cart

  cpbabyblue

  committed
  09ea113

  Copy full SHA for 09ea113

• change quantity in cart

  cpbabyblue

  committed
  96b3a76

  Copy full SHA for 96b3a76

• cannot add item with quantity 0

  cpbabyblue

  committed
  b398e9b

  Copy full SHA for b398e9b

• cannot change quantity which exceed stock

  cpbabyblue

  committed
  98424f8

  Copy full SHA for 98424f8

• cannot add same item in cart

  cpbabyblue

  committed
  d36ac90

  Copy full SHA for d36ac90

Commits on Nov 28, 2017

• add checkout routing

  cpbabyblue

  committed
  01deca4

  Copy full SHA for 01deca4

• add order model

  cpbabyblue

  committed
  4b33e2c

  Copy full SHA for 4b33e2c

• touch app/views/cart/checkout.html.erb

  cpbabyblue

  committed
  55e3a21

  Copy full SHA for 55e3a21

• add order controller

  cpbabyblue

  committed
  4939cc1

  Copy full SHA for 4939cc1

• add product_list model

  cpbabyblue

  committed
  cdc30c0

  Copy full SHA for cdc30c0

• add orders show function

  cpbabyblue

  committed
  2ce1cae

  Copy full SHA for 2ce1cae

• add token to order

  cpbabyblue

  committed
  eaded1b

  Copy full SHA for eaded1b

• add token to order

  cpbabyblue

  committed
  cb78f01

  Copy full SHA for cb78f01

• users can see their orders

  cpbabyblue

  committed
  edf98e8

  Copy full SHA for edf98e8

• add payment_method function

  cpbabyblue

  committed
  21efe33

  Copy full SHA for 21efe33

Commits on Nov 29, 2017

• add OrderMailer function

  cpbabyblue

  committed
  a445703

  Copy full SHA for a445703

• add aasm_state to order

  cpbabyblue

  committed
  7705798

  Copy full SHA for 7705798

• add admin/order

  cpbabyblue

  committed
  4f49524

  Copy full SHA for 4f49524

• implement admin/orders show function

  cpbabyblue

  committed
  c0ffec4

  Copy full SHA for c0ffec4

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

  cpbabyblue

  committed
  470eccd

  Copy full SHA for 470eccd

• add admin/orders/state_option button

  cpbabyblue

  committed
  2fd7397

  Copy full SHA for 2fd7397

• add apply_cancel function

  cpbabyblue

  committed
  ac1678a

  Copy full SHA for ac1678a

Commits on Nov 30, 2017

• add notify_cancel/ship function

  cpbabyblue

  committed
  a6adf82

  Copy full SHA for a6adf82

Commits on Dec 2, 2017

• config qiniu

  cpbabyblue

  committed
  4639de7

  Copy full SHA for 4639de7

• figaro

  cpbabyblue

  committed
  67ea7b6

  Copy full SHA for 67ea7b6

• move sqlite3 to dev group & add pg to production group

  cpbabyblue

  committed
  040712f

  Copy full SHA for 040712f

• sendcloud settings

  cpbabyblue

  committed
  d1bb5eb

  Copy full SHA for d1bb5eb