caboose-cms 0.9.19 → 0.9.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd1a1d7bb01139d692c5ea699b110b583c58e699
-  data.tar.gz: 8cfe600f087feb342822b04e1e2b56d3d0302768
+  metadata.gz: d65662059d99a76d7ddcd7aec3b7103266bcd7b2
+  data.tar.gz: 5374e50d8d027c0fa0be6296efa79797e426cd03
 SHA512:
-  metadata.gz: 82d1c40bc05d740ef7cbfc7999659b4dd354040deaf5412136e3b48f8c9efbb8ce3e71d0d07c9cfa993ea4e710917a416bed466d08c172b383904691dbda9329
-  data.tar.gz: b986be6897527d8d79997b8ac7ef1a435a7ce23e6af94a6e15a9c3a6197375ea11b3a04b21f32a0bda255b4c2207cad88a727417663a61890118d90d5f5f7364
+  metadata.gz: f9719d772e11d46e2de4f9b3cf7ace2d8818b1eb32cee6c7f5aebb2a503ec6029aab1f968d45d62dbea26b054831d17deb5d6d1edd5c79e9645a56480574963a
+  data.tar.gz: ec11cf49c859ea8886ec26afc0801c5873abebd44c2dc5d4f6e56c0eebdfde72319a40554fc8f96bc820a09da6aa32d76f4427a3613f4090ed128fd9b3ac30ee

data/app/controllers/caboose/cart_controller.rb

@@ -141,6 +141,7 @@ module Caboose
         end
       end
       li.save
+      li.invoice.reload # Reload invoice in case li.quantity changed
       li.invoice.calculate
       resp.success = true
       render :json => resp                                    

data/app/controllers/caboose/event_groups_controller.rb

@@ -35,7 +35,16 @@ module Caboose
       resp.success = true
       render :json => resp
     end
-     
+
+    # @route DELETE /admin/event-groups/:id
+    def admin_delete
+      return unless user_is_allowed('calendars', 'delete')
+      CalendarEvent.where(:calendar_event_group_id => params[:id]).destroy_all
+      CalendarEventGroup.find(params[:id]).destroy
+      resp = StdClass.new({ 'redirect' => "/admin/calendars" })                  
+      render :json => resp
+    end
+
     # @route GET /admin/event-groups/period-options
     def admin_period_options
       render :json => [

data/app/controllers/caboose/my_account_invoices_controller.rb

@@ -176,9 +176,11 @@ module Caboose
         return
       end
 
-      pdf = InvoicePdf.new
-      pdf.invoice = Invoice.find(params[:id])
-      send_data pdf.to_pdf, :filename => "invoice_#{pdf.invoice.id}.pdf", :type => "application/pdf", :disposition => "inline"
+      pdf = @site.store_config.custom_invoice_pdf
+      pdf = "InvoicePdf" if pdf.nil? || pdf.strip.length == 0                              
+      eval("pdf = #{pdf}.new")
+      pdf.invoice = Invoice.find(params[:id])             
+      send_data pdf.to_pdf, :filename => "invoice_#{pdf.invoice.id}.pdf", :type => "application/pdf", :disposition => "inline"   
     end
     
     # @route GET  /my-account/invoices/authnet-relay

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

@@ -48,8 +48,9 @@ g = @event.calendar_event_group
 
 <div id='message'></div>
 <p>
-<input type='button' value='Close'        onclick="modal.close();" />
-<input type='button' value='Delete Event' onclick="delete_event(<%= @event.id %>);" />
+<input type='button' value='Close'              onclick="modal.close();" />
+<input type='button' value='Delete Event'       onclick="delete_event(<%= @event.id %>);" />
+<input type='button' value='Delete Event Group' onclick="delete_event_group(<%= @event.id %>);" />
 </p>
 
 <% content_for :caboose_js do %>
@@ -125,6 +126,28 @@ function delete_event(event_id, confirm)
   });
 }
 
+function delete_event_group(event_id, confirm)
+{
+  if (!confirm)
+  {
+    var p = $('<p/>').addClass('note confirm')
+      .append('Are you sure you want to delete the event group? ')
+      .append($('<input/>').attr('type','button').val('Yes').click(function() { delete_event_group(event_id, true); })).append(' ')
+      .append($('<input/>').attr('type','button').val('No').click(function() { $('#message').empty(); }));    
+    modal.autosize(p);
+    return;
+  }
+  modal.autosize("<p class='loading'>Deleting event group...</p>");
+  $.ajax({
+    url: '/admin/event-groups/<%= g.id %>',
+    type: 'delete',
+    success: function(resp) {
+      if (resp.error) modal.autosize("<p class='note error'>" + resp.error + "</p>");
+      if (resp.redirect) modal.close();
+    }
+  });
+}
+
 function after_all_day_update()
 {
   var el = $('#datetime_container');

data/lib/caboose/version.rb

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

metadata

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