caboose-cms 0.6.12 → 0.6.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmZmZjJjMjE2ZTgyZjc3ZjEwYjVkODMxNzA2ODY2NjBmY2M1NmU5ZA==
+    M2U1YjdkM2YxYWNmMWVlNzBiYzc1MDE5ZmNiNWNkMGI3OWU2ZjhkNg==
   data.tar.gz: !binary |-
-    YmUxZjQ5ZTc3YmJlZWRiZGE2MjY2OTFhY2I4Y2IxYzJhNzNiMjVlMw==
+    NmEzN2UyOTVlNDY4OWQ0ZWJkMzBiZTg3ZmU1NWFjNDI3NTE1MDQ5MA==
 SHA512:
   metadata.gz: !binary |-
-    MTU4NTM4YTY2MDVkOWU1MTMzYzIwYWY1YzNmMDZmZDc2YzVhODdmMmM0Njgx
-    ZTAyZDg0Yzg4YmUxMmQ4MTVlZDI1YzQxNzM0NmRjMTQ2ODE0YzE3ZGIyMjJi
-    NjUyMzBhZjZkYTNhMTNiZTI4NDY1NzBjMDQ2MzkzMzVlZjUwMmY=
+    N2JjNmJmMDA3MjE2OTUwZDFjYjhkMThhNzAzZWEzOWY4ZTU4NDk0NDdjMmE3
+    NGIwOGQ3ZDJhY2UyYzIyMTZiMWE4MTVkN2M5MzIxMmZmOWU0MTU2ZGUzNGVi
+    M2VhZWFhMTY0ZmM0NzE0ZDRkZDI4YTNmZTMwMzNjNGU5YmJjYWU=
   data.tar.gz: !binary |-
-    OTEwNjAzN2YyMDgwNGI4YTkyZDk2M2RjYmVlZmQyOGUwYmExOTQ2ODk3MmRl
-    OGIwNjMxZTBiYzJjZDQzYzFmNTEyNTE3YjQzYzY4MDVlNmU4Y2RjYWU4YTE3
-    MTgxNDBhODQyNjQ0N2M5ZTM5ZDVkMWYwZGVmMjBlNTE0MGUxZWY=
+    ZGY0ZjUxNzg0MmNmNTE4MzA5MDhjNzdiNTVjNDhjMDJmZWMyOTBkNjRjOWY5
+    NGVhYTNmYjEzMWIxNDkxZDNlZDY0MmFhODE3Y2RiYzViNTNhZThjMGY5NGNh
+    ZjVmYTRhNjYzOGFmMmQzOWQwOGZkZDRkNzFhOTZiMzFhZTlkOTE=

data/app/controllers/caboose/media_categories_controller.rb

@@ -93,6 +93,13 @@ module Caboose
         m = Media.where(:id => id).first
         next if m.nil?
         m.update_attribute(:media_category_id, media_category_id)
+        p = Product.where(:media_category_id => media_category_id).last
+        if p
+          pi = ProductImage.where(:media_id => id).exists? ? ProductImage.where(:media_id => id).first : ProductImage.create(:media_id => id, :product_id => p.id)
+          pi.product_id = p.id
+          pi.save
+          ProductImageVariant.where(:product_image_id => pi.id).destroy_all
+        end
       end
         
       render :json => { :success => true }

data/app/controllers/caboose/media_controller.rb

@@ -93,7 +93,8 @@ module Caboose
     # DELETE /admin/media/:id
     def admin_delete
       return unless user_is_allowed('media', 'delete')
-      Media.find(params[:id]).destroy                  
+      Media.find(params[:id]).destroy
+      ProductImage.where(:media_id => params[:id]).destroy_all
       render :json => { :success => true }
     end
     
@@ -104,6 +105,7 @@ module Caboose
       if ids
         ids.each do |id|                
           Media.where(:id => id).destroy_all
+          ProductImage.where(:media_id => id).destroy_all
         end
       end
       render :json => { :success => true }
@@ -116,7 +118,13 @@ module Caboose
       original_name = params[:name]
       name = Caboose::Media.upload_name(original_name)                        
       m = Media.where(:media_category_id => media_category_id, :original_name => original_name, :name => name).first
