piggybak 0.1.1 → 0.2.0

data/app/views/piggybak/orders/download.text.erb

@@ -0,0 +1,19 @@
+Order: #<%= @order.id %>
+
+Email: <%= @order.email %>
+Phone: <%= @order.phone %>
+
+<% @order.line_items.each do |line_item| %>
+<%= line_item.quantity %> x <%= raw line_item.variant.description %> (<%= number_to_currency line_item.total %>)
+<% end -%>
+
+Subtotal: <%= number_to_currency @order.line_items.inject(0) { |subtotal, li| subtotal + li.total } %>
+Tax: <%= number_to_currency @order.tax_charge %>
+Shipping: <%= number_to_currency @order.shipments.inject(0) { |shipping, shipment| shipping + shipment.total } %>
+Total: <%= number_to_currency @order.total %>
+
+Billing Information
+<%= raw @order.billing_address.display.gsub("<br />", "\n") %>
+
+Shipping Information
+<%= raw @order.shipping_address.display.gsub("<br />", "\n") %>

data/app/views/piggybak/orders/list.html.erb

@@ -1,12 +1,12 @@
-<h1>Your Orders</h1>
-
-<% @user.piggybak_orders.each do |order| -%>
-<h2>Order #<%= order.id %></h2>
-
-<p><%= number_to_currency order.total %></p>
-
-<% order.line_items.each do |line_item| -%>
-<%= debug(line_item) %>
-<% end -%>
-
-<% end -%>
+<div id="list_orders">
+	<h1>Your Orders</h1>
+	
+	<% current_user.piggybak_orders.each do |order| -%>
+	
+	<h2>Order #<%= order.id %></h2>
+	Status: <%= order.status %><br />
+	Created at: <%= order.created_at.strftime("%m-%d-%Y") %><br />
+	<%= render "details", :order => order %>	
+	
+	<% end -%>
+</div>

data/app/views/piggybak/orders/no_access.text.erb

@@ -0,0 +1 @@
+You do not have access to view this information.

data/app/views/piggybak/orders/receipt.html.erb

@@ -1,53 +1,5 @@
 <div id="receipt">	
 	<h1>Thanks for your Order</h1>
-	
-	<table id="items" cellpadding="5" cellspacing="0">
-		<tr>
-			<th>Item</th>
-			<th>Price</th>
-			<th>Quantity</th>
-			<th>Subtotal</th>
-		</tr>
-		<% @order.line_items.each do |line_item| %>
-		<tr>
-			<td><%= line_item.product.description %></td>
-			<td><%= line_item.product.price %></td>
-			<td><%= line_item.quantity %></td>
-			<td><%= number_to_currency line_item.total %></td>
-		</tr>
-		<% end -%>
-		<tr>
-			<td colspan="4"></td>
-		</tr>
-		<tr>
-			<td colspan="2"></td>
-			<td>Subtotal</td>
-			<td><%= number_to_currency @order.line_items.inject(0) { |subtotal, li| subtotal + li.total } %></td>
-		</tr>
-		<tr>
-			<td colspan="2"></td>
-			<td>Tax</td>
-			<td><%= number_to_currency @order.tax_charge %></td>
-		</tr>
-		<tr>
-			<td colspan="2"></td>
-			<td>Shipping</td>
-			<td><%= number_to_currency @order.shipments.inject(0) { |shipping, shipment| shipping + shipment.total } %></td>
-		</tr>
-		<tr>
-			<td colspan="2"></td>
-			<td>Total</td>
-			<td><%= number_to_currency @order.total %></td>
-		</tr>
-	</table>
 
-	Email: <%= @order.email %><br />
-    Phone: <%= @order.phone %>
-	
-	<h3>Billing Information</h3>
-	<%= raw @order.billing_address.display %>
-	
-	<h3>Shipping Information</h3>
-	<%= raw @order.shipping_address.display %>
-	
+	<%= render "details", :order => @order %>	
 </div>

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

@@ -4,10 +4,31 @@
 <%= form_for @order, :url => piggybak.order_submit_url, :method => "POST" do |f| %>
 
 <% if @order.errors.any? -%>
+<div id="checkout_error">
 <b>You have errors with your submission:</b><br />
 <%= raw @order.errors.full_messages.join("<br />") %>
+</div>
 <% end -%>
 <div class="clear"></div>
+	
+<div id="user_details">
+	<h3>User Details</h3>
+	<div class="item">
+		<% if current_user -%>
+		<%= f.label :email %>
+		<%= f.text_field :email, { :readonly => true, :class => "readonly" } %><br />
+		<span>or <%= link_to 'LOGOUT', destroy_user_session_path, :method => :delete, :class => "last" %></span>
+		<% else -%>
+		<%= f.label :email %>
+		<%= f.text_field :email %><br />
+		<span>or <%= link_to 'LOG IN', new_user_session_path %></span>
+		<% end -%>
+	</div>
+	<div class="item">
+		<%= f.label :phone %>
+		<%= f.text_field :phone %>
+	</div>
+</div>
 
 <div id="billing_address">
 	<h3>Billing Address</h3>
@@ -16,48 +37,30 @@
 	<% end -%>
 </div>
 <div id="shipping_address">
-	<h3>Shipping Address</h3>
+	<h3>
+		Shipping Address
+		<a href="#" id="copy">copy from billing</a>
+	</h3>
+
 	<%= f.fields_for :shipping_address do |shipping_address| %>
 	<%= render "address_form", :address => shipping_address %>
 	<% end -%>
 </div>
 
 <div id="add_details">
-	<div id="user_details">
-	<h3>User Details</h3>
-	<p>
-		<% if current_user -%>
-		<%= f.label :email %>
-		<%= f.text_field :email, { :readonly => true, :class => "readonly" } %>
-		<% if false -%>
-		<span>or <%= link_to 'LOGOUT', destroy_user_session_path, :method => :delete, :class => "last" %></span>
-		<% end -%>
-		<% else -%>
-		<%= f.label :email %>
-		<%= f.text_field :email %>
-		<% if false -%>
-		<span>or <%= link_to 'LOG IN', new_user_session_path %></span>
-		<% end -%>
-		<% end -%>
-	</p>
-	<p>
-		<%= f.label :phone %>
-		<%= f.text_field :phone %>
-	</p>
-	</div>
 	<div id="shipping">
 	<h3>Shipping Option</h3>
 	<%= f.fields_for :shipments, f.object.shipments.build do |shipment| %>
-		<p>
+		<div class="item">
 		<%= shipment.label :shipping_method_id %>
 		<%= shipment.select :shipping_method_id, [] %>
-		</p>
+		</div>
 	<% end -%>
 	</div>
 	<div id="payment">
 	<h3>Payment</h3>
 	<%= f.fields_for :payments, f.object.payments.build do |payment| %>
-		<p>
+		<div class="item">
 		<%= payment.label :number %>
 		<% if @order.errors.keys.include?("payments.number".to_sym) %>
 		<span class="field_with_errors">
@@ -66,9 +69,9 @@
 		<% else -%>
 		<%= payment.text_field :number %>
 		<% end -%>
-		</p>
+		</div>
 
-		<p>
+		<div class="item">
 		<%= payment.label :verification_value %>
 		<% if @order.errors.keys.include?("payments.verification_value".to_sym) %>
 		<span class="field_with_errors">
@@ -77,9 +80,9 @@
 		<% else -%>
 		<%= payment.text_field :verification_value %>
 		<% end -%>
-		</p>
+		</div>
 
-		<p>
+		<div class="item">
 		<%= payment.label :month %>
 		<% if @order.errors.keys.include?("payments.verification_value".to_sym) %>
 		<span class="field_with_errors">
@@ -90,7 +93,7 @@
 		<%= payment.select :month, 1.upto(12) %> /
 		<%= payment.select :year, Time.now.year.upto(Time.now.year + 10) %>
 		<% end -%>
-		</p>
+		</div>
 	<% end -%>
 	</div>
 	<div id="submit">
@@ -106,7 +109,9 @@
 
 </div>
 
+<%= javascript_include_tag "piggybak" %>
 <script type="text/javascript">
 var shipping_lookup = "<%= piggybak.orders_shipping_url %>"; 
 var tax_lookup = "<%= piggybak.orders_tax_url %>"; 
+var geodata_lookup = "<%= piggybak.orders_geodata_url %>"; 
 </script>

data/app/views/rails_admin/main/_actions.html.erb

@@ -1,5 +1,12 @@
+<ul>
 <% if params[:action] == 'edit' -%>
-<%= link_to "Send Email Confirmation", piggybak.orders_email_url(params[:id]) %>
+<li><%= link_to "Send Email Confirmation", piggybak.orders_email_url(params[:id]) %></li>
 <% else -%>
-<b>You may not send a confirmation email until you have a saved order.</b>
+<li><b>You may not send a confirmation email until you have a saved order.</b></li>
 <% end -%>
+<% if params[:action] == 'edit' -%>
+<li><%= link_to "View as Text", piggybak.orders_download_url(params[:id]) %></li>
+<% else -%>
+<li><b>You may not download until you have a saved order.</b></li>
+<% end -%>
+</ul>

data/config/routes.rb

@@ -1,15 +1,24 @@
 Piggybak::Engine.routes.draw do
   scope :module => "piggybak" do
-    match "/show" => "orders#show", :as => :orders
+    # cart actions
     match "/cart" => "cart#show", :as => :cart
     match "/cart/add" => "cart#add", :via => :post, :as => :cart_add
     match "/cart/update" => "cart#update", :via => :post, :as => :cart_update
     match "/cart/remove/:item" => "cart#remove", :via => :delete, :as => :remove_item
+
+    # order actions
+    match "/show" => "orders#show", :as => :orders
     match "/submit" => "orders#submit", :via => :post, :as => :order_submit
     match "/receipt" => "orders#receipt", :as => :receipt
-    match "/orders" => "orders#list", :as => :orders_list
-    match "/admin/orders/:id/email" => "orders#email", :as => :orders_email
     match "/orders/shipping" => "orders#shipping", :as => :orders_shipping
     match "/orders/tax" => "orders#tax", :as => :orders_tax
+    match "/orders/geodata" => "orders#geodata", :as => :orders_geodata
+
+    # list orders
+    match "/orders" => "orders#list", :as => :orders_list
+
+    # admin actions
+    match "/admin/orders/:id/email" => "orders#email", :as => :orders_email
+    match "/admin/orders/:id/download" => "orders#download", :as => :orders_download, :format => "txt"
   end
 end

data/db/migrate/20111227150106_create_orders.rb

@@ -8,9 +8,9 @@ class CreateOrders < ActiveRecord::Migration
       t.string :email, :null => false
       t.string :phone, :null => false
 
-      t.float :total, :null => false
-      t.float :total_due, :null => false
-      t.float :tax_charge, :null => false
+      t.decimal :total, :null => false
+      t.decimal :total_due, :null => false
+      t.decimal :tax_charge, :null => false
       t.string :status, :null => false
 
       t.timestamps
@@ -19,3 +19,4 @@ class CreateOrders < ActiveRecord::Migration
 end
 
 # Note: To force precision, alter column type in database console
+# Always use decimal when dealing with currency

data/db/migrate/20111227150322_create_addresses.rb

@@ -6,7 +6,8 @@ class CreateAddresses < ActiveRecord::Migration
       t.string :address1, :null => false
       t.string :address2
       t.string :city, :null => false
-      t.references :state, :null => false
+      t.string :state_id, :null => false # because both text states and ids are allowed
+      t.references :country, :null => false
       t.string :zip, :null => false
 
       t.timestamps

data/db/migrate/20111227150432_create_line_items.rb

@@ -3,8 +3,8 @@ class CreateLineItems < ActiveRecord::Migration
     create_table :line_items do |t|
       t.references :order, :null => false
       t.integer :quantity, :null => false
-      t.references :product, :null => false
-      t.float :total
+      t.references :variant, :null => false
+      t.decimal :total
     end
   end
 end

