lucadeal 0.2.19 → 0.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36ce9f92d92079f0049ec346da2921116e7cde669314bccca3653c28dca33b51
-  data.tar.gz: b2f591e9bfb9710fa45cdb1d3582f19997d392e84e639531e4b15e77d6b284c7
+  metadata.gz: f73de0d5baa72b53fcaeb3ec5ef85c0d3d80a21b7d7531f914892ff476d8eee0
+  data.tar.gz: 3ecfc52d4a1e2257e926773f3e7db455dccce71e8fe89822fccb91402d0a979e
 SHA512:
-  metadata.gz: 8e2ca7f2a7063d44d29013cdd7448f807c58dbabca341cdeb1a8a118e24ca826ca94ac608f1c4a56eb16cb41cb039a0b39d2b07cb011fdd4a57e4b04c24a7d92
-  data.tar.gz: 692b888b1209de7fa6329ffbc7edd1ef7ad84be530b2dad7fcaad64b5c621d0da424e3ac90f21e9db7113057599497c91b61d70f479cf48bdea6bee2c49e1f0e
+  metadata.gz: 1f8c7a3301a69e5891736379fb9cf4fac3d1cda121e295d77903bb36f9f87ab6485be8d69e4bb398b23cf18af80f47f3d1b4a2f67d2dc3cfba5cc1f9c6fcf5cf
+  data.tar.gz: 1515a346552be7a7ec33a37bd3af941b57f8be9c890d67ccfde40bf0f0ece6f678a405d0723ad1d04649ae70e745e4dfa5d3a869400314b366fddf576c31c21a

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## LucaDeal 0.2.21
+
+* Implement `luca-deal fee` subcommands.
+* single invoice creation with contract id fragment.
+
+## LucaDeal 0.2.20
+
+* CLI provides `--nu` option. Add JSON output.
+* `luca-deal invoices list --html`, rendering HTML to stdout.
+
 ## LucaDeal 0.2.19
 
 * CLI id completion on Customer delete, Contract create/delete

data/README.md

@@ -61,6 +61,12 @@ Monthly invoices are generated with `invoice create --monthly` sub command. Targ
 $ luca-deal invoice create --monthly [yyyy m]
 ```
 
+Or, any invoice can be created with contract ID. Contract ID is just unique fragment of uuid, listed with `luca-deal invoice create` with no args.
+
+```
+$ luca-deal invoice create 1d3 yyyy m
+```
+
 Invoice conditions are defined by contracts.
 
 

data/exe/luca-deal

@@ -5,8 +5,8 @@ require 'date'
 require 'optparse'
 require 'luca_deal'
 
-module LucaCmd
-  class Customer
+class LucaCmd
+  class Customer < LucaCmd
     def self.create(args = nil, params = {})
       if args
         id = LucaDeal::Customer.create(name: args[0])
@@ -28,7 +28,7 @@ module LucaCmd
         list = LucaDeal::Customer.id_completion(args[0])
         case list.length
         when 1
-          id = LucaDeal::Customer.new.describe(list.first)
+          render(LucaDeal::Customer.new.describe(list.first), params)
         else
           puts 'found multiple contract id. exit'
           list.each { |item| puts "  #{item[:id]}  #{item[:label]}" }
@@ -57,11 +57,11 @@ module LucaCmd
     end
 
     def self.list(args = nil, params = {})
-      LucaDeal::Customer.new.list_name
+      render(LucaDeal::Customer.new.list_name, params)
     end
   end
 
-  class Contract
+  class Contract < LucaCmd
     def self.create(args = nil, params = {})
       if args.empty?
         list = LucaDeal::Customer.id_completion('')
@@ -93,7 +93,7 @@ module LucaCmd
         list = LucaDeal::Contract.id_completion(args[0])
         case list.length
         when 1
-          id = LucaDeal::Contract.new.describe(list.first)
+          render(LucaDeal::Contract.new.describe(list.first), params)
         else
           puts 'found multiple contract id. exit'
           list.each { |item| puts "  #{item[:id]}  #{item[:label]}" }
@@ -122,14 +122,29 @@ module LucaCmd
     end
   end
 
-  class Invoice
+  class Invoice < LucaCmd
     def self.create(args = nil, params = {})
-      date = "#{args[0]}-#{args[1]}-#{args[2] || '1'}" if !args.empty?
       case params['mode']
       when 'monthly'
+        date = "#{args[0]}-#{args[1]}-#{args[2] || '1'}" if !args.empty?
         LucaDeal::Invoice.new(date).monthly_invoice
       else
-        puts 'not implemented mode'
+        date = "#{args[1]}-#{args[2]}-#{args[3] || '1'}" if !args.empty?
+        list = LucaDeal::Contract.id_completion(args[0] || '', label: 'customer_name')
+        if args.length != 3
+          puts 'requires contract id & year month. exit'
+          list.each { |item| puts "  #{item[:id]}  #{item[:label]}" }
+          exit 1
+        else
+          case list.length
+          when 1
+            id = LucaDeal::Invoice.new(date).single_invoice(list.first)
+          else
+            puts 'found multiple contract id. exit'
+            list.each { |item| puts "  #{item[:id]}  #{item[:label]}" }
+            exit 1
+          end
+        end
       end
     end
 
@@ -157,7 +172,11 @@ module LucaCmd
         date = "#{Date.today.year}-#{Date.today.month}-1"
         count = 3
       end
-      LucaDeal::Invoice.new(date).stats(count || 1)
+      if params[:html]
+        LucaDeal::Invoice.new(date).preview_stdout
+      else
+        render(LucaDeal::Invoice.new(date).stats(count || 1), params)
+      end
     end
 
     def self.mail(args = nil, params = {})
@@ -170,6 +189,62 @@ module LucaCmd
       end
     end
   end
+
+  class Fee < LucaCmd
+    def self.create(args = nil, params = {})
+      case params['mode']
+      when 'monthly'
+        date = "#{args[0]}-#{args[1]}-#{args[2] || '1'}" if !args.empty?
+        LucaDeal::Fee.new(date).monthly_fee
+      else
+        puts "not implemented yet"
+        exit 1
+      end
+    end
+
+    def self.delete(args = nil, params = {})
+      if args
+        id = LucaDeal::Fee.delete(args[0])
+      else
+        puts 'requires contract id. exit'
+        exit 1
+      end
+    end
+
+    def self.list(args = nil, params = {})
+      date = "#{args[0]}-#{args[1]}-#{args[2] || '1'}" if !args.empty?
+      if args.empty?
+        date = "#{Date.today.year}-#{Date.today.month}-1"
+        count = 3
+      end
+      if params[:html]
+        LucaDeal::Fee.new(date).preview_stdout
+      else
+        render(LucaDeal::Fee.new(date).stats(count || 1), params)
+      end
+    end
+
+    def self.mail(args = nil, params = {})
+      date = "#{args[0]}-#{args[1]}-#{args[2] || '1'}" if !args.empty?
+      case params['mode']
+      when 'preview'
+        LucaDeal::Fee.new(date).preview_mail
+      else
+        LucaDeal::Fee.new(date).deliver_mail
+      end
+    end
+  end
+
+  def self.render(dat, params)
+    case params[:output]
+    when 'json'
+      puts JSON.dump(dat)
+    when 'nu'
+      LucaSupport::View.nushell(YAML.dump(dat))
+    else
+      puts YAML.dump(dat)
+    end
+  end
 end
 
 def new_pj(args = nil, params = {})
@@ -184,20 +259,28 @@ case cmd
 when /customers?/
   subcmd = ARGV.shift
   case subcmd
+  when 'create'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-deal customers create CustomerName'
+      args = opt.parse(ARGV)
+      LucaCmd::Customer.create(args, params)
+    end
   when 'list'
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-deal customers list [options]'
+      opt.on('--nu', 'show table in nushell') { |_v| params[:output] = 'nu' }
+      opt.on('-o', '--output VAL', 'output serialized data') { |v| params[:output] = v }
       args = opt.parse(ARGV)
       LucaCmd::Customer.list(args, params)
     end
-  when 'create'
+  when 'describe'
     OptionParser.new do |opt|
-      opt.banner = 'Usage: luca-deal customers create CustomerName'
+      opt.banner = 'Usage: luca-deal customers describe [options] customer_id'
+      opt.on('--nu', 'show table in nushell') { |_v| params[:output] = 'nu' }
+      opt.on('-o', '--output VAL', 'output serialized data') { |v| params[:output] = v }
       args = opt.parse(ARGV)
-      LucaCmd::Customer.create(args, params)
+      LucaCmd::Customer.describe(args, params)
     end
-  when 'describe'
-    LucaCmd::Customer.describe(ARGV)
   when 'delete'
     LucaCmd::Customer.delete(ARGV)
   else
@@ -223,7 +306,13 @@ when /contracts?/
       LucaCmd::Contract.create(args, params)
     end
   when 'describe'
-    LucaCmd::Contract.describe(ARGV)
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-deal contracts describe [options] customer_id'
+      opt.on('--nu', 'show table in nushell') { |_v| params[:output] = 'nu' }
+      opt.on('-o', '--output VAL', 'output serialized data') { |v| params[:output] = v }
+      args = opt.parse(ARGV)
+      LucaCmd::Contract.describe(args, params)
+    end
   when 'delete'
     LucaCmd::Contract.delete(ARGV)
   else
@@ -242,7 +331,7 @@ when /invoices?/, 'i'
   case subcmd
   when 'create'
     OptionParser.new do |opt|
-      opt.banner = 'Usage: luca-deal invoices create [options] year month [date]'
+      opt.banner = 'Usage: luca-deal invoices create [options] --monthly|contract_id year month [date]'
       opt.on('--monthly', 'generate monthly data') { |_v| params['mode'] = 'monthly' }
       args = opt.parse(ARGV)
       LucaCmd::Invoice.create(args, params)
@@ -252,6 +341,9 @@ when /invoices?/, 'i'
   when 'list'
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-deal invoices list [options] year month [date]'
+      opt.on('--nu', 'show table in nushell') { |_v| params[:output] = 'nu' }
+      opt.on('-o', '--output VAL', 'output serialized data') { |v| params[:output] = v }
+      opt.on('--html', 'output html invoices') { |_v| params[:html] = 'monthly' }
       args = opt.parse(ARGV)
       LucaCmd::Invoice.list(args, params)
     end
@@ -279,6 +371,44 @@ when 'new'
     args = opt.parse(ARGV)
     new_pj(args, params)
   end
+when /fee/
+  subcmd = ARGV.shift
+  case subcmd
+  when 'create'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-deal fee create [options] year month [date]'
+      opt.on('--monthly', 'generate monthly data') { |_v| params['mode'] = 'monthly' }
+      args = opt.parse(ARGV)
+      LucaCmd::Fee.create(args, params)
+    end
+  when 'delete'
+    LucaCmd::Fee.delete(ARGV)
+  when 'list'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-deal fee list [options] year month [date]'
+      opt.on('--nu', 'show table in nushell') { |_v| params[:output] = 'nu' }
+      opt.on('-o', '--output VAL', 'output serialized data') { |v| params[:output] = v }
+      opt.on('--html', 'output html invoices') { |_v| params[:html] = 'monthly' }
+      args = opt.parse(ARGV)
+      LucaCmd::Fee.list(args, params)
+    end
+  when 'mail'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-deal fee mail [options] year month [date]'
+      opt.on('--preview', 'send to preview user') { |_v| params['mode'] = 'preview' }
+      args = opt.parse(ARGV)
+      LucaCmd::Fee.mail(args, params)
+    end
+  else
+    puts 'Proper subcommand needed.'
+    puts
+    puts 'Usage: luca-deal fee subcommand [--help|options]'
+    puts '  create'
+    puts '  delete'
+    puts '  list'
+    puts '  mail: send mail with report'
+    exit 1
+  end
 else
   puts 'Proper subcommand needed.'
   puts

data/lib/luca_deal/contract.rb

@@ -47,14 +47,14 @@ module LucaDeal
       contract = parse_current(self.class.find(id))
       if contract['products']
         contract['products'] = contract['products'].map do |product|
-          LucaDeal::Product.find(product['id'])
+          Product.find(product['id'])
         end
       end
-      YAML.dump(readable(contract)).tap{ |d| puts d }
+      readable(contract)
     end
 
     def generate!(customer_id, mode = 'subscription')
-      LucaDeal::Customer.find(customer_id) do |customer|
+      Customer.find(customer_id) do |customer|
         current_customer = parse_current(customer)
         if mode == 'sales_fee'
           obj = salesfee_template

data/lib/luca_deal/customer.rb

@@ -12,19 +12,17 @@ module LucaDeal
     @dirname = 'customers'
     @required = ['name']
 
-    def initialize(pjdir = nil)
+    def initialize
       @date = Date.today
-      @pjdir = pjdir || Dir.pwd
     end
 
     def list_name
-      list = self.class.all.map { |dat| parse_current(dat).sort.to_h }
-      YAML.dump(list).tap { |l| puts l }
+      self.class.all.map { |dat| parse_current(dat).sort.to_h }
     end
 
     def describe(id)
       customer = parse_current(self.class.find(id))
-      contracts = LucaDeal::Contract.all.select { |contract| contract['customer_id'] == customer['id'] }
+      contracts = Contract.all.select { |contract| contract['customer_id'] == customer['id'] }
       if !contracts.empty?
         customer['contracts'] = contracts.map do |c|
           {
@@ -34,7 +32,7 @@ module LucaDeal
           }
         end
       end
-      YAML.dump(readable(customer)).tap{ |d| puts d }
+      readable(customer)
     end
 
     def self.create(obj)

data/lib/luca_deal/fee.rb

@@ -14,40 +14,99 @@ module LucaDeal
 
     def initialize(date = nil)
       @date = issue_date(date)
-      @config = load_config('config.yml')
     end
 
     # calculate fee, based on invoices
     #
     def monthly_fee
-      LucaDeal::Contract.asof(@date.year, @date.month, @date.day) do |contract|
+      Contract.asof(@date.year, @date.month, @date.day) do |contract|
         next if contract.dig('terms', 'category') != 'sales_fee'
+        next if duplicated_contract? contract['id']
 
         @rate = { 'default' => BigDecimal(contract.dig('rate', 'default')) }
         @rate['initial'] = contract.dig('rate', 'initial') ? BigDecimal(contract.dig('rate', 'initial')) : @rate['default']
 
-        LucaDeal::Invoice.asof(@date.year, @date.month) do |invoice|
+        fee = { 'contract_id' => contract['id'], 'items' => [] }
+        fee['customer'] = get_customer(contract['customer_id'])
+        fee['issue_date'] = @date
+        Invoice.asof(@date.year, @date.month) do |invoice|
           next if invoice.dig('sales_fee', 'id') != contract['id']
-          next if duplicated_contract? invoice['contract_id']
-
-          fee = invoice.dup
-          fee['invoice'] = {}.tap do |f_invoice|
-            %w[id contract_id issue_date due_date].each do |i|
-              f_invoice[i] = invoice[i]
-              fee.delete i
-            end
+
+          invoice['items'].each do |item|
+            rate = item['type'] == 'initial' ? @rate['initial'] : @rate['default']
+            fee['items'] << {
+              'invoice_id' => invoice['id'],
+              'customer_name' => invoice.dig('customer', 'name'),
+              'name' => item['name'],
+              'price' => item['price'],
+              'qty' => item['qty'],
+              'fee' => item['price'] * item['qty'] * rate
+            }
           end
-          fee['id'] = issue_random_id
-          fee['customer'].delete('to')
-          fee['sales_fee'].merge! subtotal(fee['items'])
-          gen_fee!(fee)
+          fee['sales_fee'] = subtotal(fee['items'])
         end
+        self.class.create(fee, date: @date, codes: Array(contract['id']))
+      end
+    end
+
+    def deliver_mail(attachment_type = nil, mode: nil)
+      attachment_type = CONFIG.dig('fee', 'attachment') || :html
+      fees = self.class.asof(@date.year, @date.month)
+      raise "No report for #{@date.year}/#{@date.month}" if fees.count.zero?
+
+      fees.each do |dat, path|
+        next if has_status?(dat, 'mail_delivered')
+
+        mail = compose_mail(dat, mode: mode, attachment: attachment_type.to_sym)
+        LucaSupport::Mail.new(mail, PJDIR).deliver
+        self.class.add_status!(path, 'mail_delivered')
+      end
+    end
+
+    def preview_mail(attachment_type = nil)
+      deliver_mail(attachment_type, mode: :preview)
+    end
+
+    # Render HTML to console
+    #
+    def preview_stdout
+      self.class.asof(@date.year, @date.month) do |dat, _|
+        @company = set_company
+        fee_vars(dat)
+        puts render_report
+      end
+    end
+
+    def compose_mail(dat, mode: nil, attachment: :html)
+      @company = set_company
+      fee_vars(dat)
+
+      mail = Mail.new
+      mail.to = dat.dig('customer', 'to') if mode.nil?
+      mail.subject = CONFIG.dig('invoice', 'mail_subject') || 'Your Report is available'
+      if mode == :preview
+        mail.cc = CONFIG.dig('mail', 'preview') || CONFIG.dig('mail', 'from')
+        mail.subject = '[preview] ' + mail.subject
+      end
+      mail.text_part = Mail::Part.new(body: render_erb(search_template('fee-report-mail.txt.erb')), charset: 'UTF-8')
+      mail.attachments[attachment_name(dat, attachment)] = render_report(attachment)
+      mail
+    end
+
+    def render_report(file_type = :html)
+      case file_type
+      when :html
+        render_erb(search_template('fee-report.html.erb'))
+      when :pdf
+        erb2pdf(search_template('fee-report.html.erb'))
+      else
+        raise 'This filetype is not supported.'
       end
     end
 
     def get_customer(id)
       {}.tap do |res|
-        LucaDeal::Customer.find(id) do |dat|
+        Customer.find(id) do |dat|
           customer = parse_current(dat)
           res['id'] = customer['id']
           res['name'] = customer.dig('name')
@@ -58,13 +117,19 @@ module LucaDeal
       end
     end
 
-    def gen_fee!(fee)
-      id = fee.dig('invoice', 'contract_id')
-      self.class.create(fee, date: @date, codes: Array(id))
-    end
-
     private
 
+    # set variables for ERB template
+    #
+    def fee_vars(fee_dat)
+      @customer = fee_dat['customer']
+      @items = readable(fee_dat['items'])
+      @sales_fee = readable(fee_dat['sales_fee'])
+      @issue_date = fee_dat['issue_date']
+      @due_date = fee_dat['due_date']
+      @amount = readable(fee_dat['sales_fee'].inject(0) { |sum, (_k, v)| sum + v })
+    end
+
     def lib_path
       __dir__
     end
@@ -73,25 +138,20 @@ module LucaDeal
     #
     def set_company
       {}.tap do |h|
-        h['name'] = @config.dig('company', 'name')
-        h['address'] = @config.dig('company', 'address')
-        h['address2'] = @config.dig('company', 'address2')
+        h['name'] = CONFIG.dig('company', 'name')
+        h['address'] = CONFIG.dig('company', 'address')
+        h['address2'] = CONFIG.dig('company', 'address2')
       end
     end
 
     # calc fee & tax amount by tax category
     #
     def subtotal(items)
-      {}.tap do |subtotal|
+      { 'fee' => 0, 'tax' => 0 }.tap do |subtotal|
         items.each do |i|
-          rate = i.dig('type') || 'default'
-          subtotal[rate] = { 'fee' => 0, 'tax' => 0 } if subtotal.dig(rate).nil?
-          subtotal[rate]['fee'] += i['qty'] * i['price'] * @rate[rate]
-        end
-        subtotal.each do |rate, amount|
-          amount['tax'] = (amount['fee'] * load_tax_rate(rate)).to_i
-          amount['fee'] = amount['fee'].to_i
+          subtotal['fee'] += i['fee']
         end
+        subtotal['tax'] = (subtotal['fee'] * load_tax_rate('default')).to_i
       end
     end
 
@@ -100,12 +160,18 @@ module LucaDeal
       Date.new(base.year, base.month, -1)
     end
 
+    # TODO: support due_date variation
+    def due_date(date)
+      next_month = date.next_month
+      Date.new(next_month.year, next_month.month, -1)
+    end
+
     # load Tax Rate from config.
     #
     def load_tax_rate(name)
-      return 0 if @config.dig('tax_rate', name).nil?
+      return 0 if CONFIG.dig('tax_rate', name).nil?
 
-      BigDecimal(take_current(@config['tax_rate'], name).to_s)
+      BigDecimal(take_current(CONFIG['tax_rate'], name).to_s)
     end
 
     def duplicated_contract?(id)

data/lib/luca_deal/invoice.rb

@@ -17,26 +17,33 @@ module LucaDeal
 
     def initialize(date = nil)
       @date = issue_date(date)
-      @pjdir = Pathname(LucaSupport::Config::Pjdir)
-      @config = load_config(@pjdir / 'config.yml')
     end
 
-    def deliver_mail
-      attachment_type = @config.dig('invoice', 'attachment') || :html
-      self.class.asof(@date.year, @date.month) do |dat, path|
+    def deliver_mail(attachment_type = nil, mode: nil)
+      attachment_type = CONFIG.dig('invoice', 'attachment') || :html
+      invoices = self.class.asof(@date.year, @date.month)
+      raise "No invoice for #{@date.year}/#{@date.month}" if invoices.count.zero?
+
+      invoices.each do |dat, path|
         next if has_status?(dat, 'mail_delivered')
 
-        mail = compose_mail(dat, attachment: attachment_type.to_sym)
-        LucaSupport::Mail.new(mail, @pjdir).deliver
+        mail = compose_mail(dat, mode: mode, attachment: attachment_type.to_sym)
+        LucaSupport::Mail.new(mail, PJDIR).deliver
         self.class.add_status!(path, 'mail_delivered')
       end
     end
 
     def preview_mail(attachment_type = nil)
-      attachment_type ||= @config.dig('invoice', 'attachment') || :html
-      self.class.asof(@date.year, @date.month) do |dat, _path|
-        mail = compose_mail(dat, mode: :preview, attachment: attachment_type.to_sym)
-        LucaSupport::Mail.new(mail, @pjdir).deliver
+      deliver_mail(attachment_type, mode: :preview)
+    end
+
+    # Render HTML to console
+    #
+    def preview_stdout
+      self.class.asof(@date.year, @date.month) do |dat, _|
+        @company = set_company
+        invoice_vars(dat)
+        puts render_invoice
       end
     end
 
@@ -46,20 +53,27 @@ module LucaDeal
 
       mail = Mail.new
       mail.to = dat.dig('customer', 'to') if mode.nil?
-      mail.subject = @config.dig('invoice', 'mail_subject') || 'Your Invoice is available'
+      mail.subject = CONFIG.dig('invoice', 'mail_subject') || 'Your Invoice is available'
       if mode == :preview
-        mail.cc = @config.dig('mail', 'preview') || @config.dig('mail', 'from')
+        mail.cc = CONFIG.dig('mail', 'preview') || CONFIG.dig('mail', 'from')
         mail.subject = '[preview] ' + mail.subject
       end
       mail.text_part = Mail::Part.new(body: render_erb(search_template('invoice-mail.txt.erb')), charset: 'UTF-8')
-      if attachment == :html
-        mail.attachments[attachment_name(dat, attachment)] = render_erb(search_template('invoice.html.erb'))
-      elsif attachment == :pdf
-        mail.attachments[attachment_name(dat, attachment)] = erb2pdf(search_template('invoice.html.erb'))
-      end
+      mail.attachments[attachment_name(dat, attachment)] = render_invoice(attachment)
       mail
     end
 
+    def render_invoice(file_type = :html)
+      case file_type
+      when :html
+        render_erb(search_template('invoice.html.erb'))
+      when :pdf
+        erb2pdf(search_template('invoice.html.erb'))
+      else
+        raise 'This filetype is not supported.'
+      end
+    end
+
     # Output seriarized invoice data to stdout.
     # Returns previous N months on multiple count
     #
@@ -96,10 +110,9 @@ module LucaDeal
             stat['count'] = stat['records'].count
             stat['total'] = stat['records'].inject(0) { |sum, rec| sum + rec.dig('subtotal') }
             stat['tax'] = stat['records'].inject(0) { |sum, rec| sum + rec.dig('tax') }
-            collection << stat
+            collection << readable(stat)
           end
         end
-        puts YAML.dump(LucaSupport::Code.readable(collection))
       end
     end
 
@@ -111,10 +124,10 @@ module LucaDeal
           item['debit'] = []
           item['credit'] = []
           dat['subtotal'].map do |sub|
-            item['debit'] << { 'label' => '売掛金', 'value' => LucaSupport::Code.readable(sub['items']) }
-            item['debit'] << { 'label' => '売掛金', 'value' => LucaSupport::Code.readable(sub['tax']) }
-            item['credit'] << { 'label' => '売上高', 'value' => LucaSupport::Code.readable(sub['items']) }
-            item['credit'] << { 'label' => '売上高', 'value' => LucaSupport::Code.readable(sub['tax']) }
+            item['debit'] << { 'label' => '売掛金', 'value' => readable(sub['items']) }
+            item['debit'] << { 'label' => '売掛金', 'value' => readable(sub['tax']) }
+            item['credit'] << { 'label' => '売上高', 'value' => readable(sub['items']) }
+            item['credit'] << { 'label' => '売上高', 'value' => readable(sub['tax']) }
           end
           item['x-customer'] = dat['customer']['name'] if dat.dig('customer', 'name')
           item['x-editor'] = 'LucaDeal'
@@ -124,14 +137,25 @@ module LucaDeal
       end
     end
 
+    def single_invoice(contract_id)
+      contract = Contract.find(contract_id)
+      raise "Invoice already exists for #{contract_id}. exit" if duplicated_contract? contract['id']
+
+      gen_invoice!(invoice_object(contract))
+    end
+
     def monthly_invoice
-      LucaDeal::Contract.new(@date.to_s).active do |contract|
+      Contract.new(@date.to_s).active do |contract|
         next if contract.dig('terms', 'billing_cycle') != 'monthly'
         # TODO: provide another I/F for force re-issue if needed
         next if duplicated_contract? contract['id']
 
-        invoice = {}
-        invoice['id'] = issue_random_id
+        gen_invoice!(invoice_object(contract))
+      end
+    end
+
+    def invoice_object(contract)
+      {}.tap do |invoice|
         invoice['contract_id'] = contract['id']
         invoice['customer'] = get_customer(contract.dig('customer_id'))
         invoice['due_date'] = due_date(@date)
@@ -144,25 +168,13 @@ module LucaDeal
           item.dig('type') == 'initial' && subsequent_month?(contract.dig('terms', 'effective'))
         end
         invoice['subtotal'] = subtotal(invoice['items'])
-                              .map { |k, v| v.tap { |dat| dat['rate'] = k } }
-        gen_invoice!(invoice)
+                                .map { |k, v| v.tap { |dat| dat['rate'] = k } }
       end
     end
 
-    # set variables for ERB template
-    #
-    def invoice_vars(invoice_dat)
-      @customer = invoice_dat['customer']
-      @items = invoice_dat['items']
-      @subtotal = invoice_dat['subtotal']
-      @issue_date = invoice_dat['issue_date']
-      @due_date = invoice_dat['due_date']
-      @amount = @subtotal.inject(0) { |sum, i| sum + i['items'] + i['tax'] }
-    end
-
     def get_customer(id)
       {}.tap do |res|
-        LucaDeal::Customer.find(id) do |dat|
+        Customer.find(id) do |dat|
           customer = parse_current(dat)
           res['id'] = customer['id']
           res['name'] = customer.dig('name')
@@ -178,7 +190,7 @@ module LucaDeal
 
       [].tap do |res|
         products.each do |product|
-          LucaDeal::Product.find(product['id'])['items'].each do |item|
+          Product.find(product['id'])['items'].each do |item|
             item['product_id'] = product['id']
             item['qty'] ||= 1
             res << item
@@ -199,11 +211,23 @@ module LucaDeal
 
     # TODO: support due_date variation
     def due_date(date)
-      Date.new(date.year, date.month + 1, -1)
+      next_month = date.next_month
+      Date.new(next_month.year, next_month.month, -1)
     end
 
     private
 
+    # set variables for ERB template
+    #
+    def invoice_vars(invoice_dat)
+      @customer = invoice_dat['customer']
+      @items = readable(invoice_dat['items'])
+      @subtotal = readable(invoice_dat['subtotal'])
+      @issue_date = invoice_dat['issue_date']
+      @due_date = invoice_dat['due_date']
+      @amount = readable(invoice_dat['subtotal'].inject(0) { |sum, i| sum + i['items'] + i['tax'] })
+    end
+
     def lib_path
       __dir__
     end
@@ -212,9 +236,9 @@ module LucaDeal
     #
     def set_company
       {}.tap do |h|
-        h['name'] = @config.dig('company', 'name')
-        h['address'] = @config.dig('company', 'address')
-        h['address2'] = @config.dig('company', 'address2')
+        h['name'] = CONFIG.dig('company', 'name')
+        h['address'] = CONFIG.dig('company', 'address')
+        h['address2'] = CONFIG.dig('company', 'address2')
       end
     end
 
@@ -237,13 +261,14 @@ module LucaDeal
     # load Tax Rate from config.
     #
     def load_tax_rate(name)
-      return 0 if @config.dig('tax_rate', name).nil?
+      return 0 if CONFIG.dig('tax_rate', name).nil?
 
-      BigDecimal(take_current(@config['tax_rate'], name).to_s)
+      BigDecimal(take_current(CONFIG['tax_rate'], name).to_s)
     end
 
     def attachment_name(dat, type)
-      "invoice-#{dat.dig('id')[0, 7]}.#{type}"
+      id = %r{/}.match(dat['id']) ? dat['id'].gsub('/', '') : dat['id'][0, 7]
+      "invoice-#{id}.#{type}"
     end
 
     def duplicated_contract?(id)

data/lib/luca_deal/templates/fee-report-mail.txt.erb

@@ -0,0 +1,6 @@
+Your monthly fee report is available.
+Please find the document attaced at the bottom of this email.
+-- 
+<%= @company['name'] %>
+<%= @company['address'] %>
+<%= @company['address2'] %>

data/lib/luca_deal/templates/fee-report.html.erb

@@ -0,0 +1,54 @@
+<html>
+    <head>
+        <meta charset="utf-8">
+        <style>
+            body { size: A4 }
+        </style>
+    </head>
+    <body>
+        <div style="text-align: right">Issue date: <%= @issue_date %></div>
+        <h1 style="display: block; margin: auto; text-align: center">Fee Report</h1>
+        <section><%= @customer["name"] %></section>
+        <section>Total amount: <%= delimit_num(@amount) %></section>
+
+        <table style="width: 100%">
+            <thead>
+                <th>#</th>
+                <th>Customer Name</th>
+                <th>Item Name</th>
+                <th>qty</th>
+                <th>Sales</th>
+                <th>Fee</th>
+            </thead>
+            <tbody>
+                <% @items.each.with_index(1) do |item, i| %>
+                    <tr class="item">
+                        <td class="unit"><%= i %></td>
+                        <td><%= item["customer_name"] %></td>
+                        <td><%= item["name"] %></td>
+                        <td class="unit"><%= item["qty"] %></td>
+                        <td class="price"><%= delimit_num( item["price"] * item["qty"] ) %></td>
+                        <td class="price"><%= delimit_num( item["fee"] ) %></td>
+                    </tr>
+                <% end %>
+                    <tr>
+                        <td class="price" colspan="3">Subtotal</td>
+                        <td class="price"><%= delimit_num( @sales_fee['fee'] ) %></td>
+                    </tr>
+                    <tr>
+                        <td class="price" colspan="3">Tax</td>
+                        <td class="price"><%= delimit_num( @sales_fee['tax'] ) %></td>
+                    </tr>
+                    <tr>
+                        <td class="price" colspan="3">Total</td>
+                        <td class="price"><%= delimit_num( @sales_fee['fee'] + @sales_fee['tax'] ) %></td>
+                    </tr>
+        </table>
+
+        <section>
+        <div><%= @company["name"] %></div>
+        <div><%= @company["address"] %></div>
+        <div><%= @company["address2"] %></div>
+        </section>
+    </body>
+</html>

data/lib/luca_deal/templates/invoice-mail.txt.erb

@@ -0,0 +1,6 @@
+Your monthly invoice is available.
+Please find the document attaced at the bottom of this email.
+-- 
+<%= @company['name'] %>
+<%= @company['address'] %>
+<%= @company['address2'] %>

data/lib/luca_deal/templates/invoice.html.erb

@@ -0,0 +1,52 @@
+<html>
+    <head>
+        <meta charset="utf-8">
+        <style>
+            body { size: A4 }
+        </style>
+    </head>
+    <body>
+        <div style="text-align: right">Issue date: <%= @issue_date %></div>
+        <h1 style="display: block; margin: auto; text-align: center">Invoice</h1>
+        <section><%= @customer["name"] %></section>
+        <section>Total amount: <%= delimit_num(@amount) %></section>
+
+        <table style="width: 100%">
+            <thead>
+                <th>#</th>
+                <th>Item</th>
+                <th>qty</th>
+                <th>Amount</th>
+            </thead>
+            <tbody>
+                <% @items.each.with_index(1) do |item, i| %>
+                    <tr class="item">
+                        <td class="unit"><%= i %></td>
+                        <td><%= item["name"] %></td>
+                        <td class="unit"><%= item["qty"] %></td>
+                        <td class="price"><%= delimit_num( item["price"] * item["qty"] ) %></td>
+                    </tr>
+                <% end %>
+                <% @subtotal.each.with_index(1) do |sub, i| %>
+                    <tr>
+                        <td class="price" colspan="3">Subtotal</td>
+                        <td class="price"><%= delimit_num( sub['items'] ) %></td>
+                    </tr>
+                    <tr>
+                        <td class="price" colspan="3">Tax</td>
+                        <td class="price"><%= delimit_num( sub['tax'] ) %></td>
+                    </tr>
+                    <tr>
+                        <td class="price" colspan="3">Total</td>
+                        <td class="price"><%= delimit_num( sub['items'] + sub['tax'] ) %></td>
+                    </tr>
+                <% end %>
+        </table>
+
+        <section>
+        <div><%= @company["name"] %></div>
+        <div><%= @company["address"] %></div>
+        <div><%= @company["address2"] %></div>
+        </section>
+    </body>
+</html>

data/lib/luca_deal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LucaDeal
-  VERSION = '0.2.19'
+  VERSION = '0.2.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucadeal
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.21
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2020-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucarecord
@@ -89,6 +89,10 @@ files:
 - lib/luca_deal/setup.rb
 - lib/luca_deal/templates/.keep
 - lib/luca_deal/templates/config.yml
+- lib/luca_deal/templates/fee-report-mail.txt.erb
+- lib/luca_deal/templates/fee-report.html.erb
+- lib/luca_deal/templates/invoice-mail.txt.erb
+- lib/luca_deal/templates/invoice.html.erb
 - lib/luca_deal/version.rb
 homepage: https://github.com/chumaltd/luca/tree/master/lucadeal
 licenses: