piggybak 0.5.5 → 0.6.0

data/app/models/piggybak/shipping_calculator/flat_rate.rb

@@ -2,6 +2,10 @@ module Piggybak
   class ShippingCalculator::FlatRate
     KEYS = ["rate"]
 
+    def self.description
+      "Flat Rate"
+    end
+
     def self.available?(*args)
       true
     end

data/app/models/piggybak/shipping_calculator/free.rb

@@ -2,6 +2,10 @@ module Piggybak
   class ShippingCalculator::Free
     KEYS = []
 
+    def self.description
+      "Free Shipping"
+    end
+
     def self.available?(method, object)
       true
     end

data/app/models/piggybak/shipping_calculator/range.rb

@@ -2,6 +2,10 @@ module Piggybak
   class ShippingCalculator::Range
     KEYS = ["cost", "upper", "lower"]
 
+    def self.description
+      "Cost per Range"
+    end
+
     def self.available?(method, object)
       low_end = method.metadata.detect { |m| m.key == "lower" }.value
       high_end = method.metadata.detect { |m| m.key == "upper" }.value

data/app/models/piggybak/shipping_method.rb

@@ -23,7 +23,7 @@ module Piggybak
     end
 
     def klass_enum
-      Piggybak.config.shipping_calculators
+      Piggybak.config.shipping_calculators.collect { |b| [ b.constantize.description, b ] }
     end
 
     def self.available_methods(cart)

data/app/models/piggybak/tax_method.rb

@@ -35,7 +35,7 @@ module Piggybak
           total_tax += calculator.rate(tax_method, object)
         end 
       end
-      
+   
       total_tax
     end
 

data/app/views/piggybak/cart/_form.html.erb

@@ -1,14 +1,14 @@
-<% if object.reflections.keys.include?(:piggybak_variant) -%>
-	<% if object.piggybak_variant && object.piggybak_variant.active -%>
-		<% if object.piggybak_variant.quantity > 0 || object.piggybak_variant.unlimited_inventory -%>
+<% if object.reflections.keys.include?(:piggybak_sellable) -%>
+	<% if object.piggybak_sellable && object.piggybak_sellable.active -%>
+		<% if object.piggybak_sellable.quantity > 0 || object.piggybak_sellable.unlimited_inventory -%>
 			<%= form_tag piggybak.cart_add_url do -%>
-			<div id="variant_details">
-			<span id="title"><%= object.piggybak_variant.description %></span>
-			<span id="price"><%= number_to_currency object.piggybak_variant.price %></span>
+			<div id="sellable_details">
+			<span id="title"><%= object.piggybak_sellable.description %></span>
+			<span id="price"><%= number_to_currency object.piggybak_sellable.price %></span>
 			</div>
 			<label>Quantity</label>
 			<%= text_field_tag :quantity, "1" %>
-			<%= hidden_field_tag :variant_id, object.piggybak_variant.id %>
+			<%= hidden_field_tag :sellable_id, object.piggybak_sellable.id %>
 			<%= submit_tag "Add to Cart", :id => "submit" %>
 			<% end -%>
 			<% else -%>

data/app/views/piggybak/cart/_items.html.erb

@@ -12,19 +12,19 @@
 	</tr>
 	<% @cart.items.each do |item| %>
 	<tr>
-		<td><%= item[:variant].description %></td>
-		<td><%= number_to_currency item[:variant].price %></td>
+		<td><%= item[:sellable].description %></td>
+		<td><%= number_to_currency item[:sellable].price %></td>
 		<td>
 			<% if page == "cart" -%>
-			<%= text_field_tag "quantity[#{item[:variant].id}]", item[:quantity] %>
+			<%= text_field_tag "quantity[#{item[:sellable].id}]", item[:quantity] %>
             <% else -%>
 			<%= item[:quantity] %>
 			<% end -%>
 		</td>
-		<td><%= number_to_currency item[:quantity]*item[:variant].price %></td>
+		<td><%= number_to_currency item[:quantity]*item[:sellable].price %></td>
 		<% if page == "cart" -%>
 		<td>
-			<%= link_to "Remove", piggybak.remove_item_url(item[:variant].id), :method => :delete %>
+			<%= link_to "Remove", piggybak.remove_item_url(item[:sellable].id), :method => :delete %>
 		</td>
 		<% end -%>
 	</tr>
@@ -48,6 +48,15 @@
 		<td>Shipping</td>
 		<td id="shipping_total"></td>
 	</tr>
+	<% Piggybak.config.line_item_types.each do |k, v| -%>
+	<% if v.has_key?(:display_in_cart) -%>
+	<tr id="<%= "#{k}_row" %>" style="display:none;">
+		<td colspan="<%= page == "cart" ? "3" : "2" %>"></td>
+		<td><%= v[:display_in_cart] %></td>
+		<td class="extra_totals" id="<%= k %>_total">$0.00</td>
+	</tr>
+	<% end -%> 
+	<% end -%>
 	<tr>
 		<td colspan="<%= page == "cart" ? "3" : "2" %>"></td>
 		<td>Total</td>

data/app/views/piggybak/notifier/order_notification.text.erb

@@ -2,8 +2,16 @@ Thanks for your order!
 
 Items
 
-<% @order.line_items.each do |line_item| %>
-<%= line_item.variant.description %> x <%= line_item.quantity %> = <%= number_to_currency line_item.total %>
+<% @order.line_items.sellables.each do |line_item| %>
+<%= line_item.description %> x <%= line_item.quantity %> = <%= number_to_currency line_item.price %>
+<% end -%>
+
+<% @order.line_items.shipments.each do |line_item| %>
+<%= line_item.description %> = <%= number_to_currency line_item.price %>
+<% end -%>
+
+<% @order.line_items.payments.each do |line_item| %>
+<%= line_item.description %> = <%= number_to_currency line_item.price %>
 <% end -%>
 
 Total

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

@@ -5,12 +5,12 @@
 		<th>Quantity</th>
 		<th>Subtotal</th>
 	</tr>
-	<% order.line_items.each do |line_item| %>
+	<% order.line_items.sellables.each do |line_item| %>
 	<tr>
 		<td><%= line_item.description %></td>
-		<td><%= number_to_currency line_item.price %></td>
+		<td><%= number_to_currency line_item.unit_price %></td>
 		<td><%= line_item.quantity %></td>
-		<td><%= number_to_currency line_item.total %></td>
+		<td><%= number_to_currency line_item.price %></td>
 	</tr>
 	<% end -%>
 	<tr>
@@ -19,7 +19,7 @@
 	<tr>
 		<td colspan="2"></td>
 		<td>Subtotal</td>
-		<td><%= number_to_currency order.line_items.inject(0) { |subtotal, li| subtotal + li.total } %></td>
+		<td><%= number_to_currency order.line_items.sellables.inject(0) { |subtotal, li| subtotal + li.price } %></td>
 	</tr>
 	<tr>
 		<td colspan="2"></td>
@@ -29,8 +29,17 @@
 	<tr>
 		<td colspan="2"></td>
 		<td>Shipping</td>
-		<td><%= number_to_currency order.shipments.inject(0) { |shipping, shipment| shipping + shipment.total } %></td>
+		<td><%= number_to_currency order.shipment_charge %></td>
+	</tr>
+	<% Piggybak.config.line_item_types.each do |k, v| -%>
+	<% if v.has_key?(:display_in_cart) && order.line_items.detect { |li| li.line_item_type == k.to_s } -%>
+	<tr>
+		<td colspan="2"></td>
+		<td><%= v[:display_in_cart] %></td>
+		<td class="extra_totals" id="<%= k %>_total"><%= number_to_currency order.line_items.detect { |li| li.line_item_type == k.to_s }.price %></td>
 	</tr>
+	<% end -%> 
+	<% end -%>
 	<tr>
 		<td colspan="2"></td>
 		<td>Total</td>

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

@@ -4,16 +4,16 @@ _gaq.push(['_addTrans',
   '<%= store_name %>', 
   '<%= @order.total %>',
   '<%= @order.tax_charge %>',
-  '<%= @order.shipments.first.total %>',
+  '<%= @order.shipment_charge %>',
   '<%= @order.billing_address.city %>',
   '<%= @order.billing_address.state_display %>',
   '<%= @order.billing_address.country.name %>'
 ]);
 
-<% @order.line_items.each do |line_item| -%>
+<% @order.line_items.sellables.each do |line_item| -%>
 _gaq.push(['_addItem',
   '<%= @order.id %>',
-  '<%= line_item.variant.try(:sku) %>',
+  '<%= line_item.sellable.try(:sku) %>',
   '<%= line_item.description %>', 
   '',   // category or variation
   '<%= line_item.price %>', //unit price

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

@@ -3,16 +3,16 @@ Order: #<%= @order.id %>
 Email: <%= @order.email %>
 Phone: <%= @order.phone %>
 
-<% @order.line_items.each do |line_item| %>
-<%= line_item.quantity %> x <%= raw line_item.description %> (<%= number_to_currency line_item.total %>)
+<% @order.line_items.sellables.each do |line_item| %>
+<%= line_item.quantity %> x <%= raw line_item.description %> (<%= number_to_currency line_item.price %>)
 <% end -%>
 
-Subtotal: <%= number_to_currency @order.line_items.inject(0) { |subtotal, li| subtotal + li.total } %>
-Shipping & Handling: <%= number_to_currency @order.shipments.inject(0) { |shipping, shipment| shipping + shipment.total } %>
+Subtotal: <%= number_to_currency @order.line_items.sellables.inject(0) { |subtotal, li| subtotal + li.price } %>
+Shipping & Handling: <%= number_to_currency @order.line_items.shipments.inject(0) { |shipping, shipment| shipping + shipment.price } %>
 Tax: <%= number_to_currency @order.tax_charge %>
 Total: <%= number_to_currency @order.total %>
-Less Payment: <%= number_to_currency(@order.payments.inject(0) { |total, p| total + p.total if p.status == "paid" }) %>
-Adjustments: <%= number_to_currency(@order.adjustments.inject(0) { |total, adj| total + adj.total }) %>
+Less Payment: <%= number_to_currency(@order.line_items.payments.inject(0) { |total, p| total + p.price if p.payment.status == "paid" }) %>
+Adjustments: <%= number_to_currency(@order.line_items.adjustments.inject(0) { |total, adj| total + adj.price }) %>
 Balance Due: <%= number_to_currency @order.total_due %>
 
 Billing Information

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

@@ -6,7 +6,7 @@
 <% if @order.errors.any? -%>
 <div id="checkout_error">
 <b>You have errors with your submission:</b><br />
-<%= raw @order.errors.full_messages.join("<br />") %>
+<%= raw @order.errors.full_messages.collect { |b| b.gsub(/^Line items payment/, 'Payment').gsub(/^Line items shipment shipping/, 'Shipping') }.join("<br />") %>
 </div>
 <% end -%>
 <div class="clear"></div>
@@ -50,59 +50,65 @@
 <div id="add_details">
 	<div id="shipping">
 	<h3>Shipping Option</h3>
-	<%= f.fields_for :shipments, f.object.shipments.build do |shipment| %>
-		<div class="item">
-		<%= shipment.label :shipping_method_id %>
-		<%= shipment.select :shipping_method_id, [] %>
-		<div id="shipping_spinner" style="display:none;">
-			<%= image_tag "ajax-loader.gif" %>
-		</div>
-		<div id="shipping_default" style="display:none;">
-			Please enter a shipping address.
-		</div>
-		<div id="shipping_empty" style="display:none;">
-			No shipping methods found.
-		</div>
-		</div>
+	<%= f.fields_for :line_items, @order.line_items.detect { |li| li.line_item_type == "shipment" } do |line_item_f| %>
+		<%= line_item_f.hidden_field :line_item_type, { :value => "shipment" } %>
+		<%= line_item_f.fields_for :shipment do |shipment| %>
+			<div class="item">
+			<%= shipment.label :shipping_method_id %>
+			<%= shipment.select :shipping_method_id, [] %>
+			<div id="shipping_spinner" style="display:none;">
+				<%= image_tag "ajax-loader.gif" %>
+			</div>
+			<div id="shipping_default" style="display:none;">
+				Please enter a shipping address.
+			</div>
+			<div id="shipping_empty" style="display:none;">
+				No shipping methods found.
+			</div>
+			</div>
+		<% end -%>
 	<% end -%>
 	</div>
 	<div id="payment">
 	<h3>Payment</h3>
-	<%= f.fields_for :payments, f.object.payments.build do |payment| %>
-		<div class="item">
-		<%= payment.label :number %>
-		<% if @order.errors.keys.include?("payments.number".to_sym) %>
-		<span class="field_with_errors">
-		<%= payment.text_field :number %>
-		</span>
-		<% else -%>
-		<%= payment.text_field :number %>
-		<% end -%>
-		</div>
-
-		<div class="item">
-		<%= payment.label :verification_value %>
-		<% if @order.errors.keys.include?("payments.verification_value".to_sym) %>
-		<span class="field_with_errors">
-		<%= payment.text_field :verification_value %>
-		</span>
-		<% else -%>
-		<%= payment.text_field :verification_value %>
-		<% end -%>
-		</div>
-
-		<div class="item">
-		<%= payment.label :month %>
-		<% if @order.errors.keys.include?("payments.verification_value".to_sym) %>
-		<span class="field_with_errors">
-		<%= payment.select :month, 1.upto(12).to_a %> /
-		<%= payment.select :year, Time.now.year.upto(Time.now.year + 10).to_a %>
-		</span>
-		<% else -%>
-		<%= payment.select :month, 1.upto(12).to_a %> /
-		<%= payment.select :year, Time.now.year.upto(Time.now.year + 10).to_a %>
+	<%= f.fields_for :line_items, @order.line_items.detect { |li| li.line_item_type == "payment" } do |line_item_f| %>
+		<%= line_item_f.hidden_field :line_item_type, { :value => "payment" } %>
+		<%= line_item_f.fields_for :payment do |payment| %>
+			<div class="item">
+			<%= payment.label :number %>
+			<% if @order.errors.keys.include?("payments.number".to_sym) %>
+			<span class="field_with_errors">
+			<%= payment.text_field :number %>
+			</span>
+			<% else -%>
+			<%= payment.text_field :number %>
+			<% end -%>
+			</div>
+	
+			<div class="item">
+			<%= payment.label :verification_value %>
+			<% if @order.errors.keys.include?("payments.verification_value".to_sym) %>
+			<span class="field_with_errors">
+			<%= payment.text_field :verification_value %>
+			</span>
+			<% else -%>
+			<%= payment.text_field :verification_value %>
+			<% end -%>
+			</div>
+	
+			<div class="item">
+			<%= payment.label :month %>
+			<% if @order.errors.keys.include?("payments.verification_value".to_sym) %>
+			<span class="field_with_errors">
+			<%= payment.select :month, 1.upto(12).to_a %> /
+			<%= payment.select :year, Time.now.year.upto(Time.now.year + 10).to_a %>
+			</span>
+			<% else -%>
+			<%= payment.select :month, 1.upto(12).to_a %> /
+			<%= payment.select :year, Time.now.year.upto(Time.now.year + 10).to_a %>
+			<% end -%>
+			</div>
 		<% end -%>
-		</div>
 	<% end -%>
 	</div>
 	<div id="submit">

data/app/views/rails_admin/main/_location_select.html.haml

@@ -8,8 +8,8 @@
 - else
   = form.text_field "state_id"
 
-- if type == "billing"
-  = javascript_include_tag "piggybak.states"
-
 :javascript
   var geodata_lookup = "#{piggybak.orders_geodata_url}";
+
+- if type == "billing"
+  = javascript_include_tag "piggybak.states"

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

@@ -3,32 +3,32 @@ N/A
 <% else -%>
 <table cellpadding="5" cellspacing="0">
 	<tr>
-		<td width="150">Subtotal</td>
-		<td>$<%= "%.2f" % form.object.line_items.inject(0) { |subtotal, li| subtotal + li.total } %></td>
+		<td width="150">Subtotal (Sellables)</td>
+		<td><%= number_to_currency form.object.subtotal %></td>
 	</tr>
 	<tr>
 		<td>Shipping</td>
-		<td>$<%= "%.2f" % form.object.shipments.inject(0) { |shipping, shipment| shipping + shipment.total } %></td>
+		<td><%= number_to_currency form.object.shipment_charge %></td>
 	</tr>
 	<tr>
 		<td>Tax</td>
-		<td>$<%= "%.2f" % form.object.tax_charge %></td>
+		<td><%= number_to_currency form.object.tax_charge %></td>
 	</tr>
 	<tr>
-		<td>Total</td>
-		<td>$<%= "%.2f" % form.object.total %></td>
+		<td>Adjustments</td>
+		<td><%= number_to_currency form.object.adjustment_charge %></td>
 	</tr>
 	<tr>
-		<td>Payments</td>
-		<td>$<%= "%.2f" % form.object.payments.inject(0) { |total, payment| total + payment.total } %></td>
+		<td>Total</td>
+		<td><%= number_to_currency form.object.total %></td>
 	</tr>
 	<tr>
-		<td>Adjustments</td>
-		<td>$<%= "%.2f" % form.object.adjustments.inject(0) { |total, adj| total + adj.total.to_f } %></td>
+		<td>Payments</td>
+		<td><%= number_to_currency form.object.payment_charge %></td>
 	</tr>
 	<tr>
 		<td>Balance Due</td>
-		<td>$<%= "%.2f" % form.object.total_due %></td>
+		<td><%= number_to_currency form.object.total_due %></td>
 	</tr>
 	<tr>
 		<td>Created at</td>
@@ -42,23 +42,11 @@ N/A
 				<li><%= link_to "Send or Resend Email Confirmation", piggybak.email_order_url(form.object.id) %></li>
 				<li><%= link_to "View as Text", piggybak.download_order_url(form.object.id) %></li>
 				<% if form.object.total_due == 0.00 -%>
-				<li><%= link_to "Cancel Order", piggybak.cancel_order_url(form.object.id) %> (This does not mark the payment gateway payments. This marks payments tied to ths order in this database as refunded, and marks the order as cancelled.)</li>
+				<li><%= link_to "Cancel Order", piggybak.cancel_order_url(form.object.id) %> (This does not refund payments.)</li>
 				<% end -%>
 			</ul>
 		</td>
 	</tr>
-	<% else -%>
-	<tr>
-		<td valign="top">Actions</td>
-		<td>
-			<ul>
-				<li>
-					<%= link_to "Restore Cancel Order", piggybak.restore_order_url(form.object.id) %>
-					(This marks order as un-cancelled.)
-				</li>
-			</ul>
-		</td>
-	</tr>
 	<% end -%>
 </table>
 <% end -%>

data/app/views/rails_admin/main/_polymorphic_nested.html.haml

@@ -0,0 +1,29 @@
+- if form.object.new_record?
+  = form.select "line_item_type", Piggybak::LineItem.line_item_type_select, {}, :onchange => "toggle_line_item($(this));"
+- else
+  = form.hidden_field "line_item_type"
+  = form.object.line_item_type
+
+%script
+  var line_item_types=#{raw Piggybak.config.line_item_types.to_json};
+  var toggle_line_item = function(el) {
+  el.parent().parent().siblings('div').hide();
+  if(line_item_types[el.val()].fields === undefined) {
+  line_item_types[el.val()].fields = new Array();
+  }
+  $.each(line_item_types[el.val()].fields, function(a, b) {
+  el.parent().parent().siblings('.' + b + '_field').show();
+  if(line_item_types[el.val()].nested_attrs !== undefined) {
+  el.parent().parent().siblings('.' + b + '_field').find('> .controls,> .control-label').hide();
+  }
+  });
+  };
+  $.each($('.line_item_type_field select,.line_item_type_field input'), function(i, el) {
+  toggle_line_item($(el));
+  });
+  //Removing delete-ability of line_item_types that can't be destroyed
+  $.each($('.line_item_type_field input'), function(i, el) {
+  if(!line_item_types[$(el).val()].allow_destroy) {
+  $(el).parentsUntil('fieldset').parent().parent().find('.remove_nested_fields').remove();
+  }
+  });