lucadeal 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 560b745f485f42d80938858af2ff4cdbe1b2cc9aef27898ca0801430c6d638cd
-  data.tar.gz: f800500cc78a51ca0cb574856493ae43660d659a463f741b442d0887da9027a9
+  metadata.gz: fa7bf6bd03335ca54d5bf0a1bf2b3e525677ef21e0ea20b009530ba73b310fc9
+  data.tar.gz: 7791dbb5b32566b52ae2bc4209382ca59f1eb95b3f284990f16bd0427f7302ae
 SHA512:
-  metadata.gz: 1c1d0abdf72851ceb10a18cf64538aee7ef1c9313d0ab4fc86bcbebf090824e4002670225208b7ddf30c38eb6e064062e15ba15c858f411895c17ce674ca1612
-  data.tar.gz: 1d9f8d246ddd47196860e350662dc34989e810e0f5e9951b380e1028962ce4a0c9a2c926592991d5a8a39036a8ab38fbc38c22b6580bec8372f50ab02753e2f7
+  metadata.gz: a1b16a74bfdb56bdbda22f1f5003e24f9f5361d361b38c0875a6d8289607328f670a0f10756dc41af7df92b12c1d3b162f15bf9fa68069d175815e13af70bd74
+  data.tar.gz: fce3bf80a9cf60ac5b904e7c51bd7fa83911cd1b5d59377cfb5cdfcaa49adc63fef2d6fdc2fbb8c8d6f0443cd9434ce0dd9eddd8012694439bc0554c818771f2

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## LucaDeal 0.5.0
+
+* `luca-deal` command now searches valid sub directory.
+* `luca-deal invoices list` has `--full` option with additional settlement info.
+  * `--mail --full` lists unsettled table.
+
+## LucaDeal 0.4.2
+
+* `luca-deal custoer|invoice|fee list`, `luca-deal reports balance` supports interactive `--explore` w/nushell.
+* `luca-deal invoices settle` checks already settled invoices and renamed customer.
+
 ## LucaDeal 0.4.1
 
 * Limit LucaRecord dependency '>= 0.5.4'

data/exe/luca-deal

@@ -1,6 +1,16 @@
 #!/usr/bin/ruby
 # frozen_string_literal: true
 
+unless Dir.exist?('data') || ARGV[0] == 'new'
+  target = 'customers'
+  Dir.glob('*').reject { |f| File.symlink?(f) }
+    .find { |f| File.directory?("#{f}/data/#{target}") }.tap do |d|
+    abort "No valid data directory, exit..." if d.nil?
+
+    Dir.chdir(d)
+  end
+end
+
 require 'date'
 require 'optparse'
 require 'luca_deal'
@@ -131,7 +141,7 @@ class LucaCmd
         LucaDeal::NoInvoice.new(date).monthly_invoice
         LucaDeal::Fee.new(date).monthly_fee if params[:fee]
         if params[:mail]
-          LucaDeal::Invoice.new(date).stats_email
+          LucaDeal::Invoice.new(date).stats_email(3, mode: 'full')
         end
       else
         date = "#{args[1]}-#{args[2]}-#{args[3] || '1'}" if !args.empty?
@@ -178,9 +188,9 @@ class LucaCmd
         count = 3
       end
       if params[:mail]
-        LucaDeal::Invoice.new(date).stats_email
+        LucaDeal::Invoice.new(date).stats_email(3, mode: params[:mode])
       else
-        render(LucaDeal::Invoice.new(date).stats(count || 1), params)
+        render(LucaDeal::Invoice.new(date).stats(count || 1, mode: params[:mode]), params)
       end
     end
 
@@ -274,7 +284,9 @@ class LucaCmd
     when 'json'
       puts JSON.dump(dat)
     when 'nu'
-      LucaSupport::View.nushell(dat)
+      LucaSupport::View.nushell(dat, :expand)
+    when 'explore'
+      LucaSupport::View.nushell(dat, :explore)
     when 'csv'
       str = CSV.generate(String.new, col_sep: "\t") do |row|
         row << dat.first.keys
@@ -309,6 +321,7 @@ when /customers?/
     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('--explore', 'explore table in nushell') { |_v| params[:output] = 'explore' }
       opt.on('-o', '--output VAL', 'output serialized data') { |v| params[:output] = v }
       args = opt.parse(ARGV)
       LucaCmd::Customer.list(args, params)
@@ -384,8 +397,10 @@ when /invoices?/, 'i'
     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('--explore', 'explore table in nushell') { |_v| params[:output] = 'explore' }
       opt.on('-o', '--output VAL', 'output serialized data') { |v| params[:output] = v }
       opt.on('--mail', 'send payment list by email') { |_v| params[:mail] = true }
+      opt.on('--full', 'add settlement info') { |_v| params[:mode] = 'full' }
       args = opt.parse(ARGV)
       LucaCmd::Invoice.list(args, params)
     end
@@ -432,6 +447,7 @@ when /reports?/, 'r'
     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('--explore', 'explore table in nushell') { |_v| params[:output] = 'explore' }
       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 }
@@ -470,6 +486,7 @@ when /fee/
     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('--explore', 'explore table in nushell') { |_v| params[:output] = 'explore' }
       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)

data/lib/luca_deal/invoice.rb

@@ -150,7 +150,11 @@ module LucaDeal
     #
     def self.settle(io, payment_terms = 1)
       customers = {}.tap do |h|
-        Customer.all.each { |c| h[c['name']] = c }
+        Customer.all.each do |c|
+          LucaSupport::Code.take_history(c, 'name').each do |name|
+            h[name] = c
+          end
+        end
       end
       contracts = {}.tap do |h|
         Contract.all.each { |c| h[c['customer_id']] ||= []; h[c['customer_id']] << c }
@@ -181,6 +185,11 @@ module LucaDeal
               if Regexp.new("^LucaBook/#{j['id']}").match invoice.dig('settled', 'id')||''
                 break
               end
+              next if 0 >= [
+                  invoice.dig('subtotal', 0, 'items'),
+                  invoice.dig('subtotal', 0, 'tax'),
+                  invoice.dig('settled', 'amount')
+                ].compact.sum
 
               invoice['settled'] = {
                 'id' => "LucaBook/#{j['id']}",
@@ -212,7 +221,7 @@ module LucaDeal
     #     total: 100000
     #     tax: 10000
     #
-    def stats(count = 1)
+    def stats(count = 1, mode: nil)
       [].tap do |collection|
         scan_date = @date.next_month
         count.times do
@@ -226,8 +235,13 @@ module LucaDeal
                 'subtotal' => amount,
                 'tax' => tax,
                 'due' => invoice.dig('due_date'),
-                'mail' => invoice.dig('status')&.select { |a| a.keys.include?('mail_delivered') }&.first
-              }
+                'mail' => invoice.dig('status')&.select { |a| a.keys.include?('mail_delivered') }&.first,
+              }.tap do |r|
+                if mode == 'full'
+                  r['settled'] = invoice.dig('settled', 'amount')
+                  r['settle_date'] = invoice.dig('settled', 'date')
+                end
+              end
             end
             stat['issue_date'] = scan_date.to_s
             stat['count'] = stat['records'].count
@@ -241,14 +255,25 @@ module LucaDeal
 
     # send payment list to preview address or from address.
     #
-    def stats_email
+    def stats_email(count = 3, mode: nil)
       {}.tap do |res|
-        stats(3).each.with_index(1) do |stat, i|
+        stats(count, mode: mode).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']]["amount#{i}"] ||= record['subtotal'].to_s
             res[record['customer']]["tax#{i}"] ||= record['tax']
+            next if mode != 'full' || ! record['settled']
+
+            diff = ['subtotal', 'tax', 'settled'].map { |k| record[k] }.compact.sum
+            mark = if diff == 0
+                     '[S]'
+                   elsif diff > 0
+                     '[P]'
+                   else
+                     '[O]'
+                   end
+            res[record['customer']]["amount#{i}"].insert(0, mark)
           end
           if i == 1
             @issue_date = stat['issue_date']
@@ -260,6 +285,16 @@ module LucaDeal
         @invoices = res.values
       end
       @company = CONFIG.dig('company', 'name')
+      @legend = if mode == 'full'
+                  '[S] Settled, [P] Partially settled, [O] Overpaid'
+                else
+                  ''
+                end
+      @unsettled = if mode == 'full'
+                     self.class.report(@date)
+                   else
+                     []
+                   end
 
       mail = Mail.new
       mail.to = CONFIG.dig('mail', 'preview') || CONFIG.dig('mail', 'from')

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

@@ -50,5 +50,28 @@
                 </tr>
             </tbody>
         </table>
+        <div style="margin: 1em 0"><%= @legend %></div>
+
+        <% if ! @unsettled.empty? %>
+            <h3 style="margin: 1em 0">Unsettled</h3>
+            <table>
+                <thead>
+                    <tr>
+                        <th>#</th>
+                        <th>Customer</th>
+                        <th>Balance</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <% @unsettled.each.with_index(1) do |record, i| %>
+                        <tr>
+                            <th><%= i %></th>
+                            <td><%= record['customer'] %></td>
+                            <td><%= record['unsettled'] %></td>
+                        </tr>
+                    <% end %>
+                </tbody>
+            </table>
+        <% end %>
     </body>
 </html>

data/lib/luca_deal/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucadeal
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-11 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucarecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.4
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -111,14 +111,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Deal with contracts