Code

Planetsy: Kate, Nara, Niv, & Rosalyn#72

Code

Open

bonara wants to merge 170 commits intoAda-C11:masterAda-C11/betsy:masterfrom bonara:masterbonara/betsy:masterCopy head branch name to clipboard

+4,227

Commits

Commits on Apr 30, 2019

• Initial rails app

  bonara

  committed
  8f72aaf

  Copy full SHA for 8f72aaf

• Generated Products controller

  bonara

  committed
  f2de0a2

  Copy full SHA for f2de0a2

• generates product model

  nidhiparixitpatel

  committed
  b114b6a

  Copy full SHA for b114b6a

• Merge branch 'np/start'

  nidhiparixitpatel

  committed
  35b3503

  Copy full SHA for 35b3503

Commits on May 1, 2019

• Adds products and merchants routes

  bonara

  committed
  a6705fb

  Copy full SHA for a6705fb

• Creates merchant model and adds merchant_id to products table

  bonara

  committed
  4dd44dd

  Copy full SHA for 4dd44dd

• Merge pull request #1 from bonara/merchant_feature

  Show description for 3c2979d
  ranuseh

  authored
  3c2979d

  Copy full SHA for 3c2979d

• created category model and controller

  nidhiparixitpatel

  committed
  0b48251

  Copy full SHA for 0b48251

• Creates merchants controller

  bonara

  committed
  0d7d54a

  Copy full SHA for 0d7d54a

• created join table product and category

  nidhiparixitpatel

  committed
  a6b37e7

  Copy full SHA for a6b37e7

• Merge branch 'nb/merchants'

  bonara

  committed
  8734057

  Copy full SHA for 8734057

• fixed join table error for category product

  nidhiparixitpatel

  committed
  bca35f9

  Copy full SHA for bca35f9

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

  nidhiparixitpatel

  committed
  e76f5e1

  Copy full SHA for e76f5e1

• added route

  nidhiparixitpatel

  committed
  4594587

  Copy full SHA for 4594587

• Adding migration models

  ranuseh

  committed
  529ee47

  Copy full SHA for 529ee47

• Fixed merge conflict

  ranuseh

  committed
  d84b528

  Copy full SHA for d84b528

• Added order items model

  ranuseh

  committed
  ed82f96

  Copy full SHA for ed82f96

• added create and index test for categories

  nidhiparixitpatel

  committed
  20cec68

  Copy full SHA for 20cec68

• Merge branch 'np/create-categories'

  nidhiparixitpatel

  committed
  7ad1e30

  Copy full SHA for 7ad1e30

• Added methods to order controller

  ranuseh

  committed
  6fa12cd

  Copy full SHA for 6fa12cd

• Methods to order controller

  ranuseh

  committed
  939d63b

  Copy full SHA for 939d63b

• Adds login and logout function

  bonara

  committed
  5356693

  Copy full SHA for 5356693

• Merge branch 'nb/merchants'

  bonara

  committed
  f2e9eb7

  Copy full SHA for f2e9eb7

• created view files for order

  ranuseh

  committed
  e79284b

  Copy full SHA for e79284b

Commits on May 2, 2019

• Added tests to controller

  ranuseh

  committed
  aec9938

  Copy full SHA for aec9938

• create review controller

  KateAnnNichols

  committed
  ea53751

  Copy full SHA for ea53751

• Adds require login and current user methods to application controller

  bonara

  committed
  d5d541f

  Copy full SHA for d5d541f

• Merchant controller test and merchant fixture

  bonara

  committed
  3dcb3f5

  Copy full SHA for 3dcb3f5

• Resolved merge conflict when pulling from master

  bonara

  committed
  90316ae

  Copy full SHA for 90316ae

• Merge pull request #3 from bonara/nb/merchants

  Show description for c0b2ed2
  bonara

  authored
  c0b2ed2

  Copy full SHA for c0b2ed2

Commits on May 3, 2019

• skeleton of products controller and initial merchant db seed

  nidhiparixitpatel

  committed
  40ff22e

  Copy full SHA for 40ff22e

• Adds merchant model tests and product fixtures

  bonara

  committed
  b85803c

  Copy full SHA for b85803c

• removed cart related methods from application controller

  bonara

  committed
  fc7acfe

  Copy full SHA for fc7acfe

• Updates the nav bar and adds footer

  bonara

  committed
  a1c474b

  Copy full SHA for a1c474b

• Merge branch 'master' into np/product-controller

  nidhiparixitpatel

  committed
  dcbf0c6

  Copy full SHA for dcbf0c6

• Merge pull request #4 from bonara/np/product-controller

  Show description for 338a776
  bonara

  authored
  338a776

  Copy full SHA for 338a776

• Merge branch 'master' into nb/merchant_features

  bonara

  committed
  46034a6

  Copy full SHA for 46034a6

• Merge pull request #5 from bonara/nb/merchant_features

  Show description for 07b9c1d
  bonara

  authored
  07b9c1d

  Copy full SHA for 07b9c1d

• Adds migration to fix the categories_products table name

  bonara

  committed
  40e7a7a

  Copy full SHA for 40e7a7a

• Adds product_id to reviews table

  bonara

  committed
  d26e186

  Copy full SHA for d26e186

• Adds product validations

  bonara

  committed
  5d54ce6

  Copy full SHA for 5d54ce6

• Adds product model test

  bonara

  committed
  0e3f8cf

  Copy full SHA for 0e3f8cf

• Added methods to orders controller

  ranuseh

  committed
  034d248

  Copy full SHA for 034d248

Commits on May 4, 2019

• Adds product edit view

  bonara

  committed
  f7c81f0

  Copy full SHA for f7c81f0

Commits on May 6, 2019

• Add controller filter and categories show page

  bonara

  committed
  c43cbee

  Copy full SHA for c43cbee

• Adds merchant show page

  bonara

  committed
  7c0c3f6

  Copy full SHA for 7c0c3f6

• Dashboard controller method and view

  bonara

  committed
  8c4464d

  Copy full SHA for 8c4464d

• Updates layouts

  bonara

  committed
  f0792f1

  Copy full SHA for f0792f1

• Adds link to each object

  bonara

  committed
  e05a528

  Copy full SHA for e05a528

• Update button for product if merchant's product

  bonara

  committed
  9d32c28

  Copy full SHA for 9d32c28

• Update method for product controller

  bonara

  committed
  3d0c3f2

  Copy full SHA for 3d0c3f2

• reviews

  KateAnnNichols

  committed
  550a364

  Copy full SHA for 550a364

• Added methods to order controller

  ranuseh

  committed
  20ddd0e

  Copy full SHA for 20ddd0e

• Accepted merge changes

  ranuseh

  committed
  d5ddca9

  Copy full SHA for d5ddca9

• Merged changew from master

  ranuseh

  committed
  25143dd

  Copy full SHA for 25143dd

• cleaned up review method tests

  KateAnnNichols

  committed
  946ef93

  Copy full SHA for 946ef93

• reviews controller update

  KateAnnNichols

  committed
  8700614

  Copy full SHA for 8700614

• Merge pull request #8 from bonara/kn/reviews

  Show description for 36cb7d7
  bonara

  authored
  36cb7d7

  Copy full SHA for 36cb7d7

• Updates merchant controller messages

  bonara

  committed
  612bd10

  Copy full SHA for 612bd10

• Merge branch 'master' into nb/product-merchant

  bonara

  committed
  ca8402d

  Copy full SHA for ca8402d

• changed to allow login from github

  nidhiparixitpatel

  committed
  309b5a8

  Copy full SHA for 309b5a8

• fixed login

  nidhiparixitpatel

  committed
  2640a73

  Copy full SHA for 2640a73

• Added add to cart to products page

  ranuseh

  committed
  82b6e6c

  Copy full SHA for 82b6e6c

• merged rating test

  ranuseh

  committed
  3a8ae5c

  Copy full SHA for 3a8ae5c

• Updates view to add images

  bonara

  committed
  467d416

  Copy full SHA for 467d416

• Product view update to show images

  bonara

  committed
  9037082

  Copy full SHA for 9037082

• added listed retired status to product

  nidhiparixitpatel

  committed
  186c8af

  Copy full SHA for 186c8af

• cleaned up product list retire status

  nidhiparixitpatel

  committed
  d7e9752

  Copy full SHA for d7e9752

• Updates to add_to_cart method

  bonara

  committed
  d112327

  Copy full SHA for d112327

Commits on May 7, 2019

• added categories to product

  nidhiparixitpatel

  committed
  09f98c1

  Copy full SHA for 09f98c1

• Adds cart functionality with updated views

  bonara

  committed
  c495510

  Copy full SHA for c495510

• Merge branch 'master' into np/category_product

  bonara

  authored
  a2644de

  Copy full SHA for a2644de

• Merge pull request #10 from bonara/np/category_product

  Show description for b46c82b
  bonara

  authored
  b46c82b

  Copy full SHA for b46c82b

• removed visible column

  nidhiparixitpatel

  committed
  83f9a72

  Copy full SHA for 83f9a72

• confirmation html

  KateAnnNichols

  committed
  a48f42c

  Copy full SHA for a48f42c

• added methods for total on order, orderitem, merchant

  nidhiparixitpatel

  committed
  96b770d

  Copy full SHA for 96b770d

• added nested route for reviews

  KateAnnNichols

  committed
  ddebd6b

  Copy full SHA for ddebd6b

• added revenue to view

  nidhiparixitpatel

  committed
  7a69872

  Copy full SHA for 7a69872

• Updates order controller and order model

  bonara

  committed
  4184c51

  Copy full SHA for 4184c51

• added tests for revenue method in merchant

  nidhiparixitpatel

  committed
  16e23bb

  Copy full SHA for 16e23bb

• Removed the visible column

  bonara

  committed
  4498d23

  Copy full SHA for 4498d23

• working on merchant tests

  nidhiparixitpatel

  committed
  dc20243

  Copy full SHA for dc20243

• Merge branch 'master' into np/revenue

  nidhiparixitpatel

  committed
  fc259c7

  Copy full SHA for fc259c7

• Updates order update controller

  bonara

  committed
  d4bcb72

  Copy full SHA for d4bcb72

• git tMerge branch 'nb/product-merchant'

  bonara

  committed
  aafc67f

  Copy full SHA for aafc67f

• working on tests for revenue methods

  nidhiparixitpatel

  committed
  3fb1e26

  Copy full SHA for 3fb1e26

• confirmation erb

  KateAnnNichols

  committed
  d4d7960

  Copy full SHA for d4d7960

• Added ability to add multiple items to cart and update cart

  ranuseh

  committed
  1ed2c82

  Copy full SHA for 1ed2c82

• Empties cart imtems

  bonara

  committed
  ea139ea

  Copy full SHA for ea139ea

• link to new review

  nidhiparixitpatel

  committed
  cd19fac

  Copy full SHA for cd19fac

• cleaned up routes

  nidhiparixitpatel

  committed
  758ab4d

  Copy full SHA for 758ab4d

• routes

  KateAnnNichols

  committed
  43f0cb3

  Copy full SHA for 43f0cb3

• added flash message

  nidhiparixitpatel

  committed
  4c994af

  Copy full SHA for 4c994af

• update

  KateAnnNichols

  committed
  e26276a

  Copy full SHA for e26276a

• Add to cart button on the products page

  bonara

  committed
  83c4b5d

  Copy full SHA for 83c4b5d

• Merge branch 'master' into nb/product-merchant

  bonara

  committed
  e4e9a2f

  Copy full SHA for e4e9a2f

• update cart button

  ranuseh

  committed
  21076bd

  Copy full SHA for 21076bd

• Merge branch 'ra/orders_controller'

  ranuseh

  committed
  cc73829

  Copy full SHA for cc73829

• Merge pull request #12 from bonara/np/review

  Show description for 0102bf8
  bonara

  authored
  0102bf8

  Copy full SHA for 0102bf8

• rearranged dashboard for order fulfillment

  nidhiparixitpatel

  committed
  25b432f

  Copy full SHA for 25b432f

• working on method test for order item

  nidhiparixitpatel

  committed
  0ea1824

  Copy full SHA for 0ea1824

Commits on May 8, 2019

• added route for confirmation page

  KateAnnNichols

  committed
  73b04b6

  Copy full SHA for 73b04b6

• Updates cc_num to string

  bonara

  committed
  b33dbd1

  Copy full SHA for b33dbd1

• Carousel on the main page

  bonara

  committed
  72e0d2f

  Copy full SHA for 72e0d2f

• Working on cart

  ranuseh

  committed
  674700f

  Copy full SHA for 674700f

• Cart features

  ranuseh

  committed
  8eaca5c

  Copy full SHA for 8eaca5c

• Update cart quantity working

  ranuseh

  committed
  ecb4fb6

  Copy full SHA for ecb4fb6

• Merge pull request #13 from bonara/ra/orders_controller

  Show description for a655bb1
  bonara

  authored
  a655bb1

  Copy full SHA for a655bb1

• Merge branch 'master' into nb/product-merchant

  bonara

  committed
  5ec2955

  Copy full SHA for 5ec2955

• merge

  nidhiparixitpatel

  committed
  fa7331a

  Copy full SHA for fa7331a

• orders

  KateAnnNichols

  committed
  8217dda

  Copy full SHA for 8217dda

• changes to confirmation

  KateAnnNichols

  committed
  8e5ec05

  Copy full SHA for 8e5ec05

• confirmation page

  KateAnnNichols

  committed
  739f219

  Copy full SHA for 739f219

• Updates category model test

  bonara

  committed
  0d90f7c

  Copy full SHA for 0d90f7c

• Updates review model testing

  bonara

  committed
  6b2e6e7

  Copy full SHA for 6b2e6e7

• Removed a dropdown list for oder list

  bonara

  committed
  1da7514

  Copy full SHA for 1da7514

• removed total order

  nidhiparixitpatel

  committed
  f2b8006

  Copy full SHA for f2b8006

• working confirmation

  KateAnnNichols

  committed
  c5bfa2d

  Copy full SHA for c5bfa2d

• Merge branch 'master' into np/revenue

  nidhiparixitpatel

  committed
  d992423

  Copy full SHA for d992423

• merge changes

  KateAnnNichols

  committed
  4015365

  Copy full SHA for 4015365

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

  nidhiparixitpatel

  committed
  486ed19

  Copy full SHA for 486ed19

• confirm changes

  KateAnnNichols

  committed
  160ffcc

  Copy full SHA for 160ffcc

• Product model test

  bonara

  committed
  0e33956

  Copy full SHA for 0e33956

• update

  KateAnnNichols

  committed
  e57aad4

  Copy full SHA for e57aad4

• finalized confirmation page

  KateAnnNichols

  committed
  c0ecea1

  Copy full SHA for c0ecea1

• updating confirmation

  KateAnnNichols

  committed
  2a5d552

  Copy full SHA for 2a5d552

• Order model testing

  bonara

  committed
  a9d7d0b

  Copy full SHA for a9d7d0b

• added confirmation page to dashboard

  nidhiparixitpatel

  committed
  8ce2c97

  Copy full SHA for 8ce2c97

• clean up dashboard

  nidhiparixitpatel

  committed
  a9804d8

  Copy full SHA for a9804d8

• Updates order_item test

  bonara

  committed
  c2d4387

  Copy full SHA for c2d4387

• Resolved merge conflict

  bonara

  committed
  c5ec41f

  Copy full SHA for c5ec41f

• Resolved merge conflicts

  bonara

  committed
  60d2009

  Copy full SHA for 60d2009

• Order controller testing

  ranuseh

  committed
  456c520

  Copy full SHA for 456c520

• Merge conflict solved

  ranuseh

  committed
  e5abaf9

  Copy full SHA for e5abaf9

• fixed order summary total

  nidhiparixitpatel

  committed
  092cc57

  Copy full SHA for 092cc57

• Fixing merge conflicts

  ranuseh

  committed
  007e9fb

  Copy full SHA for 007e9fb

• dashboard clean up

  nidhiparixitpatel

  committed
  7262186

  Copy full SHA for 7262186

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

  nidhiparixitpatel

  committed
  742bbd4

  Copy full SHA for 742bbd4

Commits on May 9, 2019

• Fixed a session issue with the confirmation page added

  bonara

  committed
  b628f44

  Copy full SHA for b628f44

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

  bonara

  committed
  978efee

  Copy full SHA for 978efee

• Merge conflict resolution

  bonara

  committed
  981a429

  Copy full SHA for 981a429

• Fixed the orders-controller private method

  bonara

  committed
  eb66b54

  Copy full SHA for eb66b54

• Removes end from order_items controller

  bonara

  committed
  0825f4a

  Copy full SHA for 0825f4a

• Updates formatting

  bonara

  committed
  ecb94e7

  Copy full SHA for ecb94e7

• Order controller tests

  ranuseh

  committed
  e6c452c

  Copy full SHA for e6c452c

• Fixed orders controller test end

  bonara

  committed
  98396e5

  Copy full SHA for 98396e5

• Updates dashboard formatting and rounds rating

  bonara

  committed
  7ce7cb2

  Copy full SHA for 7ce7cb2

• Updates review form

  bonara

  committed
  ec16165

  Copy full SHA for ec16165

• Working on order controller test. All passing

  ranuseh

  committed
  4e9afeb

  Copy full SHA for 4e9afeb

Commits on May 10, 2019

• resolved merge conflicts

  ranuseh

  committed
  de72b83

  Copy full SHA for de72b83

• making changes to test after merging master

  ranuseh

  committed
  8f83697

  Copy full SHA for 8f83697

• Merchant controller tests passing

  ranuseh

  committed
  44597c4

  Copy full SHA for 44597c4

• Adds styling

  bonara

  committed
  d41c223

  Copy full SHA for d41c223

• Updates carousel

  bonara

  committed
  06864f8

  Copy full SHA for 06864f8

• Merge pull request #15 from bonara/ra/order_controller_tests

  Show description for 8c31735
  bonara

  authored
  8c31735

  Copy full SHA for 8c31735

• Merge branch 'master' into nb/product-merchant

  bonara

  committed
  34aaed7

  Copy full SHA for 34aaed7

• Updates a bug if purchased product is equal to item quantity.

  bonara

  committed
  49a4282

  Copy full SHA for 49a4282

• SimpleCov gem

  bonara

  committed
  208a4e8

  Copy full SHA for 208a4e8

• All tests passing for categories controller

  ranuseh

  committed
  5355c7c

  Copy full SHA for 5355c7c

• Styling

  bonara

  committed
  38a0c39

  Copy full SHA for 38a0c39

• Merge branch 'master' into nb/product-merchant

  bonara

  committed
  ec85371

  Copy full SHA for ec85371

• Fixed a bug with merchant reviewing their own item

  bonara

  committed
  a806f45

  Copy full SHA for a806f45

• Review test

  KateAnnNichols

  committed
  de918ce

  Copy full SHA for de918ce

• Passing review test

  KateAnnNichols

  committed
  9eef126

  Copy full SHA for 9eef126

• Review test update

  bonara

  committed
  e2444a2

  Copy full SHA for e2444a2

• Styling cart

  bonara

  committed
  74dcbed

  Copy full SHA for 74dcbed

Commits on May 11, 2019

• Fixing bugs in controlle test

  ranuseh

  committed
  9b3a01b

  Copy full SHA for 9b3a01b

• order item controller method passing

  ranuseh

  committed
  ae77f26

  Copy full SHA for ae77f26

• All order item controller test passing

  ranuseh

  committed
  153fdc5

  Copy full SHA for 153fdc5

• Merge pull request #17 from bonara/ra/order_controller_tests

  Show description for 02686a3
  bonara

  authored
  02686a3

  Copy full SHA for 02686a3