caboose-cms 0.8.25 → 0.8.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f96a208dfdb1074c18a5b5f0c845276dd631798
-  data.tar.gz: 60d73ecbb0e26bc549c8131c1cde2a01334dba57
+  metadata.gz: 41bf1ce6d0e61f964d2f161da9b1bf4719786fe5
+  data.tar.gz: 6e4f08e55f99e6b8023803edbbf1e1f7bf247561
 SHA512:
-  metadata.gz: bf1a6499f62a952971b09ebd6fe6c4eb64c29b165885bed861abb516e78af0a1dc56e5bbdd3d0a3fc7fe9305dd0b756e5eb9965f7c4e00deffc1920bd78e8272
-  data.tar.gz: 949c6f709388a4190ce2583c0ef432e63f40f0621aa7e4acaef9a800c08a7417184b6aab86e696336b9679cfe01a44644de5bc9534bedcee09b960bf2b88def8
+  metadata.gz: 55d17b778bef6a0d74bc48f68945c9156b8e452d0c80ae13d3a8495180f2dca5e2c4577bc55775291640d48c647bb7b0b2bc7a4cdf8fb06ac6f2017f897413b5
+  data.tar.gz: 05db00cfc1cf84ac39845441eec91d590399b0ca45e76ca8d8338fbea9997652fb1f77f738fa9dac95c3fc665aa75f5e17b2874f30f2a8c24586007fd450494c

data/app/controllers/caboose/products_controller.rb

@@ -10,8 +10,8 @@ module Caboose
            
     # @route GET /admin/products/stubs
     def admin_stubs      
-      title = params[:title].strip.downcase.split(' ')
-      render :json => [] and return if title.length == 0
+      title = params[:title] ? params[:title].strip.downcase.split(' ') : nil
+      render :json => [] and return if title.nil? || title.length == 0
       
       where = ["site_id = ?"]      
       vars = [@site.id]
@@ -462,6 +462,7 @@ module Caboose
       resp = Caboose::StdClass.new
       name = params[:name]
       pd = @site.product_default
+      vd = @site.variant_default
       
       if name.length == 0
         resp.error = "The title cannot be empty."
@@ -482,6 +483,39 @@ module Caboose
         p.gift_wrap_price = pd.gift_wrap_price
         
         p.save
+        
+        v = Variant.new
+        v.product_id = p.id 
+        v.option1    = p.default1 if p.option1
+        v.option2    = p.default2 if p.option2
+        v.option3    = p.default3 if p.option3
+        
+        v.cost                           = vd.cost                         
+        v.price                          = vd.price                              
+        v.available                      = vd.available                    
+        v.quantity_in_stock              = vd.quantity_in_stock            
+        v.ignore_quantity                = vd.ignore_quantity              
+        v.allow_backorder                = vd.allow_backorder              
+        v.weight                         = vd.weight                       
+        v.length                         = vd.length                       
+        v.width                          = vd.width                        
+        v.height                         = vd.height                       
+        v.volume                         = vd.volume                       
+        v.cylinder                       = vd.cylinder                     
+        v.requires_shipping              = vd.requires_shipping            
+        v.taxable                        = vd.taxable                      
+        v.shipping_unit_value            = vd.shipping_unit_value          
+        v.flat_rate_shipping             = vd.flat_rate_shipping           
+        v.flat_rate_shipping_package_id  = vd.flat_rate_shipping_package_id
+        v.flat_rate_shipping_method_id   = vd.flat_rate_shipping_method_id 
+        v.flat_rate_shipping_single      = vd.flat_rate_shipping_single    
+        v.flat_rate_shipping_combined    = vd.flat_rate_shipping_combined     
+        v.status                         = vd.status                       
+        v.downloadable                   = vd.downloadable                 
+        v.is_bundle                      = vd.is_bundle
+        
+        v.save
+        
         resp.redirect = "/admin/products/#{p.id}/general"
       end
       render :json => resp    

data/app/controllers/caboose/variants_controller.rb

@@ -36,12 +36,12 @@ module Caboose
       
       if @product.variants.nil? || @product.variants.count == 0
         v = Variant.new
+        v.product_id = @product.id
         v.option1 = @product.default1 if @product.option1
         v.option2 = @product.default2 if @product.option2
         v.option3 = @product.default3 if @product.option3
         v.status  = 'Active'
-        @product.variants = [v]
-        @product.save
+        v.save        
       end
       @variant = params[:variant_id] ? Variant.find(params[:variant_id]) : @product.variants[0]
       @highlight_variant_id = params[:highlight] ? params[:highlight].to_i : nil

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.8.25'
+  VERSION = '0.8.26'
 end

data/lib/tasks/caboose.rake

@@ -308,11 +308,39 @@ namespace :caboose do
     caboose_correct_sequences    
   end
 
-  desc "Resets the admin password to 'caboose'"
-  task :reset_admin_pass => :environment do  
-    admin_user = Caboose::User.where(username: 'admin').first
+  desc "Resets the admin password to 'caboose'"  
+  task :reset_admin_pass, [:site_name] => :environment do |t, args|  
+    site = Caboose::Site.where(:name => args.first).first
+    if site.nil?
+      puts "Error: can't find a site with that name."
+      return
+    end    
+    admin_user = Caboose::User.where(:username => 'admin', :site_id => site.id).first
+    if admin_user.nil?
+      puts "Error: can't find admin user for site #{site.name}."
+      return
+    end
     admin_user.password = Digest::SHA1.hexdigest(Caboose::salt + 'caboose')
     admin_user.save    
+    puts "Password reset successfully for the admin user for site #{site.name}."
+  end
+  
+  desc "Verify store products have a default variant"
+  task :verify_variants_exist => :environment do    
+    query = ["select id from store_products where id not in (select distinct product_id from store_variants) order by site_id, status"]    
+    rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, query))    
+    return if rows.nil? || rows.count == 0
+    
+    rows.each do |row|
+      p = Caboose::Product.find(row[0])
+      v = Caboose::Variant.new
+      v.product_id = p.id 
+      v.option1 = p.default1 if p.option1
+      v.option2 = p.default2 if p.option2
+      v.option3 = p.default3 if p.option3
+      v.status  = 'Active'
+      v.save
+    end    
   end
                  
   desc "Clears sessions older than the length specified in the caboose config from the sessions table"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.25
+  version: 0.8.26
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg