Code

OrderMailer#2616

Code

Open

Jayyyy1011 wants to merge 114 commits intoquanzhanying:masterquanzhanying/jdstore:masterfrom Jayyyy1011:masterJayyyy1011/jdstore:masterCopy head branch name to clipboard

+7,134-157

Commits

Commits on Dec 5, 2019

• geml update & specify the version of sqlite

  Jayyyy1011

  committed
  8865db8

• add bootstrap to project

  Jayyyy1011

  committed
  855e8af

• add bootstrap html

  Jayyyy1011

  committed
  dddab95

• add bootstrap flash function

  Jayyyy1011

  committed
  4e5f271

• correct the flash function

  Jayyyy1011

  committed
  3036a3e

• user can login/logout/signup

  Jayyyy1011

  committed
  e2e183f

• install simpleform with bootstrap

  Jayyyy1011

  committed
  b869f2a

• install font-awesome-rails

  Jayyyy1011

  committed
  9a46ace

• first hw

  Jayyyy1011

  committed
  8dc6830

Commits on Dec 9, 2019

• implement backend CRUD

  Jayyyy1011

  committed
  c1eaec6

• only admin can access backend panel

  Jayyyy1011

  committed
  2fc41d5

• implement image upload

  Jayyyy1011

  committed
  f511018

• implement product show

  Jayyyy1011

  committed
  925918d

• correct update function

  Jayyyy1011

  committed
  59376c7

Commits on Dec 10, 2019

• implement add_product_to_cart function

  Jayyyy1011

  committed
  bf15f73

• implement current_cart function

  Jayyyy1011

  committed
  3251f2c

• implement carts index function

  Jayyyy1011

  committed
  d87fdb7

• implement cart_total_price function

  Jayyyy1011

  committed
  c58364b

Commits on Dec 14, 2019

• first week

  Jayyyy1011

  committed
  f38fda3

• add clear all cart_itemss btn

  Jayyyy1011

  committed
  f960435

• clear all carts_items

  Jayyyy1011

  committed
  d0ac357

• pull request HW

  Jayyyy1011

  committed
  b0ed28b

• correct REAME

  Jayyyy1011

  committed
  6ae1fe6

• delete an titem form cart

  Jayyyy1011

  committed
  d6db48f

• modify READMEE

  Jayyyy1011

  committed
  1e00607

• cannt add same item in cart

  Jayyyy1011

  committed
  c3fccb1

• modify README

  Jayyyy1011

  committed
  122390c

• change quaantity in cart

  Jayyyy1011

  committed
  63df1d9

• modify README

  Jayyyy1011

  committed
  d778af3

• caant add product with quantity 0

  Jayyyy1011

  committed
  a3d6863

• moodify README

  Jayyyy1011

  committed
  abc11eb

Commits on Dec 16, 2019

• add checkout routing

  Jayyyy1011

  committed
  f13f4c1

• add order model

  Jayyyy1011

  committed
  cd2e588

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

  Jayyyy1011

  committed
  7cf8ff5

• add order controller

  Jayyyy1011

  committed
  795baeb

• add order controller

  Jayyyy1011

  committed
  d6f3934

• modify README

  Jayyyy1011

  committed
  85cb792

Commits on Dec 17, 2019

• add prodcuct_list model

  Jayyyy1011

  committed
  fd17b59

• add orders show function

  Jayyyy1011

  committed
  d430224

• correct product_lists migration

  Jayyyy1011

  committed
  c817a14

• add token to order

  Jayyyy1011

  committed
  5ad1703

• users can see their orders

  Jayyyy1011

  committed
  b1bd2ee

Commits on Dec 19, 2019

• add payment_method function

  Jayyyy1011

  committed
  8943906

• add OrderMailer function

  Jayyyy1011

  committed
  72285ed

Commits on Dec 21, 2019

• add aasm_state to order

  Jayyyy1011

  committed
  daf0c3c

• add admin/orders

  Jayyyy1011

  committed
  fa82a82

• implement admin/orders show function

  Jayyyy1011

  committed
  7977409

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

  Jayyyy1011

  committed
  f07dcf6

• add apply_cancel function

  Jayyyy1011

  committed
  d33eae6

• add notify_cancel/ship function

  Jayyyy1011

  committed
  b7369a5

• install figaro

  Jayyyy1011

  committed
  e8e2220

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

  Jayyyy1011

  committed
  346c5ea

• install postmark-raiils

  Jayyyy1011

  committed
  2e7fff6

Commits on Dec 29, 2019

• generate devise view

  Jayyyy1011

  committed
  71a8611

• generate account/setting&favlist page

  Jayyyy1011

  committed
  e0ec37b

• add carousel & thumbnails to products index

  Jayyyy1011

  committed
  e6028d3

• implement products pagination with will_paginate

  Jayyyy1011

  committed
  408c12a

• use bootstrap component to decorate website

  Jayyyy1011

  committed
  af8c3ee

Commits on Dec 30, 2019

• modify navbar & welcome_index & footer

  Jayyyy1011

  committed
  097ea9d

• footer always on the bottom

  Jayyyy1011

  committed
  cf74e5a

• add logo and favicon

  Jayyyy1011

  committed
  f4d97a2

• decorate Navbar & welcome & signup/login page

  Jayyyy1011

  committed
  fa77d85

Commits on Jan 5, 2020

• generate category model and add column to products

  Jayyyy1011

  committed
  baf681f

• install ancestry gem to manage product category

  Jayyyy1011

  committed
  c25f059

• add ancestry to category & build the relationship between category and product & install rails-erd

  Jayyyy1011

  committed
  86a5f08

• create rrandom uuid before products are created

  Jayyyy1011

  committed
  07504e8

• separate ufront/back platform

  Jayyyy1011

  committed
  735270c

• finish proodcut categorization function

  Jayyyy1011

  committed
  f9c87cf

• upgrade prodduct management:add some column & merge new and edit page

  Jayyyy1011

  committed
  2633ea2

• category page development stage1

  Jayyyy1011

  committed
  9197a9a

• category page development stage2

  Jayyyy1011

  committed
  8e5b327

Commits on Jan 7, 2020

• add search function

  Jayyyy1011

  committed
  09f57a6

• add modal & static pages

  Jayyyy1011

  committed
  80f9b6a

Commits on Jan 8, 2020

• product vote function

  Jayyyy1011

  committed
  e5c369d

• product review function

  Jayyyy1011

  committed
  2290cae

• personal setting and default shipping address

  Jayyyy1011

  committed
  d5be043

• product social share but

  Jayyyy1011

  committed
  8feb7c5

• add plus/minus btn to carts

  Jayyyy1011

  committed
  8d3b3b0

• beautify carts page

  Jayyyy1011

  committed
  7bbe711

• product favorite function

  Jayyyy1011

  committed
  a4146e7

• beautify navbar, footer, product.index

  Jayyyy1011

  committed
  bc0fd43

• beautify service page

  Jayyyy1011

  committed
  c0da733

• beautify about page

  Jayyyy1011

  committed
  f56e317

Commits on Jan 9, 2020

• fix some bugs

  Jayyyy1011

  committed
  837dcb8

• fix several bugs

  Jayyyy1011

  committed
  fe4edea

• beautify admin page

  Jayyyy1011

  committed
  5836c9c

Commits on Jan 12, 2020

• install paperclip & paperclip-cloudinary & figaro

  Jayyyy1011

  committed
  8ed5d62

• upload pic to cloudinary

  Jayyyy1011

  committed
  208df72

• mailgun setting

  Jayyyy1011

  committed
  fc97d49

• beautify checkout page

  Jayyyy1011

  committed
  ce6d725

• update heroku app address

  Jayyyy1011

  committed
  cbd9be5

• modify cart page

  Jayyyy1011

  committed
  5f6282d

• cloudinary adds-on heroku

  Jayyyy1011

  committed
  342c443

Commits on Jan 14, 2020

• rollback migration

  Jayyyy1011

  committed
  f420b66

• modify cart page

  Jayyyy1011

  committed
  436366d

• fix apply_to_cancel

  Jayyyy1011

  committed
  2209492

• delete help_page background pic

  Jayyyy1011

  committed
  115d117

Commits on Jan 17, 2020

• rake erd

  Jayyyy1011

  committed
  7800dec

• seeds

  Jayyyy1011

  committed
  07c6242

• seeds

  Jayyyy1011

  committed
  ab9d3d7

Commits on Jan 18, 2020

• delete navbar white border & beautify about_page layout

  Jayyyy1011

  committed
  a8af479

• change product.index ad image

  Jayyyy1011

  committed
  3b85160

• add image to help page

  Jayyyy1011

  committed
  3bfe8f2

• reconnect new cloudinary and heroku app

  Jayyyy1011

  committed
  52c767b

• fix migration - add name to user twice

  Jayyyy1011

  committed
  03a7a02

• delete product.show parent category

  Jayyyy1011

  committed
  69ef11f

• modify text on product.show

  Jayyyy1011

  committed
  1f97aa5

• fix unfavorite function & user can unfavorite on MyFavorite page

  Jayyyy1011

  committed
  8a30772

• simplify code of favorite function on product.show page

  Jayyyy1011

  committed
  79cac5e

• align code in favorite_index

  Jayyyy1011

  committed
  8af1190

Commits on Jan 19, 2020

• cant place order if cart has no products

  Jayyyy1011

  committed
  a5299e9

• thumb up/down on product.show

  Jayyyy1011

  committed
  2f87969

• clean routes

  Jayyyy1011

  committed
  8e9756f

Commits on Feb 3, 2020

• beautify code in devise.new

  Jayyyy1011

  committed
  a15904b