piggybak 0.6.22 → 0.6.23

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    piggybak (0.6.22)
+    piggybak (0.6.23)
       activemerchant
       countries
       devise

data/README.md

@@ -63,13 +63,9 @@ Visit the project website [here][project-website] to see more documentation and
 TODO
 ========
 
-* Ensure that changes in nested addresses are recorded on order notes.
-
-* Add/check validation to ensure sufficient inventory
+* Fix tax calculation when coupon / discounts applied.
 
-* Add copy from billing above shipping address section button in admin
-
-* Re-add order logging / masking payment parameters
+* Ensure that changes in nested addresses are recorded on order notes.
 
 Copyright
 ========

data/app/assets/javascripts/piggybak/piggybak.js

@@ -98,6 +98,10 @@ var piggybak = {
 	},
 	update_tax: function(field) {
 		var billing_data = {};
+		billing_data['reduce_tax_subtotal'] = 0;
+		$('.reduce_tax_subtotal:visible').each(function(i, j) {
+			billing_data['reduce_tax_subtotal'] += parseFloat($(j).html().replace('$', ''));
+		});
 		$('#billing_address input, #billing_address select').each(function(i, j) {
 			var id = $(j).attr('id');
 			id = id.replace("piggybak_order_billing_address_attributes_", '');

data/app/models/piggybak/tax_calculator/percent.rb

@@ -19,7 +19,17 @@ module Piggybak
     end
 
     def self.rate(method, object)
-      (method.metadata.detect { |m| m.key == "rate" }.value.to_f * object.subtotal).to_c
+      taxable_total = object.subtotal
+      if object.is_a?(::Piggybak::Order)
+        Piggybak.config.line_item_types.each do |k, v|
+          if v.has_key?(:reduce_tax_subtotal) && v[:reduce_tax_subtotal]
+            taxable_total += object.send("#{k}_charge")
+          end
+        end
+      else
+        taxable_total += object.extra_data[:reduce_tax_subtotal].to_f
+      end
+      (method.metadata.detect { |m| m.key == "rate" }.value.to_f * taxable_total).to_c
     end
   end
 end

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

@@ -40,7 +40,7 @@
 	<% if page != "cart" -%>
 	<tr>
 		<td colspan="<%= page == "cart" ? "3" : "2" %>"></td>
-		<td>Tax</td>
+		<td>Estimated Tax</td>
 		<td id="tax_total"></td>
 	</tr>
 	<tr>
@@ -53,7 +53,7 @@
 	<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>
+		<td class="extra_totals <%= 'reduce_tax_subtotal' if v.has_key?(:reduce_tax_subtotal) && v[:reduce_tax_subtotal] %>" id="<%= k %>_total">$0.00</td>
 	</tr>
 	<% end -%> 
 	<% end -%>

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

@@ -7,12 +7,11 @@ Phone: <%= @order.phone %>
 <%= line_item.quantity %> x <%= raw line_item.description %> (<%= number_to_currency line_item.price %>)
 <% end -%>
 
-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 %>
+<% Piggybak::LineItem.sorted_line_item_types.each do |type| -%>
+<%= type.to_s.pluralize.titleize %>: <%= number_to_currency @order.send("#{type}_charge") %>
+<% end -%>
+
 Total: <%= number_to_currency @order.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/lib/piggybak.rb

@@ -82,7 +82,7 @@ module Piggybak
             # e.g. self.line_items.sellables
             # e.g. self.line_items.taxes
             define_method "#{k.to_s.pluralize}" do
-              proxy_association.proxy.select { |li| li.line_item_type == "#{k}" }.select { |li| !li.marked_for_destruction? }
+              proxy_association.proxy.select { |li| li.line_item_type == "#{k}" && !li.marked_for_destruction? }
             end
           end
         end

data/lib/piggybak/version.rb

@@ -1,3 +1,3 @@
 module Piggybak
-  VERSION = "0.6.22"
+  VERSION = "0.6.23"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.6.22
+  version: 0.6.23
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -234,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3911161906514988357
+      hash: -2079213283630134630
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3911161906514988357
+      hash: -2079213283630134630
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23