ish_manager 0.1.8.463 → 0.1.8.464

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e3d19cd10fe96e5cb993413b121bc44c107cd793ca8280f193d18a5967b6fd1
-  data.tar.gz: 8269b21b2d010573fbb04ea80282e96507a5bc01bbf98c98e0cdd46157d3c1e2
+  metadata.gz: 129a6f70a1dca0e0a0a6520c9cb3b47e588649c5cbb28c17020f1a05d928de0f
+  data.tar.gz: 6929d2066273ed6ba47f8c3e9528303c7862798238fb0a60470e46f305e295f8
 SHA512:
-  metadata.gz: d623e2070e7f1f933960fc4c71aad603e77a6391aa7886e9a22b610d3c7c76d89e184aa346d8096f2416234d85623a4c59b58caa78ec3fb0b7b9bb19ef488c32
-  data.tar.gz: 58fe7332a16091c22fb181fd76f6c33cfeb44093d52196f198f5bf01dc66ef749566539c09646269799bd5002c4e3512031fbded7968d5090dcdafa7332600be
+  metadata.gz: df339f9e3bbce4f31231cb70492eec9c43ce3d0678bbb4a58f5154aaa68b907efbd9e986406e7b900da7fd23914566748cc8ed875dd2deffe28e621311f942e7
+  data.tar.gz: 106dabcf7f541a6f46969792718c000e4a2f05719b3eb15063c3f8480ff3b9e56a156bf6315c8d3c5800ee3492c1146347837d36a1c7fac7cea4ef3affd5406b

data/app/controllers/ish_manager/invoices_controller.rb

@@ -6,115 +6,50 @@ class ::IshManager::InvoicesController < IshManager::ApplicationController
   before_action :set_lists
 
   def create_monthly_pdf
+    month_on = DateTime.strptime(params[:month_on], '%Y-%m-%d').strftime('%Y-%m-01')
     @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
+    @invoice = Ish::Invoice.where({ leadset_id: @leadset.id, month_on: month_on }).first
+    if @invoice && !params[:replace]
       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] })
+    if !@invoice
+      @invoice = Ish::Invoice.create({
+        leadset_id: @leadset.id,
+        month_on:   month_on,
+        number:     @leadset.next_invoice_number,
+      })
+      @leadset.update_attributes({ next_invoice_number: @leadset.next_invoice_number + 1 })
+    end
 
-    @pdf = @invoice.generate_monthly_invoice params[:month_on]
-    filename = "invoice-#{@invoice.number}.pdf"
-    path = Rails.root.join 'tmp', filename
+    @pdf = @invoice.generate_monthly_invoice
+    path = Rails.root.join 'tmp', @invoice.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.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
+    asset = ::Gameui::Asset3d.new invoice: @invoice
+    f = File.new( path )
+    asset.object = f
+    f.close
+    @invoice.asset = asset
+    if asset.save
+      flash_notice "Saved the asset."
+    end
+    if @invoice.save
+      flash_notice "Saved the invoice."
     end
 
-    filename = "a-summary.pdf"
-    path = Rails.root.join 'tmp', filename
-    pdf.render_file path
-    data = File.read path
     File.delete(path) if File.exist?(path)
+    redirect_to controller: :leadsets, action: :show, id: @invoice.leadset_id
 
-    send_data( data, { :filename => filename,
-      :disposition => params[:disposition] ? params[:disposition] : :attachment,
-      :type => 'application/pdf'
-    })
+    # send_data( data, { :filename => @invoice.filename,
+    #   :disposition => params[:disposition] ? params[:disposition] : :attachment,
+    #   :type => 'application/pdf'
+    # })
   end
 
   def create_stripe
@@ -170,6 +105,15 @@ class ::IshManager::InvoicesController < IshManager::ApplicationController
     @products_list = Wco::Product.list
   end
 
+  def email_send
+    @invoice = Ish::Invoice.find params[:id]
+    authorize! :send_email, @invoice
+    out = ::IshManager::LeadsetMailer.monthly_invoice( @invoice.id )
+    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 show
     @invoice = Ish::Invoice.find params[:id]
     authorize! :show, @invoice

data/app/mailers/ish_manager/leadset_mailer.rb

@@ -0,0 +1,22 @@
+require 'open-uri'
+
+class IshManager::LeadsetMailer < IshManager::ApplicationMailer
+  default from: 'WasyaCo Consulting <hello@wasya.co>'
+
+  # layout 'mailer'
+
+  def monthly_invoice invoice_id
+    @invoice = ::Ish::Invoice.find invoice_id
+    @leadset = @invoice.leadset
+
+    path = Rails.root.join 'tmp', @invoice.filename
+    download = open( @invoice.asset.object.url(:original) )
+    IO.copy_stream( download, path )
+    attachments[@invoice.filename] = File.read( path )
+
+    mail( to:      @leadset.email,
+          subject: "WasyaCo invoice for #{@invoice.month_on.strftime('%B')}",
+        )
+  end
+
+end

data/app/mailers/ish_manager/office_mailer.rb

@@ -1,6 +1,6 @@
 
 class IshManager::OfficeMailer < IshManager::ApplicationMailer
-  default from: 'WasyaCo Consulting & Software Development <hello@wasya.co>'
+  default from: 'WasyaCo Consulting & Software Development <no-reply@mail.wasyaco.com>'
 
   ## 2023-04-02 _vp_ Continue.
   def send_context_email ctx_id

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

@@ -3,4 +3,10 @@
   %ul
     - invoices.each do |i|
       %li
-        = i.inspect
+        = i.month_on
+        \::
+        - if i.asset
+          = link_to i.number, i.asset.object.url(:original)
+          .inline-block= button_to 'Send', send_invoice_path(i), data: { confirm: 'Are you sure?' }
+        - else
+          = i.number

data/app/views/ish_manager/leadset_mailer/monthly_invoice.html.erb

@@ -0,0 +1,6 @@
+
+<p>Hello! Please see the invoice attached.</p>
+
+<p>Regards,<br />
+--<br />
+WasyaCo RRT</p>

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

@@ -6,18 +6,23 @@
   .input-field
     = f.label :company_url
     = f.text_field :company_url
+
   .input-field
     = f.label :name
     = f.text_field :name
+
   .input-field
     = f.label :email
     = f.text_field :email
-  -# .input-field
-  -#   = f.label :tag
-  -#   = f.text_field :tag
-  -# .input-field
-  -#   %label Stripe customer_id
-  -#   = f.text_field :customer_id
+
+  .input-field
+    = f.label :next_invoice_number
+    = f.text_field :next_invoice_number
+
+  .input-field
+    %label Stripe customer_id
+    = f.text_field :customer_id
+
   .actions
     = f.submit
 

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

@@ -1,3 +1,4 @@
 
-%h1 Edit leadset
-= render 'form', :leadset => @leadset
+.leadsets-edit.max-width
+  %h1 Edit leadset `#{link_to @leadset.name, leadset_path(@leadset)}`
+  = render 'form', :leadset => @leadset

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

@@ -1,5 +1,6 @@
 
-.row
-  .col.s6.col-sm-offset-3
-    %h5 New Leadset
-    = render 'form', :leadset => @new_leadset
+.leadsets-new.max-width
+  .row
+    .col.s6.col-sm-offset-3
+      %h5 New Leadset
+      = render 'form', :leadset => @new_leadset

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

@@ -31,9 +31,11 @@
       = 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
+        %label Invoice for month
         = text_field_tag 'month_on'
-        = submit_tag 'Submit', data: { confirm: 'Are you sure?' }
+        %label (x?)
+        = check_box_tag 'replace'
+        = submit_tag '>', data: { confirm: 'Are you sure?' }
       %hr
 
     .col-md-6

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/send/:id', to: 'invoices#email_send', as: :send_invoice
   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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.463
+  version: 0.1.8.464
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-08 00:00:00.000000000 Z
+date: 2023-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -525,6 +525,7 @@ files:
 - app/jobs/ish_manager/email_campaign_job.rb-trash
 - app/jobs/ish_manager/test_email_job.rb
 - app/mailers/ish_manager/application_mailer.rb
+- app/mailers/ish_manager/leadset_mailer.rb
 - app/mailers/ish_manager/meeting_mailer.rb
 - app/mailers/ish_manager/office_mailer.rb
 - app/mailers/ish_manager/offier_mailer.rb-trash
@@ -727,6 +728,7 @@ files:
 - app/views/ish_manager/leads/index.haml
 - app/views/ish_manager/leads/new.haml
 - app/views/ish_manager/leads/show.haml
+- app/views/ish_manager/leadset_mailer/monthly_invoice.html.erb
 - app/views/ish_manager/leadsets/_form.haml
 - app/views/ish_manager/leadsets/edit.haml
 - app/views/ish_manager/leadsets/index.haml