data/db/migrate/{20111227213558_create_products.rb → 20111227213558_create_variants.rb}

@@ -1,9 +1,9 @@
-class CreateProducts < ActiveRecord::Migration
+class CreateVariants < ActiveRecord::Migration
   def change
-    create_table :products do |t|
+    create_table :variants do |t|
       t.string :sku, :null => false
       t.string :description, :null => false
-      t.float :price, :null => false
+      t.decimal :price, :null => false
       t.integer :quantity, :null => false, :default => 0
       t.integer :item_id, :null => false
       t.string :item_type, :null => false

data/db/migrate/20111228231829_create_payments.rb

@@ -4,13 +4,15 @@ class CreatePayments < ActiveRecord::Migration
       t.references :order
       t.references :payment_method
       t.string :status, :null => false, :default => 'paid'
-      t.float :total, :null => false, :default => 0.0
+      t.decimal :total, :null => false, :default => 0.0
 
       t.string :number
       t.integer :month
       t.integer :year
       t.string :verification_value
 
+      t.string :transaction_id
+
       t.timestamps
     end
   end

data/db/migrate/20111228231838_create_shipments.rb

@@ -4,7 +4,7 @@ class CreateShipments < ActiveRecord::Migration
       t.references :order, :null => false
       t.references :shipping_method, :null => false
       t.string :status, :null => false, :default => "new"
-      t.float :total, :null => false, :default => 0.0
+      t.decimal :total, :null => false, :default => 0.0
 
       t.timestamps
     end

data/db/migrate/20120102162414_create_countries.rb

@@ -0,0 +1,10 @@
+require "countries"
+
+class CreateCountries < ActiveRecord::Migration
+  def change
+    create_table :countries do |t|
+      t.string :name
+      t.string :abbr
+    end
+  end
+end

data/db/migrate/20120102162415_create_states.rb

@@ -3,6 +3,7 @@ class CreateStates < ActiveRecord::Migration
     create_table :states do |t|
       t.string :name
       t.string :abbr
+      t.references :country
     end
   end
 end

data/db/migrate/20120104020930_populate_countries_and_states.rb

@@ -0,0 +1,18 @@
+require "countries"
+
+class PopulateCountriesAndStates < ActiveRecord::Migration
+  def change
+    ISO3166::Country.all.each do |country_array|
+      name = country_array[0]
+      abbr = country_array[1]
+      country = Piggybak::Country.create :name => name, :abbr => abbr
+
+      iso3166_country = ISO3166::Country.new(abbr)
+      iso3166_country.states.each do |key, value|
+        abbr = key
+        name = value["name"]
+        Piggybak::State.create! :name => name, :abbr => abbr, :country => country
+      end
+    end
+  end
+end

data/db/migrate/20120106010412_create_credits.rb

@@ -0,0 +1,14 @@
+class CreateCredits < ActiveRecord::Migration
+  def change
+    create_table :credits do |t|
+      t.references :order
+
+      t.string :source_type
+      t.integer :source_id
+
+      t.decimal :total
+
+      t.timestamps
+    end
+  end
+end

data/lib/{acts_as_product → acts_as_variant}/base.rb

@@ -1,5 +1,5 @@
 module Piggybak
-  module ActsAsProduct
+  module ActsAsVariant
     ## Define ModelMethods
     module Base
       def self.included(klass)
@@ -9,12 +9,12 @@ module Piggybak
       end
       
       module ClassMethods
-        def acts_as_product
-          has_one :piggybak_product, :as => "item", :class_name => "::Piggybak::Product"
+        def acts_as_variant
+          has_one :piggybak_variant, :as => "item", :class_name => "::Piggybak::Variant"
 
-          accepts_nested_attributes_for :piggybak_product, :allow_destroy => true
+          accepts_nested_attributes_for :piggybak_variant, :allow_destroy => true
           
-          include Piggybak::ActsAsProduct::Base::InstanceMethods
+          include Piggybak::ActsAsVariant::Base::InstanceMethods
         end
       end
       
@@ -29,4 +29,4 @@ module Piggybak
   end
 end
 
-::ActiveRecord::Base.send :include, Piggybak::ActsAsProduct::Base
+::ActiveRecord::Base.send :include, Piggybak::ActsAsVariant::Base

data/lib/piggybak.rb

@@ -1,29 +1,45 @@
-require 'acts_as_product/base'
+require 'acts_as_variant/base'
 require 'acts_as_orderer/base'
-require 'application_helper'
 require 'active_merchant'
 require 'currency'
-      
-ActiveMerchant::Billing::Base.mode = :test
 
 module Piggybak
+
   class Engine < Rails::Engine
-    initializer "define rails_admin config" do |app|
+    initializer "piggybak.add_helper" do |app|
+      ApplicationController.class_eval do
+        helper :piggybak
+      end
+    end
+
+    initializer "piggybak.rails_admin_config" do |app|
       # RailsAdmin config file. Generated on December 21, 2011 13:04
       # See github.com/sferik/rails_admin for more informations
 
       RailsAdmin.config do |config|
         config.model Piggybak::Order do
           label "Order"
-          navigation_label "Piggybak Orders"
+          navigation_label "Orders"
           weight 1
           object_label_method :admin_label
 
           show do
             field :status
-            field :total
-            field :tax_charge
-            field :total_due
+            field :total do
+              formatted_value do
+                "$%.2f" % value
+              end
+            end
+            field :tax_charge do
+              formatted_value do
+                "$%.2f" % value
+              end
+            end
+            field :total_due do
+              formatted_value do
+                "$%.2f" % value
+              end
+            end
             field :created_at
             field :email
             field :phone
@@ -43,7 +59,7 @@ module Piggybak
               end
             end
             field :created_at do
-              strftime_format "%d-%m-%Y"
+              #strftime_format "%d-%m-%Y"
             end
             field :user
           end
@@ -52,6 +68,10 @@ module Piggybak
               read_only true
               help "Autopopulated"
             end
+            field :actions do
+              partial "actions"
+              help ""
+            end
             field :user do
               read_only do
                 !bindings[:object].new_record?
@@ -59,15 +79,15 @@ module Piggybak
             end
             field :email
             field :phone
-            field :billing_address
-            field :shipping_address
+            field :billing_address do 
+             help "Required"
+            end
+            field :shipping_address do
+              help "Required"
+            end
             field :line_items
             field :shipments
             field :payments
-            field :actions do
-              partial "actions"
-              help "Click above to resend email with current order details."
-            end
           end
         end
       
@@ -84,7 +104,7 @@ module Piggybak
           visible false
 
           edit do
-            field :product
+            field :variant
             field :quantity
             field :total do
               read_only true
@@ -160,7 +180,7 @@ module Piggybak
         end
       
         config.model Piggybak::PaymentMethod do
-          navigation_label "Piggybak Configuration"
+          navigation_label "Configuration"
           weight 2
           object_label_method :admin_label
           list do
@@ -254,21 +274,37 @@ module Piggybak
           end
         end
 
+        config.model Piggybak::Country do
+          label "Countries"
+          navigation_label "Geodata"
+          weight 3
+          list do
+            field :name
+            field :abbr
+          end
+          edit do
+            field :name
+            field :abbr
+          end
+        end
+
         config.model Piggybak::State do
-          weight 1
-          parent Piggybak::PaymentMethod
+          parent Piggybak::Country
+          label "States"
           list do
             field :name
             field :abbr
+            field :country
           end
           edit do
             field :name
             field :abbr
+            field :country
           end
         end
       
-        config.model Piggybak::Product do
-          label "Product"
+        config.model Piggybak::Variant do
+          label "Variant"
           parent Piggybak::Order
           object_label_method :admin_label
           edit do
@@ -279,7 +315,7 @@ module Piggybak
             end
             include_all_fields
             field :unlimited_inventory do
-              help "If true, backorders on this product will be allowed, regardless of quantity on hand."
+              help "If true, backorders on this variant will be allowed, regardless of quantity on hand."
             end
           end
           list do