caboose-cms 0.4.151 → 0.5.1

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.151'
+  VERSION = '0.5.1'
 end

data/lib/tasks/caboose.rake

@@ -162,4 +162,16 @@ namespace :assets do
 
   end
   
+  desc "Fix variant sort order"
+  task :set_variant_sort_order => :environment do
+    Caboose::Product.all.each do |p|
+      puts "Setting sort order for product #{p.id}..."
+      i = 1
+      Caboose::Variant.where(:product_id => p.id).reorder(:id).all.each do |v|
+        v.update_attribute('sort_order', i)
+        i = i + 1
+      end
+    end
+  end
+  
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.151
+  version: 0.5.1
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -196,9 +196,16 @@ files:
 - app/assets/javascripts/caboose/admin_block_edit.js
 - app/assets/javascripts/caboose/admin_images_index.js
 - app/assets/javascripts/caboose/admin_page_edit_content.js
-- app/assets/javascripts/caboose/admin_page_edit_content_bak.js
 - app/assets/javascripts/caboose/admin_page_new_blocks.js
+- app/assets/javascripts/caboose/admin_products.js
 - app/assets/javascripts/caboose/application.js
+- app/assets/javascripts/caboose/cart.js
+- app/assets/javascripts/caboose/checkout.js
+- app/assets/javascripts/caboose/checkout_module.js
+- app/assets/javascripts/caboose/checkout_step1.js
+- app/assets/javascripts/caboose/checkout_step2.js
+- app/assets/javascripts/caboose/checkout_step3.js
+- app/assets/javascripts/caboose/checkout_step4.js
 - app/assets/javascripts/caboose/jquery.detect.js
 - app/assets/javascripts/caboose/jquery.fileupload.js
 - app/assets/javascripts/caboose/jquery.iframe-transport.js
@@ -207,7 +214,6 @@ files:
 - app/assets/javascripts/caboose/main.js
 - app/assets/javascripts/caboose/modal.js
 - app/assets/javascripts/caboose/modal_integration.js
-- app/assets/javascripts/caboose/model/#Untitled-1#
 - app/assets/javascripts/caboose/model/all.js
 - app/assets/javascripts/caboose/model/attribute.js
 - app/assets/javascripts/caboose/model/bound_checkbox.js
@@ -231,6 +237,7 @@ files:
 - app/assets/javascripts/caboose/model/s3.js
 - app/assets/javascripts/caboose/model.form.page.js
 - app/assets/javascripts/caboose/model.form.user.js
+- app/assets/javascripts/caboose/product.js
 - app/assets/javascripts/caboose/s3upload.js
 - app/assets/javascripts/caboose/shortcut.js
 - app/assets/javascripts/caboose/station.js
@@ -241,6 +248,7 @@ files:
 - app/assets/stylesheets/caboose/admin_images_index.css.scss
 - app/assets/stylesheets/caboose/admin_main.css
 - app/assets/stylesheets/caboose/admin_page_edit_content.css
+- app/assets/stylesheets/caboose/admin_products.css
 - app/assets/stylesheets/caboose/application.css
 - app/assets/stylesheets/caboose/bound_input.css
 - app/assets/stylesheets/caboose/caboose.css
@@ -261,7 +269,19 @@ files:
 - app/assets/stylesheets/caboose/station_modal.css
 - app/assets/stylesheets/caboose/station_sidebar.css
 - app/assets/stylesheets/caboose/tinymce.css
+- app/assets/templates/caboose/cart/add_to_cart.jst.ejs
+- app/assets/templates/caboose/cart/line_items.jst.ejs
+- app/assets/templates/caboose/checkout/address.jst.ejs
+- app/assets/templates/caboose/checkout/forms/guest.jst.ejs
+- app/assets/templates/caboose/checkout/forms/register.jst.ejs
+- app/assets/templates/caboose/checkout/forms/signin.jst.ejs
+- app/assets/templates/caboose/checkout/line_items.jst.ejs
+- app/assets/templates/caboose/checkout/login.jst.ejs
+- app/assets/templates/caboose/checkout/payment.jst.ejs
+- app/assets/templates/caboose/checkout/shipping.jst.ejs
 - app/assets/templates/caboose/messages/error.jst.ejs
+- app/assets/templates/caboose/product/images.jst.ejs
+- app/assets/templates/caboose/product/options.jst.ejs
 - app/controllers/caboose/ab_options_controller.rb
 - app/controllers/caboose/ab_variants_controller.rb
 - app/controllers/caboose/admin_controller.rb
@@ -272,6 +292,9 @@ files:
 - app/controllers/caboose/block_types_controller.rb
 - app/controllers/caboose/blocks_controller.rb
 - app/controllers/caboose/calendars_controller.rb
+- app/controllers/caboose/cart_controller.rb
+- app/controllers/caboose/categories_controller.rb
+- app/controllers/caboose/checkout_controller.rb
 - app/controllers/caboose/domains_controller.rb
 - app/controllers/caboose/event_groups_controller.rb
 - app/controllers/caboose/events_controller.rb
@@ -280,26 +303,36 @@ files:
 - app/controllers/caboose/logout_controller.rb
 - app/controllers/caboose/media_categories_controller.rb
 - app/controllers/caboose/modal_controller.rb
+- app/controllers/caboose/orders_controller.rb
 - app/controllers/caboose/page_permissions_controller.rb
 - app/controllers/caboose/pages_controller.rb
 - app/controllers/caboose/permissions_controller.rb
 - app/controllers/caboose/posts_controller.rb
+- app/controllers/caboose/product_images_controller.rb
+- app/controllers/caboose/products_controller.rb
 - app/controllers/caboose/redirects_controller.rb
 - app/controllers/caboose/register_controller.rb
+- app/controllers/caboose/reviews_controller.rb
 - app/controllers/caboose/roles_controller.rb
 - app/controllers/caboose/settings_controller.rb
 - app/controllers/caboose/sites_controller.rb
 - app/controllers/caboose/station_controller.rb
 - app/controllers/caboose/users_controller.rb
+- app/controllers/caboose/variants_controller.rb
+- app/controllers/caboose/vendors_controller.rb
 - app/helpers/caboose/application_helper.rb
+- app/helpers/caboose/categories_helper.rb
+- app/helpers/caboose/checkout_helper.rb
 - app/helpers/caboose/pages_helper.rb
 - app/helpers/caboose/permissions_helper.rb
 - app/helpers/caboose/products_helper.rb
 - app/mailers/caboose/login_mailer.rb
+- app/mailers/caboose/orders_mailer.rb
 - app/models/caboose/ab_option.rb
 - app/models/caboose/ab_testing.rb
 - app/models/caboose/ab_value.rb
 - app/models/caboose/ab_variant.rb
+- app/models/caboose/address.rb
 - app/models/caboose/approval_request.rb
 - app/models/caboose/asset.rb
 - app/models/caboose/authenticator.rb
@@ -314,37 +347,59 @@ files:
 - app/models/caboose/calendar.rb
 - app/models/caboose/calendar_event.rb
 - app/models/caboose/calendar_event_group.rb
+- app/models/caboose/category.rb
+- app/models/caboose/category_membership.rb
 - app/models/caboose/core_plugin.rb
 - app/models/caboose/crumbtrail.rb
+- app/models/caboose/customization_membership.rb
 - app/models/caboose/database_session.rb
+- app/models/caboose/discount.rb
 - app/models/caboose/domain.rb
+- app/models/caboose/line_item.rb
 - app/models/caboose/media_category.rb
 - app/models/caboose/media_file.rb
 - app/models/caboose/media_image.rb
 - app/models/caboose/menu_block.rb
+- app/models/caboose/message.rb
+- app/models/caboose/order.rb
+- app/models/caboose/order_discount.rb
+- app/models/caboose/order_pdf.rb
 - app/models/caboose/page.rb
 - app/models/caboose/page_bar_generator.rb
 - app/models/caboose/page_permission.rb
 - app/models/caboose/page_tag.rb
 - app/models/caboose/pager.rb
+- app/models/caboose/payment_processors/authorizenet.rb
+- app/models/caboose/payment_processors/base.rb
+- app/models/caboose/payment_processors/payscape.rb
 - app/models/caboose/permanent_redirect.rb
 - app/models/caboose/permission.rb
 - app/models/caboose/post.rb
 - app/models/caboose/post_category.rb
 - app/models/caboose/post_category_membership.rb
+- app/models/caboose/product.rb
+- app/models/caboose/product_image.rb
+- app/models/caboose/product_image_variant.rb
+- app/models/caboose/review.rb
 - app/models/caboose/rich_text_block_parser.rb
 - app/models/caboose/role.rb
 - app/models/caboose/role_membership.rb
 - app/models/caboose/role_permission.rb
 - app/models/caboose/schema.rb
+- app/models/caboose/search_filter.rb
 - app/models/caboose/setting.rb
+- app/models/caboose/shipping_calculator.rb
 - app/models/caboose/site.rb
 - app/models/caboose/site_membership.rb
 - app/models/caboose/smtp_config.rb
 - app/models/caboose/states.rb
 - app/models/caboose/std_class.rb
+- app/models/caboose/tax_calculator.rb
+- app/models/caboose/tax_line.rb
 - app/models/caboose/user.rb
 - app/models/caboose/utilities/schema.rb
+- app/models/caboose/variant.rb
+- app/models/caboose/vendor.rb
 - app/views/caboose/ab_variants/admin_edit.html.erb
 - app/views/caboose/ab_variants/admin_index.html.erb
 - app/views/caboose/ab_variants/admin_new.html.erb
@@ -401,6 +456,36 @@ files:
 - app/views/caboose/blocks/admin_render_second_level.json.erb
 - app/views/caboose/calendars/admin_edit.html.erb
 - app/views/caboose/calendars/admin_index.html.erb
+- app/views/caboose/cart/index.html.erb
+- app/views/caboose/categories/admin_edit.html.erb
+- app/views/caboose/categories/admin_index.html.erb
+- app/views/caboose/categories/admin_new.html.erb
+- app/views/caboose/checkout/_address_form.html.erb
+- app/views/caboose/checkout/_billing_form.html.erb
+- app/views/caboose/checkout/_cart.html.erb
+- app/views/caboose/checkout/_confirm.html.erb
+- app/views/caboose/checkout/_order_discount.html.erb
+- app/views/caboose/checkout/_shipping_address.html.erb
+- app/views/caboose/checkout/_shipping_method.html.erb
+- app/views/caboose/checkout/_shipping_method_form.html.erb
+- app/views/caboose/checkout/billing.html.erb
+- app/views/caboose/checkout/discount.html.erb
+- app/views/caboose/checkout/empty.html.erb
+- app/views/caboose/checkout/error.html.erb
+- app/views/caboose/checkout/index.html.erb
+- app/views/caboose/checkout/login.html.erb
+- app/views/caboose/checkout/payment.html.erb
+- app/views/caboose/checkout/relay.html.erb
+- app/views/caboose/checkout/relay_old.html.erb
+- app/views/caboose/checkout/relay_postMessage.html.erb
+- app/views/caboose/checkout/shipping.html.erb
+- app/views/caboose/checkout/step_four.html.erb
+- app/views/caboose/checkout/step_one.html.erb
+- app/views/caboose/checkout/step_one_old.html.erb
+- app/views/caboose/checkout/step_three.html.erb
+- app/views/caboose/checkout/step_two.html.erb
+- app/views/caboose/checkout/step_two_old.html.erb
+- app/views/caboose/checkout/thanks.html.erb
 - app/views/caboose/events/admin_edit.html.erb
 - app/views/caboose/events/admin_index.html.erb
 - app/views/caboose/events/admin_new.html.erb
@@ -416,6 +501,18 @@ files:
 - app/views/caboose/login/reset_password_form.html.erb
 - app/views/caboose/login_mailer/forgot_password_email.html.erb
 - app/views/caboose/modal/index.html.erb
+- app/views/caboose/orders/_admin_footer.html.erb
+- app/views/caboose/orders/_admin_header.html.erb
+- app/views/caboose/orders/_quickbooks_order.html.erb
+- app/views/caboose/orders/admin_delete_form.html.erb
+- app/views/caboose/orders/admin_edit.html.erb
+- app/views/caboose/orders/admin_index.html.erb
+- app/views/caboose/orders/admin_new.html.erb
+- app/views/caboose/orders/admin_print.html.erb
+- app/views/caboose/orders_mailer/customer_new_order.html.erb
+- app/views/caboose/orders_mailer/customer_status_updated.html.erb
+- app/views/caboose/orders_mailer/fulfillment_new_order.html.erb
+- app/views/caboose/orders_mailer/shipping_order_ready.html.erb
 - app/views/caboose/pages/_admin_footer.html.erb
 - app/views/caboose/pages/_admin_header.html.erb
 - app/views/caboose/pages/_content.html.erb
@@ -449,6 +546,30 @@ files:
 - app/views/caboose/posts/admin_new.html.erb
 - app/views/caboose/posts/detail.html.erb
 - app/views/caboose/posts/index.html.erb
+- app/views/caboose/products/_admin_footer.html.erb
+- app/views/caboose/products/_admin_header.html.erb
+- app/views/caboose/products/_sort_options.html.erb
+- app/views/caboose/products/admin_add_upcs.html.erb
+- app/views/caboose/products/admin_delete_form.html.erb
+- app/views/caboose/products/admin_edit_categories.html.erb
+- app/views/caboose/products/admin_edit_category_images.html.erb
+- app/views/caboose/products/admin_edit_description.html.erb
+- app/views/caboose/products/admin_edit_general.html.erb
+- app/views/caboose/products/admin_edit_images.html.erb
+- app/views/caboose/products/admin_edit_options.html.erb
+- app/views/caboose/products/admin_edit_seo.html.erb
+- app/views/caboose/products/admin_edit_variant_columns.html.erb
+- app/views/caboose/products/admin_edit_variant_sort_order.html.erb
+- app/views/caboose/products/admin_edit_variants.html.erb
+- app/views/caboose/products/admin_edit_variants_single.html.erb
+- app/views/caboose/products/admin_group_variants.html.erb
+- app/views/caboose/products/admin_index.html.erb
+- app/views/caboose/products/admin_new.html.erb
+- app/views/caboose/products/admin_sort.html copy.erb
+- app/views/caboose/products/admin_sort.html.erb
+- app/views/caboose/products/details.html.erb
+- app/views/caboose/products/index.html.erb
+- app/views/caboose/products/not_available.html.erb
 - app/views/caboose/redirects/admin_edit.html.erb
 - app/views/caboose/redirects/admin_index.html.erb
 - app/views/caboose/redirects/admin_new.html.erb
@@ -470,6 +591,12 @@ files:
 - app/views/caboose/users/my_account.html.erb
 - app/views/caboose/users/new.html.erb
 - app/views/caboose/users/update_pic.html.erb
+- app/views/caboose/variants/admin_edit.html.erb
+- app/views/caboose/variants/admin_group.html.erb
+- app/views/caboose/variants/admin_new.html.erb
+- app/views/caboose/vendors/admin_edit.html.erb
+- app/views/caboose/vendors/admin_index.html.erb
+- app/views/caboose/vendors/admin_new.html.erb
 - app/views/layouts/caboose/_content.html.erb
 - app/views/layouts/caboose/_station.html.erb
 - app/views/layouts/caboose/_station_link.html.erb
@@ -479,6 +606,26 @@ files:
 - app/views/layouts/caboose/empty.html.erb
 - app/views/layouts/caboose/error404.html.erb
 - app/views/layouts/caboose/modal.html.erb
+- app/views/layouts/caboose/store/_banner.html.erb
+- app/views/layouts/caboose/store/_banner2.html.erb
+- app/views/layouts/caboose/store/_footer.html.erb
+- app/views/layouts/caboose/store/_header.html.erb
+- app/views/layouts/caboose/store/_sidebar.html.erb
+- app/views/layouts/caboose/store/application.html.erb
+- app/views/layouts/caboose/store/authorize_net.erb
+- app/views/layouts/caboose/store/layout_about.html.erb
+- app/views/layouts/caboose/store/layout_blog.html.erb
+- app/views/layouts/caboose/store/layout_confirm.html.erb
+- app/views/layouts/caboose/store/layout_contact.html.erb
+- app/views/layouts/caboose/store/layout_default.html.erb
+- app/views/layouts/caboose/store/layout_detail.html.erb
+- app/views/layouts/caboose/store/layout_order.html.erb
+- app/views/layouts/caboose/store/layout_pricing.html.erb
+- app/views/layouts/caboose/store/layout_product.html.erb
+- app/views/layouts/caboose/store/layout_profile.html.erb
+- app/views/layouts/caboose/store/layout_single.html.erb
+- app/views/layouts/caboose/store/layout_testimonial.html.erb
+- app/views/layouts/caboose/store/layout_testing.html.erb
 - bin/caboose
 - config/routes.rb
 - config/tinymce.yml

data/app/assets/javascripts/caboose/admin_page_edit_content_bak.js

@@ -1,164 +0,0 @@
-
-var PageContentController = function(page_id) { this.init(page_id); };
-
-PageContentController.prototype = {
-
-  page_id: false,    
-  new_block_type_id: false,
-  
-  init: function(page_id)
-  {
-    this.page_id = page_id;
-    var that = this;
-    //this.render_blocks(function() {
-    //  that.sortable_blocks();
-    //  that.draggable_blocks();
-    //});
-  },
-  
-  sortable_blocks: function()
-  { 
-    var that = this;
-    $('#blocks').sortable({
-      //hoverClass: "ui-state-active",
-      placeholder: 'sortable-placeholder',
-      forcePlaceholderSize: true,
-      handle: '.sort_handle',
-      receive: function(e, ui) {      
-        that.new_block_type_id = ui.item.attr('id').replace('new_block_', '');    
-      },
-      update: function(e, ui) {        
-        if (that.new_block_type_id)
-        {
-          $.ajax({
-            url: '/admin/pages/' + that.page_id + '/blocks',
-            type: 'post',
-            data: { block_type_id: that.new_block_type_id, index: ui.item.index() },
-            success: function(resp) { that.render_blocks(function() { that.edit_block(resp.block.id); }); }
-          });                    
-          that.new_block_type_id = false;
-        }
-        else
-        {        
-          $.ajax({
-            url: '/admin/pages/' + that.page_id + '/block-order',
-            type: 'put',
-            data: $('#blocks').sortable('serialize', { key: "block_ids[]" }),
-            success: function(resp) {}
-          });
-        }
-      }
-    });
-  },
-  
-  draggable_blocks: function() 
-  {
-    $('#new_blocks li').draggable({
-      dropOnEmpty: true,
-      connectToSortable: "#blocks",
-      helper: "clone",
-      revert: "invalid"    
-    });    
-  },
-    
-  edit_block: function(block_id)
-  {
-    caboose_modal_url('/admin/pages/' + this.page_id + '/blocks/' + block_id + '/edit');    
-  },
-  
-  delete_block: function(block_id, confirm)
-  {
-    var that = this;        
-    if (!confirm)
-    {
-      var p = $('<p/>')
-        .addClass('note warning')
-        .append("Are you sure you want to delete the block? ")
-        .append($('<input/>').attr('type', 'button').val('Yes').click(function() { that.delete_block(block_id, true); })).append(" ")
-        .append($('<input/>').attr('type', 'button').val('No').click(function() { that.render_block(block_id); }));
-      $('#block_container_' + block_id).attr('onclick','').unbind('click');
-      $('#block_container_' + block_id).empty().append(p);
-      return;
-    }
-    $.ajax({
-      url: '/admin/pages/' + this.page_id + '/blocks/' + block_id,
-      type: 'delete',
-      success: function(resp) {
-        that.render_blocks();      
-      }
-    });    
-  },
-    
-  /*****************************************************************************
-  Block Rendering
-  *****************************************************************************/
-
-  render_blocks: function(after)
-  {
-    $('#blocks').empty();    
-    var that = this;
-    $.ajax({      
-      url: '/admin/pages/' + this.page_id + '/blocks/render?empty_text=[Empty, click to edit]',
-      success: function(blocks) {
-        if (blocks.length == 0)
-        {
-          $('#blocks').parent().append("<p>This page is empty.  Please add a new block.</p>");
-        }          
-        $(blocks).each(function(i,b) {
-          $('#blocks')
-            .append($('<li/>')
-              .attr('id', 'block_container_' + b.id)                                          
-              //.append($('<a/>').attr('id', 'block_' + b.id + '_sort_handle'  ).addClass('sort_handle'  ).append($('<span/>').addClass('ui-icon ui-icon-arrow-2-n-s')))
-              //.append($('<a/>').attr('id', 'block_' + b.id + '_delete_handle').addClass('delete_handle').append($('<span/>').addClass('ui-icon ui-icon-close')).click(function(e) { e.preventDefault(); that.delete_block(b.id); }))
-              //.append($('<div/>').attr('id', 'block_' + b.id).addClass('block'))
-            );
-        });                
-        $(blocks).each(function(i,b) { 
-          that.render_block_html(b.id, b.html); 
-        });
-        that.set_clickable();        
-        if (after) after();
-      }
-    });    
-  },
-  
-  render_block_html: function(block_id, html)
-  {        
-    var that = this;    
-    $('#block_container_' + block_id).empty().html(html);    
-  },
-  
-  set_clickable: function()
-  {        
-    var that = this;                
-    $.ajax({      
-      url: '/admin/pages/' + this.page_id + '/blocks/tree',
-      success: function(blocks) {        
-        $(blocks).each(function(i,b) {
-          that.set_clickable_helper(b);                      
-        });
-      }
-    });    
-  },
-  
-  set_clickable_helper: function(b)
-  {
-    var that = this;    
-    if (!b.children || b.children.length == 0)
-    {      
-      $('#block_' + b.id).attr('onclick','').unbind('click');    
-      $('#block_' + b.id).click(function(e) { that.edit_block(b.id); });
-    }
-    else
-    {      
-      $.each(b.children, function(i, b2) {
-        that.set_clickable_helper(b2);
-      });
-    }
-  }
-};
-
-function toggle_blocks()
-{
-  $('#new_blocks_container2').slideToggle();
-}