Code

FarMarRails#21

Code

Open

lacuchilla wants to merge 48 commits intoAda-C4:arhcas/masterAda-C4/FarMarRails:arhcas/masterfrom lacuchilla:arhcas/masterlacuchilla/FarMarRails:arhcas/masterCopy head branch name to clipboard

+989-20,199

Commits

Commits on Nov 18, 2015

• Add code to try to seed the database. Not working yet.

  lacuchilla

  committed
  fa56b21

  Copy full SHA for fa56b21

• Seeded database with markets

  CShekta

  committed
  51e841a

  Copy full SHA for 51e841a

• Reassign array indexes to proper elements and seed data is now displaying properly.

  lacuchilla

  committed
  ba5a9bd

  Copy full SHA for ba5a9bd

• Added edit and new views, routes, and methods for market

  CShekta

  committed
  ff1f78a

  Copy full SHA for ff1f78a

• Add delete function for Market class and create model and controller for vendor class. Seed database

  lacuchilla

  committed
  a40c15d

  Copy full SHA for a40c15d

• Added Vendor views, controller, and routes for index, show, and new

  CShekta

  committed
  7bcea25

  Copy full SHA for 7bcea25

• deleted market line in show vendor file

  CShekta

  committed
  02592f8

  Copy full SHA for 02592f8

• Add edit feature to vendor class

  lacuchilla

  committed
  e75f30c

  Copy full SHA for e75f30c

• Add links to navigate between the edit, view, and show pages for vendor class.

  lacuchilla

  committed
  c46b23d

  Copy full SHA for c46b23d

• Added model, controller, and seed data for Product and Sales

  CShekta

  committed
  f4a7a6a

  Copy full SHA for f4a7a6a

• Added vendor market name method to show page

  CShekta

  committed
  9fb719a

  Copy full SHA for 9fb719a

Commits on Nov 19, 2015

• Added sales and product nesting and associations. Added product new form

  CShekta

  committed
  612b04f

  Copy full SHA for 612b04f

• Add has many products relationship to vendor class

  lacuchilla

  committed
  bf2b56f

  Copy full SHA for bf2b56f

• Fixed new form by creating specific create action and updating route to take in vendor_id params. Worksgit add .

  CShekta

  committed
  6902d12

  Copy full SHA for 6902d12

• change redirect path

  CShekta

  committed
  9387916

  Copy full SHA for 9387916

• Working on edit function for products. this feature is not working yet.

  lacuchilla

  committed
  c378e63

  Copy full SHA for c378e63

• Working product edit

  CShekta

  committed
  ec31fa8

  Copy full SHA for ec31fa8

• Created new form for sale

  CShekta

  committed
  2fd3983

  Copy full SHA for 2fd3983

• Add ability to show the list of sales on the vendor page

  lacuchilla

  committed
  d64be08

  Copy full SHA for d64be08

• Add ability for a vendor to see the total amount of their sales on the individual vendor page

  lacuchilla

  committed
  b1074bf

  Copy full SHA for b1074bf

• Added bootstrap container class, background, and divs to every page

  CShekta

  committed
  f2206d1

  Copy full SHA for f2206d1

Commits on Nov 20, 2015

• Working on fixing links in view pages to navigate correctly

  lacuchilla

  committed
  ea1b45d

  Copy full SHA for ea1b45d

• Fixed link in new product page

  CShekta

  committed
  0bdf861

  Copy full SHA for 0bdf861

• Made the markets/ page to a table w/ style

  CShekta

  committed
  486173d

  Copy full SHA for 486173d

• added more styling for markets

  CShekta

  committed
  755b71d

  Copy full SHA for 755b71d

• Refactored vendor classes with tables, number_to_currency, and some more styling

  CShekta

  committed
  7a08131

  Copy full SHA for 7a08131

• refactored vendor show page more to include table-division class, and an iterator that uses i

  CShekta

  committed
  0f35a8d

  Copy full SHA for 0f35a8d

• Updated vendor index to access market data

  CShekta

  committed
  fcfae6f

  Copy full SHA for fcfae6f

• Added sales method and table for current month in vendor show page

  CShekta

  committed
  92b8496

  Copy full SHA for 92b8496

• Changed routes to have sales#index vendor_sales_path and removed the sales data from vendor page

  CShekta

  committed
  3e12f6c

  Copy full SHA for 3e12f6c

• Add functionality to view all products for a particular vendor.

  lacuchilla

  committed
  5c60a8b

  Copy full SHA for 5c60a8b

• Add dropdown to select products for a sale. Doesn't work yet.

  lacuchilla

  committed
  48aea68

  Copy full SHA for 48aea68

• Added user_type functionality to homepage to start to separate views for @if_market, @if_vendor, and @if_guest

  CShekta

  committed
  6c6f1aa

  Copy full SHA for 6c6f1aa

• Refactored market show page to divide in if statement for user_type inputs

  CShekta

  committed
  c55834f

  Copy full SHA for c55834f

• Added is_market add a market link to home page

  CShekta

  committed
  d958bed

  Copy full SHA for d958bed

• Added route to see all vendors if you are a vendor and link back to all markets

  CShekta

  committed
  51d662d

  Copy full SHA for 51d662d

• Separted user_type logic for vendor show page

  CShekta

  committed
  71fa8f8

  Copy full SHA for 71fa8f8

• separated user_type tables for sales data. not working yet

  CShekta

  committed
  0402cfa

  Copy full SHA for 0402cfa

• Merged amy fonts and styles

  CShekta

  committed
  436ab37

  Copy full SHA for 436ab37

• changed one font. onto heroku

  CShekta

  committed
  1d0badd

  Copy full SHA for 1d0badd

• Added pg and sqlite3 gems

  CShekta

  committed
  4fbf78a

  Copy full SHA for 4fbf78a

• fixed sqlite3 gem and added csv gem

  CShekta

  committed
  7bb40a8

  Copy full SHA for 7bb40a8

Commits on Nov 21, 2015

• really did add those gems

  CShekta

  committed
  898a18c

  Copy full SHA for 898a18c

• Upgrade spring gem and binstubs

  CShekta

  committed
  1bf6e68

  Copy full SHA for 1bf6e68

Commits on Nov 22, 2015

• changed background image url

  CShekta

  committed
  a07e17f

  Copy full SHA for a07e17f

Commits on Nov 23, 2015

• Updated a couple lines to debug user_session

  CShekta

  committed
  4734cea

  Copy full SHA for 4734cea

• update css on one line

  CShekta

  committed
  5f2b0f0

  Copy full SHA for 5f2b0f0

• Added comma

  CShekta

  committed
  56d4286

  Copy full SHA for 56d4286