ish_manager 0.1.8.464 → 0.1.8.466

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 129a6f70a1dca0e0a0a6520c9cb3b47e588649c5cbb28c17020f1a05d928de0f
-  data.tar.gz: 6929d2066273ed6ba47f8c3e9528303c7862798238fb0a60470e46f305e295f8
+  metadata.gz: 8a683cfef772c003347453411d5e573a99e0e728dd991e8f8992fe6aa1f513cb
+  data.tar.gz: cc083c29d80e582b0419d54416a795ea526786361486a615e445fc3e052439c1
 SHA512:
-  metadata.gz: df339f9e3bbce4f31231cb70492eec9c43ce3d0678bbb4a58f5154aaa68b907efbd9e986406e7b900da7fd23914566748cc8ed875dd2deffe28e621311f942e7
-  data.tar.gz: 106dabcf7f541a6f46969792718c000e4a2f05719b3eb15063c3f8480ff3b9e56a156bf6315c8d3c5800ee3492c1146347837d36a1c7fac7cea4ef3affd5406b
+  metadata.gz: 05ca4a618c3395a1342c7a4707b81fa0e19d5718f3e97b113c93964bda85639936eed2a965ed392ea494bf52c8e215b30e80c969b552f5df0efdeed5efbfd352
+  data.tar.gz: 43657b8c0a70855ad030dfb4438a28b9558ad88aba7e3bd57f8fc75ffb737ae2db5347f6a6d8037b99fdf1bd0915de3560217cb6dec69f1215ac0c55d1b00fa8

data/app/assets/javascripts/ish_manager/application.js

@@ -13,6 +13,7 @@
 //= require ish_manager/email_conversations
 //= require ish_manager/email_templates
 //= require ish_manager/galleries
+//= require ish_manager/invoices
 //= require ish_manager/iro
 //= require ish_manager/leads
 //

data/app/assets/javascripts/ish_manager/invoices.js

@@ -0,0 +1,29 @@
+
+
+$(document).ready(function () {
+
+  const jwt_token = $("#Config").data('jwt-token')
+  logg(jwt_token, 'jwt_token')
+
+  if ($(".invoices-new").length) {
+
+    $("select[name='invoice[items][][product_id]']").on('change', function(ev) {
+      var productId = ev.target.value
+      logg(productId, 'productId')
+
+      $.get(`/api/products/${productId}.json?jwt_token=${jwt_token}`, function(_data) {
+        logg(_data, '_data')
+
+        $('select[name="invoice[items][][price_id]"]').empty();
+        // $('select[name="invoice[items][][price_id]"]').append($("<option disabled=true selected=true></option>").attr("value", '').text('Choose a price...')
+        $.each(_data.prices, function(_, item) {
+          $('select[name="invoice[items][][price_id]"]').append($("<option></option>").attr("value", item.id).text(item.name));
+        })
+      })
+    })
+
+  }
+
+
+})
+

data/app/controllers/ish_manager/invoices_controller.rb

@@ -64,7 +64,8 @@ class ::IshManager::InvoicesController < IshManager::ApplicationController
       pending_invoice_items_behavior: 'exclude',
     })
     params[:invoice][:items].each do |item|
-      stripe_price = Wco::Product.find( item[:product_id] ).price_id
+      stripe_price = Wco::Price.find( item[:price_id] ).price_id
+      puts! stripe_price, 'stripe_price'
       invoice_item = Stripe::InvoiceItem.create({
         customer: @invoice.leadset.customer_id,
         price:    stripe_price,
@@ -72,14 +73,18 @@ class ::IshManager::InvoicesController < IshManager::ApplicationController
         quantity: item[:quantity],
       })
     end
-    Stripe::Invoice.send_invoice(stripe_invoice[:id])
+    Stripe::Invoice.finalize_invoice( stripe_invoice[:id] )
+    if params[:do_send]
+      Stripe::Invoice.send_invoice(stripe_invoice[:id])
+      flash_notice "Scheduled to send the invoice via stripe."
+    end
     @invoice.update_attributes({ invoice_id: stripe_invoice[:id] })
 
     if @invoice.save
-      flash[:notice] = "Created the invoice."
+      flash_notice "Created the invoice."
       redirect_to action: :show, id: @invoice.id
     else
-      flash[:alert] = "Cannot create invoice: #{@invoice.errors.messages}"
+      flash_alert "Cannot create invoice: #{@invoice.errors.messages}"
       render :new
     end
   end
@@ -108,12 +113,20 @@ class ::IshManager::InvoicesController < IshManager::ApplicationController
   def email_send
     @invoice = Ish::Invoice.find params[:id]
     authorize! :send_email, @invoice
-    out = ::IshManager::LeadsetMailer.monthly_invoice( @invoice.id )
+    out = ::IshManager::LeadsetMailer.monthly_invoice( @invoice.id.to_s )
     Rails.env.production? ? out.deliver_later : out.deliver_now
     flash_notice "Scheduled to send an email."
     redirect_to controller: :leadsets, action: :show, id: @invoice.leadset_id
   end
 
+  def send_stripe
+    @invoice = Ish::Invoice.find params[:id]
+    authorize! :send_stripe, @invoice
+    Stripe::Invoice.send_invoice( @invoice.invoice_id )
+    flash_notice "Scheduled to send the invoice."
+    redirect_to action: :show, id: @invoice.id
+  end
+
   def show
     @invoice = Ish::Invoice.find params[:id]
     authorize! :show, @invoice

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

@@ -3,6 +3,7 @@
   %ul
     - invoices.each do |i|
       %li
+        = link_to '[view]', invoice_path( i )
         = i.month_on
         \::
         - if i.asset

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

@@ -22,10 +22,13 @@
           -# - else
           -#   = f.select :email, options_for_select([[nil,nil]] + @leadset.employees.map { |i| [ i.email, i.email ] } )
 
-        .input-field
+        .input-row
           %label item
-          = select_tag 'invoice[items][][product_id]', options_for_select( @products_list )
-        .input-field
+          = select_tag 'invoice[items][][product_id]', options_for_select( @products_list ), class: 'products'
+
+          %label price
+          = select_tag 'invoice[items][][price_id]'
+
           %label quantity
           = number_field_tag 'invoice[items][][quantity]'
 
@@ -37,5 +40,11 @@
         -#   %label Description
         -#   = f.text_area :description
 
-        = f.submit 'Save'
+        .input-field
+          %label Send now?
+          = check_box_tag :do_send
+
+        .actions
+
+          = f.submit 'Create', data: { confirm: 'Are you sure?' }
 

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

@@ -2,7 +2,7 @@
 - i = @invoice
 
 .invoices-show.max-width
-  %h5 Invoice ##{@invoice.number}
+  %h5 Invoice ##{i.number}
 
   %ul
     %li email: #{i.email}
@@ -10,10 +10,14 @@
     %li invoice_id: #{i.invoice_id}
     %li items: #{i.items}
 
-    = @invoice.inspect
+    -# = @invoice.inspect
 
   %hr
+  %h5
+    Stripe Invoice
+    = link_to 'pdf', @stripe_invoice[:invoice_pdf], target: :_blank
+    .inline-block= button_to 'stripe-send', send_invoice_stripe_path( i.id ), data: { confirm: 'Are you sure?' }
 
-  %pre
-    = @stripe_invoice.inspect
+  -# %pre
+  -#   = @stripe_invoice.inspect
 

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

@@ -28,6 +28,7 @@
         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

data/config/routes.rb

@@ -31,6 +31,7 @@ IshManager::Engine.routes.draw do
   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
+  post 'invoices/:id/send-stripe', to: 'invoices#send_stripe', as: :send_invoice_stripe
   resources :invoices
 
   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.464
+  version: 0.1.8.466
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-10 00:00:00.000000000 Z
+date: 2023-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -279,6 +279,7 @@ files:
 - app/assets/javascripts/ish_manager/email_conversations.js
 - app/assets/javascripts/ish_manager/email_templates.js
 - app/assets/javascripts/ish_manager/galleries.js
+- app/assets/javascripts/ish_manager/invoices.js
 - app/assets/javascripts/ish_manager/iro.js
 - app/assets/javascripts/ish_manager/iro0.js
 - app/assets/javascripts/ish_manager/leads.js