wco_models 3.1.0.95 → 3.1.0.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae03145e8191b78c7e2428e0f6aeca805eaf1027188ed29fefd95e3efbc3ca1a
-  data.tar.gz: 8d6e41d9daed642b6618b2756c46c813f76098644337695cc75421944d03cbf6
+  metadata.gz: 2b8f95ac4445fae28c24950aa08aa7c36cfe21d61a7f5791c0ca688862f2216b
+  data.tar.gz: f37434ed5db0e33d3754b0e91e4cf69c3c90272e358f5229eebc7ca314ec56d0
 SHA512:
-  metadata.gz: 5c9c3f163ab78fec2ad25837e069cac2162e29de0c986e75792f8b314886c65b1e390428ac0bbd26813ff42feaaa97ff999c5d57b54b74c45e0882d82651316e
-  data.tar.gz: 0527a5c66734608bf8926768f2c76d084069d33911508e138a6212255e2b22426a91493ef334bb92465f731a097af1b8f239f356c505637babd4b14cd7459f01
+  metadata.gz: da38057b8f74c5c3ce868398cc6868d253f32f2b3ed4803e52ad40caa3f889507ba92b17d46180bd362e79a9a45fb568654667911b3dbdb38528584358b0d1a5
+  data.tar.gz: 408013e01f428949316aac1ab3866affc50f3efa1ba9ce41147a2451186809c1b053781a67979f381535be23414e138d014e3548d7711e0c2b5cd0d79490ce77

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

@@ -14,11 +14,13 @@
 //
 // require select2
 //
-//= require ./alerts-notices
-//= require ./collapse-expand
-//= require ./file_upload
-//= require ./office_action_templates
+// require ./alerts-notices
+// require ./collapse-expand
+// require ./file_upload
+// require ./office_action_templates
+//
 //= require ./shared
+//= require_tree .
 //
 
 $(function() {

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

@@ -0,0 +1,33 @@
+
+const AppRouter = {
+  product_path: (id) => `/wco/products/${id}.json`,
+}
+
+$(document).ready(function () {
+
+  // const jwt_token = $("#Config").data('jwt-token')
+  // logg(jwt_token, 'jwt_token')
+  // path = `/api/products/${productId}.json?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(AppRouter.product_path(productId), 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/wco/invoices_controller.rb

@@ -0,0 +1,159 @@
+require 'prawn'
+require 'prawn/table'
+
+class Wco::InvoicesController < Wco::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 = Wco::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 = Wco::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 = "/tmp/#{@invoice.filename}"
+    @pdf.render_file path
+    data = File.read path
+
+    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
+
+    File.delete(path) if File.exist?(path)
+    redirect_to controller: :leadsets, action: :show, id: @invoice.leadset_id
+
+    # send_data( data, { :filename => @invoice.filename,
+    #   :disposition => params[:disposition] ? params[:disposition] : :attachment,
+    #   :type => 'application/pdf'
+    # })
+  end
+
+  def create_stripe
+    @invoice = Wco::Invoice.new params[:invoice].permit!
+    authorize! :create, @invoice
+
+    stripe_invoice = Stripe::Invoice.create({
+      customer:          @invoice.leadset.customer_id,
+      collection_method: 'send_invoice',
+      days_until_due:    0,
+      # collection_method: 'charge_automatically',
+      pending_invoice_items_behavior: 'exclude',
+    })
+    params[:invoice][:items].each do |item|
+      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,
+        invoice:  stripe_invoice.id,
+        quantity: item[:quantity],
+      })
+    end
+    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."
+      redirect_to action: :show, id: @invoice.id
+    else
+      flash_alert "Cannot create invoice: #{@invoice.errors.messages}"
+      render :new
+    end
+  end
+
+  def index
+    authorize! :index, Wco::Invoice
+    @invoices = Wco::Invoice.all
+    if params[:leadset_id]
+      @invoices = @invoices.where( leadset_id: params[:leadset_id] )
+    end
+    @invoices = @invoices.includes( :payments )
+  end
+
+  def new_pdf
+    authorize! :new, @invoice
+    @leadset = Leadset.find params[:leadset_id]
+    @products_list = Wco::Product.list
+  end
+
+  def new_stripe
+    authorize! :new, @invoice
+    @leadset       = Wco::Leadset.find params[:leadset_id]
+    @products_list = Wco::Product.list
+  end
+
+  def email_send
+    @invoice = Wco::Invoice.find params[:id]
+    authorize! :send_email, @invoice
+    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 = Wco::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 = Wco::Invoice.find params[:id]
+    authorize! :show, @invoice
+    @stripe_invoice = Stripe::Invoice.retrieve @invoice.invoice_id
+  end
+
+  def update
+    @invoice = Wco::Invoice.find params[:id]
+    authorize! :update, @invoice
+    if @invoice.update_attributes params[:invoice].permit!
+      flash[:notice] = 'Success'
+      redirect_to :action => 'index'
+    else
+      flash[:alert] = "Cannot update invoice: #{@invoice.errors.messages}"
+    end
+    redirect_to :action => 'index'
+  end
+
+  #
+  # private
+  #
+  private
+
+  def set_lists
+    @invoice_number = Wco::Invoice.order_by( :number => :desc ).first
+    @invoice_number = @invoice_number ? @invoice_number.number + 1 : 1
+    @new_invoice    = Wco::Invoice.new :number => @invoice_number
+  end
+
+end

data/app/controllers/wco/products_controller.rb

@@ -23,17 +23,17 @@ class Wco::ProductsController < Wco::ApplicationController
   end
 
   def destroy
-    authorize! :destroy, Wco::Product
-    # product = Wco::Product.find params[:id]
-
-    flag = Stripe::Product.delete( params[:id] )
-    # puts! flag, 'flag'
-    flash[:notice] = flag
-    # if product.destroy
-    #   flash[:notice] = 'Success'
-    # else
-    #   flash[:alert] = "Cannot destroy product: #{product.errors.fill_messages.join(', ')}."
-    # end
+    @product = Wco::Product.find params[:id]
+    authorize! :destroy, @product
+
+    # flag = Stripe::Product.delete( @product.product_id ) if @product.product_id.present?
+    # flash_notice "Delete stripe product: #{flag}"
+
+    if @product.destroy
+      flash_notice 'Deleted Wco::Product'
+    else
+      flash_alert "Cannot destroy product: #{@product.errors.fill_messages.join(', ')}."
+    end
     redirect_to action: :index
   end
 
@@ -82,6 +82,10 @@ class Wco::ProductsController < Wco::ApplicationController
   def show
     authorize! :show, @product
     @product = Wco::Product.find params[:id]
+    respond_to do |format|
+      format.html
+      format.json { render 'show.jbuilder', layout: false }
+    end
   end
 
   def update

data/app/models/wco/price.rb

@@ -13,11 +13,6 @@ class Wco::Price
 
   field :amount_cents, type: Integer
 
-  def to_s
-    price = self
-    "$#{ price[:amount_cents].to_f/100 }/#{ price.interval||'onetime' }"
-  end
-
   INTERVAL_DAY   = 'day'
   INTERVAL_WEEK  = 'week'
   INTERVAL_MONTH = 'month'
@@ -27,10 +22,13 @@ class Wco::Price
 
   field :price_id   # stripe
 
+  def to_s
+    price = self
+    "$#{ price[:amount_cents].to_f/100 }/#{ price.interval||'onetime' }"
+  end
   def self.list
     [[nil,nil]] + all.map { |p| [ "#{p.product.name} :: #{p.amount_cents.to_f/100}/#{p.interval||'onetime'}", p.id ] }
   end
-
 end
 
 

data/app/models/wco/product.rb

@@ -13,10 +13,12 @@ class Wco::Product
 
   has_many :subscriptions, as: :product
 
+  def to_s
+    name
+  end
   def self.list
     [ [nil,nil] ] + self.all.order_by({ name: :asc }).map { |i| [i.name, i.id] }
   end
-
 end
 
 

data/app/views/wco/_alerts_notices.haml

@@ -1,5 +1,8 @@
 
--# 2023-12-25 v.0.0.0
+-# = notice.inspect
+-# = alert.inspect
+
+-## 2024-01-30 v.0.0.1
 .wco--alerts-notices.flexwidth
 
   - if notice&.class == String

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

@@ -7,13 +7,13 @@
 
   .row
     .col.s12.col.m6.col-md-offset-3
-      %h5 New Stripe Invoice for `#{link_to @leadset&.name, leadset_path(@leadset)}`:
+      %h5 New Stripe Invoice for `#{link_to @leadset, leadset_path(@leadset)}`:
 
       = form_for invoice, :as => :invoice, :url => url do |f|
         = hidden_field_tag 'invoice[leadset_id]', @leadset.id
 
         .input-field
-          %label Email
+          %label <b>Email:</b>
           = @leadset.email
           -# - if @leadset.email
           -#   = f.text_field :email, value: @leadset.email

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

@@ -6,7 +6,7 @@
 
   %ul
     %li email: #{i.email}
-    %li leadset: #{link_to i.leadset.name, leadset_path( i.leadset) }
+    %li leadset: #{link_to i.leadset, leadset_path( i.leadset) }
     %li invoice_id: #{i.invoice_id}
     %li items: #{i.items}
 

data/app/views/wco/products/_table.haml

@@ -10,6 +10,7 @@
       %tr
         %td.p-2
           = link_to '[~]', edit_product_path( product )
+          .d-inline-block= button_to 'x', product_path(product), method: :delete, data: { confirm: 'Are you sure?' }
           = product.name
           .gray= product.product_id
         %td.p-2

data/app/views/wco/products/new.haml

@@ -0,0 +1,2 @@
+
+= render :form, product: @product

data/app/views/wco/products/show.jbuilder

@@ -0,0 +1,16 @@
+
+params.permit!
+json.cache! [ params, @product ] do
+
+  json.id         @product.id.to_s
+  json.name       @product.to_s
+
+  json.prices do
+    json.array! @product.prices do |price|
+      json.id   price.id.to_s
+      json.name price.to_s
+    end
+  end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.95
+  version: 3.1.0.96
 platform: ruby
 authors:
 - Victor Pudeyev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-24 00:00:00.000000000 Z
+date: 2024-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.20.0
+- !ruby/object:Gem::Dependency
+  name: jbuilder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.11.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.11.5
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -359,6 +373,7 @@ files:
 - app/assets/javascripts/wco/application.js
 - app/assets/javascripts/wco/collapse-expand.js
 - app/assets/javascripts/wco/file_upload.js
+- app/assets/javascripts/wco/invoices.js
 - app/assets/javascripts/wco/office_action_templates.js
 - app/assets/javascripts/wco/shared.js
 - app/assets/stylesheets/vendor/bootstrap-4.6.2.min.css
@@ -373,6 +388,7 @@ files:
 - app/controllers/wco/application_controller.rb
 - app/controllers/wco/galleries_controller.rb
 - app/controllers/wco/headlines_controller.rb
+- app/controllers/wco/invoices_controller.rb
 - app/controllers/wco/leads_controller.rb
 - app/controllers/wco/leadsets_controller.rb
 - app/controllers/wco/logs_controller.rb
@@ -405,7 +421,7 @@ files:
 - app/models/wco/office_action_template.rb
 - app/models/wco/office_action_template_tie.rb
 - app/models/wco/photo.rb
-- app/models/wco/premium_item.rb
+- app/models/wco/premium_item.rb-trash
 - app/models/wco/price.rb
 - app/models/wco/product.rb
 - app/models/wco/profile.rb
@@ -526,7 +542,9 @@ files:
 - app/views/wco/products/_table.haml
 - app/views/wco/products/edit.haml
 - app/views/wco/products/index.haml
+- app/views/wco/products/new.haml
 - app/views/wco/products/show.haml
+- app/views/wco/products/show.jbuilder
 - app/views/wco/publishers/_form.haml
 - app/views/wco/publishers/_header.haml
 - app/views/wco/publishers/edit.haml