lucadeal 0.2.23 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f3d23a1f082ee44833db42f3cf4dbdecc0d078ea3ca6499d5cf77e6d235580a
-  data.tar.gz: c2ea468ea064bb865d0b481d9717a03f11afe212f0bfd3b58ac43722116a95e7
+  metadata.gz: 060bcea890091dbe70e03718d1a8871bccf4873db86922d505e0e2c3ffefd94a
+  data.tar.gz: 3d202e5711a7e1d28cadb5a4debbda18900b7ab7ea4d6e5e413d52980c1cb84f
 SHA512:
-  metadata.gz: 545d6acb5b7837497c30d17a42c6a32611186f2e12f9821d116c9aa3ed9735dc1c8bc2c072d1439c9e21e1fd38d7398de770ffd9fd835352f4565f96a18a19ca
-  data.tar.gz: c8cf01067781332a241138ab9b253d282902a3838a19d2f9623d9eb29c6c4a3432e7d0e6818bc67a3e3b3e682e5ba3c4c5c128a90f93b3f91dcadca0285ea2f4
+  metadata.gz: 7a61af30d3b434edf10ab8553b3f878646354dd6e838a93405483b476ab3d8456713a745c0eb2a99eefdbc233ed662a87d4645c7a94b375924e2d8f347208c00
+  data.tar.gz: ca88eff9ed7c7c8dd815089ccdb34bd8dcd0813ae58dbb3b026db4833373a4cb33cb2b91eea27fce67b599a9a43b6e27796ed14ef1c2da6c60cf7308e389ea7f

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## LucaDeal 0.3.0
+
+* implement `luca-deal reports balance` for unsettled balance by customer
+* implement `luca-deal invoices settle` for import payment data from LucaBook
+
+## LucaDeal 0.2.25
+
+* implement deduction rate for fee calculation.
+* implement `luca-deal fee export`
+* refine export label for luca-book compatibility
+* add `luca-deal invoice create --monthly --with-fee` option.
+* preview_mail can deliver regardless of `mail_delivered` status
+* `luca-deal fee mail` skip no item record by default.
+
+## LucaDeal 0.2.24
+
+* add `luca-deal invoices create --monthly --mail`, send payment list after monthly invoice creation.
+* add 'other_payments' tracking with no invoices.
+* can have limit on fee calculation.
+* initial implment of `luca-deal fee list`
+
 ## LucaDeal 0.2.23
 
 * implement `luca-deal invoices list --mail`: payment list via HTML mail

data/README.md

@@ -135,7 +135,7 @@ Fields for subscription customers are as bellows:
 | Top level | Second level  |          | historical | Description                                                                                          |
 |-----------|---------------|----------|------------|------------------------------------------------------------------------------------------------------|
 | terms     |               |          |            |                                                                                                      |
-|           | billing_cycle | optional |            | If 'monthly', invoices are generated on each month.                                                  |
+|           | billing_cycle | optional |            | If 'monthly', invoices are generated on each month. If 'other_payments', no_invoices are generated on each month. `no_invoices` are mostly same as invoices, but not sending email. |
 |           | category      | optional |            | Default: 'subscription'                                                                              |
 | products  |               |          |            | Array of products.                                                                                   |
 |           | id            |          |            | reference for Product                                                            |
@@ -154,9 +154,12 @@ Fields for sales fee are as bellows:
 |-----------|--------------|----------|------------|-------------------------------------------------------------------------------------|
 | terms     |              |          |            |                                                                                     |
 |           | category     |          |            | If 'sales_fee', contract is treated as selling commission. |
+|           | limit |          |            | If set, fees are calculated as mas as `limit` months. |
+|           | deduction_label |          |            | Label for deduction. Used on export |
 | rate      |              | optional |            |                                                                                     |
 |           | default      |          |            | sales fee rate.                                                                     |
 |           | initial      |          |            | sales fee rate for items of type=initial.                                           |
+|           | deduction |          |            | deduction rate(if any) multiplied by fee    |
 
 
 ### Invoice
@@ -164,7 +167,7 @@ Fields for sales fee are as bellows:
 Invoice is basically auto generated from Customer and Contract objects.
 
 | Top level  | Second level | Description                              |
-|------------|--------------|------------------------------------------|
+|------------+--------------+------------------------------------------|
 | id         |              | uuid                                     |
 | issue_date |              |                                          |
 | due_date   |              |                                          |
@@ -180,6 +183,10 @@ Invoice is basically auto generated from Customer and Contract objects.
 |            | qty          | quantity. Default: 1.                    |
 |            | type         |                                          |
 |            | product_id   | refrence for Product                     |
+| settled    |              |                                          |
+|            | id           | data source id for duplication check     |
+|            | date         | payment date                             |
+|            | amount       | payment amount                           |
 | subtotal   |              | Array of subtotal by tax category.       |
 |            | items        | amount of items                          |
 |            | tax          | amount of tax                            |

data/exe/luca-deal

@@ -124,10 +124,15 @@ class LucaCmd
 
   class Invoice < LucaCmd
     def self.create(args = nil, params = {})
-      case params['mode']
+      case params[:mode]
       when 'monthly'
         date = "#{args[0]}-#{args[1]}-#{args[2] || '1'}" if !args.empty?
         LucaDeal::Invoice.new(date).monthly_invoice
+        LucaDeal::NoInvoice.new(date).monthly_invoice
+        LucaDeal::Fee.new(date).monthly_fee if params[:fee]
+        if params[:mail]
+          LucaDeal::Invoice.new(date).stats_email
+        end
       else
         date = "#{args[1]}-#{args[2]}-#{args[3] || '1'}" if !args.empty?
         list = LucaDeal::Contract.id_completion(args[0] || '', label: 'customer_name')
@@ -181,6 +186,11 @@ class LucaCmd
       end
     end
 
+    def self.report(args = nil, params = {})
+      date = Date.new(args[0].to_i, args[1].to_i, 1)
+      render(LucaDeal::Invoice.report(date, detail: params[:detail], due: params[:due]), params)
+    end
+
     def self.mail(args = nil, params = {})
       date = "#{args[0]}-#{args[1]}-#{args[2] || '1'}" if !args.empty?
       case params['mode']
@@ -190,11 +200,16 @@ class LucaCmd
         LucaDeal::Invoice.new(date).deliver_mail
       end
     end
+
+    def self.settle(args = nil, _params = nil)
+      str = args[0].nil? ? STDIN.read : File.read(args[0])
+      LucaDeal::Invoice.settle(str)
+    end
   end
 
   class Fee < LucaCmd
     def self.create(args = nil, params = {})
-      case params['mode']
+      case params[:mode]
       when 'monthly'
         date = "#{args[0]}-#{args[1]}-#{args[2] || '1'}" if !args.empty?
         LucaDeal::Fee.new(date).monthly_fee
@@ -213,6 +228,15 @@ class LucaCmd
       end
     end
 
+    def self.export(args = nil, _params = nil)
+      if args
+        args << 28 if args.length == 2 # specify safe last day
+        LucaDeal::Fee.new(args.join('-')).export_json
+      else
+        LucaDeal::Fee.new.export_json
+      end
+    end
+
     def self.list(args = nil, params = {})
       date = "#{args[0]}-#{args[1]}-#{args[2] || '1'}" if !args.empty?
       if args.empty?
@@ -243,6 +267,12 @@ class LucaCmd
       puts JSON.dump(dat)
     when 'nu'
       LucaSupport::View.nushell(YAML.dump(dat))
+    when 'csv'
+      str = CSV.generate(String.new, col_sep: "\t") do |row|
+        row << dat.first.keys
+        dat.each { |d| row << d.values }
+      end
+      puts str
     else
       puts YAML.dump(dat)
     end
@@ -334,7 +364,9 @@ when /invoices?/, 'i'
   when 'create'
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-deal invoices create [options] --monthly|contract_id year month [date]'
-      opt.on('--monthly', 'generate monthly data') { |_v| params['mode'] = 'monthly' }
+      opt.on('--mail', 'send payment list by email. Only works with --monthly') { |_v| params[:mail] = true }
+      opt.on('--monthly', 'generate monthly data') { |_v| params[:mode] = 'monthly' }
+      opt.on('--with-fee', 'generate sales fee data after monthly invoice creation') { |_v| params[:fee] = true }
       args = opt.parse(ARGV)
       LucaCmd::Invoice.create(args, params)
     end
