Code

Merge to Main#70

Code

Merged

ruezheng merged 51 commits intomainruezheng/little-esty-shop:mainfrom almost-mainruezheng/little-esty-shop:almost-mainCopy head branch name to clipboardJun 3, 2022

+656-44

Commits

Commits on Jun 2, 2022

• Write test for admin dashboard, create route

  jenniferhalloran

  committed
  f7f24e9

  Copy full SHA for f7f24e9

• Pass test for admin dashboard

  jenniferhalloran

  committed
  4b40ad4

  Copy full SHA for 4b40ad4

• Write tests for admin dashboard links

  jenniferhalloran

  committed
  de57c5c

  Copy full SHA for de57c5c

• Create routes for links

  jenniferhalloran

  committed
  0e94493

  Copy full SHA for 0e94493

• Create empty views for the admin/merchants and admin/invoices

  jenniferhalloran

  committed
  c48a00e

  Copy full SHA for c48a00e

• Test: add test for item's #best_sales_date

  ruezheng

  committed
  65a213d

  Copy full SHA for 65a213d

• Feat: add method #best_sales_date to item.rb

  ruezheng

  committed
  7161e1c

  Copy full SHA for 7161e1c

• Write feature test for incomplete invoices on admin show page

  jenniferhalloran

  committed
  fcf72c7

  Copy full SHA for fcf72c7

• Write model test for incomplete_invoice_ids method

  jenniferhalloran

  committed
  0772611

  Copy full SHA for 0772611

• Create incomplete invoices section in admin dashboard view

  jenniferhalloran

  committed
  9c7a0fa

  Copy full SHA for 9c7a0fa

• Add merchant invoices show route for links

  jenniferhalloran

  committed
  005d276

  Copy full SHA for 005d276

• Create actions in the admin invoices controller so links work

  jenniferhalloran

  committed
  3626864

  Copy full SHA for 3626864

• Write incomplete_invoice_ids method and pass tests

  jenniferhalloran

  committed
  21e5f3f

  Copy full SHA for 21e5f3f

• Feat: add best_sales_date to items index

  ruezheng

  committed
  cc953e8

  Copy full SHA for cc953e8

• Fix: best_sales_date test data

  ruezheng

  committed
  579c723

  Copy full SHA for 579c723

• Fix: spacing

  ruezheng

  committed
  07b750a

  Copy full SHA for 07b750a

• Merge pull request #62 from ruezheng/fix_items_best_day

  Show description for 63e8210
  jenniferhalloran

  authored
  63e8210

  Copy full SHA for 63e8210

Commits on Jun 3, 2022

• Merge branch 'almost-main' into feat/admin-dashboard

  ruezheng

  authored
  edde127

  Copy full SHA for edde127

• Merge pull request #63 from ruezheng/feat/admin-dashboard

  Show description for 191159a
  ruezheng

  authored
  191159a

  Copy full SHA for 191159a

• Test: Update Invoice Item Status

  ZacHazelwood

  committed
  99a3c9c

  Copy full SHA for 99a3c9c

• Feat: Update Invoice Item Status with selector

  ZacHazelwood

  committed
  6812b3e

  Copy full SHA for 6812b3e

• Add missing 'end'

  ZacHazelwood

  committed
  da465bd

  Copy full SHA for da465bd

• Test: Invoice class method

  ZacHazelwood

  committed
  b15ddc9

  Copy full SHA for b15ddc9

• Reinstate Invoice model method to display unique Invoice IDs

  ZacHazelwood

  committed
  e995529

  Copy full SHA for e995529

• Move variable to correct location

  ZacHazelwood

  committed
  d87f0bd

  Copy full SHA for d87f0bd

• Merge branch 'almost-main' into invoice_show_update_item

  ZacHazelwood

  authored
  339aef6

  Copy full SHA for 339aef6

• Merge pull request #64 from ruezheng/invoice_show_update_item

  Show description for 3536f22
  jenniferhalloran

  authored
  3536f22

  Copy full SHA for 3536f22

• Test: Admin Merchant Index Page

  ZacHazelwood

  committed
  b609e90

  Copy full SHA for b609e90

• Feat: Admin Merchant Index Page

  ZacHazelwood

  committed
  6816cb5

  Copy full SHA for 6816cb5

• Test: Admin Merchant Show displays name

  ZacHazelwood

  committed
  2ff18db

  Copy full SHA for 2ff18db

• Test: Admin Merchant Show displays name

  ZacHazelwood

  committed
  c4c6bdc

  Copy full SHA for c4c6bdc

• Feat: Admin Merchant Show displays name

  ZacHazelwood

  committed
  193cf6a

  Copy full SHA for 193cf6a

• Test: admin index page lists the names of the top 5 customers with the largest number of successful transactions

  ruezheng

  committed
  2a6d565

  Copy full SHA for 2a6d565

• Test: customer model ::top_customers returns the names of the top 5 customers and the number of successful transactions they made

  ruezheng

  committed
  1979b20

  Copy full SHA for 1979b20

• Feat: add ::top_customers and #count_of_transactions to Customer model

  ruezheng

  committed
  36db5cf

  Copy full SHA for 36db5cf

• Feat: add name of top 5 customers and number of successful transactions to Admin Index Page

  ruezheng

  committed
  ffc40cc

  Copy full SHA for ffc40cc

• Feat: add ordered list

  ruezheng

  committed
  7a44f77

  Copy full SHA for 7a44f77

• Style: add jumbotron to layouts to format header

  ruezheng

  committed
  cf9bdd9

  Copy full SHA for cf9bdd9

• Style: add nav bar to admin dashboard

  ruezheng

  committed
  4f5c17b

  Copy full SHA for 4f5c17b

• Style: change spacing

  ruezheng

  committed
  97da00d

  Copy full SHA for 97da00d

• Move 'incomplete_invoice_ids' to the invoice model and change method

  jenniferhalloran

  committed
  9df7336

  Copy full SHA for 9df7336

• Add more test data, update view/controller to access invoices not invoice_items

  jenniferhalloran

  committed
  3f23bc6

  Copy full SHA for 3f23bc6

• Merge branch 'almost-main' into feat/incomplete_invoices

  jenniferhalloran

  authored
  beb3a30

  Copy full SHA for beb3a30

• Merge pull request #65 from ruezheng/admin_merchants_index_show

  Show description for d39b955
  jenniferhalloran

  authored
  d39b955

  Copy full SHA for d39b955

• Merge pull request #66 from ruezheng/top_customers

  Show description for 2a47cf5
  ZacHazelwood

  authored
  2a47cf5

  Copy full SHA for 2a47cf5

• Merge pull request #67 from ruezheng/bootstrap

  Show description for a9ee67e
  ZacHazelwood

  authored
  a9ee67e

  Copy full SHA for a9ee67e

• Merge branch 'almost-main' into feat/incomplete_invoices

  jenniferhalloran

  authored
  7207fec

  Copy full SHA for 7207fec

• Merge pull request #68 from ruezheng/feat/incomplete_invoices

  Show description for 2e0ad0f
  ZacHazelwood

  authored
  2e0ad0f

  Copy full SHA for 2e0ad0f

• Fix errors/failing tests from merge

  jenniferhalloran

  committed
  02def9b

  Copy full SHA for 02def9b

• Merge pull request #69 from ruezheng/fix_merge_errors-JH

  Show description for a447cf0
  ruezheng

  authored
  a447cf0

  Copy full SHA for a447cf0

• Refactor: remove helped method and add to ::top_customers

  ruezheng

  committed
  e822d3f

  Copy full SHA for e822d3f