caboose-cms 0.9.161 → 0.9.162

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d46a35b3b0506567f3ed44550b5a69f472c84451
-  data.tar.gz: 01c3d0d3e9212ab3955a79c558b336b6457365f4
+  metadata.gz: 4ff8dda14d423d69c0f37041dd91c1c9b498c034
+  data.tar.gz: 03480f6f6c4f63ef1910c67ace85ab45fa0a1226
 SHA512:
-  metadata.gz: d1a0adefb331e52d46c3b615bdf1de93485a0ddd2ac3f9c5447a0d94c274337ff84dd90ce530f0a41b233b5e944894454793e0b798e04db371f4c297bb582b91
-  data.tar.gz: 74d54aa2905acdff4dd3ef1626f8d6a5e456042a81bffabb236a3ad9a46df93bf109b7e5295e299acef7b10601b0ab3a37a31f50e205676ded7ed35834b527b8
+  metadata.gz: 3d63c0cf3d69878011d13c713f5c98ccfac32dae72779fbe65da3feb032ad92c9227eede09247459f4bf03e558e9aacd61986ef3a0818c5c1fc467ca7a441fe6
+  data.tar.gz: bc77eba4793bb58fcac02e94ffb721ccac93f03548ce788af3fd6e80e265950fbf78677009f18647ac19f1735eaecd38ee0cbe29777fb52bb2818b7445c40d4a

data/app/assets/javascripts/caboose/checkout/stripe_payment_method_controller.js

@@ -3,7 +3,8 @@ var StripePaymentMethodController = function(params) { this.init(params); };
 
 StripePaymentMethodController.prototype = {
 
-  container: 'payment_method_container',  
+  container: 'payment_method_container',
+  user_id: false,
   stripe_key: false,
   customer_id: false,
   card_brand: false,
@@ -195,7 +196,7 @@ StripePaymentMethodController.prototype = {
     }
     $('#payment_message').html("<p class='loading'>Removing payment method...</p>");
     $.ajax({
-      url: '/checkout/payment-method',
+      url: '/checkout/payment-method/' + that.user_id,
       type: 'delete',          
       success: function(resp) {
         if (resp.error)

data/app/controllers/caboose/checkout_controller.rb

@@ -163,20 +163,20 @@ module Caboose
         :card_exp_year  => u.card_exp_year
       }      
     end
-        
+    
     # @route DELETE /checkout/payment-method
+    # @route DELETE /checkout/payment-method/:user_id
     def remove_payment_method
       render :json => false and return if !logged_in?
-      
       resp = Caboose::StdClass.new
       sc = @site.store_config      
       if sc.pp_name == 'stripe'
         Stripe.api_key = sc.stripe_secret_key.strip
-        u = logged_in_user        
+        u = params[:user_id].blank? ? logged_in_user : Caboose::User.find(params[:user_id])       
         if u.stripe_customer_id          
           begin
             c = Stripe::Customer.retrieve(u.stripe_customer_id)
-            c.delete
+            c.delete if Rails.env.production?
           rescue Exception => ex
             Caboose.log(ex)
             resp.error = ex.message if !ex.message.starts_with?('No such customer')

data/app/controllers/caboose/users_controller.rb

@@ -324,6 +324,17 @@ module Caboose
       @edituser = User.find(params[:id])
       @new_value = "Testing"
     end
+
+    # @route DELETE /admin/users/bulk
+    def admin_bulk_delete
+      return unless user_is_allowed_to 'delete', 'users'
+      params[:model_ids].each do |user_id|
+        user = User.where(:id => user_id).first
+        user.destroy if user
+      end
+      resp = Caboose::StdClass.new('success' => true)
+      render :json => resp
+    end
       
     # @route DELETE /admin/users/:id
     def admin_delete

data/app/views/caboose/users/admin_edit_payment_method.html.erb

@@ -42,6 +42,7 @@ $(document).ready(function() {
       invoice: { total: 1.00 },
       print_ready_message: function() {},      
     },
+    user_id: <%= @edituser.id %>,
     refresh_url: '/admin/users/<%= @edituser.id %>/stripe/json',
     after_update_url: '/admin/users/<%= @edituser.id %>'
   });

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.161'
+  VERSION = '0.9.162'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.161
+  version: 0.9.162
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-14 00:00:00.000000000 Z
+date: 2018-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg