bodega 0.4.9 → 0.4.12

data/VERSION

@@ -1 +1 @@
-0.4.9
+0.4.12

data/app/controllers/bodega/orders_controller.rb

@@ -20,7 +20,7 @@ class Bodega::OrdersController < ApplicationController
   end
 
   def create
-    if current_order.update_attributes(params[:order])
+    if current_order.update_attributes(params[:order].merge(checking_out: params[:checkout].present?))
       if !current_order.new_shipping_rates? && params[:checkout]
         redirect_to current_order.payment_method.checkout_url(complete_order_url, new_order_url, params)
       else

data/app/models/bodega/order.rb

@@ -4,7 +4,11 @@ module Bodega
   class Order < ActiveRecord::Base
     self.table_name = :bodega_orders
 
+    attr_accessor :checking_out
+
+    attr_accessible :email, :checking_out
     attr_accessible :order_products_attributes, :postal_code, :shipping_rate_code
+    attr_accessible :street_1, :street_2, :city, :state
 
     before_create :set_identifier
     before_save :set_shipping_rates, if: :set_shipping_rates?
@@ -30,13 +34,15 @@ module Bodega
 
     serialize :shipping_rates
 
+    validates_presence_of :email, if: :require_email?
+
     def finalize!(options)
       self.class.transaction do
         self.status = :complete
         self.save!
         begin
           self.payment_id = payment_method.complete!(options)
-          self.save
+          self.save!
         rescue Exception
           raise ActiveRecord::Rollback
         end
@@ -85,6 +91,10 @@ module Bodega
       end
     end
 
+    def state_options
+      US_STATES.values
+    end
+
     def subtotal
       order_products.inject(Money.new(0)) {|sum, order_product| sum += order_product.subtotal }
     end
@@ -138,6 +148,10 @@ module Bodega
       end
     end
 
+    def require_email?
+      Bodega.config.collect_email && persisted? && (postal_code_changed? || checking_out)
+    end
+
     def set_identifier
       self.identifier = self.class.count.succ.to_s(36)
     end
@@ -161,4 +175,61 @@ module Bodega
       self.total = subtotal + tax + shipping
     end
   end
+
+
+  US_STATES = ActiveSupport::OrderedHash.new
+  Hash['Alabama', 'AL',
+    'Alaska', 'AK',
+    'Arizona', 'AZ',
+    'Arkansas', 'AR',
+    'California', 'CA',
+    'Colorado', 'CO',
+    'Connecticut', 'CT',
+    'Delaware', 'DE',
+    'District Of Columbia', 'DC',
+    'Florida', 'FL',
+    'Georgia', 'GA',
+    'Hawaii', 'HI',
+    'Idaho', 'ID',
+    'Illinois', 'IL',
+    'Indiana', 'IN',
+    'Iowa', 'IA',
+    'Kansas', 'KS',
+    'Kentucky', 'KY',
+    'Louisiana', 'LA',
+    'Maine', 'ME',
+    'Maryland', 'MD',
+    'Massachusetts', 'MA',
+    'Michigan', 'MI',
+    'Minnesota', 'MN',
+    'Mississippi', 'MS',
+    'Missouri', 'MO',
+    'Montana', 'MT',
+    'Nebraska', 'NE',
+    'Nevada', 'NV',
+    'New Hampshire', 'NH',
+    'New Jersey', 'NJ',
+    'New Mexico', 'NM',
+    'New York', 'NY',
+    'North Carolina', 'NC',
+    'North Dakota', 'ND',
+    'Ohio', 'OH',
+    'Oklahoma', 'OK',
+    'Oregon', 'OR',
+    'Pennsylvania', 'PA',
+    'Rhode Island', 'RI',
+    'South Carolina', 'SC',
+    'South Dakota', 'SD',
+    'Tennessee', 'TN',
+    'Texas', 'TX',
+    'Utah', 'UT',
+    'Vermont', 'VT',
+    'Virginia', 'VA',
+    'Washington', 'WA',
+    'West Virginia', 'WV',
+    'Wisconsin', 'WI',
+    'Wyoming', 'WY'
+  ].sort.each do |key, value|
+    US_STATES[key] = value
+  end
 end

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

@@ -7,9 +7,10 @@
       <%= form.fields_for(:order_products) do |order_product_form| -%>
       <%= render partial: 'cart_row', locals: {form: order_product_form, order_product: order_product_form.object} %>
       <% end =%>
+      <%= render partial: 'email_row', locals: {form: form} if Bodega.config.collect_email %>
+      <%= render partial: 'shipping_row', locals: {form: form} if current_order.shipping_method %>
     </tbody>
     <tfoot>
-      <%= render partial: 'shipping_row', locals: {form: form} if current_order.shipping_method %>
       <% if current_order.ready? -%>
       <tr>
         <td class="product-total-label" colspan="3"><%= t 'bodega.total' %></td>

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

@@ -0,0 +1,5 @@
+<tr id="bodega-email">
+  <td colspan="5">
+    <%= form.email_field :email, placeholder: t('bodega.email') %>
+  </td>
+</tr>

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

@@ -1,11 +1,24 @@
+<% unless current_order.payment_method.shipping? -%>
+<tr id="bodega-shipping-address">
+  <td colspan="5">
+    <%= form.text_field :street_1, placeholder: t('bodega.street_1') %>
+    <%= form.text_field :street_2, placeholder: t('bodega.street_2') %>
+    <%= form.text_field :city, placeholder: t('bodega.city') %>
+    <%= form.select :state, current_order.state_options, {}, prompt: t('bodega.state') %>
+    <%= form.text_field :postal_code, placeholder: t('bodega.postal_code') %>
+  </td>
+</tr>
+<% end -%>
 <tr>
   <td class="shipping-postal-code" colspan="3">
+    <% if current_order.payment_method.shipping? -%>
     <%= form.text_field :postal_code, placeholder: t('bodega.postal_code') %>
+    <% end -%>
     <% if current_order.postal_code.present? -%>
     <%= form.select :shipping_rate_code, current_order.shipping_rate_options %>
     <% end -%>
   </td>
   <td class="shipping-total" colspan="2">
-    <%= humanized_money_with_symbol current_order.shipping %>
+    <%= humanized_money_with_symbol current_order.shipping if current_order.ready? %>
   </td>
 </tr>

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

@@ -1,24 +1,21 @@
+<% if params[:stripe] == 'yes' -%>
 <%= javascript_include_tag 'https://checkout.stripe.com/v2/checkout.js' %>
 <script type="text/javascript">
-  $('#bodega-checkout').click(function(event) {
-    event.preventDefault();
-    var button = $(this);
-    var form = button.parents('form');
+  var form = $('#bodega-cart').parents('form');
 
-    var token = function(response) {
-      button.attr('name', '');
-      input = $('<input type="hidden" name="stripe" />').val(response.id);
-      form.append('<input type="hidden" name="checkout" value="1" />');
-      form.append(input).submit();
-    };
+  var token = function(response) {
+    input = $('<input type="hidden" name="stripe" />').val(response.id);
+    form.append('<input type="hidden" name="checkout" value="1" />');
+    form.append(input).submit();
+  };
 
-    StripeCheckout.open({
-      key: <%= Bodega.config.stripe.publishable_key.inspect.html_safe %>,
-      amount: <%= current_order.total_cents %>,
-      name: <%= Bodega.config.store_name.inspect.html_safe %>,
-      description: <%= current_order.summary.inspect.html_safe %>,
-      panelLabel: 'Confirm:',
-      token: token
-    });
+  StripeCheckout.open({
+  key: <%= Bodega.config.stripe.publishable_key.inspect.html_safe %>,
+    amount: <%= current_order.total_cents %>,
+    name: <%= Bodega.config.store_name.inspect.html_safe %>,
+    description: <%= current_order.summary.inspect.html_safe %>,
+    panelLabel: 'Confirm:',
+    token: token
   });
 </script>
+<% end -%>

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

@@ -18,6 +18,19 @@
       </td>
     </tr>
     <% end -%>
+
+    <tr>
+      <td class="product-name">
+        <%= @order.shipping_rate_name %>
+      </td>
+      <td class="price">
+        <%= humanized_money_with_symbol @order.shipping %>
+      </td>
+      <td class="subtotal">
+        <%= humanized_money_with_symbol @order.shipping %>
+      </td>
+    </tr>
+
     <tr>
       <td colspan="2"></td>
       <td><%= humanized_money_with_symbol @order.total %></td>

data/bodega.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bodega"
-  s.version = "0.4.8"
+  s.version = "0.4.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Flip Sasser"]
-  s.date = "2013-03-31"
+  s.date = "2013-04-24"
   s.description = "Bodega adds checkout logic to any model in your app!"
   s.email = "flip@x451.com"
   s.extra_rdoc_files = [
@@ -33,7 +33,10 @@ Gem::Specification.new do |s|
     "app/models/bodega/product.rb",
     "app/views/bodega/orders/_cart.html.erb",
     "app/views/bodega/orders/_cart_row.html.erb",
+    "app/views/bodega/orders/_email_row.html.erb",
+    "app/views/bodega/orders/_paypal.html.erb",
     "app/views/bodega/orders/_shipping_row.html.erb",
+    "app/views/bodega/orders/_stripe.html.erb",
     "app/views/bodega/orders/edit.html.erb",
     "app/views/bodega/orders/new.html.erb",
     "app/views/bodega/orders/show.html.erb",
@@ -42,12 +45,14 @@ Gem::Specification.new do |s|
     "config/routes.rb",
     "db/migrate/20121111170337_create_bodega_orders.rb",
     "db/migrate/20121111170420_create_bodega_order_products.rb",
+    "db/migrate/20130415214518_add_email_to_orders.rb",
     "lib/bodega.rb",
     "lib/bodega/engine.rb",
     "lib/bodega/optional.rb",
     "lib/bodega/payment_method.rb",
     "lib/bodega/payment_method/base.rb",
     "lib/bodega/payment_method/paypal.rb",
+    "lib/bodega/payment_method/stripe.rb",
     "lib/bodega/shipping_method.rb",
     "lib/bodega/shipping_method/base.rb",
     "lib/bodega/shipping_method/ups.rb",

data/config/locales/en.yml

@@ -13,3 +13,8 @@ en:
     order_failed: "There was a problem processing this order. Your account has not been charged."
     calculate_shipping: "Calculate Shipping"
     remove_link: "Remove"
+    email: "Email address"
+    street_1: "Shipping address"
+    street_2: "Shipping address cont'd"
+    city: "City"
+    state: "State"

data/db/migrate/20121111170337_create_bodega_orders.rb

@@ -11,6 +11,10 @@ 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.money :shipping
       t.money :tax

data/db/migrate/20130415214518_add_email_to_orders.rb

@@ -0,0 +1,5 @@
+class AddEmailToOrders < ActiveRecord::Migration
+  def change
+    add_column :bodega_orders, :email, :string
+  end
+end

data/lib/bodega.rb

@@ -12,6 +12,7 @@ module Bodega
   option :max_quantity, 1000
 
   option :store_name, "Store name (override in Bodega.config.store_name)"
+  option :collect_email, false
 
   # Auto-detect payment method. If a user has the Paypal gem installed,
   # it'll use that. If a user has the Plinq gem installed, it'll use that.

data/lib/bodega/payment_method/base.rb

@@ -18,6 +18,12 @@ module Bodega
       def initialize(order)
         self.order = order
       end
+
+      # Does the payment method provide shipping details? If not, they'll
+      # be editable at checkout.
+      def shipping?
+        true
+      end
     end
   end
 end

data/lib/bodega/payment_method/stripe.rb

@@ -8,19 +8,29 @@ module Bodega
 
       # Redirect to /cart/complete?stripe=tokenToVerifyPayment
       def checkout_url(success_url, cancel_url, params = {})
-        uri = Addressable::URI.heuristic_parse(success_url)
-        uri.query_hash[:stripe] = params[:stripe]
+        if params[:stripe]
+          uri = Addressable::URI.heuristic_parse(success_url)
+          uri.query_hash[:stripe] = params[:stripe]
+        else
+          uri = Addressable::URI.heuristic_parse(cancel_url)
+          uri.query_hash[:stripe] = 'yes'
+        end
         uri.to_s
       end
 
       def complete!(options = {})
         ::Stripe.api_key = Bodega.config.stripe.secret_key
-        ::Stripe::Charge.create(
+        charge = ::Stripe::Charge.create(
           amount: order.total_cents,
           currency: 'usd',
           card: options[:stripe],
           description: order.summary
-        ).id
+        )
+        charge.id
+      end
+
+      def shipping?
+        false
       end
 
       protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bodega
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-31 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -131,6 +131,7 @@ files:
 - app/models/bodega/product.rb
 - app/views/bodega/orders/_cart.html.erb
 - app/views/bodega/orders/_cart_row.html.erb
+- app/views/bodega/orders/_email_row.html.erb
 - app/views/bodega/orders/_paypal.html.erb
 - app/views/bodega/orders/_shipping_row.html.erb
 - app/views/bodega/orders/_stripe.html.erb
@@ -142,6 +143,7 @@ files:
 - config/routes.rb
 - db/migrate/20121111170337_create_bodega_orders.rb
 - db/migrate/20121111170420_create_bodega_order_products.rb
+- db/migrate/20130415214518_add_email_to_orders.rb
 - lib/bodega.rb
 - lib/bodega/engine.rb
 - lib/bodega/optional.rb