ish_manager 0.1.8.462 → 0.1.8.464

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d544fb840059764a4d3c9c557416c0ec338ca5ce9f2e109aff72bc3743e844a6
-  data.tar.gz: 82efc85b76bde5801fb399907e341d0f944f7813d4800a569f5e6109d3572878
+  metadata.gz: 129a6f70a1dca0e0a0a6520c9cb3b47e588649c5cbb28c17020f1a05d928de0f
+  data.tar.gz: 6929d2066273ed6ba47f8c3e9528303c7862798238fb0a60470e46f305e295f8
 SHA512:
-  metadata.gz: 9a308e33cb23380dcc77f7b7518cfde43587d3f2260745dd9c808990c9acbefa9412a52e13e8341da39cc3b17f467957426590366927c5f1431740d54f3ffc80
-  data.tar.gz: 49c3077ff88f4139b3bc2a25f57202b21ae0f26784dca13eb486f24c1a0e7a02bbb12f1c593a04ff4da571d24523f7c348f942e7cfdfa437d00e830f8bb0223f
+  metadata.gz: df339f9e3bbce4f31231cb70492eec9c43ce3d0678bbb4a58f5154aaa68b907efbd9e986406e7b900da7fd23914566748cc8ed875dd2deffe28e621311f942e7
+  data.tar.gz: 106dabcf7f541a6f46969792718c000e4a2f05719b3eb15063c3f8480ff3b9e56a156bf6315c8d3c5800ee3492c1146347837d36a1c7fac7cea4ef3affd5406b

data/app/controllers/ish_manager/invoices_controller.rb

@@ -1,77 +1,55 @@
 require 'prawn'
+require 'prawn/table'
 
 class ::IshManager::InvoicesController < IshManager::ApplicationController
 
   before_action :set_lists
 
-  ##
-  ## Prawn/pdf unit of measure is 1/72" .
-  ##
-  def create_pdf
-    @invoice = Ish::Invoice.new
-    authorize! :new, @invoice
-
-    tree_img_url = "https://wasya.co/wp-content/uploads/2023/09/tree-1.jpg"
-    tree_img_url = "#{Rails.root.join('public')}/tree-1.jpg"
-    wasya_co_logo_url = "#{Rails.root.join('public')}/259x66-WasyaCo-logo.png"
-
-    ## canvas width: 612, height: 792
-    pdf = Prawn::Document.new
-
-    pdf.canvas do
-      pdf.image tree_img_url, at: [ 0, 792 ], width: 612
-
-      pdf.fill_color 'ffffff'
-      # pdf.stroke_color '000000'
-      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.5*72], width: 3.25*72, height: 0.75*72 ) do
-        pdf.stroke_bounds
-      end
-
-      pdf.bounding_box( [4.5*72, 9.5*72], width: 3.25*72, height: 0.75*72 ) do
-        pdf.stroke_bounds
-      end
-
-      pdf.bounding_box( [0.75*72, 8.5*72], width: 3.25*72, height: 0.75*72 ) do
-        pdf.stroke_bounds
-      end
-
-      pdf.bounding_box( [4.5*72, 8.5*72], width: 3.25*72, height: 0.75*72 ) do
-        pdf.stroke_bounds
-      end
-
-      pdf.make_table([ ['one'],
-                       ['two'],
-      ])
+  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
 
-      pdf.text_box "Thank you!", at: [ 3.25*72, 1.25*72 ], width: 2*72, height: 1*72, align: :center
+    @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
 
+    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
+    path = Rails.root.join 'tmp', @invoice.filename
+    @pdf.render_file path
+    data = File.read path
 
-    # pdf.text "hello, world?", 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
@@ -127,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

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

data/config/routes.rb

@@ -25,6 +25,8 @@ 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
   get  'invoices/new_pdf',       to: 'invoices#new_pdf',       as: :new_invoice_pdf

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.462
+  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