stockor 0.4.0 → 0.5.0

data/lib/skr/models/purchase_order.rb

@@ -41,14 +41,14 @@ module Skr
         after_save :set_maybe_completed!
 
         export_join_tables :details
-        export_scope :with_details, lambda { |should_use=true |
+        scope :with_details, lambda { |should_use=true |
             joins('join po_details as details on details.purchase_order_id = purchase_orders.id')
             .select('purchase_orders.*, details.*') if should_use
-        }
+        }, export: true
 
-        export_scope :only_incoming, lambda { |should_use=true|
+        scope :only_incoming, lambda { |should_use=true|
             with_details.where.not(state: :received) if should_use
-        }
+        }, export: true
 
         enum state: {
             open:      0,

data/lib/skr/models/uom.rb

@@ -51,13 +51,13 @@ module Skr
             Uom.new({ :code=>'EA',:size=>1, :price=>0.0 })
         end
 
-        export_scope :for_sku_loc, lambda{ | sku_loc_id = nil |
+        scope :for_sku_loc, lambda{ | sku_loc_id = nil |
             if sku_loc_id
                 Skr::Uom.joins(sku: [:sku_locs]).where(Skr::SkuLoc.table_name => {id: sku_loc_id})
             else
                 Skr::Uom.none
             end
-        }
+        }, export: true
     end
 
 

data/lib/skr/models/voucher.rb

@@ -28,13 +28,13 @@ module Skr
 
         before_validation :set_defaults, :on=>:create
 
-        export_scope :with_details, lambda { | *args |
+        scope :with_details, lambda { | *args |
             compose_query_using_detail_view( view: 'vo_details', join_to: 'voucher_id' )
-        }
+        }, export: true
 
-        export_scope :unpaid, lambda{ | unused=nil |
+        scope :unpaid, lambda{ | unused=nil |
             where(['vouchers.state <> ? and payment_lines.id is null', 'pending']).includes(:payment_line)
-        }
+        }, export: true
 
         enum state: {
             pending:    0,

data/lib/skr/print/form.rb

@@ -1,25 +1,28 @@
 module Skr
     module Print
 
+        # finds and generates a pdf verison of a document
         class Form
 
             def initialize(form, code)
-                @template = Template.get(form) || raise("Unable to find template for #{form}")
+                @template = Template.get(form) ||
+                            fail("Unable to find template for #{form}")
                 @record   = @template.model.where(hash_code: code).first!
                 @latex    = @template.path_for_record(@record)
                 unless @latex.exist?
-                    raise("Unable to find template type for record")
+                    fail("Unable to find template type for record")
                 end
                 Lanes.logger.debug "Printing #{form} #{code} using #{@latex}"
             end
 
             def as_pdf
-                begin
-                    template.to_stringio
-                rescue => e
-                    Lanes.logger.warn e.log
-                    raise
-                end
+                template.to_stringio
+            rescue ErbLatex::LatexError => e
+                Lanes.logger.warn e.log
+                raise
+            rescue => e
+                Lanes.logger.warn e
+                raise
             end
 
             def as_latex
@@ -38,12 +41,12 @@ module Skr
             end
 
             def template
-                ErbLatex::Template.new( @latex,
-                                        data: data,
-                                        context: Skr::Print::Context,
-                                        layout: ROOT.join('layout.tex.erb'),
-                                        partials_path: ROOT.join('partials'),
-                                        packages_path: ROOT.join('packages')
+                ErbLatex::Template.new(@latex,
+                                       data: data,
+                                       context: Skr::Print::Context,
+                                       layout: ROOT.join('layout.tex.erb'),
+                                       partials_path: ROOT.join('partials'),
+                                       packages_path: ROOT.join('packages')
                                       )
             end
         end

data/lib/skr/version.rb

@@ -1,3 +1,3 @@
 module Skr
-    VERSION='0.4.0'
+    VERSION='0.5.0'
 end

data/spec/fixtures/skr/expense_category.yml

@@ -0,0 +1,17 @@
+misc:
+  code: MISC
+  name: Miscellaneous Expenses
+  gl_account: misc_expense
+  is_active: true
+
+food:
+  code: FOOD
+  name: Dining
+  gl_account: misc_expense
+  is_active: true
+
+trans:
+  code: TRANS
+  name: Transportation Expenses
+  gl_account: trans_expense
+  is_active: true

data/spec/fixtures/skr/expense_entries.yml

@@ -0,0 +1,20 @@
+paper:
+  uuid: f8c45b51-8d87-43bf-ae5b-a86b77133660
+  name: Biggy Office Store
+  memo: Paper for office
+  occured: <%= Time.now - 2.days %>
+  created_by_id: 1
+
+gas:
+  uuid: 3c6dd5c7-7dca-4763-a7c3-5964b6f42e36
+  name: Mr Fuel
+  memo: Gas for truck
+  occured: <%= Time.now - 3.days %>
+  created_by_id: 1
+
+transmission:
+  uuid: 13182d4c-ab49-49bc-85a7-b0aae5eb186f
+  name: Tranny Fixit
+  memo: repairs
+  occured: <%= Time.now - 1.days %>
+  created_by_id: 1

data/spec/fixtures/skr/expense_entry_category.yml

@@ -0,0 +1,19 @@
+paper_misc:
+  category: misc
+  entry: paper
+  amount: 13.48
+
+gas_trans:
+  category: trans
+  entry: gas
+  amount: 53.00
+
+gas_food:
+  category: food
+  entry: gas
+  amount: 12.00
+
+transmission_trans:
+  category: trans
+  entry: transmission
+  amount: 833.88

data/spec/fixtures/skr/gl_account.yml

@@ -55,6 +55,16 @@ utilities:
   name: Utilities
   description: Utility Costs
 
+misc_expense:
+  number: 5200
+  name: Misc Exp
+  description: Miscellaneous Expense
+
+trans_expense:
+  number: 5300
+  name: Trans Exp
+  description: Transportation Expenses
+
 ship:
   number: 5100
   name: Shipping

data/spec/server/handlers/invoice_from_time_entries_spec.rb

@@ -14,7 +14,7 @@ class InvoiceFromTimeEntriesSpec < Skr::TestCase
     let (:controller) {
         subject.new( Invoice, authentication, {}, data )
     }
-    let (:invoice_data)    { controller.perform_creation[:data]['invoice'] }
+    let (:invoice_data)    { controller.create[:data]['invoice'] }
     let (:invoice)         { Invoice.find(invoice_data['id']) }
     let (:time_entry) { skr_time_entry(:siteprep) }
     let (:line)       { invoice.lines.first }
@@ -23,7 +23,7 @@ class InvoiceFromTimeEntriesSpec < Skr::TestCase
         assert_raises(ActiveRecord::RecordNotFound) {
             subject.new(
                 Invoice, authentication, {}, data.merge('time_entry_ids' => [12345])
-            ).perform_creation
+            ).create
         }
     end
 

data/spec/server/handlers/sequential_ids_spec.rb

@@ -6,7 +6,7 @@ class SequentialIdsSpec < Skr::TestCase
 
     let (:authentication) { Lanes::API::AuthenticationProvider.new({}) }
     let (:controller)     { subject.new( Skr::Invoice, authentication, {}, {} ) }
-    let (:sids)    { controller.perform_retrieval[:data]['ids'] }
+    let (:sids)    { controller.show[:data]['ids'] }
 
     it "retrieves the list of sequential ids" do
         assert_kind_of Array, sids

data/spec/server/models/expense_category_spec.rb

@@ -0,0 +1,17 @@
+require_relative '../spec_helper'
+
+class ExpenseCategorySpec < Skr::TestCase
+
+    it "can be saved" do
+        model = ExpenseCategory.new(
+            code: 'FOO', name: 'Category Newer', is_active: true,
+            gl_account: skr_gl_account(:misc_expense)
+        )
+        assert_saves model
+    end
+
+    it 'calculates balance' do
+        assert_equal(skr_expense_category(:trans).balance.to_s, '886.88')
+    end
+
+end

data/spec/server/models/expense_entry_spec.rb

@@ -0,0 +1,44 @@
+require_relative '../spec_helper'
+
+class ExpenseEntrySpec < Skr::TestCase
+
+    it "can be saved" do
+        model = ExpenseEntry.new(
+            name: 'Food Inc'
+        )
+        model.categories.build({
+            amount: 101.42,
+            category: skr_expense_category(:food)
+        })
+        assert_saves model
+    end
+
+    it 'calulates amount from  categories' do
+        entry = skr_expense_entries(:gas)
+        assert_equal entry.amount.to_s,  '65.0'
+    end
+
+    it 'can join with details' do
+        entries = ExpenseEntry.with_category_details.order('occured desc')
+        details = entries.map(&:category_list)
+        assert_equal(details[0].first['amount'], 833.88)
+        assert_equal(details[0].first['balance'], 886.88)
+        assert_equal(details[2].first['balance'], 12.0)
+    end
+
+    it "can query details with a category id" do
+        food = skr_expense_category(:food)
+        entries = ExpenseEntry.with_category_details(food.id)
+        assert_equal(entries.length, 1)
+    end
+
+    it "can be approved" do
+        entry = skr_expense_entries(:gas)
+        bank_account = skr_bank_account(:checking)
+        assert_difference ->{ bank_account.gl_account.trial_balance }, (entry.amount * -1) do
+            assert entry.approve!(bank_account), 'expense failed to save'
+            assert entry.reload.gl_transaction
+        end
+    end
+
+end

data/spec/server/models/invoice_spec.rb

@@ -49,7 +49,6 @@ class InvoiceSpec < Skr::TestCase
                     assert inv.payments.create!(
                                amount: 10.10, bank_account: bank_account
                            )
-                    inv.mark_partialy_paid!
                     assert inv.reload.partialy_paid?
                 end
             end

data/spec/server/models/spec_helper_spec.rb

@@ -1,13 +1,8 @@
 module FixtureHelpers
 
-    extend ActiveSupport::Concern
+    def table_rows
 
-    included do
-        alias_method_chain :table_rows, :custom_autoset_fields
-    end
-
-    def table_rows_with_custom_autoset_fields
-        results = table_rows_without_custom_autoset_fields
+        results = super #table_rows_without_custom_autoset_fields
         if model_class
             results[ table_name ].each do | row |
                 row['visible_id'] ||= Skr::SequentialId.next_for( model_class ) if model_class.column_names.include?('visible_id')
@@ -15,12 +10,12 @@ module FixtureHelpers
                 row['created_at'] = Time.now if model_class.column_names.include?('created_at')
                 row['updated_at'] = Time.now if model_class.column_names.include?('updated_at')
                 # 135138680 == "admin"
-                row['created_by_id'] = 135138680  if model_class.column_names.include?('created_by_id')
-                row['updated_by_id'] = 135138680 if model_class.column_names.include?('updated_by_id')
+                row['created_by_id'] ||= 135138680  if model_class.column_names.include?('created_by_id')
+                row['updated_by_id'] ||= 135138680 if model_class.column_names.include?('updated_by_id')
             end
         end
         results
     end
 end
 
-ActiveRecord::FixtureSet.send :include, FixtureHelpers
+ActiveRecord::FixtureSet.prepend FixtureHelpers

data/spec/server/spec_helper.rb

@@ -1,7 +1,10 @@
-require 'skr'
-require 'lanes/spec_helper'
-require 'webmock/minitest'
-require 'vcr'
+require 'lanes'
+Lanes.silence_logs do
+    require 'skr'
+    require 'lanes/spec_helper'
+    require 'webmock/minitest'
+    require 'vcr'
+end
 
 class Lanes::TestCase
     include Skr
@@ -22,14 +25,9 @@ module Skr
 end
 
 module StockorFixtureTestPatches
-    extend ActiveSupport::Concern
-
-    included do
-        alias_method_chain :table_rows, :custom_autoset_stockor_fields
-    end
 
-    def table_rows_with_custom_autoset_stockor_fields
-        results = table_rows_without_custom_autoset_stockor_fields
+    def table_rows
+        results = super
         if model_class && model_class < ActiveRecord::Base
             results[ table_name ].each do | row |
                 if self['hash_code'].blank? && model_class.column_names.include?('hash_code')
@@ -41,6 +39,9 @@ module StockorFixtureTestPatches
     end
 end
 
+ActiveRecord::FixtureSet.prepend StockorFixtureTestPatches
+
+
 VCR_OPTS = {
     record: :none
 }

data/spec/skr/components/SkuLinesSpec.coffee

@@ -16,6 +16,7 @@ startEdit = (props) ->
                 checkRendered = ->
                     editors = LT.Utils.scryRenderedComponentsWithType(lines,
                         Lanes.Components.Grid.RowEditor)
+
                     if remaining and _.isEmpty(editors)
                         remaining -= 1
                         console.log remaining
@@ -30,24 +31,25 @@ startEdit = (props) ->
         screen   = LT.makeScreen()
         commands = new Lanes.Screens.Commands(screen, modelName: 'sales_order')
         Lanes.Models.Sync.restorePerform =>
-            Skr.Models.SalesOrder.where({visible_id: 1}, include: 'lines')
+            Skr.Models.SalesOrder.where({visible_id: 1021}, include: 'lines')
                 .whenLoaded (orders) =>
                     @sales_order = orders.first()
                     lines = @sales_order.lines
                     @props = {lines, commands, screen}
                     done()
 
-    xit "renders lines", (done) ->
+    it "renders lines", (done) ->
         renderLines(@props).then (lines) =>
-            expect(_.dom(lines).qsa('.grid-body .r').length).toEqual( @props.lines.length )
+            expect(_.dom(lines).qs('.grid-body .r:last-child .c:first-child').text)
+                .toEqual(@sales_order.lines.last().sku_code)
             done()
 
-#     it "displays the editor", (done) ->
-#         startEdit(@props).then ({lines, editor}) =>
-#             sol = @props.lines.last()
-#             expect(_.pluck( _.dom(editor).qsa('input'), 'value'))
-#                 .toEqual([sol.sku_code, sol.description, sol.uom_code, "#{sol.qty}", sol.price.toString()])
-#             done()
+    # it "displays the editor", (done) ->
+    #     startEdit(@props).then ({lines, editor}) =>
+    #         sol = @sales_order.lines.last()
+    #         expect(_.pluck( _.dom(editor).qsa('input'), 'value'))
+    #             .toEqual([sol.sku_code, sol.description, sol.uom_code, "#{sol.qty}", sol.price.toString()])
+    #         done()
 
 #     it "saves values when edited", (done) ->
 #         startEdit(@props).then ({lines, editor}) =>

data/spec/skr/models/CustomerSpec.coffee

@@ -11,7 +11,7 @@ describe "Skr.Models.Customer", ->
     it "saves when fields are set", (done) ->
         model = new Skr.Models.Customer(
             code: "SPECTEST", name: "A Spec Test Customer"
-            terms: {code: 'SPECTESTER'}
+            terms: {code: 'SPECTESTER', description: 'SPEC test'}
             billing_address:  { name: "Billing Address" }
             shipping_address: { name: "Shipping Address" }
         )

data/spec/skr/models/ExpenseAccountSpec.coffee

@@ -0,0 +1,5 @@
+describe "Skr.Models.ExpenseAccount", ->
+
+    # it "can be instantiated", ->
+    #     model = new Skr.Models.ExpenseAccount()
+    #     expect(model).toEqual(jasmine.any(Skr.Models.ExpenseAccount))

data/spec/skr/screens/expense-categories/ExpenseCategoriesSpec.coffee

@@ -0,0 +1,5 @@
+#describe "Skr.Screens.ExpenseCategories", ->
+
+#    it "can be rendered", ->
+        # screen = LT.renderComponent(Skr.Screens.ExpenseCategories)
+        # expect(_.dom(screen).text).toBeDefined()

data/spec/skr/screens/expense-entry/ExpenseEntrySpec.coffee

@@ -0,0 +1,5 @@
+describe "Skr.Screens.ExpenseEntry", ->
+
+    it "can be rendered", ->
+        screen = LT.renderComponent(Skr.Screens.ExpenseEntry)
+        expect(_.dom(screen).text).toBeDefined()

data/spec/skr/screens/locations/LocationsSpec.coffee

@@ -1,5 +1,5 @@
-describe "Skr.Screens.Locations", ->
+# describe "Skr.Screens.Locations", ->
 
-    it "can be rendered", ->
-        screen = LT.renderComponent(Skr.Screens.Locations)
-        expect(_.dom(screen).el.textContent).toMatch(/Code/)
+#     it "can be rendered", ->
+#         screen = LT.renderComponent(Skr.Screens.Locations)
+#         expect(_.dom(screen).el.textContent).toMatch(/Code/)