caboose-cms 0.9.20 → 0.9.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d65662059d99a76d7ddcd7aec3b7103266bcd7b2
-  data.tar.gz: 5374e50d8d027c0fa0be6296efa79797e426cd03
+  metadata.gz: 5b8773e74ab7649b25fbeacaf41ce486ec13a8df
+  data.tar.gz: e762a637d32dda18e888bd4c2ab4a6fcbe29de29
 SHA512:
-  metadata.gz: f9719d772e11d46e2de4f9b3cf7ace2d8818b1eb32cee6c7f5aebb2a503ec6029aab1f968d45d62dbea26b054831d17deb5d6d1edd5c79e9645a56480574963a
-  data.tar.gz: ec11cf49c859ea8886ec26afc0801c5873abebd44c2dc5d4f6e56c0eebdfde72319a40554fc8f96bc820a09da6aa32d76f4427a3613f4090ed128fd9b3ac30ee
+  metadata.gz: 61601f5df2c4ce0c7e81d41072777ce7849cbe34ea8b5de1672de6723961193213b6cba55c85f22b66ae801a1b04575bf9fcb7fef9b47c35a6a6927b3fa7c13f
+  data.tar.gz: 440bc247d52eaf1088fdf42424516468ae8f03f9e41c3487f6b9095a316a1b9edb4326f3483801a9ae8d2b127059d76f4e27d7ce14931459bbbfdbfbca1a1269

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

@@ -46,26 +46,26 @@ function add_variant(product_id)
   })
 }
 
-function delete_variant(variant_id, confirm)
+function delete_variant(product_id, variant_id, confirm)
 {
   if (!confirm)
   {
     var p = $('<p/>')
       .addClass('note error')
       .append("Are you sure you want to delete the variant?<br />This can't be undone.<br /><br />")
-      .append($("<input/>").attr('type', 'button').val('Confirm').click(function() { delete_variant(variant_id, true); }))
+      .append($("<input/>").attr('type', 'button').val('Confirm').click(function() { delete_variant(product_id, variant_id, true); }))
       .append(' ')
       .append($("<input/>").attr('type', 'button').val('Cancel').click(function() { cancel_delete_variant(variant_id); }));    
-    modal.autosize(p);
+    $('#message').html(p);
     return;
   }
-  modal.autosize("<p class='loading'>Deleting product...</p>");
+  $('#message').html("<p class='loading'>Deleting product...</p>");
   $.ajax({
-    url: '/admin/variants/' + variant_id,
+    url: '/admin/products/' + product_id + '/variants/' + variant_id,
     type: 'delete',
     success: function(resp) {
       if (resp.error)
-        modal.autosize("<p class='note error'>" + resp.error + "</p>");
+        $('#message').html("<p class='note error'>" + resp.error + "</p>");
       if (resp.redirect)
         window.location = resp.redirect;
     }

data/app/controllers/caboose/subscriptions_controller.rb

@@ -25,6 +25,7 @@ module Caboose
       return if !user_is_allowed('subscriptions', 'view')
       
       pager = PageBarGenerator.new(params, {
+          'site_id'               => @site.id,
           'variant_id'            => '',
           'user_id'               => params[:user_id] ? params[:user_id] : '',
           'date_started_gte'      => '',
@@ -138,7 +139,7 @@ module Caboose
       case params[:field]                
         when 'variant'
           arr = Variant.joins(:product).where("store_products.site_id = ? and is_subscription = ?", @site.id, true).reorder("store_products.title").all          
-          options = arr.collect{ |v| { 'value' => v.id, 'text' => v.product.title }}
+          options = arr.collect{ |v| { 'value' => v.id, 'text' => "#{v.product.title} - #{v.alternate_id}" }}
         when 'status'
           options = [
             { 'value' => Subscription::STATUS_ACTIVE   , 'text' => 'Active'   },

data/app/models/caboose/product.rb

@@ -120,8 +120,8 @@ module Caboose
       min = 100000
       max = 0
       
-      self.variants.each do |variant|        
-        next if variant.nil? || variant.price.nil? || variant.price <= 0
+      self.variants.each do |variant|
+        next if variant.nil? || variant.price.nil? || variant.price <= 0 || variant.status != Variant::STATUS_ACTIVE
         price = variant.on_sale? ? variant.sale_price : variant.price
         min = price if price < min
         max = price if price > max

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

@@ -23,7 +23,7 @@ $(document).ready(function() {
     update_url: '/admin/users/<%= @edituser.id %>/subscriptions/<%= @subscription.id %>',
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [      
-      { name: 'variant_id'         , nice_name: 'Variant'           , type: 'select' , value: <%= raw Caboose.json(@subscription.variant_id        ) %>, width: 400 , options_url: '/admin/subscriptions/subscription-options' },        
+      { name: 'variant_id'         , nice_name: 'Variant'           , type: 'select' , value: <%= raw Caboose.json(@subscription.variant_id        ) %>, width: 400 , options_url: '/admin/subscriptions/variant-options' },        
       { name: 'date_started'       , nice_name: 'Date Started'      , type: 'date'   , value: <%= raw Caboose.json(@subscription.date_started      ) %>, width: 400 , date_format: 'Y-m-d' },
       { name: 'date_started_full'  , nice_name: 'Date Started Full' , type: 'date'   , value: <%= raw Caboose.json(@subscription.date_started_full ) %>, width: 400 , date_format: 'Y-m-d' },
       { name: 'status'             , nice_name: 'Status'            , type: 'select' , value: <%= raw Caboose.json(@subscription.status            ) %>, width: 400 , options_url: '/admin/subscriptions/status-options' }

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

@@ -73,7 +73,7 @@ v = @variant
 
 <h2>Delete Variant</h2>
 <div id='message'></div>
-<p><input type='button' value='Delete Variant' onclick="delete_variant(<%= v.id %>);" /></p>
+<p><input type='button' value='Delete Variant' onclick="delete_variant(<%= p.id %>, <%= v.id %>);" /></p>
 
 <%= render :partial => 'caboose/products/admin_footer' %>
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.20'
+  VERSION = '0.9.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.20
+  version: 0.9.21
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-28 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg