bodega 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/app/models/bodega/order.rb

@@ -4,7 +4,7 @@ module Bodega
   class Order < ActiveRecord::Base
     self.table_name = :bodega_orders
 
-    attr_accessible :order_products_attributes, :street_1, :street_2, :city, :state, :postal_code, :shipping_rate_code
+    attr_accessible :order_products_attributes, :postal_code, :shipping_rate_code
 
     before_create :set_identifier
     before_save :set_shipping_rates, if: :postal_code_changed?
@@ -111,10 +111,11 @@ module Bodega
 
     protected
     def calculate_shipping
-      self.shipping = 0
       if shipping_rate_code
         self.shipping_rate_name = shipping_rates[shipping_rate_code][:name]
         self.shipping = shipping_rates[shipping_rate_code][:price] / 100.0
+      else
+        self.shipping = 0
       end
     end
 
@@ -139,7 +140,13 @@ module Bodega
     end
 
     def set_shipping_rates
-      self.shipping_rates = postal_code.present? ? shipping_method.rates : nil
+      if postal_code.present?
+        self.shipping_rates = shipping_method.rates
+        self.shipping_rate_code = shipping_rate_options.values.first
+        calculate_shipping
+      else
+        self.shipping_rates = self.shipping_rate_code = nil
+      end
       @new_shipping_rates = true
     end
 

data/app/views/bodega/orders/_cart.html.erb

@@ -19,8 +19,10 @@
       <% end -%>
     </tfoot>
   </table>
-  <%= button_tag t('bodega.update_cart'), id: 'bodega-update', name: :update, value: 1 %>
   <% if current_order.ready? -%>
-  <%= button_tag t('bodega.checkout'), id: 'bodega-checkout', name: :checkout, value: 1 %>
+  <%= button_tag t('bodega.update_cart'), id: 'bodega-update', name: :update, value: 1 %>
+  <%= button_tag t('bodega.check_out'), id: 'bodega-checkout', name: :checkout, value: 1 %>
+  <% else -%>
+  <%= button_tag t('bodega.calculate_shipping'), id: 'bodega-update', name: :update, value: 1 %>
   <% end -%>
 <% end =%>

data/bodega.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bodega"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
-  s.date = "2013-02-04"
+  s.date = "2013-02-05"
   s.description = "Bodega adds checkout logic to any model in your app!"
   s.email = "flip@x451.com"
   s.extra_rdoc_files = [

data/config/locales/en.yml

@@ -8,9 +8,7 @@ en:
     sold_out: "Sorry, this product is sold out."
     one_in_stock: "There is only one in stock!"
     x_in_stock: "There are only x in stock!"
-    street_1: "123 Main Street"
-    street_2: "Apartment #1B"
-    city: "City"
-    postal_code: "Zip"
+    postal_code: "Enter your zip code"
     order_processed: "Your order has been processed! Thank you!"
     order_failed: "There was a problem processing this order. Your account has not been charged."
+    calculate_shipping: "Calculate Shipping"

data/db/migrate/20121111170337_create_bodega_orders.rb

@@ -11,12 +11,7 @@ class CreateBodegaOrders < ActiveRecord::Migration
       t.string :shipping_rate_name, limit: 50
       t.text :shipping_rates
       t.string :tracking_number
-      t.string :street_1, limit: 60
-      t.string :street_2, limit: 60
-      t.string :city, limit: 60
-      t.string :state, limit: 3
       t.string :postal_code, limit: 11
-      t.string :country, limit: 3
       t.money :shipping
       t.money :tax
       t.money :total

data/lib/bodega/shipping_method/base.rb

@@ -35,12 +35,7 @@ module Bodega
       end
 
       def location_for(location_object)
-        Location.new(
-          city: location_object.city,
-          state: location_object.state,
-          zip: location_object.postal_code,
-          country: location_object.country
-        )
+        Location.new(zip: location_object.postal_code)
       end
 
       def origin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bodega
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -158,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3124905005200788522
+      hash: 1460082399436927068
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: