ish_manager 0.1.8.461 → 0.1.8.463

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a936861bb4879bb1d16f7e04dadf42d0932dd47bb73dfaa89b63c72267655dae
-  data.tar.gz: 5ebcfead1814dfe078ef49a41e1c0b21af6f87c952e493838e89ef4450e8fd58
+  metadata.gz: 3e3d19cd10fe96e5cb993413b121bc44c107cd793ca8280f193d18a5967b6fd1
+  data.tar.gz: 8269b21b2d010573fbb04ea80282e96507a5bc01bbf98c98e0cdd46157d3c1e2
 SHA512:
-  metadata.gz: 13c83e9dd12495f4fa9d3e71464a693c9949fe4b7e5b2f34b580f4b24c55d9093741a63221b6b45af96427e7b3e1a9c755596b6b812e7244d7f4feabb1d1994d
-  data.tar.gz: 7d7ac4f8fbe39793720d1bed308dd138731533b23601a2745935883e22e4e63be65baa58ecbf3b4463a8cdb56a5117a44cbb51eb565d4e2c20cb53fae5164fb4
+  metadata.gz: d623e2070e7f1f933960fc4c71aad603e77a6391aa7886e9a22b610d3c7c76d89e184aa346d8096f2416234d85623a4c59b58caa78ec3fb0b7b9bb19ef488c32
+  data.tar.gz: 58fe7332a16091c22fb181fd76f6c33cfeb44093d52196f198f5bf01dc66ef749566539c09646269799bd5002c4e3512031fbded7968d5090dcdafa7332600be

data/app/assets/stylesheets/ish_manager/application.scss

@@ -20,8 +20,10 @@
  *= require ish_manager/markers
  *= require ish_manager/office
  *= require ish_manager/pagination
+ *= require ish_manager/products
  *= require ish_manager/photos
  *= require ish_manager/scheduled_email_actions
+ *= require ish_manager/subscriptions
  *= require ish_manager/tags
  *= require ish_manager/user_profiles
  *= require ish_manager/videos

data/app/assets/stylesheets/ish_manager/products.scss

@@ -0,0 +1,9 @@
+
+.products--index-table {
+  td {
+    // padding: 10px;
+  }
+  th.name {
+    min-width: 250px;
+  }
+}

data/app/assets/stylesheets/ish_manager/subscriptions.scss

@@ -0,0 +1,6 @@
+
+.subscriptions-new {
+  .select2-container {
+    width: 500px !important;
+  }
+}

data/app/controllers/ish_manager/application_controller.rb

@@ -50,6 +50,26 @@ class IshManager::ApplicationController < ActionController::Base
     JWT.encode(payload, Rails.application.secrets.secret_key_base.to_s)
   end
 
+  def flash_alert what
+    flash[:alert] ||= []
+    if String == what.class
+      str = what
+    else
+      str = "Cannot create/update #{what.class.name}: #{what.errors.full_messages.join(', ')} ."
+    end
+    flash[:alert] << str
+  end
+
+  def flash_notice what
+    flash[:notice] ||= []
+    if String == what.class
+      str = what
+    else
+      str = "Created/updated #{what.class.name} ."
+    end
+    flash[:notice] << str
+  end
+
   def my_truthy? which
     ["1", "t", "T", "true"].include?( which )
   end

data/app/controllers/ish_manager/invoices_controller.rb

@@ -1,14 +1,109 @@
+require 'prawn'
+require 'prawn/table'
 
 class ::IshManager::InvoicesController < IshManager::ApplicationController
 
   before_action :set_lists
 
+  def create_monthly_pdf
+    @leadset = Leadset.find params[:leadset_id]
+    authorize! :create_monthly_invoice_pdf, @leadset
+
+    @invoice = Ish::Invoice.where({ leadset_id: @leadset.id, month_on: params[:month_on] }).first
+    if @invoice
+      flash_alert "Already created this invoice."
+      redirect_to controller: :leadsets, action: :show, id: @leadset.id
+      return
+    end
+
+    @invoice = Ish::Invoice.create({ leadset_id: @leadset.id, month_on: params[:month_on] })
+
+    @pdf = @invoice.generate_monthly_invoice params[:month_on]
+    filename = "invoice-#{@invoice.number}.pdf"
+    path = Rails.root.join 'tmp', filename
+    @pdf.render_file path
+    data = File.read path
+    File.delete(path) if File.exist?(path)
+
+    send_data( data, { :filename => filename,
+      :disposition => params[:disposition] ? params[:disposition] : :attachment,
+      :type => 'application/pdf'
+    })
+  end
+
+
+  ## @TODO: obsolete, remove
+  ##
   def create_pdf
     @invoice = Ish::Invoice.new
     authorize! :new, @invoice
 
+    tree_img_url = "#{Rails.root.join('public')}/tree-1.jpg"
+    wasya_co_logo_url = "#{Rails.root.join('public')}/259x66-WasyaCo-logo.png"
+
     pdf = Prawn::Document.new
-    pdf.text "Job Summary."
+
+    pdf.canvas do
+      pdf.image tree_img_url, at: [ 0, 792 ], width: 612
+
+      pdf.fill_color 'ffffff'
+      pdf.transparent( 0.75 ) do
+        pdf.fill_rectangle [0, 792], 612, 792
+      end
+      pdf.fill_color '000000'
+
+      pdf.image wasya_co_logo_url, at: [252, 720], width: 108 ## 1.5"
+
+      pdf.bounding_box( [0.75*72, 9.25*72], width: 3.25*72, height: 0.75*72 ) do
+        pdf.text "From:"
+        pdf.text "Wasya Co"
+        pdf.text "(415) 948-0368"
+      end
+
+      pdf.bounding_box( [4.5*72, 9.25*72], width: 3.25*72, height: 0.75*72 ) do
+        pdf.text "Stats:"
+        pdf.text "Date: #{ '2023-09-07' }"
+        pdf.text "Invoice # #{ '111' }"
+      end
+
+      pdf.bounding_box( [0.75*72, 8.25*72], width: 3.25*72, height: 0.75*72 ) do
+        pdf.text "To:"
+        pdf.text "Creen Enterprise"
+      end
+
+      pdf.bounding_box( [4.5*72, 8.25*72], width: 3.25*72, height: 0.75*72 ) do
+        pdf.text "Notes:"
+        pdf.text "Support & various, for the month of August '23."
+      end
+
+      pdf.move_down 20
+
+      pdf.table([
+        [ 'Description', 'Type', 'Hours', 'Subtotal' ],
+        [ 'Part 2/2', 'indep. proj.', '-', '$3,501' ],
+      ], {
+        position: :center,
+        width: 7.5*72,
+        cell_style: {
+          inline_format: true,
+          borders: [ :bottom ]
+        },
+      } )
+
+      pdf.table([
+        [ 'Total' ],
+        [ '$3,501' ],
+      ], {
+        position: 7*72,
+        width: 1*72,
+        cell_style: {
+          inline_format: true,
+          borders: [ :bottom ]
+        },
+      } )
+
+      pdf.text_box "Thank you!", at: [ 3.25*72, 1.25*72 ], width: 2*72, height: 1*72, align: :center
+    end
 
     filename = "a-summary.pdf"
     path = Rails.root.join 'tmp', filename

data/app/controllers/ish_manager/leadsets_controller.rb

@@ -57,7 +57,9 @@ class ::IshManager::LeadsetsController < IshManager::ApplicationController
       @email_contexts[lead.email] = lead.email_contexts
     end
 
-    @employees = @leadset.employees.page( params[:leads_page] ).per( current_profile.per_page )
+    @employees     = @leadset.employees.page( params[:leads_page] ).per( current_profile.per_page )
+    @subscriptions = @leadset.subscriptions
+    @invoices      = @leadset.invoices
   end
 
   def update

data/app/controllers/ish_manager/prices_controller.rb

@@ -0,0 +1,15 @@
+
+
+
+
+class IshManager::PricesController < IshManager::ApplicationController
+
+  def update
+
+    # if !params[:price][:interval].present?
+    #   @price.interval = nil
+    # end
+  end
+
+end
+

data/app/controllers/ish_manager/products_controller.rb

@@ -3,37 +3,48 @@ class IshManager::ProductsController < IshManager::ApplicationController
 
   before_action :set_lists
 
-  # alphabetized : )
+  # Alphabetized : )
 
   def create
-    @product = Wco::Product.new params[:product].permit!
+    @product = Wco::Product.new params[:product].permit( :name )
+    @price   = Wco::Price.new params[:price].permit( :amount_cents, :interval )
     authorize! :create, @product
 
-    stripe_product = Stripe::Product.create({ name: params[:product][:name] })
-    puts! stripe_product, 'stripe_product'
+    if !params[:price][:interval].present?
+      @price.interval = nil
+    end
+
+    stripe_product = Stripe::Product.create({ name: @product.name })
+    # puts! stripe_product, 'stripe_product'
+    flash_notice 'Created stripe product.'
+    @product.product_id = stripe_product[:id]
+
+    if @product.save
+      flash_notice 'Created wco product.'
+    else
+      flash_alert "Cannot create wco product: #{@product.errors.full_messages.join(', ')}."
+    end
 
     price_hash = {
-      product: stripe_product.id,
-      unit_amount: params[:product][:price_cents],
-      currency: 'usd',
+      product:     stripe_product.id,
+      unit_amount: @price.amount_cents,
+      currency:    'usd',
     }
-    if params[:product][:interval].present?
-      price_hash[:recurring] = { interval: params[:product][:interval] }
+    if @price.interval.present?
+      price_hash[:recurring] = { interval: @price.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
+    # puts! stripe_price, 'stripe_price'
+    flash_notice 'Created stripe price.'
+    @price.product = @product
+    @price.price_id = stripe_price[:id]
+    if @price.save
+      flash_notice @price
     else
-      flash[:alert] = "No luck: #{@product.errors.full_messages.join(', ')}."
-      render action: :index
+      flash_alert @price
     end
+
+    redirect_to action: :index
   end
 
   def destroy
@@ -60,25 +71,42 @@ class IshManager::ProductsController < IshManager::ApplicationController
 
   def index
     authorize! :index, Wco::Product
-    @stripe_products = {}
 
-    Stripe.api_key = ::STRIPE_SK
-    Stripe.api_version = '2020-08-27'
+    @stripe_products  = {}
     @_stripe_products = Stripe::Product.list().data
-    @_stripe_prices = Stripe::Price.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
+      begin
+        @stripe_products[price[:product]][:prices][price[:id]] = price
+      rescue Exception
+        nil
+      end
     end
 
-    @products = Wco::Product.all
+    @wco_products = Wco::Product.all.includes( :prices )
+    @wco_products.each do |item|
+      if @stripe_products[item[:product_id]]
+        @stripe_products[item[:product_id]][:wco_product] = item
+      end
+    end
+
+    ## 2023-09-07 @TODO: move to model:
+    ##   @wco_prices_hash = Wco::Price.all.hash_by( :price_id )
+    ##
+    @wco_prices_hash = {}
+    @wco_prices = Wco::Price.all
+    @wco_prices.each do |item|
+      @wco_prices_hash[item[:price_id]] = item
+    end
 
   end
 
+
   def show
     authorize! :show, @product
     @product = Wco::Product.find params[:id]

data/app/controllers/ish_manager/subscriptions_controller.rb

@@ -5,42 +5,51 @@ class IshManager::SubscriptionsController < IshManager::ApplicationController
 
   ## Alphabetized : )
 
+  ##
+  ## A stripe subscription is currently single-item only.
+  ##
   def create
     @subscription = Wco::Subscription.new params[:subscription].permit!
     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! params, 'params'
-    @stripe_subscription = Stripe::Subscription.create( params )
-    # puts! @stripe_subscription, '@stripe_subscription'
+    @subscription.leadset_id = Leadset.where({ customer_id: params[:subscription][:customer_id] }).first&.id
+    @subscription.price   = Wco::Price.find_by price_id: params[:subscription][:price_id]
+    @subscription.product = @subscription.price.product
+
+    if params[:is_stripe]
+      payment_methods = Stripe::Customer.list_payment_methods( params[:subscription][:customer_id] ).data
+      params = {
+        customer: params[:subscription][:customer_id],
+        default_payment_method: payment_methods[0][:id],
+        items: [
+          { price:    params[:subscription][:price_id],
+            quantity: params[:subscription][:quantity],
+          },
+        ],
+      }
+      @stripe_subscription = Stripe::Subscription.create( params )
+      flash_notice @stripe_subscription
+    end
 
 
     flag = @subscription.save
     if flag
-      flash[:notice] = 'Created the subscription.'
+      flash_notice @subscription
       redirect_to action: :show, id: @subscription.id
     else
-      flash[:alert] = "Cannot create the subscription: #{@subscription.errors.full_messages.join(', ')}."
-      render action: :new
+      flash_alert @subscription
+      redirect_to action: :new
     end
   end
 
+
   def index
     authorize! :index, Wco::Subscription
 
     @stripe_customers     = Stripe::Customer.list().data
     @stripe_subscriptions = Stripe::Subscription.list().data
 
-    @customers     = {}
+    @customers     = {} ## still stripe customers
     customer_ids   = @stripe_customers.map &:id
     @leadsets      = Leadset.where( :customer_id.in => customer_ids )
     @leadsets.each do |i|
@@ -54,8 +63,10 @@ class IshManager::SubscriptionsController < IshManager::ApplicationController
       @customers[i[:customer_id]][:profiles] ||= []
       @customers[i[:customer_id]][:profiles].push( i )
     end
-
     # puts! @customers, '@customers'
+
+    @wco_subscriptions = Wco::Subscription.all
+
   end
 
   def new
@@ -63,6 +74,16 @@ class IshManager::SubscriptionsController < IshManager::ApplicationController
     authorize! :new, @subscription
   end
 
+  def new_stripe
+    @subscription = Wco::Subscription.new
+    authorize! :new, @subscription
+  end
+
+  def new_wco
+    @subscription = Wco::Subscription.new
+    authorize! :new, @subscription
+  end
+
   def show
     @subscription = Wco::Subscription.find params[:id]
     authorize! :show, @subscription
@@ -75,11 +96,19 @@ class IshManager::SubscriptionsController < IshManager::ApplicationController
 
   def set_lists
     super
-    @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 ] }
+    @products_list = Wco::Product.list
+    leadsets = Leadset.where( "customer_id IS NOT NULL"         ).map { |i| [ "leadset // #{i.company_url} (#{i.email})", 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 ] }
+    @price_ids_list = Wco::Product.all.includes( :prices ).map do |i|
+      price    = i.prices[0]
+      if price&.price_id
+        puts! price.interval, 'price.interval'
+        [ "#{i.name} // $#{price.amount_cents.to_f/100}/#{price.interval||'onetime'}", price.price_id ]
+      else
+        [ "#{i.name} - no price!!!", nil ]
+      end
+    end
   end
 
 end

data/app/views/ish_manager/appliances/_index.haml

@@ -18,4 +18,5 @@
               - else
                 <no-serverhost>
             %li.host <b>host:</b> #{i.host}
-            -# %li.inspect= i.inspect
+%hr
+

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

@@ -1,12 +1,22 @@
 
 .row.max-width
   .col-sm-12
-    - if notice
+    - if notice&.class == String
       .notice
         = notice
         .close [x]
-    - if alert
+    - if notice&.class == Array
+      - notice.each do |i|
+        .notice
+          = i
+          .close [x]
+    - if alert&.class == String
       .alert
         = alert
         .close [x]
+    - if alert&.class == Array
+      - alert.each do |i|
+        .alert
+          = i
+          .close [x]
 

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

@@ -104,7 +104,8 @@
         %li
           = link_to 'Products & Prices', products_path
         %li
-          = link_to 'Customers & Subscriptions', subscriptions_path
+          = link_to 'Subscriptions', subscriptions_path
+          = link_to '[+]', new_wco_subscription_path
 
     .c
 

data/app/views/ish_manager/galleries/index_titles.haml

@@ -1,7 +1,7 @@
 
 = render 'ish_manager/galleries/menu', count: @galleries.count
 
-%table#dataTable
+%table.bordered.data-table
   %thead
     %tr
       %th Public?

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

@@ -0,0 +1,6 @@
+
+.invoices--list
+  %ul
+    - invoices.each do |i|
+      %li
+        = i.inspect

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

@@ -0,0 +1,20 @@
+
+.invoices--index-table
+  %table.bordered.data-table
+    %thead
+      %tr
+        %th
+        %th Email
+        %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.email
+          %td= i.number
+          %td= i.amount_cents
+          %td= i.paid_amount_cents
+          %td= i.created_at.to_s[0..10]

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

@@ -1,31 +1,3 @@
 
 .invoices-index.max-width
-
-
-  %h5
-    Invoices
-    -# = link_to '[+]', new_invoice_path
-
-  -# .row
-  -#   .col.s12.col.m6.col-md-offset-3
-  -#     = render 'form', :invoice => @new_invoice
-  %hr
-
-  %table#dataTable
-    %thead
-      %tr
-        %th
-        %th Email
-        %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.email
-          %td= i.number
-          %td= i.amount_cents
-          %td= i.paid_amount_cents
-          %td= i.created_at.to_s[0..10]
+  = render 'index_table', invoices: @invoices

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

@@ -3,9 +3,12 @@
 
   .row
     .col.s12.col.m6.col-md-offset-3
+
       %h5 New PDF Invoice for `#{link_to @leadset&.name, leadset_path(@leadset)}`:
       = form_for @new_invoice, as: :invoice, url: create_invoice_pdf_path do |f|
-        = f.text_field :email
+        .input-field
+          %label Email
+          = f.text_field :email
         .input-field
           invoice month, description
         .input-field

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

@@ -9,14 +9,11 @@
     %li <b>Email:</b> #{@leadset.email}
     %li <b>company_url</b>: #{@leadset.company_url}
     %li <b>customer_id</b>: #{@leadset.customer_id}
-    %li
-      = link_to invoices_path({ leadset_id: @leadset.id }) do
-        Invoices
-        (#{@leadset.invoices.length})
-      = link_to '[+stripe]', new_invoice_stripe_path({ leadset_id: @leadset.id })
-      = link_to '[+pdf]', new_invoice_pdf_path({ leadset_id: @leadset.id })
 
+
+  %h5.collapse-expand#leads Leads
   = render 'ish_manager/leads/index', leads: @employees
+  %hr
 
   .row
     .col-md-6
@@ -24,3 +21,33 @@
 
     .col-md-6
       = render 'ish_manager/appliances/index', appliances: @leadset.appliances
+
+  .row
+    .col-md-6
+      %h5.collapse-expand#invoicesList
+        Invoices  (#{@leadset.invoices.length})
+        = link_to '[+stripe]', new_invoice_stripe_path({ leadset_id: @leadset.id })
+        = link_to '[+pdf]', new_invoice_pdf_path({ leadset_id: @leadset.id })
+      = render 'ish_manager/invoices/index_list', invoices: @invoices
+
+      = form_tag create_monthly_invoice_for_leadset_path({ leadset_id: @leadset.id }) do
+        %label Create invoice for month
+        = text_field_tag 'month_on'
+        = submit_tag 'Submit', data: { confirm: 'Are you sure?' }
+      %hr
+
+    .col-md-6
+      %h5.collapse-expand#subscriptionsList
+        Subscriptions (#{@subscriptions.length})
+        = link_to '[+wco]', new_wco_subscription_path({ customer_id: @leadset.customer_id })
+      %table.bordered
+        %thead
+          %tr
+            %th Name
+            %th Price
+        - @subscriptions.each do |i|
+          %tr
+            %td= i.product.name
+            %td= i.price
+      %hr
+

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

@@ -1,7 +1,7 @@
 
 .manager-meeetings-index
 
-  %table#dataTable.display.compact
+  %table.data-table.display.compact
     %thead
       %tr
         %th Invitee

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

@@ -5,7 +5,7 @@
 
 %h1 Payments
 
-%table#dataTable
+%table.bordered.data-table
   %thead
     %tr
       %th Amount

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

@@ -2,19 +2,19 @@
 - url = product.new_record? ? products_path : product_path( product )
 
 .products--form
-  = form_for product, as: :product, url: url do |f|
+  = form_for product, url: url do |f|
 
     .form-field
       %label Name
-      = f.text_field :name
+      = text_field_tag 'product[name]'
 
     .form-field
       %label Price in cents
-      = f.text_field :price_cents
+      = text_field_tag 'price[amount_cents]'
 
     .form-field
       %label Recurring?
-      = f.select :interval, options_for_select(Wco::Product::INTERVALS)
+      = select_tag 'price[interval]', options_for_select(Wco::Price::INTERVALS)
 
     -# .form-field
     -#   %label Stripe product_id

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

@@ -0,0 +1,10 @@
+
+%ol
+  - products.each do |product|
+    %li
+      = link_to '[~]', edit_product_path( product )
+      #{product.name} // $#{product.price_cents.to_f/100}/#{product.interval.presence || 'onetime'}
+      - if product.product_id
+        .ml-5 <b>product_id:</b> #{product.product_id}
+      - if product.price_id
+        .ml-5 <b>price_id:</b> #{product.price_id}

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

@@ -0,0 +1,20 @@
+
+.products--index-table
+  %table.bordered.data-table
+    %thead
+      %tr
+        %th.name Name
+        %th.prices Prices
+
+    - products.each do |product|
+      %tr
+        %td.p-2
+          = link_to '[~]', edit_product_path( product )
+          = product.name
+          .gray= product.product_id
+        %td.p-2
+          %ul
+            - product.prices.each do |price|
+              %li
+                $#{ price.amount_cents.to_f/100 } / #{price.interval}
+                .gray= price.price_id

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

@@ -1,7 +1,12 @@
 
 .products-index.max-width
 
-  %h5
+  .a
+    %h5 New Product:
+    = render 'ish_manager/products/form', product: Wco::Product.new
+  %hr
+
+  %h5.collapse-expand#stripeProducts
     Stripe Products (#{@stripe_products.length}):
     -# = link_to '[+]', new_product_path
   %ol
@@ -10,24 +15,23 @@
         = 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
+        - if product[:wco_product]
+          = link_to product.name, product_path( product )
+        - else
+          = 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
-
+              - price_str = "$#{ price[:unit_amount].to_f/100 }/#{ (price[:recurring]||{})[:interval]||'onetime' }"
+              - if @wco_prices_hash[price.id]
+                = link_to price_str, price_path( @wco_prices_hash[price.id] )
+              - else
+                = price_str
   %hr
 
-  %h5 New Product:
-  = render 'ish_manager/products/form', product: Wco::Product.new
+  %h5.collapse-expand#wcoProducts
+    Wco::Products (#{@wco_products.length}):
+  = render 'index_table', products: @wco_products
+  -# = render 'index_list', products: @wco_products
 
-  %hr
-  %h5 Wco::Product's (#{@products.length})
-  %ul
-    - @products.each do |product|
-      %li
-        = link_to '[~]', edit_product_path( product )
-        #{product.name} // $#{product.price_cents.to_f/100}/#{product.interval.presence || 'onetime'}
-        [ #{product.product_id}, #{product.price_id} ]

data/app/views/ish_manager/serverhosts/_index.haml

@@ -1,7 +1,6 @@
 
 .serverhosts--index
   %h5 Serverhosts (#{serverhosts.length})
-  %hr
 
   %ul.items
     - serverhosts.each do |i|
@@ -18,4 +17,4 @@
           %li.nginx_root <b>nginx_root:</b> #{i.nginx_root}
           %li.appliances
             = render 'ish_manager/appliances/index', appliances: i.appliances
-
+%hr

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

@@ -8,9 +8,17 @@
       %label Product (price):
       = f.select :price_id, options_for_select(@price_ids_list, selected: subscription.price_id), {}, class: :select2
 
+    .input-group
+      %label Quantity:
+      = f.number_field :quantity
+
     .input-group
       %label Customer/Leadset
-      = f.select :customer_id, options_for_select(@customer_ids_list, selected: subscription.customer_id), {}, class: :select2
+      = f.select :customer_id, options_for_select(@customer_ids_list, selected: params[:customer_id] || subscription.customer_id), {}, class: :select2
+
+    .input-group
+      %label Create a stripe subscription?
+      = check_box_tag :is_stripe
 
     .actions
-      = f.submit 'Submit'
+      = f.submit 'Submit', data: { confirm: 'Are you sure?' }

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

@@ -1,7 +1,7 @@
 
 .container.subscriptions-index.padded
+  %p.collapse-expand#rowStripe Stripe
   .row
-
     .col-md-6
       %h5 Stripe Customers
       %ul
@@ -16,11 +16,10 @@
                   - @stripe_subscriptions.each do |sub|
                     - if sub.customer == customer.id
                       %li= sub.items.data[0].plan.product
-
     .col-md-6
       %h5
         Stripe Subscriptions
-        = link_to '[+]', new_subscription_path
+        = link_to '[+]', new_stripe_subscription_path
       %ul
         - @stripe_subscriptions.each do |sub|
           %li
@@ -33,4 +32,17 @@
                 %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]}" } }
+  %hr
+
+  %p.collapse-expand#rowWco WasyaCo
+  .row
+    .col-md-6
+      Customers (leadsets)
+    .col-md-6
+      %h5
+        Subscriptions
+        = link_to '[+]', new_wco_subscription_path
+      %ul
+        - @wco_subscriptions.each do |item|
+          %li= item.inspect
 

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

@@ -1,4 +1,4 @@
 
 .subscriptions-new.max-width
-  %h5 New Subscription
+  %h5 New ^^ generic ^^ Subscription
   = render 'form', subscription: @subscription

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

@@ -0,0 +1,4 @@
+
+.subscriptions-new.max-width
+  %h5 New Stripe Subscription
+  = render 'form', subscription: @subscription

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

@@ -0,0 +1,4 @@
+
+.subscriptions-new.max-width
+  %h5 New Wco Subscription
+  = render 'form', subscription: @subscription

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

@@ -1,4 +1,8 @@
 
 .subscriptions-show.max-width
   %h5 Subscription
+  %ul
+    %li
+      <b>Leadset:</b>
+      = link_to @subscription.leadset.company_url, leadset_path( @subscription.leadset )
   = @subscription.inspect

data/config/routes.rb

@@ -25,6 +25,7 @@ IshManager::Engine.routes.draw do
 
   get 'image_assets', to: 'image_assets#index', as: :image_assets
 
+  post 'invoices/create-monthly-for/:leadset_id', to: 'invoices#create_monthly_pdf', as: :create_monthly_invoice_for_leadset
   post 'invoices/create-pdf',    to: 'invoices#create_pdf',    as: :create_invoice_pdf
   post 'invoices/create-stripe', to: 'invoices#create_stripe', as: :create_invoice_stripe
   get  'invoices/new_pdf',       to: 'invoices#new_pdf',       as: :new_invoice_pdf
@@ -122,12 +123,16 @@ IshManager::Engine.routes.draw do
 
   resources :photos
   resources :payments
+  resources :prices
   resources :products
 
   resources :reports
 
   resources :serverhosts
   resources :scheduled_email_actions
+
+  get 'subscriptions/new_stripe', to: 'subscriptions#new_stripe', as: :new_stripe_subscription
+  get 'subscriptions/new_wco',    to: 'subscriptions#new_wco',    as: :new_wco_subscription
   resources :subscriptions
 
   resources :user_profiles do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.461
+  version: 0.1.8.463
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -234,6 +234,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
+- !ruby/object:Gem::Dependency
+  name: prawn-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 description: Description of IshManager.
 email:
 - piousbox@gmail.com
@@ -456,7 +470,9 @@ files:
 - app/assets/stylesheets/ish_manager/office.scss
 - app/assets/stylesheets/ish_manager/pagination.scss
 - app/assets/stylesheets/ish_manager/photos.scss
+- app/assets/stylesheets/ish_manager/products.scss
 - app/assets/stylesheets/ish_manager/scheduled_email_actions.scss
+- app/assets/stylesheets/ish_manager/subscriptions.scss
 - app/assets/stylesheets/ish_manager/tags.scss
 - app/assets/stylesheets/ish_manager/trash/pagination.scss
 - app/assets/stylesheets/ish_manager/user_profiles.scss
@@ -495,6 +511,7 @@ files:
 - app/controllers/ish_manager/office_actions_controller.rb
 - app/controllers/ish_manager/payments_controller.rb
 - app/controllers/ish_manager/photos_controller.rb
+- app/controllers/ish_manager/prices_controller.rb
 - app/controllers/ish_manager/products_controller.rb
 - app/controllers/ish_manager/reports_controller.rb
 - app/controllers/ish_manager/scheduled_email_actions_controller.rb
@@ -665,6 +682,8 @@ files:
 - app/views/ish_manager/galleries/show.haml
 - app/views/ish_manager/image_assets/index.haml
 - app/views/ish_manager/invoices/_form.haml-trash
+- app/views/ish_manager/invoices/_index_list.haml
+- app/views/ish_manager/invoices/_index_table.haml
 - app/views/ish_manager/invoices/index.haml
 - app/views/ish_manager/invoices/new_pdf.haml
 - app/views/ish_manager/invoices/new_stripe.haml
@@ -758,6 +777,8 @@ files:
 - 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/_index_list.haml
+- app/views/ish_manager/products/_index_table.haml
 - app/views/ish_manager/products/edit.haml
 - app/views/ish_manager/products/index.haml
 - app/views/ish_manager/products/show.haml
@@ -782,6 +803,8 @@ files:
 - app/views/ish_manager/subscriptions/_form.haml
 - app/views/ish_manager/subscriptions/index.haml
 - app/views/ish_manager/subscriptions/new.haml
+- app/views/ish_manager/subscriptions/new_stripe.haml
+- app/views/ish_manager/subscriptions/new_wco.haml
 - app/views/ish_manager/subscriptions/show.haml
 - app/views/ish_manager/trash/email_campaigns-trash/_form.haml
 - app/views/ish_manager/trash/email_campaigns-trash/edit.haml