Code

Market controller#28

Code

Open

goaskcarmen wants to merge 43 commits intoAda-C6:masterAda-C6/FarMarRails:masterfrom goaskcarmen:marketControllergoaskcarmen/FarMarRails:marketControllerCopy head branch name to clipboard

+16,309-20,146

Commits

Commits on Oct 4, 2016

• test on readme

  

  Maya Wang

  committed
  e5c4dd1

  Copy full SHA for e5c4dd1

• generated general user controller, model for markets, vendors, products, and sales

  goaskcarmen

  committed
  0c9797d

  Copy full SHA for 0c9797d

Commits on Oct 5, 2016

• added ERD diagram in app/assets/images

  

  Maya Wang

  committed
  94c44c5

  Copy full SHA for 94c44c5

• imported data

  goaskcarmen

  committed
  0f4da78

  Copy full SHA for 0f4da78

• added index page

  goaskcarmen

  committed
  9f38d61

  Copy full SHA for 9f38d61

• for updating delelopment

  

  Maya Wang

  committed
  059df0e

  Copy full SHA for 059df0e

• deleted development log

  

  Maya Wang

  committed
  9deef05

  Copy full SHA for 9deef05

• set up index page

  

  Maya Wang

  committed
  94e527f

  Copy full SHA for 94e527f

• completed general_user view page with market list and vendor lists

  

  Maya Wang

  committed
  cc8c3b5

  Copy full SHA for cc8c3b5

• generated vendors controller

  

  Maya Wang

  committed
  4fc77ca

  Copy full SHA for 4fc77ca

• added market form

  goaskcarmen

  committed
  2fedcc0

  Copy full SHA for 2fedcc0

• merge

  goaskcarmen

  committed
  083e9ab

  Copy full SHA for 083e9ab

• Merge pull request #1 from goaskcarmen/marketController

  Show description for c1c577f
  goaskcarmen

  authored
  c1c577f

  Copy full SHA for c1c577f

Commits on Oct 6, 2016

• completed create a vendor feature. used dropdown to let user to select market

  

  Maya Wang

  committed
  25f6aa4

  Copy full SHA for 25f6aa4

• edit a vendor feature. Also link to vendor index from main page

  

  Maya Wang

  committed
  e8ffb5d

  Copy full SHA for e8ffb5d

• completed delete a vendor feature

  

  Maya Wang

  committed
  49913ed

  Copy full SHA for 49913ed

Commits on Oct 7, 2016

• completed market modification

  goaskcarmen

  committed
  7028a61

  Copy full SHA for 7028a61

• vendor can create, edit and delete a product

  

  Maya Wang

  committed
  ab25638

  Copy full SHA for ab25638

• merged createNewVendor branch

  

  Maya Wang

  committed
  d3cc3b5

  Copy full SHA for d3cc3b5

• merge

  goaskcarmen

  committed
  59e838f

  Copy full SHA for 59e838f

• Merge pull request #3 from goaskcarmen/marketController

  Show description for aaf3118
  goaskcarmen

  authored
  aaf3118

  Copy full SHA for aaf3118

• postgres for production gem

  goaskcarmen

  committed
  c653119

  Copy full SHA for c653119

• added gemfile.lock

  goaskcarmen

  committed
  8050c5d

  Copy full SHA for 8050c5d

• completed market controller tasks and added validation

  goaskcarmen

  committed
  3ae8607

  Copy full SHA for 3ae8607

• completed as a vendor user, I can view a list of Sales. working on creating a new sale

  

  Maya Wang

  committed
  b4b8b83

  Copy full SHA for b4b8b83

• merge

  goaskcarmen

  committed
  f3fc76e

  Copy full SHA for f3fc76e

• Merge pull request #4 from goaskcarmen/marketController

  Show description for aaa0893
  goaskcarmen

  authored
  aaa0893

  Copy full SHA for aaa0893

Commits on Oct 8, 2016

• submit

  goaskcarmen

  committed
  656feca

  Copy full SHA for 656feca

• Remove temp file

  

  Maya Wang

  committed
  e6199b0

  Copy full SHA for e6199b0

• remove Gemfile.lock, it's machine depedent and should be regenerated everytime

  

  Maya Wang

  committed
  c4b3f60

  Copy full SHA for c4b3f60

• update gitignore

  

  Maya Wang

  committed
  5973381

  Copy full SHA for 5973381

• fix routes naming convention

  

  Maya Wang

  committed
  5ac48e0

  Copy full SHA for 5ac48e0

• add sales for product feature done

  

  Maya Wang

  committed
  bc54e3e

  Copy full SHA for bc54e3e

• show total sales feature done

  

  Maya Wang

  committed
  b5e52b5

  Copy full SHA for b5e52b5

• completed total sales for current month. debugging

  

  Maya Wang

  committed
  538e6cf

  Copy full SHA for 538e6cf

Commits on Oct 9, 2016

• completed and tested total sales in current month

  

  Maya Wang

  committed
  6b71ea4

  Copy full SHA for 6b71ea4

• completed sales list in current month

  

  Maya Wang

  committed
  0ecf3b4

  Copy full SHA for 0ecf3b4

• converted sales from cents to dollor in model

  

  Maya Wang

  committed
  c6e2ba6

  Copy full SHA for c6e2ba6

• basic layout setup for index, market and vendor index

  

  Maya Wang

  committed
  f1d2bcc

  Copy full SHA for f1d2bcc

Commits on Oct 11, 2016

• improved layout of indexes and create form for all accounts

  

  Maya Wang

  committed
  aa02114

  Copy full SHA for aa02114

• corrected @Product intead of haha_product in Vendor edit view

  

  Maya Wang

  committed
  8dc0334

  Copy full SHA for 8dc0334

Commits on Oct 12, 2016

• Merge pull request #5 from goaskcarmen/sales

  Show description for 038bf0f
  goaskcarmen

  authored
  038bf0f

  Copy full SHA for 038bf0f

• added sort to the market list

  goaskcarmen

  committed
  e60c358

  Copy full SHA for e60c358