lucadeal 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a2f79f88f7a7047f07f4c2137888f43e29cec70129e0b8d79544d4c8137e2f4
-  data.tar.gz: 8d3d2dbf4908f7e5851f64003eaf39fd455f34c1e8f51c07dff7685fa913e036
+  metadata.gz: e1b2a723a3fc191616f5a602a58428797afe69b19f9ee7e8d78d7dd187ae9b73
+  data.tar.gz: b45c547d86312b94b702c68b94999be576c4f14fb55258b7961aa218ff4f74ef
 SHA512:
-  metadata.gz: feb4db73cf4f5d59a1caafb5e18c7e00460e9903244ba9a43ac1781b8a2ffd7b6465d95a309211e98e487b5b77daa5e1463c4647313f001b80f779c2e23354ad
-  data.tar.gz: 6204831c6bb54534a3527c7280a5c761bfb422a52831d1dd4d26b484fc221ddc78a979d5b66e42263c1a6d76ebeb140fefcb54c63a203d8b292e6ce40e5e2e05
+  metadata.gz: 9daff536435c5bcbcc9f6694b4068df22f108d667283eb48754fdda02121f3724312ca0257d7029ec09f27034112af72123e734b2262c6f91c3b93f56a099b4e
+  data.tar.gz: bdd40230688a1080fee49472adc22e8a98e53988aa2822688efc9e8537a0095de7919ec6c2c4a810da8f82e315fa714b2507d1e417dc07140fa0f1f897a31b0e

data/README.md

@@ -75,6 +75,8 @@ Fields for subscription customers are as bellows:
 | terms     |               |          |            |                                                                                                      |
 |           | billing_cycle | optional |            | If 'monthly', invoices are generated on each month.                                                  |
 |           | category      | optional |            | Default: 'subscription'                                                                              |
+| products  |               |          |            | Array of products.                                                                                   |
+|           | id            |          |            | reference for Product                                                            |
 | items     |               |          |            | Array of items.                                                                                      |
 |           | name          |          | x          | Item name.                                                                                           |
 |           | price         |          | x          | Item price.                                                                                          |
@@ -115,6 +117,7 @@ Invoice is basically auto generated from Customer and Contract objects.
 |            | price        | Item price.                              |
 |            | qty          | quantity. Default: 1.                    |
 |            | type         |                                          |
+|            | product_id   | refrence for Product                     |
 | subtotal   |              | Array of subtotal by tax category.       |
 |            | items        | amount of items                          |
 |            | tax          | amount of tax                            |

data/lib/luca_deal/contract.rb

@@ -9,6 +9,7 @@ require 'luca_record'
 module LucaDeal
   class Contract < LucaRecord::Base
     @dirname = 'contracts'
+    @required = ['customer_id', 'terms']
 
     def initialize(date = nil)
       @date = date ? Date.parse(date) : Date.today

data/lib/luca_deal/customer.rb

@@ -10,6 +10,7 @@ require 'luca_record'
 module LucaDeal
   class Customer < LucaRecord::Base
     @dirname = 'customers'
+    @required = ['name']
 
     def initialize(pjdir = nil)
       @date = Date.today

data/lib/luca_deal/invoice.rb

@@ -12,6 +12,7 @@ require 'luca_record'
 module LucaDeal
   class Invoice < LucaRecord::Base
     @dirname = 'invoices'
+    @required = ['issue_date', 'customer', 'items', 'subtotal']
 
     def initialize(date = nil)
       @date = issue_date(date)
@@ -113,16 +114,12 @@ module LucaDeal
         invoice['due_date'] = due_date(@date)
         invoice['issue_date'] = @date
         invoice['sales_fee'] = contract.dig('sales_fee')
-        invoice['items'] = contract.dig('items').map do |item|
-          next if item.dig('type') == 'initial' && subsequent_month?(contract.dig('terms', 'effective'))
-
-          {}.tap do |h|
-            h['name'] = item.dig('name')
-            h['price'] = item.dig('price')
-            h['qty'] = item.dig('qty') || 1
-            h['type'] = item.dig('type') if item.dig('type')
-          end
-        end.compact
+        invoice['items'] = get_products(contract['products'])
+                             .concat(contract['items']&.map { |i| i['qty'] ||= 1; i } || [])
+                             .compact
+        invoice['items'].reject! do |item|
+          item.dig('type') == 'initial' && subsequent_month?(contract.dig('terms', 'effective'))
+        end
         invoice['subtotal'] = subtotal(invoice['items'])
                               .map { |k, v| v.tap { |dat| dat['rate'] = k } }
         gen_invoice!(invoice)
@@ -153,6 +150,20 @@ module LucaDeal
       end
     end
 
+    def get_products(products)
+      return [] if products.nil?
+
+      [].tap do |res|
+        products.each do |product|
+          LucaDeal::Product.find(product['id'])['items'].each do |item|
+            item['product_id'] = product['id']
+            item['qty'] ||= 1
+            res << item
+          end
+        end
+      end
+    end
+
     def gen_invoice!(invoice)
       id = invoice.dig('contract_id')
       self.class.create_record!(invoice, @date, Array(id))
@@ -190,8 +201,9 @@ module LucaDeal
       {}.tap do |subtotal|
         items.each do |i|
           rate = i.dig('tax') || 'default'
+          qty = i['qty'] || 1
           subtotal[rate] = { 'items' => 0, 'tax' => 0 } if subtotal.dig(rate).nil?
-          subtotal[rate]['items'] += i['qty'] * i['price']
+          subtotal[rate]['items'] += qty * i['price']
         end
         subtotal.each do |rate, amount|
           amount['tax'] = (amount['items'] * load_tax_rate(rate)).to_i

data/lib/luca_deal/product.rb

@@ -10,32 +10,40 @@ require 'luca_record'
 module LucaDeal
   class Product < LucaRecord::Base
     @dirname = 'products'
+    @required = ['items']
 
     def list_name
       list = self.class.all.map { |dat| parse_current(dat) }
       YAML.dump(list).tap { |l| puts l }
     end
 
+    # Save data with hash in Product format. Simple format is also available as bellows:
+    #   {
+    #      name: 'item_name(required)', price: 'item_price', qty: 'item_qty',
+    #      initial: { name: 'item_name', price: 'item_price', qty: 'item_qty' }
+    #   }
     def self.create(obj)
-      raise ':name is required' if obj[:name].nil?
-
-      items = [{
-                 'name' => obj[:name],
-                 'price' => obj[:price] || 0,
-                 'qty' => obj[:qty] || 1
-               }]
-      if obj[:initial]
-        items << {
-          'name' => obj.dig(:initial, :name),
-          'price' => obj.dig(:initial, :price) || 0,
-          'qty' => obj.dig(:initial, :qty) || 1,
-          'type' => 'initial'
+      if obj[:name].nil?
+        h = obj
+      else
+        items = [{
+                   'name' => obj[:name],
+                   'price' => obj[:price] || 0,
+                   'qty' => obj[:qty] || 1
+                 }]
+        if obj[:initial]
+          items << {
+            'name' => obj.dig(:initial, :name),
+            'price' => obj.dig(:initial, :price) || 0,
+            'qty' => obj.dig(:initial, :qty) || 1,
+            'type' => 'initial'
+          }
+        end
+        h = {
+          'name' => obj[:name],
+          'items' => items
         }
       end
-      h = {
-        'name' => obj[:name],
-        'items' => items
-      }
       super(h)
     end
   end

data/lib/luca_deal/version.rb

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

metadata

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