Code

Penguin/master - Lindsey & Alice#2

Code

Open

a-lmx wants to merge 121 commits intoamirahaile:penguin/masteramirahaile/C3Projects--bEtsy:penguin/masterfrom a-lmx:penguin/mastera-lmx/C3Projects--bEtsy:penguin/masterCopy head branch name to clipboard

+1,066-536

Commits

Commits on Aug 17, 2015

• Commented out production gems.

  lindseyreno

  committed
  d3d6e7f

  Copy full SHA for d3d6e7f

• added pry-rails to Gemset

  a-lmx

  committed
  7362c86

  Copy full SHA for 7362c86

• added comments to help understand legacy code

  a-lmx

  committed
  76ef3d6

  Copy full SHA for 76ef3d6

Commits on Aug 19, 2015

• added weight, length, width, and height attributes to model

  a-lmx

  committed
  68bbbf8

  Copy full SHA for 68bbbf8

• added --format doc to .rspec

  a-lmx

  committed
  a1837f7

  Copy full SHA for a1837f7

• added weight, length, width, height to required_attributes

  a-lmx

  committed
  36b38e3

  Copy full SHA for 36b38e3

• commented out failing tests; added newly required attributes to unique name test

  a-lmx

  committed
  9781c1b

  Copy full SHA for 9781c1b

• updated product seeds with newly required attributes

  a-lmx

  committed
  383ab89

  Copy full SHA for 383ab89

• modified datatype of weight to integer

  a-lmx

  committed
  a1f568d

  Copy full SHA for a1f568d

• re-migrated, updated schema

  a-lmx

  committed
  46c6d66

  Copy full SHA for 46c6d66

• added logic to prevent users from editing other users products, or adding their own products to the cart

  a-lmx

  committed
  c02a494

  Copy full SHA for c02a494

• added logic to display weight and dimensions on product show

  a-lmx

  committed
  ff0a8a4

  Copy full SHA for ff0a8a4

• added weight and dimensions attributes to permitted params

  a-lmx

  committed
  46e4f88

  Copy full SHA for 46e4f88

• added fields on form for weight and dimensions

  a-lmx

  committed
  d214e78

  Copy full SHA for d214e78

• added new attributes to example products in spec to make them valid

  a-lmx

  committed
  7cd30a4

  Copy full SHA for 7cd30a4

• added new attributes to example product in spec to make it valid

  a-lmx

  committed
  bb6a731

  Copy full SHA for bb6a731

• added new attributes to example product

  a-lmx

  committed
  bbf3877

  Copy full SHA for bbf3877

• added new attributes to example product

  a-lmx

  committed
  98b9f36

  Copy full SHA for 98b9f36

• Added validations for new address attributes.

  lindseyreno

  committed
  31b5617

  Copy full SHA for 31b5617

• Added address seed data to users.

  lindseyreno

  committed
  88982e7

  Copy full SHA for 88982e7

• Added columns for city, state, zip, and country.

  lindseyreno

  committed
  f8bfb05

  Copy full SHA for f8bfb05

• Added tests for new model validations for city, state, zip, and country.

  lindseyreno

  committed
  707c09b

  Copy full SHA for 707c09b

• Added --format doc to be able to see tests better.

  lindseyreno

  committed
  52c99fd

  Copy full SHA for 52c99fd

• Added city, state, zip, and country to uer_params.

  lindseyreno

  committed
  a6a34af

  Copy full SHA for a6a34af

• Added city, state, zip, and country data where a User is created.

  lindseyreno

  committed
  ac94606

  Copy full SHA for ac94606

• Merge pull request #1 from arhx/product_model/ar

  Show description for b05b913
  lindseyreno

  committed
  b05b913

  Copy full SHA for b05b913

• Fixed merge conflicts.

  lindseyreno

  committed
  1246177

  Copy full SHA for 1246177

• Merge pull request #2 from arhx/lr/user_model

  Show description for ebf364a
  arhx

  committed
  ebf364a

  Copy full SHA for ebf364a

• Added shipping origin information to user create form.

  lindseyreno

  committed
  2b91e8c

  Copy full SHA for 2b91e8c

• Changed text fields to password fields in the user create form.

  lindseyreno

  committed
  78d8d65

  Copy full SHA for 78d8d65

• added spec and validation for weight_in_gms :numericality

  a-lmx

  committed
  8325247

  Copy full SHA for 8325247

• added specs and validations for numericality for remaining new attributes; refactored tests to share expectation

  a-lmx

  committed
  b9b1b6b

  Copy full SHA for b9b1b6b

• Merge pull request #4 from arhx/product_model/ar

  Show description for afa8487
  lindseyreno

  committed
  afa8487

  Copy full SHA for afa8487

• Merge pull request #3 from arhx/lr/user_model

  Show description for 6dd34d9
  arhx

  committed
  6dd34d9

  Copy full SHA for 6dd34d9

• changed Order.find to Order.find_by in #logged_in

  a-lmx

  committed
  68db8d1

  Copy full SHA for 68db8d1

• removed @cart_quantity from ApplicationController#logged_in to fix bug in which cart was showing no items despite there being one item

  a-lmx

  committed
  9006322

  Copy full SHA for 9006322

• created migration to change :orders :zipcode to :zip; changed everywhere

  a-lmx

  committed
  a159b8b

  Copy full SHA for a159b8b

• extracted order details into partial

  a-lmx

  committed
  125d222

  Copy full SHA for 125d222

• changed submit button to Shipping Options button

  a-lmx

  committed
  7706bc3

  Copy full SHA for 7706bc3

• added get orders#shipping route

  a-lmx

  committed
  165db5b

  Copy full SHA for 165db5b

• created shipping view

  a-lmx

  committed
  6f4a7a4

  Copy full SHA for 6f4a7a4

• pseudo-coded shipping and finalize actions

  a-lmx

  committed
  51c1953

  Copy full SHA for 51c1953

• Created JSON shipment object for each distinct origin location.

  lindseyreno

  committed
  b30992c

  Copy full SHA for b30992c

• Added httparty gem

  lindseyreno

  committed
  e3659bd

  Copy full SHA for e3659bd

• WIP integrate shipping

  lindseyreno

  committed
  502d8a2

  Copy full SHA for 502d8a2

Commits on Aug 20, 2015

• WIP

  lindseyreno

  committed
  eb5c56f

  Copy full SHA for eb5c56f

• changed :orders :zip to integer

  a-lmx

  committed
  5d8f023

  Copy full SHA for 5d8f023

• Merge branch 'integrate-shipper/la' of github.com:arhx/C3Projects--bEtsy into integrate-shipper/la

  a-lmx

  committed
  95f1b5d

  Copy full SHA for 95f1b5d

• changed datatypes of :products dimensions to integers

  a-lmx

  committed
  57a0aaf

  Copy full SHA for 57a0aaf

• added display logic to show shipping options

  a-lmx

  committed
  125708f

  Copy full SHA for 125708f

• added map-reduce function to process rates for rendering on view

  a-lmx

  committed
  00c140a

  Copy full SHA for 00c140a

• Merge pull request #5 from arhx/integrate-shipper/la

  Show description for 174b244
  arhx

  committed
  174b244

  Copy full SHA for 174b244

• added delivery date to calculated_rates

  a-lmx

  committed
  4297d8a

  Copy full SHA for 4297d8a

• Added factory girl gem

  lindseyreno

  committed
  11b799a

  Copy full SHA for 11b799a

• Required factory girl

  lindseyreno

  committed
  5d29310

  Copy full SHA for 5d29310

• Added required config line.

  lindseyreno

  committed
  49f340e

  Copy full SHA for 49f340e

• Refactored tests to use factory girl

  lindseyreno

  committed
  dc4b254

  Copy full SHA for dc4b254

• Created factories.

  lindseyreno

  committed
  a7a8904

  Copy full SHA for a7a8904

• Changed #normalize_names to handle a name error.

  lindseyreno

  committed
  7b11772

  Copy full SHA for 7b11772

• Refactored to use factory girl

  lindseyreno

  committed
  df6b0eb

  Copy full SHA for df6b0eb

• Removed _or_equal_to from quantity validation.

  lindseyreno

  committed
  8df9d97

  Copy full SHA for 8df9d97

• added orders#update_total route

  a-lmx

  committed
  66eaa0c

  Copy full SHA for 66eaa0c

• added shipping_option_label view helper

  a-lmx

  committed
  494795a

  Copy full SHA for 494795a

• added form_tag with radio buttons displaying shipping options

  a-lmx

  committed
  7b9b8c7

  Copy full SHA for 7b9b8c7

• added #update_total action, and example of params[:shipping_option for debugging]

  a-lmx

  committed
  ae5fcdb

  Copy full SHA for ae5fcdb

• Refactored tests to use factory girl

  lindseyreno

  committed
  78e39c1

  Copy full SHA for 78e39c1

• Refactored tests to use factory girl

  lindseyreno

  committed
  9890838

  Copy full SHA for 9890838

• Removed redundant validation for presence of email.

  lindseyreno

  committed
  3acaa90

  Copy full SHA for 3acaa90

• Fixed typo in order factory

  lindseyreno

  committed
  eddf6b1

  Copy full SHA for eddf6b1

• Refactored rating and product_id it statements to be more clear what they are testing.

  lindseyreno

  committed
  daf25f8

  Copy full SHA for daf25f8

• Refactored tests to use factory girl.

  lindseyreno

  committed
  ccb193b

  Copy full SHA for ccb193b

• Refactored to dry up the code a bit

  lindseyreno

  committed
  3c4803d

  Copy full SHA for 3c4803d

• Refactored to use factory girl

  lindseyreno

  committed
  a7b2324

  Copy full SHA for a7b2324

• Merge pull request #7 from arhx/shipping-page/ar

  Show description for 67a06fc
  lindseyreno

  committed
  67a06fc

  Copy full SHA for 67a06fc

• Merge pull request #6 from arhx/lr/factory-girl

  Show description for 05be929
  arhx

  committed
  05be929

  Copy full SHA for 05be929

• Added columns for shipping service and shipping cost to orders table

  lindseyreno

  committed
  f6278eb

  Copy full SHA for f6278eb

• Added route for orders controller finalize action

  lindseyreno

  committed
  a3d70a1

  Copy full SHA for a3d70a1

• Created helper method to disable finalize button if shipping hasn't been chosen yet.

  lindseyreno

  committed
  5c04538

  Copy full SHA for 5c04538

• Changed Total to Item Total

  lindseyreno

  committed
  531e313

  Copy full SHA for 531e313

• Added table to view order details and a button to finalize order

  lindseyreno

  committed
  91e53f6

  Copy full SHA for 91e53f6

• Added logic to update_total and shipping to be able to select a shipping option and see an updated total on the shipping view.

  lindseyreno

  committed
  b06e986

  Copy full SHA for b06e986

• made update_total a GET method, and finalize a PUT method

  a-lmx

  committed
  0101fb3

  Copy full SHA for 0101fb3

• refactored order shipping/finalize/confirmation routes

  a-lmx

  committed
  c068679

  Copy full SHA for c068679

• removed checkboxes, fixed indenting

  a-lmx

  committed
  374966c

  Copy full SHA for 374966c

• added back in #update method, filled out finalize method

  a-lmx

  committed
  53e3a9c

  Copy full SHA for 53e3a9c

• added TODO comment re: API call to audit log shipping option

  a-lmx

  committed
  c336f95

  Copy full SHA for c336f95

• Merge pull request #8 from arhx/update-total/la

  Show description for 2ef3244
  arhx

  committed
  2ef3244

  Copy full SHA for 2ef3244

• added logic to make API call to post audit log in penguin shipper

  a-lmx

  committed
  feb8e98

  Copy full SHA for feb8e98

• Added error handling for api calls

  lindseyreno

  committed
  43b9d4e

  Copy full SHA for 43b9d4e

Commits on Aug 21, 2015

• Added a continue shopping link to cart page that returns to root_path

  lindseyreno

  committed
  55d0759

  Copy full SHA for 55d0759

• added #order_params; refactored #update

  a-lmx

  committed
  c39436d

  Copy full SHA for c39436d

• Changed radio buttons to regular buttons

  lindseyreno

  committed
  5879fe7

  Copy full SHA for 5879fe7

• refactored methods from OrdersController

  a-lmx

  committed
  ac85c78

  Copy full SHA for ac85c78

• required penguin_shipper_interface

  a-lmx

  committed
  92d2f7e

  Copy full SHA for 92d2f7e

• refactoring new methods

  a-lmx

  committed
  c9f3b99

  Copy full SHA for c9f3b99

• filled out .process_order(order)

  a-lmx

  committed
  d68a166

  Copy full SHA for d68a166

• removed commented code in #shipping

  a-lmx

  committed
  64310d8

  Copy full SHA for 64310d8

• Merge pull request #9 from arhx/lr/return-to-shopping-button

  Show description for c6d8347
  arhx

  committed
  c6d8347

  Copy full SHA for c6d8347

• Merge pull request #10 from arhx/lr/shipping-buttons

  Show description for 832a0c7
  arhx

  committed
  832a0c7

  Copy full SHA for 832a0c7

• removed commented code

  a-lmx

  committed
  98e9611

  Copy full SHA for 98e9611

• Merge pull request #11 from arhx/refactor_orders_controller/ar

  Show description for 2df2c2e
  lindseyreno

  committed
  2df2c2e

  Copy full SHA for 2df2c2e

• Fixed merge conflict in #shipping

  lindseyreno

  committed
  d3fc29e

  Copy full SHA for d3fc29e

• Added error handling to #shipping

  lindseyreno

  committed
  7c34a20

  Copy full SHA for 7c34a20

• Added error handling t0 #request_rates_from_API

  lindseyreno

  committed
  f203e25

  Copy full SHA for f203e25

• added readable_date helper

  a-lmx

  committed
  cad7033

  Copy full SHA for cad7033

• refactored shipping_option_label formatting

  a-lmx

  committed
  35e4f5a

  Copy full SHA for 35e4f5a

• uncommented production gems

  a-lmx

  committed
  33d23df

  Copy full SHA for 33d23df

• modified migrations to avoid change_columns

  a-lmx

  committed
  22f9706

  Copy full SHA for 22f9706

• removed change migration

  a-lmx

  committed
  1eb2864

  Copy full SHA for 1eb2864

• changed user search in logged_in to find_by

  a-lmx

  committed
  a01189b

  Copy full SHA for a01189b

• changed logged_in Order.find_by to find

  a-lmx

  committed
  ae57791

  Copy full SHA for ae57791

• commented out late order

  a-lmx

  committed
  87445d5

  Copy full SHA for 87445d5

• testing out find_by with id in params

  a-lmx

  committed
  c4ec66a

  Copy full SHA for c4ec66a

• added heroku uris for PenguinShipper for production env

  a-lmx

  committed
  5a830d8

  Copy full SHA for 5a830d8

• fixed typo in log_choice_url

  a-lmx

  committed
  0e8592b

  Copy full SHA for 0e8592b

• fixed bug in storage and display of shipping cost

  a-lmx

  committed
  a222873

  Copy full SHA for a222873

• debugging redirect error in shipping action

  a-lmx

  committed
  072bb2f

  Copy full SHA for 072bb2f

• debugging redirect loop

  a-lmx

  committed
  9a2d6bb

  Copy full SHA for 9a2d6bb

• debugging redirect loop

  a-lmx

  committed
  5078685

  Copy full SHA for 5078685

• removed commented code

  a-lmx

  committed
  10c6af9

  Copy full SHA for 10c6af9

• destroyed session[:shipping_option]

  a-lmx

  committed
  597f50d

  Copy full SHA for 597f50d