Code

Mvl update orderitem#23

Code

Open

mvlofthus wants to merge 63 commits intoAda-C14:masterAda-C14/betsy:masterfrom scottzec:mvl-update-orderitemscottzec/betsy:mvl-update-orderitemCopy head branch name to clipboard

+11,626

Commits

Commits on Nov 16, 2020

• Initial Rails setup

  scottzec

  committed
  8eb5248

  Copy full SHA for 8eb5248

Commits on Nov 18, 2020

• Set up models and controllers, updated routes, added seed file

  roshni-patel

  committed
  5342980

  Copy full SHA for 5342980

• created CRUD except delete, not sure needed, some notes included on open topics

  scottzec

  committed
  1ad8efb

  Copy full SHA for 1ad8efb

• set up oauth and login method for merchant

  ghostfruitleaf

  committed
  43e5efb

  Copy full SHA for 43e5efb

• added logout function

  ghostfruitleaf

  committed
  6ceaa6e

  Copy full SHA for 6ceaa6e

• added show and index functions, still need edit/update and require login controller filter

  ghostfruitleaf

  committed
  bcfe9d0

  Copy full SHA for bcfe9d0

• empty method for remaining functions made, still need require login controller filter

  ghostfruitleaf

  committed
  fa4f5b2

  Copy full SHA for fa4f5b2

• Starting to work on orders controller

  roshni-patel

  committed
  5849047

  Copy full SHA for 5849047

• created orderitem_controler, created CRUD actions for orderitem, added flash to application view so messages would show

  mvlofthus

  committed
  d601b4c

  Copy full SHA for d601b4c

• fixed a few typos

  mvlofthus

  committed
  72097fb

  Copy full SHA for 72097fb

• added require login controller filter and edit/update and dashboard functions

  ghostfruitleaf

  committed
  5e706bc

  Copy full SHA for 5e706bc

• created views to test merchant controller functions

  ghostfruitleaf

  committed
  e29d8e4

  Copy full SHA for e29d8e4

• moved merchant view to correct directory

  ghostfruitleaf

  committed
  3da6ccf

  Copy full SHA for 3da6ccf

Commits on Nov 19, 2020

• some views and tests for functions that don't require login

  ghostfruitleaf

  committed
  4174001

  Copy full SHA for 4174001

• Updated some methods, unclear on a few things

  roshni-patel

  committed
  af3fe8b

  Copy full SHA for af3fe8b

• minor edit to initializer to add two options for when oauth is implemented

  ghostfruitleaf

  committed
  dd4d3e5

  Copy full SHA for dd4d3e5

• Merge pull request #3 from scottzec/merchant-controller-and-tests

  Show description for d27b2c0
  ghostfruitleaf

  authored
  d27b2c0

  Copy full SHA for d27b2c0

• Merge pull request #4 from scottzec/orders_controller

  Show description for 3ae924b
  roshni-patel

  authored
  3ae924b

  Copy full SHA for 3ae924b

• changed error flash to warning flash

  ghostfruitleaf

  committed
  2f82e4f

  Copy full SHA for 2f82e4f

• changed routes and added nested orderitem to rproducts routes

  scottzec

  committed
  b73d654

  Copy full SHA for b73d654

• Merge pull request #2 from scottzec/mvl-order-item

  Show description for d25e9f7
  mvlofthus

  authored
  d25e9f7

  Copy full SHA for d25e9f7

• Merge pull request #1 from scottzec/product-crud

  Show description for 64bbda6
  scottzec

  authored
  64bbda6

  Copy full SHA for 64bbda6

• Merge branch 'master' of https://github.com/scottzec/betsy into merchant-model-and-tests

  ghostfruitleaf

  committed
  89eebdd

  Copy full SHA for 89eebdd

• added username validation

  ghostfruitleaf

  committed
  a15eb5c

  Copy full SHA for a15eb5c

• migration relate products to merchants

  scottzec

  committed
  0e799cc

  Copy full SHA for 0e799cc

• commented out pseudo code for merchant model

  ghostfruitleaf

  committed
  913d1e7

  Copy full SHA for 913d1e7

• Merge branch 'master' of https://github.com/scottzec/betsy into categories-and-reviews

  ghostfruitleaf

  committed
  be59ced

  Copy full SHA for be59ced

• default image added and show view added

  ghostfruitleaf

  committed
  511a2ad

  Copy full SHA for 511a2ad

• adding user specific functions to merchant views

  ghostfruitleaf

  committed
  e39c08b

  Copy full SHA for e39c08b

• refining view

  ghostfruitleaf

  committed
  d819deb

  Copy full SHA for d819deb

• new methods and blank view pages for categories

  ghostfruitleaf

  committed
  c63858b

  Copy full SHA for c63858b

• made form to create new category

  ghostfruitleaf

  committed
  77bdd31

  Copy full SHA for 77bdd31

• added navigation for categories, products, merchants, fixed categories#index view

  ghostfruitleaf

  committed
  758f3b6

  Copy full SHA for 758f3b6

• fixed category/product relations, working on show view for categories

  ghostfruitleaf

  committed
  b09db45

  Copy full SHA for b09db45

• added partial views

  ghostfruitleaf

  committed
  38d428f

  Copy full SHA for 38d428f

• added an end to products#update method

  ghostfruitleaf

  committed
  f532c28

  Copy full SHA for f532c28

• added an end to products#update method

  ghostfruitleaf

  committed
  b3dff89

  Copy full SHA for b3dff89

• added some document for oauth related testing

  ghostfruitleaf

  committed
  050945e

  Copy full SHA for 050945e

• show and index tests working for category

  ghostfruitleaf

  committed
  d79e25d

  Copy full SHA for d79e25d

• creating views for review and product (for testing purposes ONLY)

  ghostfruitleaf

  committed
  e4de150

  Copy full SHA for e4de150

• hipster styling of flash messages :D

  ghostfruitleaf

  committed
  2341152

  Copy full SHA for 2341152

• cleaning up some merchant views and getting working new view for reviews

  ghostfruitleaf

  committed
  25cd9c0

  Copy full SHA for 25cd9c0

• set up review controller tests

  ghostfruitleaf

  committed
  dc9ff28

  Copy full SHA for dc9ff28

• fixed product relations, added temp views to test categories and reviews, set up template for review tests

  ghostfruitleaf

  committed
  6483027

  Copy full SHA for 6483027

• destroy added

  scottzec

  committed
  b399b14

  Copy full SHA for b399b14

• add merchant to product create action

  scottzec

  committed
  2b1adbd

  Copy full SHA for 2b1adbd

• added products index view

  scottzec

  committed
  ef12132

  Copy full SHA for ef12132

• working out confusing bits with orderitem, corrected orderitem_controller to orderitems controller, show method works, starting tests

  mvlofthus

  committed
  75f8cdd

  Copy full SHA for 75f8cdd

• review controller tests working, need refactor for validations/oauth

  ghostfruitleaf

  committed
  10894b9

  Copy full SHA for 10894b9

• as far as I can get on orderitems solo

  mvlofthus

  committed
  a44a4d6

  Copy full SHA for a44a4d6

• just need to add create tests to categories and get login related tests for merchants

  ghostfruitleaf

  committed
  db91d94

  Copy full SHA for db91d94

• index view product

  scottzec

  committed
  056d07c

  Copy full SHA for 056d07c

• added create tests for category

  ghostfruitleaf

  committed
  14b2e37

  Copy full SHA for 14b2e37

Commits on Nov 20, 2020

• Updated routes, added order items and orders seed files, added some order model methods, still working on tests, adding some views

  roshni-patel

  committed
  8132b2c

  Copy full SHA for 8132b2c

• Merge branch 'master' into orders_controller

  roshni-patel

  authored
  cf165e1

  Copy full SHA for cf165e1

• Merge pull request #6 from scottzec/orders_controller

  Show description for cb09e1b
  roshni-patel

  authored
  cb09e1b

  Copy full SHA for cb09e1b

• Merge branch 'master' into mvl-orderitem-views-tests

  mvlofthus

  authored
  d2d4fe9

  Copy full SHA for d2d4fe9

• Merge pull request #8 from scottzec/mvl-orderitem-views-tests

  Show description for 3028e97
  mvlofthus

  authored
  3028e97

  Copy full SHA for 3028e97

• Merge pull request #7 from scottzec/products-controller-views

  Show description for 5b10d20
  scottzec

  authored
  5b10d20

  Copy full SHA for 5b10d20

• Merge branch 'master' into categories-reviews-and-merchant-views

  ghostfruitleaf

  authored
  d1dc0fe

  Copy full SHA for d1dc0fe

• Merge pull request #5 from scottzec/categories-reviews-and-merchant-views

  Show description for abb58ce
  ghostfruitleaf

  authored
  abb58ce

  Copy full SHA for abb58ce

• removed syntax error

  scottzec

  committed
  96b0f2e

  Copy full SHA for 96b0f2e

• added shipped/status column to orderitem

  mvlofthus

  committed
  cdb2221

  Copy full SHA for cdb2221