ish_manager 0.1.8.457 → 0.1.8.458

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0182df5197f378f6b0dac039e2df3c86058a3a3e9203257378d17118efe177e
-  data.tar.gz: 499fe16c69807cc1cfb273017131bb60450d4d326e1640a93e3fe5db0c2d1783
+  metadata.gz: 42443ac595bb611c6e4dcd495212dea118197ce3d5cd736c4ffc13ff7672915f
+  data.tar.gz: 20b76203f7e205e0421a856bd832e5ae98e061552c59aeb33b76ba994663c736
 SHA512:
-  metadata.gz: d766d3ce17a9366d99204fafcb7afdafcc9d2f2a0583896c635be3bace6eaf100b16e41071bb56a714a62ef1d02c1225999ee1848682e761db3d8f302e30ae31
-  data.tar.gz: c6c07fee9694012636d01308dddc8ad78f7464abb4a633a7a37c604baa7adfb0b0a05430d2f27ab7e7129ec4dd4ffe5c11fb0ea259fe68da824f54f2fbd4c23d
+  metadata.gz: 91a07f1df419c2fce93601e0b35f48233f414ffc2a7f18d78019afa9d875a1417e5db42ba24d96be2aea66cc05a9ce472b25b0ba98cbe9d9ca3b6d6f34960bdb
+  data.tar.gz: 1cf8ed0befe718c28f386243798a4465e90a44abda909794a41842b32abf13d7c2383abee35fa47f5960b62406edef4bc382942da9bdeb3601d95064cf3878a4

data/app/controllers/ish_manager/subscriptions_controller.rb

@@ -3,47 +3,69 @@ class IshManager::SubscriptionsController < IshManager::ApplicationController
 
   before_action :set_lists
 
-  # alphabetized : )
+  ## Alphabetized : )
 
   def create
-    authorize! :create, Wco::Subscription
     @subscription = Wco::Subscription.new params[:subscription].permit!
-    @stripe_subscription = Stripe::Subscription.create({
+    authorize! :create, @subscription
+
+    payment_methods = Stripe::Customer.list_payment_methods( params[:subscription][:customer_id] ).data
+    # puts! payment_methods, 'payment_methods'
+
+    params = {
       customer: params[:subscription][:customer_id],
+      default_payment_method: payment_methods[0][:id],
       items: [
         { price: params[:subscription][:price_id] },
       ],
-    })
-    puts! @stripe_subscription, '@stripe_subscription'
-
-    # flag = @subscription.save
-    # if flag
-    #   flash[:notice] = 'Created the subscription.'
-    #   redirect_to action: :show, id: @subscription.id
-    # else
-    #   flash[:alert] = "Cannot create the subscription: #{@subscription.errors.full_messages.join(', ')}."
-    #   render action: :new
-    # end
+    }
+    puts! params, 'params'
+    @stripe_subscription = Stripe::Subscription.create( params )
+    # puts! @stripe_subscription, '@stripe_subscription'
+
+
+    flag = @subscription.save
+    if flag
+      flash[:notice] = 'Created the subscription.'
+      redirect_to action: :show, id: @subscription.id
+    else
+      flash[:alert] = "Cannot create the subscription: #{@subscription.errors.full_messages.join(', ')}."
+      render action: :new
+    end
   end
 
   def index
     authorize! :index, Wco::Subscription
 
-    @stripe_customers = Stripe::Customer.list().data
+    @stripe_customers     = Stripe::Customer.list().data
     @stripe_subscriptions = Stripe::Subscription.list().data
 
-    emails = @stripe_customers.map &:email
-    @leadsets = Leadset.find_by( email: emails )
-  end
+    @customers     = {}
+    customer_ids   = @stripe_customers.map &:id
+    @leadsets      = Leadset.where( :customer_id.in => customer_ids )
+    @leadsets.each do |i|
+      @customers[i[:customer_id]] ||= {}
+      @customers[i[:customer_id]][:leadsets] ||= []
+      @customers[i[:customer_id]][:leadsets].push( i )
+    end
+    @profiles = Ish::UserProfile.where( :customer_id.in => customer_ids )
+    @profiles.each do |i|
+      @customers[i[:customer_id]] ||= {}
+      @customers[i[:customer_id]][:profiles] ||= []
+      @customers[i[:customer_id]][:profiles].push( i )
+    end
 
-  def show
-    authorize! :show, Wco::Subscription
-    @subscription = Wco::Subscription.find params[:id]
+    # puts! @customers, '@customers'
   end
 
   def new
-    authorize! :new, Wco::Subscription
     @subscription = Wco::Subscription.new
+    authorize! :new, @subscription
+  end
+
+  def show
+    @subscription = Wco::Subscription.find params[:id]
+    authorize! :show, @subscription
   end
 
   ##
@@ -53,9 +75,11 @@ class IshManager::SubscriptionsController < IshManager::ApplicationController
 
   def set_lists
     super
-    @products_list = Wco::Product.list
-    @customer_ids_list = Leadset.where( "customer_id IS NOT NULL" ).map { |i| [ i.company_url, i.customer_id ] }
-    @price_ids_list = Wco::Product.all.map { |i| [ i.name, i.price_id ] }
+    @products_list     = Wco::Product.list
+    leadsets = Leadset.where( "customer_id IS NOT NULL" ).map { |i| [ "leadset // #{i.company_url}", i.customer_id ] }
+    profiles = ::Ish::UserProfile.where( :customer_id.ne => nil ).map { |i| [ "profile ++ #{i.email}", i.customer_id ] }
+    @customer_ids_list = leadsets + profiles
+    @price_ids_list    = Wco::Product.all.map { |i| [ i.name, i.price_id ] }
   end
 
 end

data/app/controllers/ish_manager/user_profiles_controller.rb

@@ -57,6 +57,13 @@ class IshManager::UserProfilesController < IshManager::ApplicationController
       @profile.profile_photo = photo
     end
 
+    puts! params[:profile][:customer_id].present?, 'params[:profile][:customer_id].present?'
+    if !params[:profile][:customer_id].present? || params[:delete_customer_id]
+      params[:profile][:customer_id] = nil
+    end
+
+    puts! params[:profile], 'ze params'
+
     flag = @profile.update_attributes params[:profile].permit!
 
     if flag

data/app/views/ish_manager/products/index.haml

@@ -29,5 +29,5 @@
     - @products.each do |product|
       %li
         = link_to '[~]', edit_product_path( product )
-        = product.inspect
-
+        #{product.name} // $#{product.price_cents.to_f/100}/#{product.interval.presence || 'onetime'}
+        [ #{product.product_id}, #{product.price_id} ]

data/app/views/ish_manager/subscriptions/index.haml

@@ -28,5 +28,9 @@
               %li plan: $#{sub[:plan][:amount].to_f/100}/#{sub[:plan][:interval]}
               %li product: #{sub[:plan][:product]}
               %li customer: #{sub[:customer]}
-              -# %li= sub.inspect
+              -# %li= @customers.inspect
+              - if @customers[sub[:customer]] && @customers[sub[:customer]][:leadsets]
+                %li leadsets: #{ @customers[sub[:customer]][:leadsets]&.map { |i| "#{i[:id]} - #{i[:email]}" } }
+              - if @customers[sub[:customer]] && @customers[sub[:customer]][:profiles]
+                %li profiles: #{ @customers[sub[:customer]][:profiles]&.map { |i| "#{i[:id]} - #{i[:email]}" } }
 

data/app/views/ish_manager/user_profiles/_form.haml

@@ -30,10 +30,19 @@
       .input-field
         = f.label :fb_access_token
         = f.text_field :fb_access_token
+
       .input-field
         = f.label :fb_long_access_token
         = f.text_field :fb_long_access_token
 
+      .input-field
+        = f.label :customer_id
+        = f.text_field :customer_id
+        %label [X]
+        = check_box_tag :delete_customer_id
+
+
+
       = f.submit 'Save', :class => %w(button)
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.457
+  version: 0.1.8.458
 platform: ruby
 authors:
 - piousbox