ish_manager 0.1.8.453 → 0.1.8.455

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ef2d955ba3b789d1a37d395a520813a373c5e53cd9f5d79a65806e6c1f1628e
-  data.tar.gz: f184a66a8c4a101d7c314b2f61504bb5eec0e07347a9f6bcc043fca222db074c
+  metadata.gz: a07cc6eecbcddc7c8a59bd1e7e783b3d30ecd3206caa3772b932f7dc73df3377
+  data.tar.gz: 0b2e806fb887ca717cadc32e9e61c2814de46a3b2a85fde455a4cbbbb9b54e0d
 SHA512:
-  metadata.gz: b8c5c0d4143be4fee50e9de321cf3755caa034c1b530052f480c006f8a7f051143d0f8c30ddf4c305e10861f391d82c2b17a469b141f57a9694e0ade07ac0e6d
-  data.tar.gz: 5d295496c6624be8d7827e3a02591e279d1b065bd6e9b2f25ef7c76554dadd7ba80b5aa023d484b66dce689d5c6ec6e446c70da747d3d28a6792fbdc32e0cbee
+  metadata.gz: 7a70f203179f874b3373ac69b2d5a7a2ed9e234fd8f5a0b39b403264cf019f0926c3e068d0c7b9571157fc1807988ece188ed6e7580a486094361f237e378235
+  data.tar.gz: 83f81e7cbb1536aacdc6d1d23fa5323a9deaff856bf6ca9b2a1f9f46cd0f74df6c8ff45ff7f344f49e9e137a37a9711aa9787eeee29c410a517f611b65bafe57

data/app/controllers/ish_manager/invoices_controller.rb

@@ -3,24 +3,55 @@ class ::IshManager::InvoicesController < IshManager::ApplicationController
 
   before_action :set_lists
 
+  def create
+    @invoice = Ish::Invoice.new params[:invoice].permit!
+    authorize! :create, @invoice
+
+    stripe_invoice = Stripe::Invoice.create({
+      customer:          @invoice.leadset.customer_id,
+      collection_method: 'send_invoice',
+      days_until_due:    0,
+      # collection_method: 'charge_automatically',
+      pending_invoice_items_behavior: 'exclude',
+    })
+    params[:invoice][:items].each do |item|
+      invoice_item = Stripe::InvoiceItem.create({
+        customer: @invoice.leadset.customer_id,
+        price:    item,
+        invoice:  stripe_invoice.id,
+      })
+    end
+    Stripe::Invoice.send_invoice(stripe_invoice[:id])
+    @invoice.update_attributes({ invoice_id: stripe_invoice[:id] })
+
+    if @invoice.save
+      flash[:notice] = "Created the invoice."
+      redirect_to action: :show, id: @invoice.id
+    else
+      flash[:alert] = "Cannot create invoice: #{@invoice.errors.messages}"
+      render :new
+    end
+  end
+
   def index
     authorize! :index, Ish::Invoice
-    @invoices = Ish::Invoice.all.includes( :payments )
+    @invoices = Ish::Invoice.all
+    if params[:leadset_id]
+      @invoices = @invoices.where( leadset_id: params[:leadset_id] )
+    end
+    @invoices = @invoices.includes( :payments )
   end
 
   def new
     authorize! :new, @invoice
+    @leadset = Leadset.find params[:leadset_id]
+    @products_list = Wco::Product.list
   end
 
-  def create
-    @invoice = Ish::Invoice.new params[:invoice].permit!
-    authorize! :create, @invoice
-    if @invoice.save
-      flash[:notice] = "created invoice"
-    else
-      flash[:alert] = "Cannot create invoice: #{@invoice.errors.messages}"
-    end
-    redirect_to :action => 'index'
+  def show
+    @invoice = Ish::Invoice.find params[:id]
+    authorize! :show, @invoice
+    @stripe_invoice = Stripe::Invoice.retrieve @invoice.invoice_id
   end
 
   def update

data/app/controllers/ish_manager/leadsets_controller.rb

@@ -36,6 +36,9 @@ class ::IshManager::LeadsetsController < IshManager::ApplicationController
     @leadsets = Leadset.all.kept.includes(:leads)
     if params[:q].present?
       @leadsets = @leadsets.where(" company_url LIKE ? ", "%#{params[:q]}%" )
+      if @leadsets.length == 1
+        return redirect_to action: :show, id: @leadsets[0][:id]
+      end
     end
     @leadsets = @leadsets.page( params[:leadsets_page] ).per( current_profile.per_page )
   end
@@ -48,10 +51,13 @@ class ::IshManager::LeadsetsController < IshManager::ApplicationController
   def show
     @leadset = Leadset.find params[:id]
     authorize! :show, @leadset
+
     @email_contexts = {}
     @leadset.employees.each do |lead|
       @email_contexts[lead.email] = lead.email_contexts
     end
+
+    @employees = @leadset.employees.page( params[:leads_page] ).per( current_profile.per_page )
   end
 
   def update
@@ -62,7 +68,7 @@ class ::IshManager::LeadsetsController < IshManager::ApplicationController
     else
       flash[:alert] = "Cannot update leadset: #{@leadset.errors.messages}"
     end
-    redirect_to :action => 'index'
+    redirect_to :action => 'show', id: @leadset.id
   end
 
   ##

data/app/controllers/ish_manager/products_controller.rb

@@ -5,11 +5,97 @@ class IshManager::ProductsController < IshManager::ApplicationController
 
   # alphabetized : )
 
+  def create
+    @product = Wco::Product.new params[:product].permit!
+    authorize! :create, @product
+
+    stripe_product = Stripe::Product.create({ name: params[:product][:name] })
+    puts! stripe_product, 'stripe_product'
+
+    price_hash = {
+      product: stripe_product.id,
+      unit_amount: params[:product][:price_cents],
+      currency: 'usd',
+    }
+    if params[:product][:interval].present?
+      price_hash[:recurring] = { interval: params[:product][:interval] }
+    end
+    stripe_price = Stripe::Price.create( price_hash )
+    puts! stripe_price, 'stripe_price'
+
+    @product.product_id = stripe_product[:id]
+    @product.price_id   = stripe_price[:id]
+
+    flag = @product.save
+    if flag
+      flash[:notice] = 'Created the product.'
+      redirect_to action: :index
+    else
+      flash[:alert] = "No luck: #{@product.errors.full_messages.join(', ')}."
+      render action: :index
+    end
+  end
+
+  def destroy
+    authorize! :destroy, Wco::Product
+    # product = Wco::Product.find params[:id]
+
+    Stripe.api_key = ::STRIPE_SK
+    Stripe.api_version = '2020-08-27'
+    flag = Stripe::Product.delete( params[:id] )
+    # puts! flag, 'flag'
+    flash[:notice] = flag
+    # if product.destroy
+    #   flash[:notice] = 'Success'
+    # else
+    #   flash[:alert] = "Cannot destroy product: #{product.errors.fill_messages.join(', ')}."
+    # end
+    redirect_to action: :index
+  end
+
+  def edit
+    @product = Wco::Product.find params[:id]
+    authorize! :edit, @product
+  end
+
   def index
     authorize! :index, Wco::Product
+    @stripe_products = {}
+
     Stripe.api_key = ::STRIPE_SK
     Stripe.api_version = '2020-08-27'
-    @products = Stripe::Product.list().data
+    @_stripe_products = Stripe::Product.list().data
+    @_stripe_prices = Stripe::Price.list().data
+
+    @_stripe_products.each do |sp|
+      @stripe_products[sp[:id]] = sp
+      @stripe_products[sp[:id]][:prices] ||= {}
+    end
+    @_stripe_prices.each do |price|
+      @stripe_products[price[:product]][:prices][price[:id]] = price
+    end
+
+    @products = Wco::Product.all
+
+  end
+
+  def show
+    authorize! :show, @product
+    @product = Wco::Product.find params[:id]
+  end
+
+  def update
+    authorize! :edit, @product
+    @product = Wco::Product.find params[:id]
+
+    if @product.update_attributes params[:product].permit!
+      flash[:notice] = 'Success.'
+      redirect_to action: :show, id: @product.id
+    else
+      flash[:alert] = "No luck: #{@product.errors.full_messages.join(', ')}."
+      render action: :edit
+    end
+
   end
 
 end

data/app/controllers/ish_manager/subscriptions_controller.rb

@@ -8,12 +8,13 @@ class IshManager::SubscriptionsController < IshManager::ApplicationController
   def index
     authorize! :index, Wco::Subscription
 
-    Stripe.api_key = ::STRIPE_SK
-    Stripe.api_version = '2020-08-27'
-    @customers = Stripe::Customer.list().data
-    @users = User.all
-    @organizations = Wco::Organization.all()
-    @subscriptions = Stripe::Subscription.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 )
+    puts! @leadsets, '@leadsets'
+
   end
 
 end

data/app/views/ish_manager/application/_main_header_admin.haml

@@ -60,6 +60,9 @@
           = link_to '[+]', new_email_template_path
         %li
           = link_to "Companies (#{Leadset.kept.length})", leadsets_path
+          .inline-search
+            = form_tag leadsets_path, method: :get do
+              = text_field_tag :q
           = link_to '[+]', new_leadset_path
 
 
@@ -97,6 +100,12 @@
           = link_to "OActions (#{Office::Action.count})", office_actions_path
           = link_to '[+]', new_office_action_path
 
+      %ul
+        %li
+          = link_to 'Products & Prices', products_path
+        %li
+          = link_to 'Customers & Subscriptions', subscriptions_path
+
     .c
 
     %i.fa.fa-compress.collapse-expand#collapseHeaderIro
@@ -118,12 +127,3 @@
           = link_to '[+]', new_iro_purse_path
     .c
 
-    %i.fa.fa-compress.collapse-expand#collapseHeaderWco
-      Wco
-    .a
-      %ul
-        %li
-          = link_to 'Products & Prices', products_path
-        %li
-          = link_to 'Customers & Subscriptions', subscriptions_path
-    .c

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

@@ -2,20 +2,28 @@
 - url = invoice.persisted? ? invoice_path( invoice.id ) : invoices_path
 
 = form_for invoice, :as => :invoice, :url => url do |f|
+  = hidden_field_tag 'invoice[leadset_id]', @leadset.id
+
   .input-field
     %label Email
-    = f.text_field :email
+    = @leadset.email
+    -# - if @leadset.email
+    -#   = f.text_field :email, value: @leadset.email
+    -# - elsif @leadset.employees.length == 1
+    -#   = f.text_field :email, value: @leadset.employees[0].email
+    -# - else
+    -#   = f.select :email, options_for_select([[nil,nil]] + @leadset.employees.map { |i| [ i.email, i.email ] } )
 
   .input-field
-    %label amount
-    = f.number_field :amount, :step => 0.01, :default => 0.0
+    %label item
+    = select_tag 'invoice[items][]', options_for_select( @products_list )
 
-  .input-field
-    %label number
-    = f.number_field :number
+  -# .input-field
+  -#   %label number
+  -#   = f.number_field :number
+
+  -# .input-field
+  -#   %label Description
+  -#   = f.text_area :description
 
-  .input-field
-    %label Description
-    = f.text_area :description
-  
   = f.submit 'Save'

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

@@ -1,30 +1,31 @@
 
--#
--# invoices / index.haml
--#
+.invoices-index.max-width
 
-%h3
-  Invoices
-  = link_to '[+]', new_invoice_path
 
-.row
-  .col.s12.col.m6.col-md-offset-3
-    = render 'form', :invoice => @new_invoice
-%hr
+  %h5
+    Invoices
+    -# = link_to '[+]', new_invoice_path
 
-%table#dataTable
-  %thead
-    %tr
-      %th Email
-      %th Number
-      %th Amount
-      %th Amount Paid
-      %th Created At
-  %tbody
-    - @invoices.each do |i|
+  -# .row
+  -#   .col.s12.col.m6.col-md-offset-3
+  -#     = render 'form', :invoice => @new_invoice
+  %hr
+
+  %table#dataTable
+    %thead
       %tr
-        %td= i.email
-        %td= i.number
-        %td= i.amount
-        %td= i.paid_amount
-        %td= i.created_at.to_s[0..10]
+        %th
+        %th Leadset
+        %th Number
+        %th Amount
+        %th Amount Paid
+        %th Created At
+    %tbody
+      - @invoices.each do |i|
+        %tr
+          %td= link_to "View", invoice_path( i )
+          %td= i.leadset.name
+          %td= i.number
+          %td= i.amount
+          %td= i.paid_amount
+          %td= i.created_at.to_s[0..10]

data/app/views/ish_manager/invoices/new.haml

@@ -1,5 +1,7 @@
 
-.row
-  .col.s12.col.m6.col-md-offset-3
-    %h5 New Invoice
-    = render 'form', :invoice => @new_invoice
+.invoices-new.max-width
+
+  .row
+    .col.s12.col.m6.col-md-offset-3
+      %h5 New Invoice for `#{link_to @leadset&.name, leadset_path(@leadset)}`:
+      = render 'form', invoice: @new_invoice

data/app/views/ish_manager/invoices/show.haml

@@ -0,0 +1,19 @@
+
+- i = @invoice
+
+.invoices-show.max-width
+  %h5 Invoice ##{@invoice.number}
+
+  %ul
+    %li email: #{i.email}
+    %li leadset: #{link_to i.leadset.name, leadset_path( i.leadset) }
+    %li invoice_id: #{i.invoice_id}
+    %li items: #{i.items}
+
+    = @invoice.inspect
+
+  %hr
+
+  %pre
+    = @stripe_invoice.inspect
+

data/app/views/ish_manager/leads/show.haml

@@ -9,7 +9,7 @@
   %ul
     %li Name: #{@lead.name}
     %li Email: #{@lead.email}
-    %li Company: #{ link_to @lead.company.company_url, leadset_path(@lead.company) }
+    %li Company (leadset): #{ link_to @lead.company.company_url, leadset_path(@lead.company) }
     %li Phone: #{@lead.phone}
     %li Address: #{@lead.address}
     %li Comment: #{raw @lead.comment}
@@ -24,10 +24,12 @@
           %li
             = pp_date( ctx.sent_at ) || 'not sent'
             = link_to ctx.subject.presence||"No Subj?!", email_context_path(ctx)
+
     .col-md-6.schs
       %h5
         Scheduled actions (#{@schs.length})
-        = link_to '[+]', '#'
+        -# = link_to '[+]', '#'
+        \[+]
       %ul
         - @schs.each do |sch|
           %li
@@ -36,13 +38,24 @@
             (#{link_to 'proto-action', edit_email_action_path(sch.email_action)})
             = sch.perform_at
 
+      %hr
+      %h5
+        Invoices (?)
+        = link_to '[+]', new_invoice_path({ leadset_id: @lead.m3_leadset_id })
+      %ul
+        %li None?
+
+
 
   .row
     .col-md-12.msgs
       %h5 Email Messages (#{@msgs.length})
+      .descr @TODO: these used to be links, but now they are broken. _vp_ 2023-08-10
       %ul
         - @msgs.each do |msg|
-          %li= link_to msg.subject, email_conversation_path( msg.conv )
+          %li
+            = msg.subject
+            -#   = link_to msg.subject, email_conversation_path( msg.conv )
 
 
 

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

@@ -10,11 +10,14 @@
     = f.label :name
     = f.text_field :name
   .input-field
-    = f.label :tag
-    = f.text_field :tag
+    = f.label :email
+    = f.text_field :email
   -# .input-field
-  -#   = f.label :location
-  -#   = f.text_field :location
-  .actions{ :style => "margin-top: 1em;" }
+  -#   = f.label :tag
+  -#   = f.text_field :tag
+  .input-field
+    %label Stripe customer_id
+    = f.text_field :customer_id
+  .actions
     = f.submit
 

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

@@ -18,6 +18,7 @@
   %table.bordered
     %thead
       %tr
+        %th  
         %th  
         %th.company-url Company Url
         %th Tags
@@ -28,6 +29,7 @@
       - @leadsets.each_with_index do |leadset, idx1|
         %tr
           %td= check_box_tag 'leadset_ids[]', leadset.id, nil, { class: 'i-sel' }
+          %td= link_to '[~]', edit_leadset_path( leadset )
           %td= link_to leadset.company_url, leadset_path(leadset)
 
           %td.tags

data/app/views/ish_manager/leadsets/show.haml

@@ -1,5 +1,18 @@
 
 .leadsets-show.max-width
   .header
-    %h2.title Leadset #{@leadset.company_url}
-  = render 'ish_manager/leads/index', leads: @leadset.employees, skip_pagination: true, email_contexts: @email_contexts
+    %h2.title
+      Leadset `#{@leadset.name}`
+      = link_to '[~]', edit_leadset_path( @leadset )
+
+  %ul
+    %li <b>Email:</b> #{@leadset.email}
+    %li <b>Stripe customer_id:</b> #{@leadset.customer_id}
+    %li <b>company_url</b>: #{@leadset.company_url}
+    %li
+      = link_to invoices_path({ leadset_id: @leadset.id }) do
+        Invoices
+        (#{@leadset.invoices.length})
+      = link_to '[+]', new_invoice_path({ leadset_id: @leadset.id })
+
+  = render 'ish_manager/leads/index', leads: @employees

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

@@ -0,0 +1,28 @@
+
+- url = product.new_record? ? products_path : product_path( product )
+
+.products--form
+  = form_for product, as: :product, url: url do |f|
+
+    .form-field
+      %label Name
+      = f.text_field :name
+
+    .form-field
+      %label Price in cents
+      = f.text_field :price_cents
+
+    .form-field
+      %label Recurring?
+      = f.select :interval, options_for_select(Wco::Product::INTERVALS)
+
+    -# .form-field
+    -#   %label Stripe product_id
+    -#   = f.text_field :product_id
+
+    -# .form-field
+    -#   %label Stripe price_id
+    -#   = f.text_field :price_id
+
+    .actions
+      = f.submit 'Submit'

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

@@ -0,0 +1,5 @@
+
+.products-edit.max-width
+  %h5 Edit product
+
+  = render 'form', product: @product

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

@@ -1,7 +1,33 @@
 
 .products-index.max-width
-  %h5 Products
 
+  %h5
+    Stripe Products (#{@stripe_products.length}):
+    -# = link_to '[+]', new_product_path
+  %ol
+    - @stripe_products.each do |product_id, product|
+      %li
+        = link_to '[~]', edit_product_path( product.id )
+        .inline-block= button_to '[x]', product_path( product.id ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+        %span.gray= product.id
+        = product.name
+        %ul
+          - product[:prices].each do |price_id, price|
+            %li
+              %span.gray= price.id
+              $#{price[:unit_amount].to_f/100}/#{(price[:recurring]||{})[:interval]||'onetime'}
+              -# = price.inspect
+
+  %hr
+
+  %h5 New Product:
+  = render 'ish_manager/products/form', product: Wco::Product.new
+
+  %hr
+  %h5 Wco::Product's (#{@products.length})
   %ul
     - @products.each do |product|
-      %li= product.name
+      %li
+        = link_to '[~]', edit_product_path( product )
+        = product.inspect
+

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

@@ -0,0 +1,5 @@
+
+.products-show.max-width
+  %h5
+    Show product #{@product.name}
+    = link_to '[~]', edit_product_path( @product )

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

@@ -1,11 +1,11 @@
 
 .container.subscriptions-index.padded
   .row
-    .col-md-6
 
+    .col-md-6
       %h5 Stripe Customers
       %ul
-        - @customers.each do |customer|
+        - @stripe_customers.each do |customer|
           %li
             %ul
               %li <b>Email:</b> #{customer.email}
@@ -13,35 +13,18 @@
               %li
                 <b>Subscriptions:</b>
                 %ul
-                  - @subscriptions.each do |sub|
+                  - @stripe_subscriptions.each do |sub|
                     - if sub.customer == customer.id
                       %li= sub.items.data[0].plan.product
 
     .col-md-6
-      %h5 Wco Users
-      %ul
-        - @users.each do |user|
-          %li
-            = user.email
-            %ul
-              %li <b>profile:</b> #{user.profile.email}
-              - if user.profile.organization
-                %li <b>organization:</b> #{user.profile.organization.name}, customer_id: #{user.profile.organization.customer_id}
-                %li <b>subscriptions:</b> #{user.profile.organization.subscriptions.inspect}
-      %hr
-      %h5 Wco Organizations
+      %h5 Stripe Subscriptions
       %ul
-        - @organizations.each do |org|
+        - @stripe_subscriptions.each do |sub|
           %li
-            = org.name
             %ul
-              %li <b>customer_id:</b> #{org.customer_id}
-            -#   %li <b>organization:</b> #{user.profile.organization.name}, customer_id: #{user.profile.organization.customer_id}
-            -#   %li <b>subscriptions:</b> #{user.profile.organization.subscriptions.inspect}
-
-  %hr
-  %h5 Subscriptions
-  %ul
-    - @subscriptions.each do |sub|
-      %li= sub.inspect
+              %li plan: $#{sub[:plan][:amount].to_f/100}/#{sub[:plan][:interval]}
+              %li product: #{sub[:plan][:product]}
+              %li customer: #{sub[:customer]}
+              -# %li= sub.inspect
 

data/config/routes.rb

@@ -22,9 +22,9 @@ IshManager::Engine.routes.draw do
 
   get 'image_assets', to: 'image_assets#index', as: :image_assets
 
-  # resources :invoices do
+  resources :invoices do
   #   resources :payments
-  # end
+  end
   # resources :orders
 
   get 'iro_positins/roll_prep/:id', to: 'iro_purses#roll_prep', as: :iro_roll_prep

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.453
+  version: 0.1.8.455
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-09 00:00:00.000000000 Z
+date: 2023-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -641,6 +641,7 @@ files:
 - app/views/ish_manager/invoices/_form.haml
 - app/views/ish_manager/invoices/index.haml
 - app/views/ish_manager/invoices/new.haml
+- app/views/ish_manager/invoices/show.haml
 - app/views/ish_manager/iro_mailer/condor_followup_alerb.html.erb
 - app/views/ish_manager/iro_mailer/option_alert.html.erb
 - app/views/ish_manager/iro_mailer/stock_alert.html.erb
@@ -729,7 +730,10 @@ files:
 - app/views/ish_manager/photos/new.haml
 - app/views/ish_manager/photos/show.haml
 - app/views/ish_manager/photos/without_gallery.haml
+- app/views/ish_manager/products/_form.haml
+- app/views/ish_manager/products/edit.haml
 - app/views/ish_manager/products/index.haml
+- app/views/ish_manager/products/show.haml
 - app/views/ish_manager/reports/_form.haml
 - app/views/ish_manager/reports/_index.haml
 - app/views/ish_manager/reports/_show_mini.haml