@@ -357,6 +389,12 @@ when /invoices?/, 'i'
       args = opt.parse(ARGV)
       LucaCmd::Invoice.mail(args, params)
     end
+  when 'settle'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-deal invoices settle [filepath]'
+      args = opt.parse(ARGV)
+    end
+    LucaCmd::Invoice.settle(ARGV)
   else
     puts 'Proper subcommand needed.'
     puts
@@ -365,6 +403,29 @@ when /invoices?/, 'i'
     puts '  delete'
     puts '  list'
     puts '  mail: send mail with invoice'
+    puts '  settle'
+    exit 1
+  end
+when /reports?/, 'r'
+  subcmd = ARGV.shift
+  case subcmd
+  when 'balance'
+    params[:detail] = false
+    params[:due] = false
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-deal r[eports] balance [options] [year month]'
+      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('--detail', 'show detail info') { |_v| params[:detail] = true }
+      opt.on('--force-due', 'respect due date over actual payment') { |_v| params[:due] = true }
+      args = opt.parse(ARGV)
+      LucaCmd::Invoice.report(args, params)
+    end
+  else
+    puts 'Proper subcommand needed.'
+    puts
+    puts 'Usage: luca-deal r[eports] subcommand [--help|options]'
+    puts '  balance'
     exit 1
   end
 when 'new'
@@ -380,12 +441,14 @@ when /fee/
   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' }
+      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 'export'
+    LucaCmd::Fee.export(ARGV)
   when 'list'
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-deal fee list [options] year month [date]'
@@ -418,7 +481,9 @@ else
   puts 'Usage: luca-deal subcommand [options]'
   puts '        customers'
   puts '        contracts'
-  puts '        invoices'
+  puts '        i[nvoices]'
+  puts '        fee'
+  puts '        r[eports]'
   puts '        new: initialize project dir'
   puts '        export: puts invoice data for LucaBook import'
   exit 1

data/lib/luca_deal/contract.rb

@@ -69,11 +69,11 @@ module LucaDeal
     end
 
     def active_period?(dat)
-      unless dat.dig('defunct').nil?
-        defunct = dat.dig('defunct').respond_to?(:year) ? dat.dig('defunct') : Date.parse(dat.dig('defunct'))
+      unless dat['defunct'].nil?
+        defunct = dat['defunct'].respond_to?(:year) ? dat['defunct'] : Date.parse(dat['defunct'])
         return false if @date > defunct
       end
-      effective = dat.dig('effective').respond_to?(:year) ? dat.dig('effective') : Date.parse(dat.dig('effective'))
+      effective = dat['effective'].respond_to?(:year) ? dat['effective'] : Date.parse(dat['effective'])
       @date >= effective
     end
 

data/lib/luca_deal/fee.rb

@@ -1,6 +1,7 @@
 require 'luca_deal/version'
 
 require 'mail'
+require 'json'
 require 'yaml'
 require 'pathname'
 require 'bigdecimal'
@@ -25,41 +26,58 @@ module LucaDeal
 
         @rate = { 'default' => BigDecimal(contract.dig('rate', 'default')) }
         @rate['initial'] = contract.dig('rate', 'initial') ? BigDecimal(contract.dig('rate', 'initial')) : @rate['default']
+        limit = contract.dig('terms', 'limit')
 
-        fee = { 'contract_id' => contract['id'], 'items' => [] }
+        fee = {
+          'contract_id' => contract['id'],
+          'items' => [],
+          'sales_fee' => {
+            'fee' => 0,
+            'tax' => 0,
+            'deduction' => 0,
+            'deduction_label' => contract.dig('terms', 'deduction_label')
+          }
+        }
         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 exceed_limit?(invoice, limit)
 
           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
-            }
+            fee['items'] << fee_record(invoice, item, rate)
           end
-          fee['sales_fee'] = subtotal(fee['items'])
+          subtotal(fee['items']).each{ |k, v| fee['sales_fee'][k] += v }
         end
+        NoInvoice.asof(@date.year, @date.month) do |no_invoice|
+          next if no_invoice.dig('sales_fee', 'id') != contract['id']
+          next if exceed_limit?(no_invoice, limit)
+
+          no_invoice['items'].each do |item|
+            rate = item['type'] == 'initial' ? @rate['initial'] : @rate['default']
+            fee['items'] << fee_record(no_invoice, item, rate)
+          end
+          subtotal(fee['items']).each{ |k, v| fee['sales_fee'][k] += v }
+        end
+        deduction_rate = contract.dig('rate', 'deduction')
+        fee['sales_fee']['deduction'] = -1 * (fee['sales_fee']['fee'] * deduction_rate).floor if deduction_rate
         self.class.create(fee, date: @date, codes: Array(contract['id']))
       end
     end
 
-    def deliver_mail(attachment_type = nil, mode: nil)
+    def deliver_mail(attachment_type = nil, mode: nil, skip_no_item: true)
       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')
+        next if skip_no_item && dat['items'].empty?
 
         mail = compose_mail(dat, mode: mode, attachment: attachment_type.to_sym)
         LucaSupport::Mail.new(mail, PJDIR).deliver
-        self.class.add_status!(path, 'mail_delivered')
+        self.class.add_status!(path, 'mail_delivered') if mode.nil?
       end
     end
 
@@ -83,7 +101,7 @@ module LucaDeal
 
       mail = Mail.new
       mail.to = dat.dig('customer', 'to') if mode.nil?
-      mail.subject = CONFIG.dig('invoice', 'mail_subject') || 'Your Report is available'
+      mail.subject = CONFIG.dig('fee', 'mail_subject') || 'Your Report is available'
       if mode == :preview
         mail.cc = CONFIG.dig('mail', 'preview') || CONFIG.dig('mail', 'from')
         mail.subject = '[preview] ' + mail.subject
@@ -93,6 +111,76 @@ module LucaDeal
       mail
     end
 
+    # Output seriarized fee data to stdout.
+    # Returns previous N months on multiple count
+    #
+    # === Example YAML output
+    #   ---
+    #   - records:
+    #     - customer: Example Co.
+    #       subtotal: 100000
+    #       tax: 10000
+    #       due: 2020-10-31
+    #       issue_date: '2020-09-30'
+    #     count: 1
+    #     total: 100000
+    #     tax: 10000
+    #
+    def stats(count = 1)
+      [].tap do |collection|
+        scan_date = @date.next_month
+        count.times do
+          scan_date = scan_date.prev_month
+          {}.tap do |stat|
+            stat['records'] = self.class.asof(scan_date.year, scan_date.month).map do |fee|
+              {
+                'customer' => fee.dig('customer', 'name'),
+                'client' => fee['items'].map{ |item| item.dig('customer_name') }.join(' / '),
+                'subtotal' => fee.dig('sales_fee', 'fee'),
+                'tax' => fee.dig('sales_fee', 'tax'),
+                'due' => fee.dig('due_date'),
+                'mail' => fee.dig('status')&.select { |a| a.keys.include?('mail_delivered') }&.first
+              }
+            end
+            stat['issue_date'] = scan_date.to_s
+            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 << readable(stat)
+          end
+        end
+      end
+    end
+
+    def export_json
+      labels = export_labels
+      [].tap do |res|
+        self.class.asof(@date.year, @date.month) do |dat|
+          item = {}
+          item['date'] = dat['issue_date']
+          item['debit'] = []
+          item['credit'] = []
+          sub = dat['sales_fee']
+          if readable(sub['fee']) != 0
+            item['debit'] << { 'label' => labels[:debit][:fee], 'amount' => readable(sub['fee']) }
+            item['credit'] << { 'label' => labels[:credit][:fee], 'amount' => readable(sub['fee']) }
+          end
+          if readable(sub['tax']) != 0
+            item['debit'] << { 'label' => labels[:debit][:tax], 'amount' => readable(sub['tax']) }
+            item['credit'] << { 'label' => labels[:credit][:tax], 'amount' => readable(sub['tax']) }
+          end
+          if readable(sub['deduction']) != 0
+            item['debit'] << { 'label' => labels[:debit][:deduction], 'amount' => readable(sub['deduction'] * -1) }
+            item['credit'] << { 'label' => sub['deduction_label'] || labels[:credit][:deduction], 'amount' => readable(sub['deduction'] * -1) }
+          end
+          item['x-customer'] = dat['customer']['name'] if dat.dig('customer', 'name')
+          item['x-editor'] = 'LucaDeal'
+          res << item
+        end
+        puts JSON.dump(res)
+      end
+    end
+
     def render_report(file_type = :html)
       case file_type
       when :html
@@ -127,13 +215,32 @@ module LucaDeal
       @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 })
+      @amount = readable(fee_dat['sales_fee']
+                           .reject{ |k, _v| k == 'deduction_label' }
+                           .inject(0) { |sum, (_k, v)| sum + v })
     end
 
     def lib_path
       __dir__
     end
 
+    # TODO: load labels from CONFIG before country defaults
+    #
+    def export_labels
+      case CONFIG['country']
+      when 'jp'
+        {
+          debit: { fee: '支払手数料', tax: '支払手数料', deduction: '未払費用' },
+          credit: { fee: '未払費用', tax: '未払費用', deduction: '雑収入' }
+        }
+      else
+        {
+          debit: { fee: 'Fees and commisions', tax: 'Fees and commisions', deduction: 'Accounts payable - other' },
+          credit: { fee: 'Accounts payable - other', tax: 'Accounts payable - other', deduction: 'Miscellaneous income' }
+        }
+      end
+    end
+
     # load user company profile from config.
     #
     def set_company
@@ -155,6 +262,11 @@ module LucaDeal
       end
     end
 
+    def attachment_name(dat, type)
+      id = %r{/}.match(dat['id']) ? dat['id'].gsub('/', '') : dat['id'][0, 7]
+      "feereport-#{id}.#{type}"
+    end
+
     def issue_date(date)
       base =  date.nil? ? Date.today : Date.parse(date)
       Date.new(base.year, base.month, -1)
@@ -174,11 +286,32 @@ module LucaDeal
       BigDecimal(take_current(CONFIG['tax_rate'], name).to_s)
     end
 
+    # Fees are unique contract_id in each month
+    # If update needed, remove the target fee file.
+    #
     def duplicated_contract?(id)
       self.class.asof(@date.year, @date.month, @date.day) do |_f, path|
         return true if path.include?(id)
       end
       false
     end
+
+    def fee_record(invoice, item, rate)
+      {
+        '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
+
+    def exceed_limit?(invoice, limit)
+      return false if limit.nil?
+
+      contract_start = Contract.find(invoice['contract_id']).dig('terms', 'effective')
+      contract_start.next_month(limit).prev_day < @date
+    end
   end
 end

data/lib/luca_deal/invoice.rb

@@ -5,6 +5,7 @@ require 'json'
 require 'yaml'
 require 'pathname'
 require 'bigdecimal'
+require 'luca_support/code'
 require 'luca_support/config'
 require 'luca_support/mail'
 require 'luca_deal/contract'
@@ -20,21 +21,23 @@ module LucaDeal
     end
 
     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, mode: mode, attachment: attachment_type.to_sym)
-        LucaSupport::Mail.new(mail, PJDIR).deliver
-        self.class.add_status!(path, 'mail_delivered')
+        deliver_one(dat, path, mode: mode, attachment_type: attachment_type)
       end
     end
 
     def preview_mail(attachment_type = nil)
-      deliver_mail(attachment_type, mode: :preview)
+      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|
+        deliver_one(dat, path, mode: :preview, attachment_type: attachment_type)
+      end
     end
 
     # Render HTML to console
@@ -74,6 +77,113 @@ module LucaDeal
       end
     end
 
+    def self.report(date, scan_years = 10, detail: false, due: false)
+      fy_end = Date.new(date.year, date.month, -1)
+      if detail
+        customers = {}.tap do |h|
+          Customer.all.each { |c| h[c['name']] = c }
+        end
+      end
+      [].tap do |res|
+        items = {}
+        head = date.prev_year(scan_years)
+        e = Enumerator.new do |yielder|
+          while head <= date
+            yielder << head
+            head = head.next_month
+          end
+        end
+        e.each do |d|
+          asof(d.year, d.month).map do |invoice|
+            if invoice['settled']
+              next if !due
+              settle_date = invoice['settled']['date'].class.name == "String" ? Date.parse(invoice['settled']['date']) : invoice['settled']['date']
+              next if (settle_date && settle_date <= fy_end)
+            end
+
+            customer = invoice.dig('customer', 'name')
+            items[customer] ||= { 'unsettled' => BigDecimal('0'), 'invoices' => [] }
+            items[customer]['unsettled'] += (invoice.dig('subtotal', 0, 'items') + invoice.dig('subtotal', 0, 'tax')||0)
+            items[customer]['invoices'] << invoice
+          end
+        end
+        items.each do |k, item|
+          row = {
+            'customer' => k,
+            'unsettled' => LucaSupport::Code.readable(item['unsettled']),
+          }
+          if detail
+            row['address'] = %Q(#{customers.dig(k, 'address')}#{customers.dig(k, 'address2')})
+            row['invoices'] = item['invoices'].map{ |i| { 'id' => i['id'], 'issue' => i['issue_date'].to_s } }
+          end
+          res << row
+        end
+        res.sort! { |a, b| b['unsettled'] <=> a['unsettled'] }
+      end
+    end
+
+    # === JSON Format:
+    #   [
+    #     {
+    #       "journals" : [
+    #         {
+    #           "id": "2021A/U001",
+    #           "header": "customer name",
+    #           "diff": -20000
+    #         }
+    #       ]
+    #     }
+    #   ]
+    #
+    def self.settle(io, payment_terms = 1)
+      customers = {}.tap do |h|
+        Customer.all.each { |c| h[c['name']] = c }
+      end
+      contracts = {}.tap do |h|
+        Contract.all.each { |c| h[c['customer_id']] ||= []; h[c['customer_id']] << c }
+      end
+      JSON.parse(io).each do |d|
+        next if d['journals'].nil?
+
+        d['journals'].each do |j|
+          next if j['diff'] >= 0
+
+          if j['header'] == 'others'
+            STDERR.puts "#{j['id']}: no customer header found. skip"
+            next
+          end
+
+          ord = customers.map do |k, v|
+            [v, LucaSupport::Code.match_score(j['header'], k, 2)]
+          end
+          customer = ord.max { |x, y| x[1] <=> y[1] }.dig(0, 'id')
+
+          if customer
+            contract = contracts[customer].length == 1 ? contracts.dig(customer, 0, 'id') : nil
+            date = Date.parse(j['date'])
+            invoices = term(date.prev_month(payment_terms).year, date.prev_month(payment_terms).month, date.year, date.month, contract)
+            invoices.each do |invoice, _path|
+              next if invoice['customer']['id'] != customer
+              next if invoice['issue_date'] > date
+              if Regexp.new("^LucaBook/#{j['id']}").match invoice.dig('settled', 'id')||''
+                break
+              end
+
+              invoice['settled'] = {
+                'id' => "LucaBook/#{j['id']}",
+                'date' => j['date'],
+                'amount' => j['diff']
+              }
+              save(invoice)
+              break
+            end
+          else
+            STDERR.puts "#{j['id']}: no customer found"
+          end
+        end
+      end
+    end
+
     # Output seriarized invoice data to stdout.
     # Returns previous N months on multiple count
     #
@@ -120,17 +230,23 @@ module LucaDeal
     #
     def stats_email
       {}.tap do |res|
-        stats(2).each.with_index(1) do |stat, i|
-          @issue_date = stat['issue_date'] if i == 1
+        stats(3).each.with_index(1) do |stat, i|
           stat['records'].each do |record|
             res[record['customer']] ||= {}
             res[record['customer']]['customer_name'] ||= record['customer']
             res[record['customer']]["amount#{i}"] ||= record['subtotal']
             res[record['customer']]["tax#{i}"] ||= record['tax']
           end
+          if i == 1
+            @issue_date = stat['issue_date']
+            @total_amount = stat['total']
+            @total_tax = stat['tax']
+            @total_count = stat['count']
+          end
         end
         @invoices = res.values
       end
+      @company = CONFIG.dig('company', 'name')
 
       mail = Mail.new
       mail.to = CONFIG.dig('mail', 'preview') || CONFIG.dig('mail', 'from')
@@ -140,6 +256,7 @@ module LucaDeal
     end
 
     def export_json
+      labels = export_labels
       [].tap do |res|
         self.class.asof(@date.year, @date.month) do |dat|
           item = {}
@@ -147,10 +264,14 @@ module LucaDeal
           item['debit'] = []
           item['credit'] = []
           dat['subtotal'].map do |sub|
-            item['debit'] << { 'label' => '売掛金', 'amount' => readable(sub['items']) }
-            item['debit'] << { 'label' => '売掛金', 'amount' => readable(sub['tax']) }
-            item['credit'] << { 'label' => '売上高', 'amount' => readable(sub['items']) }
-            item['credit'] << { 'label' => '売上高', 'amount' => readable(sub['tax']) }
+            if readable(sub['items']) != 0
+              item['debit'] << { 'label' => labels[:debit][:items], 'amount' => readable(sub['items']) }
+              item['credit'] << { 'label' => labels[:credit][:items], 'amount' => readable(sub['items']) }
+            end
+            if readable(sub['tax']) != 0
+              item['debit'] << { 'label' => labels[:debit][:tax], 'amount' => readable(sub['tax']) }
+              item['credit'] << { 'label' => labels[:credit][:tax], 'amount' => readable(sub['tax']) }
+            end
           end
           item['x-customer'] = dat['customer']['name'] if dat.dig('customer', 'name')
           item['x-editor'] = 'LucaDeal'
@@ -167,9 +288,9 @@ module LucaDeal
       gen_invoice!(invoice_object(contract))
     end
 
-    def monthly_invoice
+    def monthly_invoice(target = 'monthly')
       Contract.new(@date.to_s).active do |contract|
-        next if contract.dig('terms', 'billing_cycle') != 'monthly'
+        next if contract.dig('terms', 'billing_cycle') != target
         # TODO: provide another I/F for force re-issue if needed
         next if duplicated_contract? contract['id']
 
@@ -251,10 +372,34 @@ module LucaDeal
       @amount = readable(invoice_dat['subtotal'].inject(0) { |sum, i| sum + i['items'] + i['tax'] })
     end
 
+    def deliver_one(invoice, path, mode: nil, attachment_type: nil)
+      attachment_type ||= CONFIG.dig('invoice', 'attachment') || :html
+      mail = compose_mail(invoice, mode: mode, attachment: attachment_type.to_sym)
+      LucaSupport::Mail.new(mail, PJDIR).deliver
+      self.class.add_status!(path, 'mail_delivered') if mode.nil?
+    end
+
     def lib_path
       __dir__
     end
 
+    # TODO: load labels from CONFIG before country defaults
+    #
+    def export_labels
+      case CONFIG['country']
+      when 'jp'
+        {
+          debit: { items: '売掛金', tax: '売掛金' },
+          credit: { items: '売上高', tax: '売上高' }
+        }
+      else
+        {
+          debit: { items: 'Accounts receivable - trade', tax: 'Accounts receivable - trade' },
+          credit: { items: 'Amount of Sales', tax: 'Amount of Sales' }
+        }
+      end
+    end
+
     # load user company profile from config.
     #
     def set_company

data/lib/luca_deal/no_invoice.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'luca_deal/invoice'
+
+module LucaDeal #:nodoc:
+  # Invoice compatible transactions for other payment methods.
+  #
+  class NoInvoice < Invoice
+    @dirname = 'no_invoices'
+
+    def monthly_invoice
+      super('other_payments')
+    end
+
+    # Override not to send mail to customer.
+    #
+    def deliver_mail(attachment_type = nil, mode: nil)
+    end
+  end
+end

data/lib/luca_deal/setup.rb

@@ -12,7 +12,7 @@ module LucaDeal
         FileUtils.cp("#{__dir__}/templates/config.yml", 'config.yml') unless File.exist?('config.yml')
         Dir.mkdir('data') unless Dir.exist?('data')
         Dir.chdir('data') do
-          %w[contracts customers invoices].each do |subdir|
+          %w[contracts customers invoices no_invoices].each do |subdir|
             Dir.mkdir(subdir) unless Dir.exist?(subdir)
           end
         end

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

@@ -39,9 +39,13 @@
                         <td class="price" colspan="3">Tax</td>
                         <td class="price"><%= delimit_num( @sales_fee['tax'] ) %></td>
                     </tr>
+                    <tr>
+                        <td class="price" colspan="3">Deduction</td>
+                        <td class="price"><%= delimit_num( @sales_fee['deduction'] ) %></td>
+                    </tr>
                     <tr>
                         <td class="price" colspan="3">Total</td>
-                        <td class="price"><%= delimit_num( @sales_fee['fee'] + @sales_fee['tax'] ) %></td>
+                        <td class="price"><%= delimit_num(@sales_fee['fee'] + @sales_fee['tax'] + @sales_fee['deduction']) %></td>
                     </tr>
         </table>
 

data/lib/luca_deal/templates/monthly-payment-list.html.erb

@@ -3,37 +3,51 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
         <style>
-         td { text-align: right; line-height: 2em; min-width: 7em }
+         td { text-align: right; line-height: 2em; min-width: 6em }
          thead th, thead td { text-align: center }
+         thead { border-bottom: solid 1px #aaa }
+         tr#total { border-top: solid 1px #aaa }
          tr.sub { font-size: .8em; color: #aaa }
+         .past { color: #777 }
         </style>
     </head>
     <body>
+        <div style="margin: 1em 0"><%= @company %></div>
         <div style="margin: 1em 0">Issue date: <%= @issue_date %></div>
         <table>
             <thead>
                 <tr>
                     <th>#</th>
                     <th>Customer</th>
-                    <th>Amount</th><th>Tax</th>
-                    <th>Amount</th><th>Tax</th>
+                    <th>This month</th>
+                    <th>Last Month</th>
+                    <th>2 Month ago</th>
                 </tr>
                 <tr class="sub">
                     <th></th>
                     <th></th>
-                    <th>This month</th><th>This month</th>
-                    <th>Last Month</th><th>Last Month</th>
+                    <th>Amount / Tax</th>
+                    <th class="past">Amount / Tax</th>
+                    <th class="past">Amount / Tax</th>
                 </tr>
             </thead>
             <tbody>
                 <% @invoices.each.with_index(1) do |invoice, i| %>
                     <tr>
-                        <td><%= i %></td>
+                        <th><%= i %></th>
                         <td><%= invoice["customer_name"] %></td>
-                        <td><%= invoice["amount1"] %></td><td><%= invoice["tax1"] %></td>
-                        <td><%= invoice["amount2"] %></td><td><%= invoice["tax2"] %></td>
+                        <td><%= delimit_num(invoice["amount1"]) %><br /><%= delimit_num(invoice["tax1"]) %></td>
+                        <td class="past"><%= delimit_num(invoice["amount2"]) %><br /><%= delimit_num(invoice["tax2"]) %></td>
+                        <td class="past"><%= delimit_num(invoice["amount3"]) %><br /><%= delimit_num(invoice["tax3"]) %></td>
                     </tr>
                 <% end %>
+                <tr id="total">
+                    <td></td>
+                    <td>Total (<%= @total_count %> records)</td>
+                    <td><%= delimit_num(@total_amount) %><br /><%= delimit_num(@total_tax) %></td>
+                    <td></td>
+                    <td></td>
+                </tr>
             </tbody>
         </table>
     </body>

data/lib/luca_deal/version.rb

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

data/lib/luca_deal.rb

@@ -8,6 +8,7 @@ module LucaDeal
   autoload :Contract, 'luca_deal/contract'
   autoload :Fee, 'luca_deal/fee'
   autoload :Invoice, 'luca_deal/invoice'
+  autoload :NoInvoice, 'luca_deal/no_invoice'
   autoload :Product, 'luca_deal/product'
   autoload :Setup, 'luca_deal/setup'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucadeal
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.3.0
 platform: ruby
 authors:
 - Chuma Takahiro
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-31 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucarecord
@@ -68,7 +68,7 @@ dependencies:
         version: 12.3.3
 description: 'Deal with contracts
 
-'
+  '
 email:
 - co.chuma@gmail.com
 executables:
@@ -85,6 +85,7 @@ files:
 - lib/luca_deal/customer.rb
 - lib/luca_deal/fee.rb
 - lib/luca_deal/invoice.rb
+- lib/luca_deal/no_invoice.rb
 - lib/luca_deal/product.rb
 - lib/luca_deal/setup.rb
 - lib/luca_deal/templates/.keep
@@ -102,7 +103,7 @@ metadata:
   homepage_uri: https://github.com/chumaltd/luca/tree/master/lucadeal
   source_code_uri: https://github.com/chumaltd/luca/tree/master/lucadeal
   changelog_uri: https://github.com/chumaltd/luca/tree/master/lucadeal/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -117,8 +118,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
-signing_key: 
+rubygems_version: 3.2.5
+signing_key:
 specification_version: 4
 summary: Deal with contracts
 test_files: []