ish_manager 0.1.8.460 → 0.1.8.462

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/invoices/new_stripe.haml

@@ -1,7 +1,7 @@
 
-
-- url = invoice.persisted? ? invoice_path( invoice.id ) : invoices_path
 - invoice = @new_invoice
+- url = invoice.persisted? ? invoice_path( invoice.id ) : create_invoice_stripe_path
+
 
 .invoices-new.max-width
 
@@ -9,30 +9,33 @@
     .col.s12.col.m6.col-md-offset-3
       %h5 New Stripe Invoice for `#{link_to @leadset&.name, leadset_path(@leadset)}`:
 
-        = form_for invoice, :as => :invoice, :url => url do |f|
-          = hidden_field_tag 'invoice[leadset_id]', @leadset.id
-
-          .input-field
-            %label 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 item
-            = select_tag 'invoice[items][]', options_for_select( @products_list )
-
-          -# .input-field
-          -#   %label number
-          -#   = f.number_field :number
-
-          -# .input-field
-          -#   %label Description
-          -#   = f.text_area :description
-
-          = f.submit 'Save'
+      = form_for invoice, :as => :invoice, :url => url do |f|
+        = hidden_field_tag 'invoice[leadset_id]', @leadset.id
+
+        .input-field
+          %label 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 item
+          = select_tag 'invoice[items][][product_id]', options_for_select( @products_list )
+        .input-field
+          %label quantity
+          = number_field_tag 'invoice[items][][quantity]'
+
+        -# .input-field
+        -#   %label number
+        -#   = f.number_field :number
+
+        -# .input-field
+        -#   %label Description
+        -#   = f.text_area :description
+
+        = f.submit 'Save'
 

data/app/views/ish_manager/iro_watches/max_pain.haml

@@ -3,21 +3,17 @@
   .header
     %h2.title max pain for #{@ticker} on #{params[:date]}
 
-  -# = @all_items.inspect
-
+  - flag = false
   %ul
-    - flag = false
-    - @calls_items.each do |_t|
-      - item = @all_items[_t[:strikePrice]]
-      - if !flag && item[:puts_subtotal] < item[:calls_subtotal]
-        %hr
-        - flag = true
+    - @all_items.each do |strike_price, item|
+      - item.delete( :strike_price )
       %li
-        -# = item.inspect
-        = item[:strikePrice]
-        %ul
-          %li calls oi: #{item[:calls_oi]}
-          %li Call pain: #{number_to_currency item[:calls_subtotal], precision: 0}
-          %li puts oi: #{item[:puts_oi]}
-          %li Put pain: #{number_to_currency item[:puts_subtotal], precision: 0}
+        - if item[:call_max_pain] > item[:put_max_pain] && !flag
+          - flag = true
+          %hr
+
+        <b>#{strike_price}</b>
+        = item.inspect
+
+  -#         %li Call pain: #{number_to_currency item[:calls_subtotal], precision: 0}
 

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

@@ -62,7 +62,8 @@
       %hr
       %h5
         Invoices (?)
-        = link_to '[+]', new_invoice_path({ leadset_id: @lead.m3_leadset_id })
+        = link_to '[+stripe]', new_invoice_stripe_path({ leadset_id: @lead.m3_leadset_id })
+        = link_to '[+pdf]', new_invoice_pdf_path({ leadset_id: @lead.m3_leadset_id })
       %ul
         %li None?
 

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,28 @@
 
     .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
+      %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,9 +25,10 @@ IshManager::Engine.routes.draw do
 
   get 'image_assets', to: 'image_assets#index', as: :image_assets
 
-  post 'invoices/create-pdf', to: 'invoices#create_pdf', as: :create_invoice_pdf
-  get 'invoices/new_pdf',    to: 'invoices#new_pdf',    as: :new_invoice_pdf
-  get 'invoices/new_stripe', to: 'invoices#new_stripe', as: :new_invoice_stripe
+  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
+  get  'invoices/new_stripe',    to: 'invoices#new_stripe',    as: :new_invoice_stripe
   resources :invoices
 
   get 'iro_positins/roll_prep/:id', to: 'iro_purses#roll_prep', as: :iro_roll_prep
@@ -37,8 +38,8 @@ IshManager::Engine.routes.draw do
   resources :iro_option_gets
 
   patch 'iro_purses/:id/show', to: 'iro_purses#update'
-  get 'iro_purses/:id/edit', to: 'iro_purses#edit', as: :edit_iro_purse
-  get 'iro_purses/:id/:kind', to: 'iro_purses#show', as: :iro_purse, defaults: { kind: 'show' } # kind: show_gameui
+  get 'iro_purses/:id/edit',   to: 'iro_purses#edit', as: :edit_iro_purse
+  get 'iro_purses/:id/:kind',  to: 'iro_purses#show', as: :iro_purse, defaults: { kind: 'show' } # kind: show_gameui
   resources :iro_purses
 
   resources :iro_strategies
@@ -121,12 +122,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.460
+  version: 0.1.8.462
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-01 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