caboose-store 0.0.37 → 0.0.38

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDE0NjMyNTQwOGMyN2NmYTM1Nzg2NzI1NTZmZjE4YWVjZWRhMDljOQ==
+    MjYzYjI2MmYxNTBlYjQ3MmM3NGFkZDFiZDhiOTdhNTY1NWFkNTYxYg==
   data.tar.gz: !binary |-
-    ZWJmMWVkZjg4ZjI1NWFjZjY3M2Q5MTM1ZDQzNTczYWFhNzE5MTVhZg==
+    ZDUyYjMyZDVlYmNiYTYzMTUwNmJiNTI1NjhmODBjZDgyNTMwZjE3NA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NThmYzJhZTM5MWM5MjUzNGY4MTY3ZGMzNzZkNjJiYmM2ZTU2OWZmZjU2N2Rl
-    ZjkyOTE0MDU2OTc0MzkyMmYwMTQwZjU3OWE4OTI1NTQ2ZmQ4Mzc5YTdhMWYz
-    ZmM0MDM1NzE4NmYxMWFlZDFkMjM1YmJjNjRlNmQxOTA4NTgxYTc=
+    OTQ5YWM4OTdlOTJlNzBlZjMyNTM0MWU1MjM0Y2RlYjA1YTQ5YjBlMTA0NzEw
+    ZmNhZWQ3M2RiNzFlZDFiZDk1MDgxNjUxMWZjMjY3MTRlZDQ3MTFlYThjODVk
+    NmU4MzIzZjFhYjg4NDM4ODI0NDI1NDRjMWFlZmY1NzEzZjc1Mjk=
   data.tar.gz: !binary |-
-    MzZjY2ZkMjM4OGEwZDQ4MjQ1YmQwMTVkNGRkNjI2YmIwYzE2YmUxYjU2OWVh
-    ZDcxMTdkOWE2YjljM2U1YjZmYmU5MGZlOWM5YzBhOWEzZDBjN2NkOTA3M2Fj
-    ZGI2ZDA2ODk1ODdmZDU5MjVmYmQwNzRjMTFjZDgzMDFlODIyOGY=
+    NGEwNzM0ODVhNTE2ZTJmNjNjYTJkZjIwMDU3M2U1N2ViOWE0MjdhNzQ1NGZk
+    YTJjMmJjMmE3YzJkOGFjNzc3Nzk2N2FjNWI0MmQwNmQ3MzM0YWFkYjZmNGYx
+    M2I3YmQ1YmU4YjJjZTYyMzVkMDBmY2EyYTkxZjAzZjMwOTY0ODg=

data/app/controllers/caboose_store/products_controller.rb

@@ -195,15 +195,15 @@ module CabooseStore
       
       # Remove passed variants
       # redirect_to "/admin/products/#{params[:id]}/variants/group"
-      
-      render json: true
+            
+      render :json => true
     end
     
     # GET /admin/products/update-vendor-status/:id
     def admin_update_vendor_status
       vendor = Vendor.find(params[:id])
       vendor.status = params[:status]
-      render json: vendor.save
+      render :json => vendor.save
     end
     
     # GET /admin/products
@@ -261,8 +261,8 @@ module CabooseStore
       end
       
       @products = Product.all(
-        include: [:variants, :vendor],
-        conditions: conditions
+        :include => [:variants, :vendor],
+        :conditions => conditions
       )
       
       render :layout => 'caboose/admin'

data/app/models/caboose_store/product.rb

@@ -130,16 +130,16 @@ module CabooseStore
       self.variants.where(:status => ['Active', 'Inactive'])
     end
     
-    def option1_values
-      arr = self.variants.reorder(:option1_sort_order).pluck(:option1).uniq.reject { |x| x.nil? || x.empty? }
+    def option1_values      
+      self.variants.where(:status => 'Active').reorder(:option1_sort_order).pluck(:option1).uniq.reject { |x| x.nil? || x.empty? }
     end
     
     def option2_values
-      self.variants.reorder(:option2_sort_order).pluck(:option2).uniq.reject { |x| x.nil? || x.empty? }
+      self.variants.where(:status => 'Active').reorder(:option2_sort_order).pluck(:option2).uniq.reject { |x| x.nil? || x.empty? }
     end
     
     def option3_values
-      self.variants.reorder(:option3_sort_order).pluck(:option3).uniq.reject { |x| x.nil? || x.empty? }
+      self.variants.where(:status => 'Active').reorder(:option3_sort_order).pluck(:option3).uniq.reject { |x| x.nil? || x.empty? }
     end
   end
 end

data/app/views/caboose_store/orders/admin_edit.html.erb

@@ -71,10 +71,7 @@ captured = @order.financial_status == 'captured'
 <% end %>
 <tr><td colspan='5' align='right'>Subtotal                </td><td align='right' id='subtotal'   ><%= number_to_currency(@order.subtotal ) %></td></tr>
 <tr><td colspan='5' align='right'>Tax                     </td><td align='right' id='tax'        ><%= number_to_currency(@order.tax      ) %></td></tr>
-<% if !@order.shipping.nil? %>
-<tr><td colspan='5' align='right'><%= @order.shipping_method %> Shipping &amp; Handling </td><td align='right' id='shipping'   ><%= number_to_currency(@order.shipping + @order.handling) %></td></tr>
-<% end %>
-
+<tr><td colspan='5' align='right'><%= @order.shipping_method ? @order.shipping_method : '' %> Shipping &amp; Handling </td><td align='right' id='shipping'><%= number_to_currency(@order.shipping + @order.handling) %></td></tr>
 <tr>
   <td colspan='5' align='right'>Discount</td>
   <td align='right'>

data/app/views/caboose_store/products/admin_edit_variants.html.erb

@@ -53,7 +53,7 @@ end
       <th>&nbsp;</th>
     </tr>
     <tbody id='variants_tbody'>
-      <% p.variants.where(:status => ['Active', 'Inactive']).each do |v| %>
+      <% p.variants.where(:status => ['Active', 'Inactive']).each do |v| %>      
         <tr id='variant_<%= v.id %>' <% if @highlight_variant_id && v.id == @highlight_variant_id %>class='highlight'<% end %>>
           <td class='sort_handle'>&nbsp;</td>
           <% if @cols['option1'           ] && p.option1 %><td><div id='variant_<%= v.id %>_option1'           ></div></td><% end %>

data/lib/caboose-store/version.rb

@@ -1,3 +1,3 @@
 module CabooseStore
-  VERSION = '0.0.37'
+  VERSION = '0.0.38'
 end

metadata

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