piggybak 0.6.4 → 0.6.5

data/Gemfile.lock

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

data/README.md

@@ -71,6 +71,8 @@ TODO
 
 * Add copy from billing above shipping address section button in admin
 
+* Re-add order logging / masking payment parameters
+
 Copyright
 ========
 

data/app/models/piggybak/line_item.rb

@@ -137,7 +137,7 @@ module Piggybak
     end
 
     def self.sorted_line_item_types
-      Piggybak::Config.line_item_types.sort { |a, b| a[1][:sort] <=> b[1][:sort] }.collect { |a| a[0] }
+      Piggybak::Config.line_item_types.sort { |a, b| (a[1][:sort] || 100) <=> (b[1][:sort] || 100) }.collect { |a| a[0] }
     end
   end
 end

data/app/models/piggybak/order.rb

@@ -160,7 +160,6 @@ module Piggybak
       else
         if self.to_be_cancelled
           self.status = "cancelled"
-        # TODO: line items scope doesn't work here, maybe on new items? Fix if possible.
         elsif line_items.select { |li| li.line_item_type == "shipment" }.any? && line_items.select { |li| li.line_item_type == "shipment" }.all? { |s| s.shipment.status == "shipped" }
           self.status = "shipped"
         elsif line_items.select { |li| li.line_item_type == "shipment" }.any? && line_items.select { |li| li.line_item_type == "shipment" }.all? { |s| s.shipment.status == "processing" }

data/lib/acts_as_sellable.rb

@@ -3,19 +3,12 @@ module Piggybak
     extend ActiveSupport::Concern
 
     module ClassMethods
-      
       def acts_as_sellable
-        
-        has_one :piggybak_sellable, :as => "item", :class_name => "::Piggybak::Sellable"
-        
+        has_one :piggybak_sellable, :as => "item", :class_name => "::Piggybak::Sellable", :inverse_of => :item
         accepts_nested_attributes_for :piggybak_sellable, :allow_destroy => true
-
       end      
-
     end
   end
 end
 
 ::ActiveRecord::Base.send :include, Piggybak::ActsAsSellable
-
-

data/lib/piggybak.rb

@@ -51,8 +51,6 @@ module Piggybak
         end
         Piggybak::Order.class_eval do
           define_method "#{k}_charge" do
-            # Scope doesn't work here for lookup of unsaved elements
-            # TODO: Figure out if we can fix, or specify behavior
             charge = 0
             self.line_items.each do |li|
               next if li._destroy || li.line_item_type.to_sym != k
@@ -112,7 +110,18 @@ module Piggybak
         end
 
         config.model Piggybak::Sellable do
+          label "Sellable"
+          object_label_method :admin_label
           visible false
+          edit do
+            field :sku
+            field :description 
+            field :price
+            field :active
+            field :unlimited_inventory do
+              help "If true, backorders on this variant will be allowed, regardless of quantity on hand."
+            end
+          end
         end
 
         config.model Piggybak::Order do

data/lib/piggybak/version.rb

@@ -1,3 +1,3 @@
 module Piggybak
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-19 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -208,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 32961448645574721
+      hash: 1894853370905249501
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 32961448645574721
+      hash: 1894853370905249501
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23