-      Media.create(:media_category_id => media_category_id, :original_name => original_name, :name => name, :processed => false) if m.nil?
+      if m.nil?
+        m = Media.create(:media_category_id => media_category_id, :original_name => original_name, :name => name, :processed => false)
+      end
+      p = Product.where(:media_category_id => media_category_id).last
+      if p
+        pi = ProductImage.create(:product_id => p.id, :media_id => m.id)
+      end
       render :json => { :success => true }
     end
     

data/app/controllers/caboose/products_controller.rb

@@ -284,7 +284,29 @@ module Caboose
     # GET /admin/products/:id/images
     def admin_edit_images    
       return if !user_is_allowed('products', 'edit')    
-      @product = Product.find(params[:id])
+      @product = Product.find(params[:id])  
+      config = YAML.load(File.read(Rails.root.join('config', 'aws.yml')))[Rails.env]      
+      access_key = config['access_key_id']
+      secret_key = config['secret_access_key']
+      bucket     = config['bucket']      
+      policy = {        
+        "expiration" => 1.hour.from_now.utc.xmlschema,
+        "conditions" => [
+          { "bucket" => "#{bucket}-uploads" },          
+          { "acl" => "public-read" },
+          [ "starts-with", "$key", '' ],      
+          [ 'starts-with', '$name', '' ],   
+          [ 'starts-with', '$Filename', '' ],          
+        ]
+      }
+      @policy = Base64.encode64(policy.to_json).gsub(/\n/,'')      
+      @signature = Base64.encode64(OpenSSL::HMAC.digest(OpenSSL::Digest::Digest.new('sha1'), secret_key, @policy)).gsub("\n","")
+      @s3_upload_url = "https://#{bucket}-uploads.s3.amazonaws.com/"
+      @aws_access_key_id = access_key                            
+          
+      @top_media_category = @product.media_category.parent
+      @media_category = @product.media_category
+
       render :layout => 'caboose/admin'
     end
     
@@ -341,7 +363,11 @@ module Caboose
           when 'site_id'            then product.site_id            = value
           when 'vendor_id'          then product.vendor_id          = value
           when 'alternate_id'       then product.alternate_id       = value          
-          when 'title'              then product.title              = value
+          when 'title'
+            product.title = value
+            c = MediaCategory.where(:id => product.media_category_id).last
+            c.name = value
+            c.save
           when 'caption'            then product.caption            = value
           when 'featured'           then product.featured           = value
           when 'description'        then product.description        = value          
@@ -409,6 +435,10 @@ module Caboose
         resp.error = "The title cannot be empty."
       else
         p = Product.new(:site_id => @site.id, :title => name)
+        mc = MediaCategory.where(:site_id => @site.id).where("parent_id IS NULL").exists? ? MediaCategory.where(:site_id => @site.id).where("parent_id IS NULL").last : MediaCategory.create(:name => "Media", :site_id => @site.id)
+        pc = MediaCategory.where(:name => "Products", :site_id => @site.id).exists? ? MediaCategory.where(:name => "Products", :site_id => @site.id).last : MediaCategory.create(:name => "Products", :site_id => @site.id, :parent_id => mc.id)
+        c = MediaCategory.create(:site_id => @site.id, :name => name, :parent_id => pc.id)
+        p.media_category_id = c.id
         p.save
         resp.redirect = "/admin/products/#{p.id}/general"
       end

data/app/models/caboose/product.rb

@@ -4,6 +4,7 @@ module Caboose
     self.primary_key = 'id'
 
     belongs_to :site    
+    belongs_to :media_category    
     belongs_to :stackable_group, :class_name => 'Caboose::StackableGroup'
     belongs_to :vendor, :class_name => 'Caboose::Vendor'
     has_many :customizations, :class_name => 'Caboose::Product', :through => :customization_memberships
@@ -45,7 +46,8 @@ module Caboose
       :stackable_group_id    ,
       :on_sale               ,
       :allow_gift_wrap       ,
-      :gift_wrap_price
+      :gift_wrap_price       ,
+      :media_category_id
 
     STATUS_ACTIVE = 'Active'
     STATUS_INACTIVE = 'Inactive'

data/app/models/caboose/product_image.rb

@@ -3,6 +3,7 @@ module Caboose
     self.table_name = 'store_product_images'
     
     belongs_to :product
+    belongs_to :media
     has_many :product_image_variants
     has_many :variants, :through => :product_image_variants
         
@@ -17,7 +18,8 @@ module Caboose
       :image_updated_at,
       :square_offset_x,
       :square_offset_y,
-      :square_scale_factor
+      :square_scale_factor,
+      :media_id
       
     has_attached_file :image,      
       :path => ':caboose_prefixproducts/:product_id_:id_:style.:extension',      
@@ -44,7 +46,8 @@ module Caboose
     end
     
     def url(size) # 'tiny', 'thumb', 'medium', 'large', 'huge'
-      self.image.url(size)
+      return self.media.image.url(size) if !self.media_id.blank?
+      return self.image.url(size)
     end
     
     def urls

data/app/models/caboose/schema.rb

@@ -521,7 +521,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :stackable_group_id    , :integer   ],
         [ :on_sale               , :boolean   , { :default => false }],
         [ :allow_gift_wrap       , :boolean   , { :default => false }],
-        [ :gift_wrap_price       , :decimal   , { :precision => 8, :scale => 2 }]
+        [ :gift_wrap_price       , :decimal   , { :precision => 8, :scale => 2 }],
+        [ :media_category_id     , :integer   ]
       ],         
       Caboose::ProductImage => [
         [ :product_id            , :integer  ],
@@ -534,7 +535,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :image_updated_at      , :datetime ],
         [ :square_offset_x       , :integer  ],
         [ :square_offset_y       , :integer  ],
-        [ :square_scale_factor   , :numeric  ]
+        [ :square_scale_factor   , :numeric  ],
+        [ :media_id              , :integer  ]
       ],
       Caboose::ProductImageVariant => [
         [ :product_image_id      , :integer ],

data/app/views/caboose/products/admin_edit_images.html.erb

@@ -3,7 +3,7 @@ p = @product
 %>
 <%= render :partial => 'caboose/products/admin_header' %>
 
-<form action='/admin/products/<%= p.id %>/images' method='post' enctype='multipart/form-data' id='new_image_form' target='new_image_iframe'>
+<!-- <form action='/admin/products/<%= p.id %>/images' method='post' enctype='multipart/form-data' id='new_image_form' target='new_image_iframe'>
 <input type='hidden' name='authenticity_token' value="<%= form_authenticity_token %>" />
 <p><input type='file' name='new_image' id='new_image' />
 <input type='submit' value='Add Image' onclick='add_image();' /></p>
@@ -11,12 +11,75 @@ p = @product
 <div id='new_image_message'></div>
 <iframe id='new_image_iframe' name='new_image_iframe' style='display: none;'></iframe>
 <div id='message'></div>
+ -->
+
+<!-- <p>Upload new product images at the <a href="/admin/media">media browser</a>.</p> -->
+
+
+
+
+
+
+<h2>Product Images</h2>
+
+<div id='left_content' style="width:150px;">
+<!--   <div id='categories'></div> -->
+  <div id='controls'></div>
+</div>
+<div id='right_content' style="margin-left:170px;">
+  <div id='uploader'></div>
+  <div id='media'></div>
+</div>
+
+<% content_for :caboose_css do %>
+<%= stylesheet_link_tag 'caboose/admin_media_index' %>
+<%= stylesheet_link_tag 'plupload/jquery.ui.plupload/css/jquery.ui.plupload.css' %>
+<% end %>
+
+<% content_for :caboose_js do %>
+<%= javascript_include_tag 'caboose/model/all' %>
+<%= javascript_include_tag 'caboose/admin_media_index.js' %>
+<%= javascript_include_tag 'caboose/jquery-ui.drag-multiple.min.js' %>
+
+<!-- production -->
+<%= javascript_include_tag 'plupload/plupload.full.min.js' %>
+<%= javascript_include_tag 'plupload/jquery.ui.plupload/jquery.ui.plupload.js' %>
+                
+<!-- debug 
+<script type="text/javascript" src="/assets/plupload/moxie.js"></script>
+<script type="text/javascript" src="/assets/plupload/plupload.dev.js"></script>
+<script type="text/javascript" src="/assets/plupload/jquery.ui.plupload/jquery.ui.plupload.js"></script>
+-->
+
+<script type="text/javascript">
+
+var controller = false;
+$(document).ready(function() {
+  controller = new MediaController({
+    top_cat_id: <%= raw Caboose.json(@media_category ? @top_media_category.id : false) %>,
+    cat_id: <%= raw Caboose.json(@media_category ? @media_category.id : false) %>,
+    s3_upload_url: '<%= raw @s3_upload_url %>',                 
+    aws_access_key_id: '<%= raw @aws_access_key_id %>',   
+    policy: '<%= raw @policy %>',
+    signature: '<%= raw @signature %>',
+    refresh_unprocessed_images: false
+  }); 
+});
+
+</script>
+<% end %>
+
+
+
+<hr style="margin:40px 0 20px 0;"/>
+
 
 <div id='images'>
+  <h4>Assign Images to Variants</h4>
   <% if p.product_images.count > 0 %>
     <ul id='images_list' class='clearfix'>
       <% p.product_images.reorder(:position).each do |img| %>
-        <% url = img.image.url(:tiny) %>
+        <% url = img.url(:tiny) %>
         <li id='img_<%= img.id %>'><div id='img_<%= img.id %>_container'><a href="javascript:select_image(<%= img.id %>);"><img src='<%= url %>' width='75' /></a></div></li> 
       <% end %>
     </ul>
@@ -38,6 +101,9 @@ p = @product
 #images div.selected img { border: #ff3333 4px solid; }
 #images_list { list-style: none; margin: 0; padding: 0; }
 #images_list li { list-style: none; margin: 0 10px 10px 0; padding: 0; float: left; }
+.delete_dropper {
+  margin-top: 0;
+}
 </style>
 <% end %>
 <% content_for :caboose_js do %>
@@ -115,7 +181,7 @@ function select_image(image_id, confirm)
   
   $('#variants').empty().append('<br/>');
   $('#variants').append($('<div/>').attr('id','delete_message'));
-  $('#variants').append($('<input/>').attr('type','button').val('Delete Image').click(function() { delete_image(image_id); }));  
+ // $('#variants').append($('<input/>').attr('type','button').val('Delete Image').click(function() { delete_image(image_id); }));  
   $('#variants').append(tbl);  
 }
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.6.12'
+  VERSION = '0.6.13'
 end

data/lib/tasks/caboose.rake

@@ -1,6 +1,54 @@
 require "caboose/version"
 
 namespace :caboose do
+
+  desc "Create media categories for existing products on all sites"
+  task :create_product_media_categories => :environment do
+    sites = Caboose::Site.where(:use_store => true).all.each do |s|
+      puts "Processing categories for " + s.description
+      # Create the parent level Media category if it doesn't exist
+      media_category = Caboose::MediaCategory.where(:name => "Media", :site_id => s.id).where("parent_id IS NULL").exists? ? Caboose::MediaCategory.where(:name => "Media", :site_id => s.id).where("parent_id IS NULL").last : Caboose::MediaCategory.new
+      media_category.name = "Media"
+      media_category.site_id = s.id
+      media_category.save
+      # Create the Products category if it doesn't exist
+      product_category = Caboose::MediaCategory.where(:name => "Products", :site_id => s.id).exists? ? Caboose::MediaCategory.where(:name => "Products", :site_id => s.id).last : Caboose::MediaCategory.new
+      product_category.parent_id = media_category.id
+      product_category.name = "Products"
+      product_category.site_id = s.id
+      product_category.save
+      # Create new category for each product
+      Caboose::Product.where(:site_id => s.id).all.each do |p|
+        puts "Creating media category for " + p.title
+        p_category = Caboose::MediaCategory.where(:name => p.title, :site_id => s.id).exists? ? Caboose::MediaCategory.where(:name => p.title, :site_id => s.id).last : Caboose::MediaCategory.new
+        p_category.name = p.title
+        p_category.parent_id = product_category.id
+        p_category.site_id = s.id
+        p_category.save
+        p.media_category_id = p_category.id
+        p.save
+      end
+    end
+  end
+
+  desc "Migrate product images to media"
+  task :migate_product_images_to_media => :environment do
+    Caboose::ProductImage.where("image_file_name is not null AND media_id IS NULL").order("id DESC").all.each do |product_image|
+      next if product_image.product.nil?
+      puts "Saving media for Product Image " + product_image.id.to_s
+      m = nil
+      m = Caboose::Media.where(:id => product_image.media_id).first
+      m = Caboose::Media.create(:media_category_id => product_image.product.media_category_id) if m.nil?
+      product_image.media_id = m.id
+      product_image.save
+      m.original_name = product_image.image_file_name
+      m.name = Caboose::Media.upload_name(m.original_name)      
+      m.image = URI.parse(product_image.image.url(:original))
+      m.processed = true
+      m.save
+    end
+  end
+
   
   desc "Create a new lite site"
   task :create_site => :environment do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.6.12
+  version: 0.6.13
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -660,7 +660,6 @@ files:
 - app/mailers/caboose/caboose_mailer.rb
 - app/mailers/caboose/login_mailer.rb
 - app/mailers/caboose/orders_mailer.rb
-- app/models/caboose/#Untitled-1#
 - app/models/caboose/ab_option.rb
 - app/models/caboose/ab_testing.rb
 - app/models/caboose/ab_value.rb

data/app/models/caboose/#Untitled-1#

@@ -1,56 +0,0 @@
-================================================================================
-Order packages
-================================================================================
-  
-# Create a single order package for the order
-sp = ShippingPackage.where(:site_id => order.site_id).first
-op = OrderPackage.create(:order_id => order.id, :shipping_package_id => sp.id)
-
-# Assign the line items to the order package  
-order.line_items.each do |li|
-  li.order_package_id = op.id
-  li.save
-end
-
-================================================================================
-Shipping
-================================================================================
-
-sc = store_config
-sa = order.shipping_address
-origin      = ActiveShipping::Location.new(:country => sc.origin_country, :state => sc.origin_state, :city => sc.origin_city, :zip => sc.origin_zip)
-destination = ActiveShipping::Location.new(:country => sc.origin_country, :state => sa.state, :city => sa.city, :postal_code => sa.zip)
-carriers = {}      
-carriers['UPS']  = ActiveShipping::UPS.new(:login => sc.ups_username, :password => sc.ups_password, :key => sc.ups_key, :origin_account => sc.ups_origin_account) 
-carriers['USPS'] = ActiveShipping::USPS.new( :login => sc.usps_username) if order.total < 150
-
-all_rates = []
-order.order_packages.all.each do |op|
-
-  flat_rate = true
-  op.line_items do |li|
-    flat_rate = false if !li.variant.flat_rate_shipping
-  end
-  if flat_rate
-    v = op.line_items.first.variant                
-    all_rates << { :order_package => op, :rates => [{ :shipping_method => v.flat_rate_shipping_method, :total_price => (v.flat_rate_shipping_single/100) }] }  
-  else
-    sp = op.shipping_package                            
-    package = op.activemerchant_package
-    rates = []
-    carriers.each do |name, carrier|                                      
-      resp = carrier.find_rates(origin, destination, package)                        
-      resp.rates.sort_by(&:price).each do |rate|                            
-        sm = ShippingMethod.where( :carrier => name, :service_code => rate.service_code).first
-        sm = ShippingMethod.create(:carrier => name, :service_code => rate.service_code, :service_name => rate.service_name) if sm.nil?
-        next if !sp.uses_shipping_method(sm)
-        price = rate.total_price
-        price = rate.package_rates[0].rate if price.nil? && rate.package_rates && rate.package_rates.count > 0              
-        rates << { :shipping_method => sm, :total_price => (price.to_d/100) }
-      end    
-    end
-    all_rates << { :order_package => op, :rates => rates }
-  end
-  
-end  
-return all_rates