lucadeal 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bccbeee521150eecf98d76d7a6ee89af35378d3d38b23074003be4efb003cb7a
-  data.tar.gz: 3d358fda0bef02a3b25e362d977f14d49b2f5a05641c7195b4b714929f11e665
+  metadata.gz: fa7bf6bd03335ca54d5bf0a1bf2b3e525677ef21e0ea20b009530ba73b310fc9
+  data.tar.gz: 7791dbb5b32566b52ae2bc4209382ca59f1eb95b3f284990f16bd0427f7302ae
 SHA512:
-  metadata.gz: a6bacf4bbb7e4ef9343693a4bec91a5a4617a969fb40dd5f6cd9755434da6bce560f2cd1788c83f9dfd1810cc212b3a1a0325866bea9b903e86853ccbdf84118
-  data.tar.gz: 281a5b540e9746cd84b265e38537584cd2fb1b09372e5e443db4c269ec591bd92db9ab274b33cffaa3dd5b5c22bb65cc30520e56fe3febd19a0e8dfd84f19ada
+  metadata.gz: a1b16a74bfdb56bdbda22f1f5003e24f9f5361d361b38c0875a6d8289607328f670a0f10756dc41af7df92b12c1d3b162f15bf9fa68069d175815e13af70bd74
+  data.tar.gz: fce3bf80a9cf60ac5b904e7c51bd7fa83911cd1b5d59377cfb5cdfcaa49adc63fef2d6fdc2fbb8c8d6f0443cd9434ce0dd9eddd8012694439bc0554c818771f2

data/CHANGELOG.md

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

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
 
@@ -390,6 +400,7 @@ when /invoices?/, 'i'
       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

data/lib/luca_deal/invoice.rb

@@ -221,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
@@ -235,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
@@ -250,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']
@@ -269,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.2'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucadeal
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-18 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