Code

shipping-service baseline#2

Code

Open

nlcurry wants to merge 46 commits intoLisa-Sano:masterLisa-Sano/betsy:masterfrom nlcurry:masternlcurry/betsy:masterCopy head branch name to clipboard

+12,752-39

Commits

Commits on May 23, 2016

• added active shipping to gemfile and bundled

  nlcurry

  committed
  d62bd3c

• added gems

  nlcurry

  committed
  aabdec6

• everything

  nlcurry

  committed
  f26fa51

• changed

  nlcurry

  committed
  dd0fc45

• assets precompile

  nlcurry

  committed
  bdf83f5

Commits on May 24, 2016

• had to redo heroku deployment and added some columns to products

  nlcurry

  committed
  1495ab1

Commits on May 25, 2016

• got rid of duplicate gem

  nlcurry

  committed
  7d646d1

• changed columns for order/order items

  nlcurry

  committed
  7264112

• product schema change

  nlcurry

  committed
  5673248

• changed weight to realistic number

  nlcurry

  committed
  af7514e

• added some columns for shipping api

  nlcurry

  committed
  328fd69

• added tracking info and coode to order items

  nlcurry

  committed
  a68be59

• moving some columns from order item to order

  nlcurry

  committed
  0d45a51

Commits on May 26, 2016

• added httparty gem

  nlcurry

  committed
  ff54914

• new view for choosing shipping

  nlcurry

  committed
  1bb7764

• changing update method to generic update instead of checkout confirmation

  nlcurry

  committed
  21ad6f7

• added some conditionals to update method so it can be used twice

  nlcurry

  committed
  ff02419

• added to save conditional on update

  nlcurry

  committed
  fce21b3

• updating update method and adding confirmation method. does not make sense yet

  nlcurry

  committed
  932a7d2

• update will render shipping and confirmation conditional

  nlcurry

  committed
  3ab0efa

• forgot to close conditional

  nlcurry

  committed
  0af90fc

• conditional for confirmation method

  nlcurry

  committed
  06cf4e5

• add total to update params

  nlcurry

  committed
  f5bb896

• started get_rates for wrapper

  nlcurry

  committed
  6ef5036

• added info for package

  nlcurry

  committed
  594c71d

• made method for creating shipment

  nlcurry

  committed
  6d9a3c9

• don't need choose method

  nlcurry

  committed
  5f71df5

• add render cart to shipping

  nlcurry

  committed
  9482fd8

• HTTParty should be get request

  nlcurry

  committed
  82a6bdb

• included shipping to total

  nlcurry

  committed
  c0393ca

• moved last commit to view

  nlcurry

  committed
  30592f0

• change wording on edit

  nlcurry

  committed
  bfe5593

• add patch for shipping

  nlcurry

  committed
  19317b2

• polish wrapper

  nlcurry

  committed
  14b0ae0

• add wrapper to order controller

  nlcurry

  committed
  b44aee6

• add get route

  nlcurry

  committed
  65c9f3b

Commits on May 27, 2016

• shipping method start

  nlcurry

  committed
  9b7a555

• method for total weight

  nlcurry

  committed
  1a00101

• gave name to paths

  nlcurry

  committed
  6d273cb

• started form for shipping

  nlcurry

  committed
  3e50026

• changes var name for more info

  nlcurry

  committed
  f7b34c8

• fix routes

  nlcurry

  committed
  3563b90

• no base_url

  nlcurry

  committed
  4624dde

• jerk code for weight

  nlcurry

  committed
  eab510b

• Merge commit.

  abrown152

  committed
  0b2dc93

• final commit EVER

  nlcurry

  committed
  710f540