vfwcash 0.6.2 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a923f7717546fa0ad5657bda35b1891027429b2
-  data.tar.gz: 3e3cf60869b88e91c5f7a53d4f40caabbd6c7bb9
+  metadata.gz: 01cc5a2a237aac00aca7a215901eb9a4a50ae8be
+  data.tar.gz: c678096ccdc03dc9f812d54c7a6f3bd2647b2345
 SHA512:
-  metadata.gz: 8f4d91e3635ba6448e9474cef074c359a280d841871f7c37d412b16303756d6c0ab0b2c1686fcfc8d7534239ae4fc6bc3098ac7384e25a52de87f86c3c30c869
-  data.tar.gz: b97948c9aeb2f094d9e302f7e040812f93bdf35abc6cefaad7f58a5717087444dd48e962754d353c15758a4741d8f1af6cffc04b2e6093ef3a36a403ff645b70
+  metadata.gz: deae047d8fa465ddb45d29b0e19c446c13f3db7f434e49a1fb2124debb51046825717bb0803b8b22d3762331f5f734a910b9e74b7fe97fb00337197b83a3fa50
+  data.tar.gz: 56e56720a816258dbbfa67b6960eef57143edc5b936217bcf642a5f094eec7e2cd58934dc07ce644a1dfaa8af5e466d91debdc784d8bdc49f67ef57e0d0dcdb0

data/lib/models/cash_account.rb

@@ -56,15 +56,13 @@ class CashAccount < SqliteBase
   end
 
   def balance_on(date)
-    sp = self.splits.joins(:tran).where('transactions.post_date < ?',date.strftime('%Y%m%d')+'00')
+    sp = self.splits.joins(:tran).where(Tran.arel_table[:post_date].lt(date.to_s(:db)))
     b = sp.sum(:value_num)
   end
 
-  def balances_between(first,last)
-    fdate = first.strftime('%Y%m%d')+'00'
-    ldate = last.strftime('%Y%m%d')+'24'
-    bb = self.balance_on(first)
-    sp = splits_by_month(fdate,ldate)
+  def balances_between(from,to)
+    bb = self.balance_on(from)
+    sp = splits_by_month(from,to)
     credits = sp.where('value_num < ?',0).sum(:value_num)
     debits = sp.where('value_num >= ?', 0).sum(:value_num)
     diff = debits + credits
@@ -72,7 +70,7 @@ class CashAccount < SqliteBase
   end
 
   def splits_by_month(bom,eom)
-    self.splits.joins(:tran).where('transactions.post_date between ? and ?',bom,eom)
+    self.splits.joins(:tran).where(transactions:{post_date: Vfwcash.str_date_range(bom,eom)})
   end
   
   def children_balance(decimal=true)

data/lib/models/gcash.rb

@@ -217,7 +217,10 @@ module Vfwcash
 
     def period_splits(acct)
       flipper = acct.account_type == 'INCOME' ? -1 : 1
-      sp = acct.splits.joins(:tran).where('transactions.post_date between ? and ?',@from.strftime('%Y%m%d')+'00',@to.strftime('%Y%m%d')+'24')
+      # sp = acct.splits.joins(:tran).where('transactions.post_date between ? and ?',@from.strftime('%Y%m%d')+'00',@to.strftime('%Y%m%d')+'24')
+      sp = acct.splits.joins(:tran).where(transactions:{post_date: Vfwcash.str_date_range(@from,@to)})
+
+
       sp.sum(:value_num) * flipper
     end
 

data/lib/models/split.rb

@@ -2,6 +2,13 @@ class Split < SqliteBase
   self.primary_key = 'guid'
   belongs_to :tran, foreign_key: 'tx_guid'
   belongs_to :cash_account, foreign_key: 'account_guid'
+  
+  attribute :rdate, :date
+  after_find do |s|
+    if s.reconcile_date.present?
+      s.rdate = Date.parse(s.reconcile_date)
+    end
+  end
 
   def amount
     return "#{self.value_num / self.value_denom}.#{self.value_num % self.value_denom}"

data/lib/models/tran.rb

@@ -4,9 +4,24 @@ class Tran < SqliteBase
 
 	has_many :splits, foreign_key: 'tx_guid'
 
+  attribute :date, :date
+  after_find do |t|
+    if t.post_date.present?
+      t.date = Date.parse(t.post_date)
+    end
+  end
+
+
+  # def self.month_transactions(date)
+  #   month = Vfwcash.yyyymm(date)
+  #   trans = Tran.where('transactions.post_date BETWEEN ? and ?',month+"00",month+"32").order(:post_date,:num)
+  # end
+
   def self.month_transactions(date)
-    month = Vfwcash.yyyymm(date)
-    trans = Tran.where('transactions.post_date BETWEEN ? and ?',month+"00",month+"32").order(:post_date,:num)
+    bom = date.beginning_of_month.to_s(:db)
+    eom = date.end_of_month.to_s(:db)
+    trans = Tran.where(post_date:(bom..eom)).order(:post_date,:num)
   end
 
+
 end

data/lib/vfwcash.rb

@@ -36,14 +36,30 @@ module Vfwcash
       date = Date.today
     elsif date.class == Date
     else
+      # has to be string
       if date.length == 6
         date += '01'
+        date = Date.parse(date)
+      else
+        date = Date.parse(date)
       end
-      date = Date.parse(date)
     end
     date
   end
 
+  def self.str_date_range(from,to)
+    # used for 
+    db = Tran.last.post_date.include?('-')
+    from = Vfwcash.set_date(from)
+    to = Vfwcash.set_date(to)
+    if db
+      return (from.to_s(:db))..(to.to_s(:db))
+    else
+      return (from.to_s(:number))..(to.to_s(:number))
+    end
+  end
+
+
   def self.money(int)
     dollars = int / 100
     cents = (int % 100) / 100.0

data/lib/vfwcash/api.rb

@@ -3,7 +3,7 @@ module Vfwcash
   class Api
     attr_accessor  :config, :cash
     def initialize(date=nil)
-      @date = date
+      @date = Vfwcash.set_date(date)
       @config = Vfwcash.config
       require_relative './sqlite_base'
       Dir.glob(File.join(LibPath,'models/*')).each do |file|

data/lib/vfwcash/version.rb

@@ -1,3 +1,3 @@
 module Vfwcash
-  VERSION = "0.6.2"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vfwcash
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.1
 platform: ruby
 authors:
 - Steve Alex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-31 00:00:00.000000000 Z
+date: 2018-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -172,6 +172,7 @@ files:
 - pdf_examples/views/checkbooks/split.html.slim
 - pdf_examples/views/checkbooks/summary.html.slim
 - vfwcash-0.6.1.gem
+- vfwcash-0.6.2.gem
 - vfwcash.gemspec
 homepage: ''
 licenses: