caboose-store 0.0.32 → 0.0.33

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Zjg2OGY0ZTNmM2VlZjc3OGIzOTNkYmM5YjgwYzcyZDg5NjhkM2UwNw==
+    YWY1ZTY0ZDg0YTNlNjEzYjExMGE3OWFlZWUyYjkwYjA5N2ZlZmM4NA==
   data.tar.gz: !binary |-
-    YmY3MzliNmJlOWQzMTA3OTlmMGE3ZDE0YmY4ZTBmN2NmMTdjNjNmZg==
+    MjNmYjg1MGIxNTFiZDFkMDZlYmQ1MTYzOTZjOGE0Nzg4M2I4ZjJkMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDJhZDkxNDhkYWU0ZTNiOWE1MDU3NTU1OTYyYTEwYzEyOGFkNmFjZTJmZjgz
-    ODdmY2I3NThlYTgwNjUzY2E4NTI2MTBmODYxMjc4ZmQ0MDM1YzQ0OTIwNDg3
-    NzlhM2FmZWZmNzBjZWE1MzE5OTg3N2QzNzY4MWM4MDM0ZTJkMzc=
+    N2UzMDM3NDNlM2ZhZDQwYjUzNTFkM2VhNTVjOTE5YmYzZGE1ZjlhNDQ1OTFh
+    NGM2ZDA1MGQ0MmQwNmJlYjUyNGU3OTUzMTI1YjBkZjBmNjI5NGExZjkxNzcw
+    YTA1NjQ0MmNlYmE0MTU5ZDZjMDlkMmU2ZWZjNDJiZTU0N2IwYjE=
   data.tar.gz: !binary |-
-    OWYyOWFiM2FhYTZiN2I5ZGM2MTVkZDdiZTY1ZTZmNjFhZjlmOWM3NTk3ODc1
-    MjM3ZjRmM2Y2NDQ5MDZhN2VmNjIxMGY3Y2RkYzY0OTAxNjRhNmY4ZmQyMzUx
-    Mzc4OWQ5ZTNlNzUyNmU3Mjc4ZjM4NTU2YWNmODc3OGNiODIwN2Y=
+    MTg5NmNmZTg3OTk5OTRkYjFlOTE3NDJkNTc4MTI1YWRhM2Q2MzUzZDNmMmQ1
+    MDUzMzVjNzg3NjcxMTMwZjcyMDFjOWI5NzdjNTRjMmRhOWI5NDJkMGMzYmEy
+    NDk1MGM4OWYxODBiYmFjYmZlZGY5MjUwOTRjYTg1YjgyYzI2OTA=

data/app/models/caboose_store/order.rb

@@ -166,7 +166,7 @@ module CabooseStore
     
     def calculate_tax
       return 0 if !self.shipping_address
-      TaxCalculator.tax_rate(self.shipping_address)
+      self.subtotal * TaxCalculator.tax_rate(self.shipping_address)
     end
     
     def calculate_shipping

data/app/models/caboose_store/product.rb

@@ -8,12 +8,12 @@ module CabooseStore
     has_many :customization_memberships, :class_name => 'CabooseStore::CustomizationMembership'
     has_many :categories, :class_name => 'CabooseStore::Category', :through => :category_memberships
     has_many :category_memberships, :class_name => 'CabooseStore::CategoryMembership'
-    has_many :variants, :class_name => 'CabooseStore::Variant', :order => 'sort_order'
+    has_many :variants, :class_name => 'CabooseStore::Variant', :order => 'option1_sort_order, option2_sort_order, option3_sort_order'
     has_many :product_images, :class_name => 'CabooseStore::ProductImage'
     has_many :proudct_inputs, :class_name => 'CabooseStore::ProductInput'
     has_many :reviews, :class_name => 'CabooseStore::Review'
     
-    default_scope order('store_products.sort_order')
+    #default_scope order('store_products.sort_order')
     
     attr_accessible :id,
       :alternate_id,
@@ -32,8 +32,7 @@ module CabooseStore
       :default3,
       :status,
       :custom_input,
-      :featured,
-      :sort_order
+      :featured
     
     
     #

data/app/models/caboose_store/schema.rb

@@ -152,7 +152,7 @@ class CabooseStore::Schema < Caboose::Utilities::Schema
         [ :date_available        , :datetime  ],
         [ :custom_input          , :text      ],
         [ :sort_order            , :integer   ],
-        [ :featured              , :boolean    , :default => false ]
+        [ :featured              , :boolean   , :default => false ]
       ],
       
       CabooseStore::Review => [
@@ -200,7 +200,8 @@ class CabooseStore::Schema < Caboose::Utilities::Schema
         [ :status                , :string   ],
         [ :option1_sort_order    , :integer  , { :defult => 0 }],
         [ :option2_sort_order    , :integer  , { :defult => 0 }],
-        [ :option3_sort_order    , :integer  , { :defult => 0 }]
+        [ :option3_sort_order    , :integer  , { :defult => 0 }],
+        [ :sort_order            , :integer  , { :defult => 0 }]
       ],
       
       CabooseStore::Vendor => [

data/app/models/caboose_store/tax_calculator.rb

@@ -1,6 +1,7 @@
 module CabooseStore
   class TaxCalculator
     def self.tax_rate(address)
+      ap '--HOOK calculate tax'
       return 0 if address.state.downcase != 'al'
       city = address.city.downcase
       rate = 0.00

data/lib/caboose-store/version.rb

@@ -1,3 +1,3 @@
 module CabooseStore
-  VERSION = '0.0.32'
+  VERSION = '0.0.33'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-store
 version: !ruby/object:Gem::Version
-  version: 0.0.32
+  version: 0.0.33
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms