lucadeal 0.2.16 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f17d75af6f101c60eced0ecfb770e39ac66b0f35725a6976f135216a0c75099
-  data.tar.gz: d3e60d51908e78ab72e177f29affc26864744afb584d1c5dadd507b18ff888f6
+  metadata.gz: d8159099446dcdae1b4c928d4eac5861cd35fe13f8d37155cdf28dafb30fc21e
+  data.tar.gz: 3c086a2ea6c4c9ec6bc9014fa9500ab9fde0a07c1778a5817fbb64e7409b5670
 SHA512:
-  metadata.gz: bd534c31a33405478cdeba88777481f5c17af6337cf743e2d16a8e5027209a65d1efb8329cf7f6e72318dfea8c3daa1965d9cf1e833ce93b85d24925c17638f6
-  data.tar.gz: f1d809de08ce94cf7da913c5bc733515f95bba596dc155596880cb4776837113c36f93ee4247c35fe34990f2a45fd758df1bddec3d2e587d182062cdb5893c60
+  metadata.gz: 0a26cec96f1a0805044470f8710b36b60aacf344bad53527c2a9fd4ff64557a06836e4eefec21f083e0b51bc48a9854dbe2fdd6fed4d4754aba9fe51fa5890ce
+  data.tar.gz: 8a611e016833673fb1e7fcab747a24d4bfdb4152a60086791a1377d8576feb181255c8b2a0dfeca2f6807a4d11d4d2f579be6353ca62a7996a5f960d8b4f1311

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## LucaDeal 0.2.18
+
+* Breaking change: restructure CLI in sub-sub command format.
+* Add 'x-customer', 'x-editor' on export to LucaBook
+
+## LucaDeal 0.2.17
+
+* `luca-deal export` export JSON for LucaBook
+
 ## LucaDeal 0.2.14
 
 * Introduce Product for selling items template.

data/README.md

@@ -22,7 +22,46 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+You can create project skelton with `new` sub command.
+
+```
+$ luca-deal new Dir
+```
+
+Example assumes setup with bundler shim. `bundle exec` prefix may be needed in most cases.
+
+
+### Manage Contract
+
+Customer object can be created by `customer create` subcommand with name.
+
+```
+$ luca-deal customer create CustomerName
+Successfully generated Customer  5976652cc2d9c0ebf4a8646f7a28aa8d6bd2d606
+Edit customer detail.
+```
+
+Customer is filed under `data/customers` as YAML. Detail need to be editted.  
+Then, Contract object is created by `contract create` sub command with customer id.
+
+```
+$ luca-deal contract create 5976652cc2d9c0ebf4a8646f7a28aa8d6bd2d606
+uccessfully generated Contract  814c6fc9fffe5566fe8e7ef683b439b355d612dc
+Conditions are tentative. Edit contract detail.
+```
+
+Contract is filed under `data/contracts` as YAML. Detail need to be editted.
+
+
+### Issue invoice
+
+Monthly invoices are generated with `invoice create --monthly` sub command. Target month is optional. Without month, this month including today is the target.
+
+```
+$ luca-deal invoice create --monthly [yyyy m]
+```
+
+Invoice conditions are defined by contracts.
 
 
 ## Data Structure

data/exe/luca-deal

@@ -5,57 +5,102 @@ require 'date'
 require 'optparse'
 require 'luca_deal'
 
-def customer(args = nil, params = {})
-  case params['mode']
-  when 'list'
-    LucaDeal::Customer.new.list_name
-  when 'create'
-    if params['name']
-      id = LucaDeal::Customer.create(name: params['name'])
-      puts "Successfully generated Customer  #{id}" if id
-      puts 'Edit customer detail.' if id
-    else
-      puts 'requires customer\'s name. exit'
-      exit 1
+module LucaCmd
+  class Customer
+    def self.create(args = nil, params = {})
+      if args
+        id = LucaDeal::Customer.create(name: args[0])
+        puts "Successfully generated Customer  #{id}" if id
+        puts 'Edit customer detail.' if id
+      else
+        puts 'requires customer\'s name. exit'
+        exit 1
+      end
+    end
+
+    def self.delete(args = nil, params = {})
+      if args
+        id = LucaDeal::Customer.delete(args[0])
+      else
+        puts 'requires customer\'s id. exit'
+        exit 1
+      end
+    end
+
+    def self.list(args = nil, params = {})
+      LucaDeal::Customer.new.list_name
     end
-  else
-    puts 'invalid option. --help for usage'
-    exit 1
   end
-end
 
-def contract(args = nil, params = {})
-  case params['mode']
-  when 'create'
-    if params['customer_id']
-      id = LucaDeal::Contract.new.generate!(params['customer_id'], params['category'])
-      puts "Successfully generated Contract  #{id}" if id
-      puts 'Conditions are tentative. Edit contract detail.' if id
-    else
-      puts 'requires customer\'s id. exit'
-      exit 1
+  class Contract
+    def self.create(args = nil, params = {})
+      if args
+        id = LucaDeal::Contract.new.generate!(args[0], params['category'])
+        puts "Successfully generated Contract  #{id}" if id
+        puts 'Conditions are tentative. Edit contract detail.' if id
+      else
+        puts 'requires customer\'s id. exit'
+        exit 1
+      end
+    end
+
+    def self.delete(args = nil, params = {})
+      if args
+        id = LucaDeal::Contract.delete(args[0])
+      else
+        puts 'requires contract id. exit'
+        exit 1
+      end
     end
-  else
   end
-end
 
-def invoice(args = nil, params = {})
-  date = "#{args[0]}-#{args[1]}-#{args[2] || '1'}" if !args.empty?
-  case params['mode']
-  when 'monthly'
-    LucaDeal::Invoice.new(date).monthly_invoice
-  when 'mail'
-    LucaDeal::Invoice.new(date).deliver_mail
-  when 'preview'
-    LucaDeal::Invoice.new(date).preview_mail
-  when 'stats'
-    if args.empty?
-      date = "#{Date.today.year}-#{Date.today.month}-1"
-      count = 3
-    end
-    LucaDeal::Invoice.new(date).stats(count || 1)
-  else
-    puts 'not implemented mode'
+  class Invoice
+    def self.create(args = nil, params = {})
+      date = "#{args[0]}-#{args[1]}-#{args[2] || '1'}" if !args.empty?
+      case params['mode']
+      when 'monthly'
+        LucaDeal::Invoice.new(date).monthly_invoice
+      else
+        puts 'not implemented mode'
+      end
+    end
+
+    def self.delete(args = nil, params = {})
+      if args
+        id = LucaDeal::Invoice.delete(args[0])
+      else
+        puts 'requires contract id. exit'
+        exit 1
+      end
+    end
+
+    def self.export(args = nil, _params = nil)
+      if args
+        args << 28 if args.length == 2 # specify safe last day
+        LucaDeal::Invoice.new(args.join('-')).export_json
+      else
+        LucaDeal::Invoice.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?
+        date = "#{Date.today.year}-#{Date.today.month}-1"
+        count = 3
+      end
+      LucaDeal::Invoice.new(date).stats(count || 1)
+    end
+
+    def self.mail(args = nil, params = {})
+      date = "#{args[0]}-#{args[1]}-#{args[2] || '1'}" if !args.empty?
+      case params['mode']
+      when 'preview'
+        LucaDeal::Invoice.new(date).preview_mail
+      else
+        LucaDeal::Invoice.new(date).deliver_mail
+      end
+    end
   end
 end
 
@@ -65,44 +110,75 @@ end
 
 LucaRecord::Base.valid_project?
 cmd = ARGV.shift
+params = {}
 
 case cmd
-when 'customer'
-  params = {}
-  OptionParser.new do |opt|
-    opt.banner = 'Usage: luca-deal customer [options]'
-    opt.on('--list', 'list all customers') { |v| params['mode'] = 'list' }
-    opt.on('--create CustomerName', 'register new customer') do |v|
-      params['mode'] = 'create'
-      params['name'] = v
+when /customers?/
+  subcmd = ARGV.shift
+  case subcmd
+  when 'list'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-deal customers list [options]'
+      args = opt.parse(ARGV)
+      LucaCmd::Customer.list(args, params)
     end
-    args = opt.parse(ARGV)
-    customer(args, params)
-  end
-when 'contract'
-  params = {}
-  OptionParser.new do |opt|
-    opt.banner = 'Usage: luca-deal contract [options]'
-    opt.on('--create CustomerId', 'register new contract') do |v|
-      params['mode'] = 'create'
-      params['customer_id'] = v
+  when 'create'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-deal customers create CustomerName'
+      args = opt.parse(ARGV)
+      LucaCmd::Customer.create(args, params)
     end
-    opt.on('--salesfee', 'create contract as sales fee definition') do |_v|
-      params['category'] = 'sales_fee'
+  when 'delete'
+    LucaCmd::Customer.delete(ARGV)
+  else
+    puts 'Usage: luca-deal customers sub-commands'
+  end
+when /contracts?/
+  subcmd = ARGV.shift
+  case subcmd
+  when 'create'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-deal contracts create [options] CustomerId'
+      opt.on('--salesfee', 'create contract as sales fee definition') do |_v|
+        params['category'] = 'sales_fee'
+      end
+      args = opt.parse(ARGV)
+      LucaCmd::Contract.create(args, params)
     end
-    args = opt.parse(ARGV)
-    contract(args, params)
+  when 'delete'
+    LucaCmd::Contract.delete(ARGV)
+  else
+    puts 'Usage: luca-deal contracts Subcommand'
   end
-when 'invoice'
-  params = {}
-  OptionParser.new do |opt|
-    opt.banner = 'Usage: luca-deal invoice [options] year month [date]'
-    opt.on('--monthly', 'generate monthly data') { |v| params['mode'] = 'monthly' }
-    opt.on('--mail', 'send to customers') { |v| params['mode'] = 'mail' }
-    opt.on('--preview', 'send to preview user') { |v| params['mode'] = 'preview' }
-    opt.on('--stats', 'list invoices') { |v| params['mode'] = 'stats' }
-    args = opt.parse(ARGV)
-    invoice(args, params)
+when 'export'
+  LucaCmd::Invoice.export(ARGV)
+when /invoices?/, 'i'
+  subcmd = ARGV.shift
+  case subcmd
+  when 'create'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-deal invoices create [options] year month [date]'
+      opt.on('--monthly', 'generate monthly data') { |v| params['mode'] = 'monthly' }
+      args = opt.parse(ARGV)
+      LucaCmd::Invoice.create(args, params)
+    end
+  when 'delete'
+    LucaCmd::Invoice.delete(ARGV)
+  when 'list'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-deal invoices list [options] year month [date]'
+      args = opt.parse(ARGV)
+      LucaCmd::Invoice.list(args, params)
+    end
+  when 'mail'
+    OptionParser.new do |opt|
+      opt.banner = 'Usage: luca-deal invoices mail [options] year month [date]'
+      opt.on('--preview', 'send to preview user') { |v| params['mode'] = 'preview' }
+      args = opt.parse(ARGV)
+      LucaCmd::Invoice.mail(args, params)
+    end
+  else
+    puts 'Usage: luca-deal invoices SubCommand'
   end
 when 'new'
   params = {}
@@ -112,7 +188,8 @@ when 'new'
   end
 else
   puts 'Usage: luca-deal sub-command [--help|options]'
-  puts '        customer'
-  puts '        contract'
-  puts '        invoice'
+  puts '        customers'
+  puts '        contracts'
+  puts '        invoices'
+  puts '        export'
 end

data/lib/luca_deal/invoice.rb

@@ -1,6 +1,7 @@
 require 'luca_deal/version'
 
 require 'mail'
+require 'json'
 require 'yaml'
 require 'pathname'
 require 'bigdecimal'
@@ -101,6 +102,27 @@ module LucaDeal
       end
     end
 
+    def export_json
+      [].tap do |res|
+        self.class.asof(@date.year, @date.month) do |dat|
+          item = {}
+          item['date'] = dat['issue_date']
+          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']) }
+          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 monthly_invoice
       LucaDeal::Contract.new(@date.to_s).active do |contract|
         next if contract.dig('terms', 'billing_cycle') != 'monthly'

data/lib/luca_deal/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucadeal
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.18
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-08 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucarecord