Code

Image url for products#50

Code

Open

OlgaSe wants to merge 108 commits intoAda-C14:masterAda-C14/betsy:masterfrom TaylorMililani:Image_url_for_productsTaylorMililani/betsy:Image_url_for_productsCopy head branch name to clipboard

+11,323

Commits

Commits on Nov 16, 2020

• Initail Rails setup

  TaylorMililani

  committed
  e570656

  Copy full SHA for e570656

• ERD.drawio

  nerdyistrendy

  committed
  40feefd

  Copy full SHA for 40feefd

Commits on Nov 17, 2020

• draft.drawio

  nerdyistrendy

  committed
  633318d

  Copy full SHA for 633318d

• seed file

  TaylorMililani

  committed
  4c5e447

  Copy full SHA for 4c5e447

• Merge branch 'master' of https://github.com/TaylorMililani/betsy into master

  Show description for 2110b92
  TaylorMililani

  committed
  2110b92

  Copy full SHA for 2110b92

• seeds csv

  nerdyistrendy

  committed
  3ffafe8

  Copy full SHA for 3ffafe8

• added seeds csv and edited seeds.rb

  nerdyistrendy

  committed
  fee373d

  Copy full SHA for fee373d

• created merchant controller and model

  indiakato

  committed
  f6f7f1c

  Copy full SHA for f6f7f1c

• Created a product model

  OlgaSe

  committed
  0a26b7e

  Copy full SHA for 0a26b7e

• review controller + model

  TaylorMililani

  committed
  8ae6d6d

  Copy full SHA for 8ae6d6d

• generated order controller and model

  nerdyistrendy

  committed
  fd98bde

  Copy full SHA for fd98bde

• added .idea too .gitignore file

  OlgaSe

  committed
  74175c9

  Copy full SHA for 74175c9

• Merge branch 'master' into MerchantController

  indiakato

  authored
  e54d848

  Copy full SHA for e54d848

• Merge pull request #1 from TaylorMililani/MerchantController

  Show description for acb4849
  indiakato

  authored
  acb4849

  Copy full SHA for acb4849

• outlined tests for review

  TaylorMililani

  committed
  1fb61f7

  Copy full SHA for 1fb61f7

• Merge pull request #2 from TaylorMililani/review

  Show description for eafff02
  TaylorMililani

  authored
  eafff02

  Copy full SHA for eafff02

Commits on Nov 18, 2020

• Pull and merge

  OlgaSe

  committed
  bb09dc3

  Copy full SHA for bb09dc3

• updated order schema

  nerdyistrendy

  committed
  dffc6b8

  Copy full SHA for dffc6b8

• Remove .idea from the repository

  OlgaSe

  committed
  b42d5ad

  Copy full SHA for b42d5ad

• update order schema

  nerdyistrendy

  committed
  be16239

  Copy full SHA for be16239

• updated seeds.rb

  nerdyistrendy

  committed
  528ca51

  Copy full SHA for 528ca51

• added routes for orders

  nerdyistrendy

  committed
  686cf4e

  Copy full SHA for 686cf4e

• changed order columns and model validations for the columns

  nerdyistrendy

  committed
  40d75f0

  Copy full SHA for 40d75f0

• created form template

  nerdyistrendy

  committed
  d8d85c6

  Copy full SHA for d8d85c6

• updated form template and schema

  nerdyistrendy

  committed
  d0617e2

  Copy full SHA for d0617e2

• added basic view pages

  nerdyistrendy

  committed
  560fa43

  Copy full SHA for 560fa43

• added presence validation and credit card validation

  nerdyistrendy

  committed
  e3fa133

  Copy full SHA for e3fa133

• added default status

  nerdyistrendy

  committed
  04f2f07

  Copy full SHA for 04f2f07

• schema changed

  indiakato

  committed
  7e6327a

  Copy full SHA for 7e6327a

• renamed merchant controller and model to user

  indiakato

  committed
  96f3e3f

  Copy full SHA for 96f3e3f

• changed seed file from merchants to users

  indiakato

  committed
  bf72a48

  Copy full SHA for bf72a48

• Merge pull request #3 from TaylorMililani/MerchantController

  Show description for 2131aa8
  indiakato

  authored
  2131aa8

  Copy full SHA for 2131aa8

• added added github_login route, created omniauth initializer

  indiakato

  committed
  7f0d39c

  Copy full SHA for 7f0d39c

Commits on Nov 19, 2020

• commit to pull

  OlgaSe

  committed
  a028c69

  Copy full SHA for a028c69

• Merge branch 'master' of https://github.com/TaylorMililani/betsy

  Show description for d6fca3e
  OlgaSe

  committed
  d6fca3e

  Copy full SHA for d6fca3e

• added login through github feature

  indiakato

  committed
  df2630d

  Copy full SHA for df2630d

• added logout feature

  indiakato

  committed
  63cdba5

  Copy full SHA for 63cdba5

• edited order validations to allow more zip code format

  nerdyistrendy

  committed
  08c8e5e

  Copy full SHA for 08c8e5e

• generated category controller and added :new route

  nerdyistrendy

  committed
  4579ac1

  Copy full SHA for 4579ac1

• added category :show and :index route

  nerdyistrendy

  committed
  71d9eaf

  Copy full SHA for 71d9eaf

• Added views for product model, homepage and updated routes

  OlgaSe

  committed
  88f1d58

  Copy full SHA for 88f1d58

• created join table

  nerdyistrendy

  committed
  4016be1

  Copy full SHA for 4016be1

• removed category column

  nerdyistrendy

  committed
  3ae4ddf

  Copy full SHA for 3ae4ddf

• Orderitem controller and model

  TaylorMililani

  committed
  76a2288

  Copy full SHA for 76a2288

• Merge branch 'orderitem' into master

  Show description for 9f49782
  TaylorMililani

  committed
  9f49782

  Copy full SHA for 9f49782

• fixed merge conflicts

  TaylorMililani

  committed
  8fe16ab

  Copy full SHA for 8fe16ab

• joined category and products and added view pages for new, index, show

  nerdyistrendy

  committed
  5a26e92

  Copy full SHA for 5a26e92

• Merge branch 'category'

  Show description for c643dad
  nerdyistrendy

  committed
  c643dad

  Copy full SHA for c643dad

• edited links in appication html

  nerdyistrendy

  committed
  c5fd5c0

  Copy full SHA for c5fd5c0

• added seeds file to connect product/category. edited product category links

  nerdyistrendy

  committed
  b813356

  Copy full SHA for b813356

• updated categories to ul

  nerdyistrendy

  committed
  7ce01f9

  Copy full SHA for 7ce01f9

• Merge branch 'master' into user-oauth

  indiakato

  authored
  6557c2d

  Copy full SHA for 6557c2d

• Merge pull request #5 from TaylorMililani/user-oauth

  Show description for ffba14c
  indiakato

  authored
  ffba14c

  Copy full SHA for ffba14c

• added username to users schema

  indiakato

  committed
  b6aea63

  Copy full SHA for b6aea63

• added index and show action

  indiakato

  committed
  ff0c018

  Copy full SHA for ff0c018

• Merge pull request #6 from TaylorMililani/user-views

  Show description for c90d7d9
  indiakato

  authored
  c90d7d9

  Copy full SHA for c90d7d9

• commented out order create validations

  nerdyistrendy

  committed
  b73125c

  Copy full SHA for b73125c

• related orderitem to product and order

  TaylorMililani

  committed
  ed2c3d3

  Copy full SHA for ed2c3d3

• Merge branch 'master' into taylor

  TaylorMililani

  authored
  deef43b

  Copy full SHA for deef43b

• Merge pull request #7 from TaylorMililani/taylor

  Show description for 4858b5d
  TaylorMililani

  authored
  4858b5d

  Copy full SHA for 4858b5d

Commits on Nov 20, 2020

• order validations only upon update

  nerdyistrendy

  committed
  b77fd8c

  Copy full SHA for b77fd8c

• login

  indiakato

  committed
  f1baa70

  Copy full SHA for f1baa70

• added flash view

  nerdyistrendy

  committed
  028a2b4

  Copy full SHA for 028a2b4

• added flash view

  nerdyistrendy

  committed
  ca90439

  Copy full SHA for ca90439

• changed session view page

  nerdyistrendy

  committed
  d8a7a9e

  Copy full SHA for d8a7a9e

• new.return user

  nerdyistrendy

  committed
  8803822

  Copy full SHA for 8803822

• shopping cart functionality

  TaylorMililani

  committed
  f6b0111

  Copy full SHA for f6b0111

• fixed merge conflicts

  TaylorMililani

  committed
  293c751

  Copy full SHA for 293c751

• Added relation product-user, fixed seeds, created migration, dropdown category's list in edit/create view

  OlgaSe

  committed
  562df33

  Copy full SHA for 562df33

• Pull and merged

  OlgaSe

  committed
  ebb1fdc

  Copy full SHA for ebb1fdc

• commented out @order_item.order_id = @new_order.id

  nerdyistrendy

  committed
  7de7ac6

  Copy full SHA for 7de7ac6

• Merge branch 'master' of https://github.com/TaylorMililani/betsy

  Show description for 91e1e09
  nerdyistrendy

  committed
  91e1e09

  Copy full SHA for 91e1e09

• Merge pull request #8 from TaylorMililani/login_logout_user

  Show description for 19267aa
  indiakato

  authored
  19267aa

  Copy full SHA for 19267aa

• Merge branch 'master' of https://github.com/TaylorMililani/betsy

  Show description for e2f81de
  nerdyistrendy

  committed
  e2f81de

  Copy full SHA for e2f81de

• Added quantity to the product page

  OlgaSe

  committed
  2a8b616

  Copy full SHA for 2a8b616

Commits on Nov 21, 2020

• updated checkout to patch order, changed status to paid and details in show page.

  nerdyistrendy

  committed
  df9dd4b

  Copy full SHA for df9dd4b

• do not allow change order after paid

  nerdyistrendy

  committed
  4df0c0d

  Copy full SHA for 4df0c0d

• clear shopping cart after purchase

  nerdyistrendy

  committed
  a1546c6

  Copy full SHA for a1546c6

• create new session after purchase

  nerdyistrendy

  committed
  d749bf1

  Copy full SHA for d749bf1

• User's shopping cart will reflect the current available stock if some items are out-of-stock when checking out

  nerdyistrendy

  committed
  287790b

  Copy full SHA for 287790b

• shopping cart view

  TaylorMililani

  committed
  6c6f097

  Copy full SHA for 6c6f097

• Merge branch 'master' of https://github.com/TaylorMililani/betsy into master

  Show description for cf85297
  TaylorMililani

  committed
  cf85297

  Copy full SHA for cf85297

• Validation to the product and tests for validation

  OlgaSe

  committed
  7d846a3

  Copy full SHA for 7d846a3

• Added 1 test for numerical validation

  OlgaSe

  committed
  3cc5fef

  Copy full SHA for 3cc5fef

• orderitem index action fixed

  TaylorMililani

  committed
  6054daa

  Copy full SHA for 6054daa

• Merge pull request #10 from TaylorMililani/product_quantities

  Show description for a2a3722
  OlgaSe

  authored
  a2a3722

  Copy full SHA for a2a3722

• cart show page

  TaylorMililani

  committed
  d605319

  Copy full SHA for d605319

• added shopping cart link to nav

  TaylorMililani

  committed
  cbfcbe3

  Copy full SHA for cbfcbe3

• cart view

  TaylorMililani

  committed
  b2c4e6e

  Copy full SHA for b2c4e6e

• Merge branch 'master' into tmt-betsy

  TaylorMililani

  authored
  59db34f

  Copy full SHA for 59db34f

• Merge pull request #11 from TaylorMililani/tmt-betsy

  Show description for 961bac7
  TaylorMililani

  authored
  961bac7

  Copy full SHA for 961bac7

Commits on Nov 22, 2020

• Fixed order_items attribute for quantity, fixed issue for destroy action in products

  OlgaSe

  committed
  eb0c370

  Copy full SHA for eb0c370

• Added product authorization (only logged in user allowed to edit, update delete product)

  OlgaSe

  committed
  62ead24

  Copy full SHA for 62ead24

• added comment

  OlgaSe

  committed
  a4b3062

  Copy full SHA for a4b3062

• working on shopping cart

  TaylorMililani

  committed
  bd8353c

  Copy full SHA for bd8353c

• Merge pull request #13 from TaylorMililani/tmt-cart

  Show description for 54abd80
  TaylorMililani

  authored
  54abd80

  Copy full SHA for 54abd80

• added order confirmation page!

  nerdyistrendy

  committed
  14b34e9

  Copy full SHA for 14b34e9

• Merge branch 'master' into product_authorization_rules

  OlgaSe

  authored
  b4c0c2f

  Copy full SHA for b4c0c2f

• Merge pull request #12 from TaylorMililani/product_authorization_rules

  Show description for 1686fa1
  OlgaSe

  authored
  1686fa1

  Copy full SHA for 1686fa1

• added order confirmation page!

  nerdyistrendy

  committed
  d8fa39d

  Copy full SHA for d8fa39d

• added order confirmation page!

  nerdyistrendy

  committed
  9f61184

  Copy full SHA for 9f61184

• Merge branch 'master' of https://github.com/TaylorMililani/betsy

  Show description for 8d6b1e0
  nerdyistrendy

  committed
  8d6b1e0

  Copy full SHA for 8d6b1e0

• deleted category column

  nerdyistrendy

  committed
  2ed8e48

  Copy full SHA for 2ed8e48

• added checkout button

  nerdyistrendy

  committed
  d9251ee

  Copy full SHA for d9251ee

• fixed remove path

  nerdyistrendy

  committed
  6f039d9

  Copy full SHA for 6f039d9

• Fixed update action for quantity of products

  OlgaSe

  committed
  c3b32d5

  Copy full SHA for c3b32d5

Commits on Nov 23, 2020

• photo of the product can be uploaded and edited

  OlgaSe

  committed
  319b17b

  Copy full SHA for 319b17b

• photo of the product can be uploaded and edited

  OlgaSe

  committed
  e25bf45

  Copy full SHA for e25bf45