caboose-cms 0.8.24 → 0.8.25

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

@@ -27,6 +27,10 @@ date_available = p.date_available ? p.date_available.strftime('%F') : ''
 %>
 $(document).ready(function() {
 	
+  add_to_crumbtrail('/admin', 'Admin');
+  add_to_crumbtrail('/admin/products', 'Products');  
+  add_to_crumbtrail('/admin/products/<%= p.id %>', <%= raw Caboose.json(p.title) %>);  
+  
   m = new ModelBinder({
     name: 'Product',
     id: <%= p.id %>,

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

@@ -55,6 +55,12 @@ p = @product
 
 var controller = false;
 $(document).ready(function() {
+    
+  add_to_crumbtrail('/admin', 'Admin');
+  add_to_crumbtrail('/admin/products', 'Products');  
+  add_to_crumbtrail('/admin/products/<%= p.id %>', <%= raw Caboose.json(p.title) %>);
+  add_to_crumbtrail('/admin/products/<%= p.id %>/images', 'Images');
+  
   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) %>,

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

@@ -40,7 +40,13 @@ may_delete3 = p.variants.collect{|v| v.option3 }.uniq.count == 1
 <script type='text/javascript'>
 
 var mods_controller = false;
-$(document).ready(function() {  
+$(document).ready(function() {
+    
+  add_to_crumbtrail('/admin', 'Admin');
+  add_to_crumbtrail('/admin/products', 'Products');  
+  add_to_crumbtrail('/admin/products/<%= p.id %>', <%= raw Caboose.json(p.title) %>);
+  add_to_crumbtrail('/admin/products/<%= p.id %>/options', 'Options');
+  
   m = new ModelBinder({
     name: 'Product',
     id: <%= p.id %>,

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

@@ -1,3 +1,4 @@
+<div id='crumbtrail'></div>
 <h1>Products</h1>
 
 <p style="margin: 12px 0">
@@ -32,6 +33,10 @@ function tiny_product_image(p) {
 
 $(document).ready(function() {
   var that = this;
+  
+  add_to_crumbtrail('/admin', 'Admin');
+  add_to_crumbtrail('/admin/products', 'Products');
+  
   var table = new IndexTable({    
     form_authenticity_token: '<%= form_authenticity_token %>',
     container: 'products',

data/app/views/caboose/store/admin_edit_defaults.html.erb

@@ -0,0 +1,90 @@
+<%
+sc = @store_config
+pd = @product_default
+vd = @variant_default
+%>
+<%= render :partial => 'caboose/store/admin_header' %>
+
+<h2>Product Defaults</h2>
+<div id='productdefault_<%= pd.id %>_product_vendor_id'         ></div>   
+<div id='productdefault_<%= pd.id %>_product_option1'           ></div>
+<div id='productdefault_<%= pd.id %>_product_option2'           ></div>
+<div id='productdefault_<%= pd.id %>_product_option3'           ></div>
+<div id='productdefault_<%= pd.id %>_product_status'            ></div>
+<div id='productdefault_<%= pd.id %>_product_on_sale'           ></div>
+<div id='productdefault_<%= pd.id %>_product_allow_gift_wrap'   ></div>
+<div id='productdefault_<%= pd.id %>_product_gift_wrap_price'   ></div>
+
+<h2>Variant Defaults</h2>
+<div id='variantdefault_<%= vd.id %>_variant_cost'              ></div>
+<div id='variantdefault_<%= vd.id %>_variant_price'             ></div>
+<div id='variantdefault_<%= vd.id %>_variant_available'         ></div>
+<div id='variantdefault_<%= vd.id %>_variant_quantity_in_stock' ></div>
+<div id='variantdefault_<%= vd.id %>_variant_ignore_quantity'   ></div>
+<div id='variantdefault_<%= vd.id %>_variant_allow_backorder'   ></div>
+<div id='variantdefault_<%= vd.id %>_variant_weight'            ></div>
+<div id='variantdefault_<%= vd.id %>_variant_length'            ></div>
+<div id='variantdefault_<%= vd.id %>_variant_width'             ></div>
+<div id='variantdefault_<%= vd.id %>_variant_height'            ></div>
+<div id='variantdefault_<%= vd.id %>_variant_volume'            ></div>
+<div id='variantdefault_<%= vd.id %>_variant_cylinder'          ></div>
+<div id='variantdefault_<%= vd.id %>_variant_requires_shipping' ></div>
+<div id='variantdefault_<%= vd.id %>_variant_taxable'           ></div>            
+<div id='variantdefault_<%= vd.id %>_variant_status'            ></div>
+<div id='variantdefault_<%= vd.id %>_variant_downloadable'      ></div>
+<div id='variantdefault_<%= vd.id %>_variant_is_bundle'         ></div>
+
+<%= render :partial => 'caboose/store/admin_footer' %>
+
+<% content_for :caboose_js do %>
+<script type="text/javascript">
+
+$(document).ready(function() {
+
+  new ModelBinder({
+    name: 'ProductDefault',
+    id: <%= pd.id %>,
+    update_url: '/admin/store',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [      
+      { name: 'product_vendor_id'         , nice_name: 'Vendor'              , type: 'select'   , value: <%= raw Caboose.json(pd.vendor_id              ) %>, width: 400, options_url: '/admin/vendors/options' },
+      { name: 'product_option1'           , nice_name: 'Option 1'            , type: 'text'     , value: <%= raw Caboose.json(pd.option1                ) %>, width: 400 },
+      { name: 'product_option2'           , nice_name: 'Option 2'            , type: 'text'     , value: <%= raw Caboose.json(pd.option2                ) %>, width: 400 },
+      { name: 'product_option3'           , nice_name: 'Option 3'            , type: 'text'     , value: <%= raw Caboose.json(pd.option3                ) %>, width: 400 },      
+      { name: 'product_status'            , nice_name: 'Status'              , type: 'select'   , value: <%= raw Caboose.json(pd.status                 ) %>, width: 400, options_url: '/admin/products/status-options' },
+      { name: 'product_on_sale'           , nice_name: 'On Sale'             , type: 'checkbox' , value: <%= raw Caboose.json(pd.on_sale                ) %>, width: 400 },
+      { name: 'product_allow_gift_wrap'   , nice_name: 'Allow gift wrap'     , type: 'checkbox' , value: <%= raw Caboose.json(pd.allow_gift_wrap        ) %>, width: 400 },
+      { name: 'product_gift_wrap_price'   , nice_name: 'Gift wrap price'     , type: 'text'     , value: <%= raw Caboose.json(pd.gift_wrap_price        ) %>, width: 400 }
+    ]    
+  });  
+  new ModelBinder({
+    name: 'VariantDefault',
+    id: <%= vd.id %>,
+    update_url: '/admin/store',
+    authenticity_token: '<%= form_authenticity_token %>',
+    attributes: [
+      { name: 'variant_cost'              , nice_name: 'Cost'                , type: 'text'     , value: <%= raw Caboose.json(vd.cost                   ) %>, width: 400 },
+      { name: 'variant_price'             , nice_name: 'Price'               , type: 'text'     , value: <%= raw Caboose.json(vd.price                  ) %>, width: 400 },
+      { name: 'variant_available'         , nice_name: 'Available'           , type: 'checkbox' , value: <%= raw Caboose.json(vd.available              ) %>, width: 400 },
+      { name: 'variant_quantity_in_stock' , nice_name: 'Quantity in Stock'   , type: 'text'     , value: <%= raw Caboose.json(vd.quantity_in_stock      ) %>, width: 400 },
+      { name: 'variant_ignore_quantity'   , nice_name: 'Ignore quantity'     , type: 'checkbox' , value: <%= raw Caboose.json(vd.ignore_quantity        ) %>, width: 400 },
+      { name: 'variant_allow_backorder'   , nice_name: 'Allow backorder'     , type: 'checkbox' , value: <%= raw Caboose.json(vd.allow_backorder        ) %>, width: 400 },
+      { name: 'variant_weight'            , nice_name: 'Weight'              , type: 'text'     , value: <%= raw Caboose.json(vd.weight                 ) %>, width: 400 },
+      { name: 'variant_length'            , nice_name: 'Length'              , type: 'text'     , value: <%= raw Caboose.json(vd.length                 ) %>, width: 400 },
+      { name: 'variant_width'             , nice_name: 'Width'               , type: 'text'     , value: <%= raw Caboose.json(vd.width                  ) %>, width: 400 },
+      { name: 'variant_height'            , nice_name: 'Height'              , type: 'text'     , value: <%= raw Caboose.json(vd.height                 ) %>, width: 400 },
+      { name: 'variant_volume'            , nice_name: 'Volume'              , type: 'text'     , value: <%= raw Caboose.json(vd.volume                 ) %>, width: 400 },
+      { name: 'variant_cylinder'          , nice_name: 'Cylinder'            , type: 'checkbox' , value: <%= raw Caboose.json(vd.cylinder               ) %>, width: 400 },
+      { name: 'variant_requires_shipping' , nice_name: 'Requires shipping'   , type: 'checkbox' , value: <%= raw Caboose.json(vd.requires_shipping      ) %>, width: 400 },
+      { name: 'variant_taxable'           , nice_name: 'Taxable'             , type: 'checkbox' , value: <%= raw Caboose.json(vd.taxable                ) %>, width: 400 },            
+      { name: 'variant_status'            , nice_name: 'Status'              , type: 'select'   , value: <%= raw Caboose.json(vd.status                 ) %>, width: 400 },
+      { name: 'variant_status'            , nice_name: 'Status'              , type: 'select'   , value: <%= raw Caboose.json(vd.status                 ) %>, width: 400  , options_url: '/admin/variants/status-options' },
+      { name: 'variant_downloadable'      , nice_name: 'Downloadable'        , type: 'checkbox' , value: <%= raw Caboose.json(vd.downloadable           ) %>, width: 400 },
+      { name: 'variant_is_bundle'         , nice_name: 'Is bundle'           , type: 'checkbox' , value: <%= raw Caboose.json(vd.is_bundle              ) %>, width: 400 }                                                      
+    ]    
+  });
+                                                                                                                                                                                    
+});
+
+</script>
+<% end %>

data/app/views/caboose/variants/admin_edit.html.erb

@@ -2,21 +2,19 @@
 p = @product
 v = @variant
 %>
-<h1>Edit Variant</h1>
-<p><strong>Product:</strong> <%= p.title %></p>
-<table>
-  <tr>
-    <td valign='top'>
-<h2>Options</h2>
-<% if p.option1 %><div id='variant_<%= v.id %>_option1'></div><% end %>
-<% if p.option2 %><div id='variant_<%= v.id %>_option2'></div><% end %>
-<% if p.option3 %><div id='variant_<%= v.id %>_option3'></div><% end %>
+<%= render :partial => 'caboose/products/admin_header' %>
+
+<!--<p><strong>Product:</strong> <%= p.title %></p>-->
+
+<h2>General Options</h2>
+<% if p.option1 && p.option1.strip.length > 0 %><div id='variant_<%= v.id %>_option1'></div><% end %>
+<% if p.option2 && p.option2.strip.length > 0 %><div id='variant_<%= v.id %>_option2'></div><% end %>
+<% if p.option3 && p.option3.strip.length > 0 %><div id='variant_<%= v.id %>_option3'></div><% end %>
 <div id='variant_<%= v.id %>_status'             ></div>
 <div id='variant_<%= v.id %>_allow_backorder'    ></div>
 <div id='variant_<%= v.id %>_taxable'            ></div>
-<div id='variant_<%= v.id %>_downloadable'       ></div>
 <div id='variant_<%= v.id %>_requires_shipping'  ></div>
-    </td><td valign='top'>
+
 <h2>Inventory</h2>
 <div id='variant_<%= v.id %>_alternate_id'       ></div>
 <div id='variant_<%= v.id %>_sku'                ></div>
@@ -25,14 +23,14 @@ v = @variant
 <div id='variant_<%= v.id %>_price'              ></div>
 <div id='variant_<%= v.id %>_quantity_in_stock'  ></div>
 <div id='variant_<%= v.id %>_ignore_quantity'  ></div>
-    </td><td valign='top'>
+
 <h2>Dimensions</h2>
 <div id='variant_<%= v.id %>_cylinder'           ></div>
 <div id='variant_<%= v.id %>_weight'             ></div>
 <div id='variant_<%= v.id %>_length'             ></div>
 <div id='variant_<%= v.id %>_width'              ></div>
 <div id='variant_<%= v.id %>_height'             ></div>
-    </td><td valign='top'>
+
 <h2>Sale</h2>
 <div id='variant_<%= v.id %>_sale_price'         ></div>
 <div id='variant_<%= v.id %>_date_sale_starts'   ></div>
@@ -41,32 +39,45 @@ v = @variant
 <div id='variant_<%= v.id %>_time_sale_ends'     ></div>
 <div id='variant_<%= v.id %>_clearance'          ></div>
 <div id='variant_<%= v.id %>_clearance_price'    ></div>
-    </td>
-    <td valign='top' colspan='4'4>
+
 <h2>Flat Rate Shipping</h2>
 <div id='variant_<%= v.id %>_flat_rate_shipping'          ></div>
 <div id='variant_<%= v.id %>_flat_rate_shipping_single'   ></div>
 <div id='variant_<%= v.id %>_flat_rate_shipping_combined' ></div>
 <div id='variant_<%= v.id %>_flat_rate_shipping_package_method_id'></div>      
-    </td>
-  </tr>
-</table>
+  
+<h2>Downloadable Options</h2>
+<div id='variant_<%= v.id %>_downloadable'       ></div>
 <div id='variant_<%= v.id %>_download_path'      ></div>
+<p><input type='button' value='Generate Download URL' onclick="download_url();" /></p>
+
+<h2>Bundling</h2>
+<div id='variant_<%= v.id %>_is_bundle'></div>
+<div id='variant_children'></div>
+
+<h2>Delete Variant</h2>
 <div id='message'></div>
-<p>
-<input type='button' value='< Back' onclick="window.location='/admin/products/<%= p.id %>/variants';" />
-<input type='button' value='Generate Download URL' onclick="download_url();" />
-<input type='button' value='Delete Variant' onclick="delete_variant(<%= v.id %>);" />
-</p>
+<p><input type='button' value='Delete Variant' onclick="delete_variant(<%= v.id %>);" /></p>
+
+<%= render :partial => 'caboose/products/admin_footer' %>
 
 <% content_for :caboose_js do %>
 <%= javascript_include_tag "caboose/model/all" %>
 <%= javascript_include_tag "caboose/admin_products" %>
+<%= javascript_include_tag "caboose/variant_children_controller" %>
 <script type='text/javascript'>
 <%
 sc = @site.store_config
 %>
+var vcc = false;
 $(document).ready(function() {
+    
+  add_to_crumbtrail('/admin', 'Admin');
+  add_to_crumbtrail('/admin/products', 'Products');  
+  add_to_crumbtrail('/admin/products/<%= p.id %>', <%= raw Caboose.json(p.title) %>);
+  add_to_crumbtrail('/admin/products/<%= p.id %>/variants', 'Inventory & Variants');
+  add_to_crumbtrail('/admin/products/<%= p.id %>/variants/<%= v.id %>', <%= raw Caboose.json(v.options.count > 0 ? v.options.join(', ') : 'Default Variant') %>);
+  
   m = new ModelBinder({
     name: 'Variant',
     id: <%= v.id %>,
@@ -105,9 +116,23 @@ $(document).ready(function() {
       { name: 'flat_rate_shipping_package_method_id' , nice_name: 'Package method'                   , type: 'select'   , align: 'right' , width: 250, options_url: '/admin/shipping-packages/package-method-options',   
         value: <%= raw Caboose.json("#{v.flat_rate_shipping_package_id}_#{v.flat_rate_shipping_method_id}") %>,
         text:  <%= raw Caboose.json(v.flat_rate_shipping_package && v.flat_rate_shipping_method ? "#{v.flat_rate_shipping_package.name} - #{v.flat_rate_shipping_method.service_name}" : '') %>         
-      }      
+      },
+      { name: 'is_bundle'                            , nice_name: 'Is Bundle'                       , type: 'checkbox' , align: 'right' , width: 175, value: <%= raw Caboose.json(v.is_bundle ? 1 : 0             ) %> , 
+        after_update: function() {
+          if ($('#variant_<%= v.id %>_is_bundle').is(':checked'))
+            vcc.print();
+          else
+            vcc.hide();          
+        }
+      }
     ]
-  });
+  });  
+  vcc = new VariantChildrenController({
+    product_id: <%= v.product_id %>,
+    variant_id: <%= v.id %>,
+    authenticity_token: '<%= raw form_authenticity_token %>',
+    hide_on_init: <% if v.is_bundle %>false<% else %>true<% end %>    
+  });  
 });
 
 function download_url(expires_in)

data/app/views/caboose/variants/admin_index.html.erb

@@ -57,6 +57,12 @@ sc = @site.store_config
 
 $(document).ready(function() {
   var that = this;
+  
+  add_to_crumbtrail('/admin', 'Admin');
+  add_to_crumbtrail('/admin/products', 'Products');  
+  add_to_crumbtrail('/admin/products/<%= p.id %>', <%= raw Caboose.json(p.title) %>);
+  add_to_crumbtrail('/admin/products/<%= p.id %>/variants', 'Inventory & Variants');
+  
   var table = new IndexTable({    
     form_authenticity_token: '<%= form_authenticity_token %>',
     container: 'variants',

data/lib/caboose/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.8.24
+  version: 0.8.25
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -600,6 +600,7 @@ files:
 - app/assets/javascripts/caboose/station.js
 - app/assets/javascripts/caboose/testing.js
 - app/assets/javascripts/caboose/united_states.js
+- app/assets/javascripts/caboose/variant_children_controller.js
 - app/assets/javascripts/chartjs/Chart.min.js
 - app/assets/javascripts/chartjs/gulpfile.js
 - app/assets/javascripts/plupload/Moxie.swf
@@ -794,6 +795,7 @@ files:
 - app/controllers/caboose/store_controller.rb
 - app/controllers/caboose/subscriptions_controller.rb
 - app/controllers/caboose/users_controller.rb
+- app/controllers/caboose/variant_children_controller.rb
 - app/controllers/caboose/variants_controller.rb
 - app/controllers/caboose/vendors_controller.rb
 - app/helpers/caboose/application_helper.rb
@@ -883,6 +885,7 @@ files:
 - app/models/caboose/post_custom_field_value.rb
 - app/models/caboose/product.rb
 - app/models/caboose/product_category_sort.rb
+- app/models/caboose/product_default.rb
 - app/models/caboose/product_image.rb
 - app/models/caboose/product_image_variant.rb
 - app/models/caboose/retargeting_config.rb
@@ -914,6 +917,8 @@ files:
 - app/models/caboose/user_subscription.rb
 - app/models/caboose/utilities/schema.rb
 - app/models/caboose/variant.rb
+- app/models/caboose/variant_child.rb
+- app/models/caboose/variant_default.rb
 - app/models/caboose/vendor.rb
 - app/models/caboose/wish_list.rb
 - app/models/caboose/wish_list_line_item.rb
@@ -1170,6 +1175,7 @@ files:
 - app/views/caboose/station/index.html.erb
 - app/views/caboose/store/_admin_footer.html.erb
 - app/views/caboose/store/_admin_header.html.erb
+- app/views/caboose/store/admin_edit_defaults.html.erb
 - app/views/caboose/store/admin_edit_general.html.erb
 - app/views/caboose/store/admin_edit_packages.html.erb
 - app/views/caboose/store/admin_edit_payment.html.erb