lucadeal 0.2.25 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68b497e68738101eafbfe6eab73c3e0cf8d297cf4676ccfb8cd05efdadc273a3
-  data.tar.gz: fb8ed0c2d5eb0f7621c4436ddad91ece16aa723f2861ecd661423802ec01d0c4
+  metadata.gz: 060bcea890091dbe70e03718d1a8871bccf4873db86922d505e0e2c3ffefd94a
+  data.tar.gz: 3d202e5711a7e1d28cadb5a4debbda18900b7ab7ea4d6e5e413d52980c1cb84f
 SHA512:
-  metadata.gz: 5c8941a80f26d67b4855f2757e00f8241dd0b73f37f0fe2ab8799500388118bec4513fcb398116ba8072889bedf97a083fbb2c4ce3fdd4219cb7a15844785b1c
-  data.tar.gz: 91a84225d3d46201f85e9e38bbedbc102b2a3aaf2ccbf0a812db56bc3b502b78b7f89cb4087ec09642db5ff49b4abe58c15f6632bcbee18d471e95f3c1ff2a20
+  metadata.gz: 7a61af30d3b434edf10ab8553b3f878646354dd6e838a93405483b476ab3d8456713a745c0eb2a99eefdbc233ed662a87d4645c7a94b375924e2d8f347208c00
+  data.tar.gz: ca88eff9ed7c7c8dd815089ccdb34bd8dcd0813ae58dbb3b026db4833373a4cb33cb2b91eea27fce67b599a9a43b6e27796ed14ef1c2da6c60cf7308e389ea7f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 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.

data/README.md

@@ -167,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   |              |                                          |
@@ -183,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

@@ -186,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']
@@ -195,6 +200,11 @@ 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
@@ -257,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
@@ -373,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
@@ -381,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'
@@ -436,8 +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/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'
@@ -76,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
     #

data/lib/luca_deal/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucadeal
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.3.0
 platform: ruby
 authors:
 - Chuma Takahiro
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-30 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:
@@ -103,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
@@ -118,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: []