stockor 0.4.0 → 0.5.0

data/spec/skr/screens/time-tracking/TimeTrackingSpec.coffee

@@ -8,7 +8,7 @@ describe "Skr.Screens.TimeTracking", ->
                 _.dom(@screen).qs('button[value=month]').click()
 
 
-    it "renders monthly totals", ->
-        _.dom(@screen).qs('button[value=month]').click()
-        totals = _.pluck _.dom(@screen).qsa('.day.summary > div'), 'textContent'
-        expect(totals).toEqual(["28.75", "14.50", "1.50", "2.00"])
+    # it "renders monthly totals", ->
+    #     _.dom(@screen).qs('button[value=month]').click()
+    #     totals = _.map _.dom(@screen).qsa('.day.summary'), 'textContent'
+    #     expect(totals).toEqual(['', '', '30.25', '', ''])

data/stockor.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.1'
 
-  spec.add_dependency 'aasm', '~>4.10.1'
+  spec.add_dependency 'aasm', '~> 4.11'
   spec.add_dependency 'erb_latex', '1.0'
-  spec.add_dependency 'lanes', '~> 0.5.5'
+  spec.add_dependency 'lanes', '~> 0.6'
   spec.add_dependency 'numbers_in_words', '~> 0.4.0'
   spec.add_dependency 'ruby-freshbooks', '~> 0.4'
   spec.add_dependency 'activemerchant', '~> 1.59'
@@ -39,5 +39,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "guard-minitest"
 
-
 end

data/templates/print/partials/header.tex.erb

@@ -1,5 +1,5 @@
 \lhead{
-  \begin{tabularx}{\textwidth} {lXr}
+  \begin{tabularx}{\textwidth} {l>{\raggedright\arraybackslash}Xr}
     %<% if @location.get_logo.present? %>
 \raisebox{1mm}{\includegraphics[align=t,height=18mm,keepaspectratio]{<%= @location.get_logo.file.path %>}}
   %<% end %>

data/templates/print/partials/skus_table_invoice_footer.tex.erb

@@ -14,22 +14,25 @@
 
 %  \hline
 <% unless @record.open? -%>
-  \multicolumn{<%= @ncols-1%>}{r}{{\textbf{Amount Paid}}} &
-  \textbf{\textsuperscript{\$}<%= Skr::String.number_with_delimiter @record.amount_paid %>} \\
-  \cline{<%= @ncols-3%>-<%= @ncols%>}
-%  \hline
-%
- &
-\multicolumn{<%= 1 %>}{l}{{
-\begin{rotate}{12}
-\resizebox{!}{16pt}{\texttt{\textcolor{BrickRed}{
-<%= @record.fully_paid? ? 'PAID IN FULL' : 'PARTIALLY PAID' %>
-}}}
-\end{rotate}
-}} &
-%
-  \multicolumn{<%= @ncols-3%>}{r}{{\textbf{Unpaid Amount}}} &
-  \textbf{\textsuperscript{\$}<%= Skr::String.number_with_delimiter @record.unpaid_amount %>} \\
-  \cline{<%= @ncols-3%>-<%= @ncols%>}
-%  \hline
-<% end -%>
+    \multicolumn{<%= @ncols-1%>}{r}{{\textbf{Amount Paid}}} &
+    \textbf{\textsuperscript{\$}<%= Skr::String.number_with_delimiter @record.payments.total %>} \\
+    \cline{<%= @ncols-3%>-<%= @ncols%>}
+  %  \hline
+  %
+   &
+  \multicolumn{<%= 1 %>}{l}{{
+  \begin{rotate}{12}
+  \resizebox{!}{16pt}{\texttt{\textcolor{BrickRed}{
+  <%= @record.fully_paid? ? 'PAID IN FULL' : 'PARTIALLY PAID' %>
+  }}}
+  \end{rotate}
+  }} &
+    <% if @record.unpaid_amount < 0 %>
+      \multicolumn{<%= @ncols-3%>}{r}{{\textbf{Overpaid Amount}}} &
+      \textbf{\textsuperscript{\$}<%= Skr::String.number_with_delimiter( @record.unpaid_amount * -1 ) %>} \\
+    <% else %>
+      \multicolumn{<%= @ncols-3%>}{r}{{\textbf{Unpaid Amount}}} &
+      \textbf{\textsuperscript{\$}<%= Skr::String.number_with_delimiter @record.unpaid_amount %>} \\
+    <% end -%>
+    \cline{<%= @ncols-3%>-<%= @ncols%>}
+<% end %>

data/templates/print/partials/skus_table_invoice_info_line.tex.erb

@@ -1,8 +1,12 @@
+<% cols = 2
+   cols += 1 unless @invoice.po_num.blank?
+   cols += 1 if @invoice.sales_order
+%>
 \medskip
 \begingroup
 \renewcommand{\arraystretch}{1.5}
 \setlength{\LTpre}{0pt}
-\begin{tabu} to \textwidth { | *{3}{X[l]|} *{3}{l|}  }
+\begin{tabu} to \textwidth { |*{<%=cols%>}{X[l]|} }
 \hline
 <% unless @invoice.po_num.blank? -%>
        PO \#:  <%=q @invoice.po_num %> &

data/templates/print/types/payment/default.tex.erb

@@ -7,13 +7,12 @@
 \noindent
 
 \begin{textblock}{195}(10,10)
+\begin{tabularx}{\columnwidth}{l>{\raggedright\arraybackslash}X>{\raggedright\arraybackslash}Xr}
 <% if (logo = @payment.location.get_logo).present? -%>
-  \begin{tabularx}{\columnwidth}{lXXr}
-    \includegraphics[align=t,height=14mm,keepaspectratio]{<%= logo.file.path %>} &
-<% else -%>
-  \begin{tabularx}{\columnwidth}{XXr}
+    \includegraphics[align=t,height=14mm,keepaspectratio]{<%= logo.file.path %>}
 <% end -%>
-  \small <%= break_lines @payment.location.address.to_s(include: [:phone]) %> &
+ &
+ \small <%= break_lines @payment.location.address.to_s(include: [:phone]) %> &
   \scriptsize <%= break_lines @payment.bank_account.address.to_s(include: [:phone]) %> &
   \raisebox{-3mm}{\shadowbox{\large\bf {CHECK \# <%= @payment.check_number %> } }}\\
  \end{tabularx}
@@ -32,17 +31,18 @@
     \end{tabu}
   \end{textblock}
 %
+\renewcommand{\tabularxcolumn}[1]{>{\large}m{#1}}
 \begin{textblock}{200}(10,50)
   \noindent
-  \begin{tabu} to \columnwidth{lX}
+  \begin{tabularx}{\columnwidth}{l>{\raggedright\arraybackslash}X}
     \parbox{5em}{\textit{PAY \newline
         TO THE \newline
         ORDER\newline
         OF}}
-    & \parbox{\linewidth}{\large{<%=q @payment.name %> } \newline
-    <%= break_lines( @payment.address ) %> } \\
-      \end{tabu}
-    \end{textblock}
+    & <%=q @payment.name %> \newline
+    <%= break_lines( @payment.address ) %> \\
+  \end{tabularx}
+\end{textblock}
 \begin{textblock}{70}(120,65)
   \noindent
   \begin{tabu} to \columnwidth{X[1,c,p]}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stockor
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-30 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.10.1
+        version: '4.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.10.1
+        version: '4.11'
 - !ruby/object:Gem::Dependency
   name: erb_latex
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: numbers_in_words
   requirement: !ruby/object:Gem::Requirement
@@ -239,7 +239,6 @@ files:
 - client/skr/api/Models/Sku.coffee
 - client/skr/api/SingleItemCheckout.cjsx
 - client/skr/api/namespace.js
-- client/skr/api/onReady.coffee
 - client/skr/components/.gitkeep
 - client/skr/components/BankAccountFinder.cjsx
 - client/skr/components/CreditCardForm.cjsx
@@ -247,6 +246,7 @@ files:
 - client/skr/components/CustomerFinder.cjsx
 - client/skr/components/CustomerLink.cjsx
 - client/skr/components/CustomerProjectFinder.cjsx
+- client/skr/components/ExpenseCategoryFinder.cjsx
 - client/skr/components/GlAccountChooser.cjsx
 - client/skr/components/InvoiceFinder.cjsx
 - client/skr/components/InvoiceLink.cjsx
@@ -272,6 +272,9 @@ files:
 - client/skr/components/address/styles.scss
 - client/skr/components/styles.scss
 - client/skr/index.js
+- client/skr/lib/Remote.coffee
+- client/skr/lib/index.js
+- client/skr/lib/namespace.coffee
 - client/skr/models/Address.coffee
 - client/skr/models/BankAccount.coffee
 - client/skr/models/Base.coffee
@@ -279,6 +282,9 @@ files:
 - client/skr/models/CreditCardGateway.coffee
 - client/skr/models/Customer.coffee
 - client/skr/models/CustomerProject.coffee
+- client/skr/models/ExpenseCategory.coffee
+- client/skr/models/ExpenseEntry.coffee
+- client/skr/models/ExpenseEntryCategory.coffee
 - client/skr/models/GlAccount.coffee
 - client/skr/models/GlManualEntry.coffee
 - client/skr/models/GlPeriod.coffee
@@ -332,6 +338,18 @@ files:
 - client/skr/screens/customer-projects/CustomerProjects.cjsx
 - client/skr/screens/customer-projects/index.js
 - client/skr/screens/customer-projects/index.scss
+- client/skr/screens/expense-categories/ExpenseCategories.cjsx
+- client/skr/screens/expense-categories/index.js
+- client/skr/screens/expense-categories/index.scss
+- client/skr/screens/expense-entry/ApprovalRequest.coffee
+- client/skr/screens/expense-entry/ApproveDialog.cjsx
+- client/skr/screens/expense-entry/Categories.cjsx
+- client/skr/screens/expense-entry/ExpenseEntry.cjsx
+- client/skr/screens/expense-entry/Form.cjsx
+- client/skr/screens/expense-entry/Grid.cjsx
+- client/skr/screens/expense-entry/ScreenState.coffee
+- client/skr/screens/expense-entry/index.js
+- client/skr/screens/expense-entry/index.scss
 - client/skr/screens/fresh-books-import/ApiInfo.cjsx
 - client/skr/screens/fresh-books-import/ChooseRecords.cjsx
 - client/skr/screens/fresh-books-import/FreshBooksImport.cjsx
@@ -346,6 +364,7 @@ files:
 - client/skr/screens/gl-transactions/index.scss
 - client/skr/screens/invoice/Invoice.cjsx
 - client/skr/screens/invoice/Payment.cjsx
+- client/skr/screens/invoice/TotalExtraInfo.cjsx
 - client/skr/screens/invoice/index.js
 - client/skr/screens/invoice/index.scss
 - client/skr/screens/locations/Locations.cjsx
@@ -443,6 +462,8 @@ files:
 - db/migrate/20160605024432_create_sku_associations_views.rb
 - db/migrate/20160608023553_create_invoice_payments.rb
 - db/migrate/20160620010455_add_payments_to_inv_details.rb
+- db/migrate/20160726004411_string_check_numbers.rb
+- db/migrate/20160805002717_create_expenses.rb
 - db/schema.sql
 - db/seed.rb
 - db/seed/chart_of_accounts.yml
@@ -469,6 +490,7 @@ files:
 - lib/skr/configuration.rb
 - lib/skr/db/migration_helpers.rb
 - lib/skr/extension.rb
+- lib/skr/handlers/approve_expense_entries.rb
 - lib/skr/handlers/credit_card_gateway.rb
 - lib/skr/handlers/fresh_books_import.rb
 - lib/skr/handlers/invoice_from_time_entries.rb
@@ -485,6 +507,9 @@ files:
 - lib/skr/models/business_entity.rb
 - lib/skr/models/customer.rb
 - lib/skr/models/customer_project.rb
+- lib/skr/models/expense_category.rb
+- lib/skr/models/expense_entry.rb
+- lib/skr/models/expense_entry_category.rb
 - lib/skr/models/gl_account.rb
 - lib/skr/models/gl_manual_entry.rb
 - lib/skr/models/gl_period.rb
@@ -534,6 +559,9 @@ files:
 - spec/fixtures/skr/bank_account.yml
 - spec/fixtures/skr/customer.yml
 - spec/fixtures/skr/customer_project.yml
+- spec/fixtures/skr/expense_category.yml
+- spec/fixtures/skr/expense_entries.yml
+- spec/fixtures/skr/expense_entry_category.yml
 - spec/fixtures/skr/gl_account.yml
 - spec/fixtures/skr/gl_manual_entry.yml
 - spec/fixtures/skr/gl_period.yml
@@ -574,6 +602,8 @@ files:
 - spec/server/jobs/fresh_books/retrieve_spec.rb
 - spec/server/models/address_spec.rb
 - spec/server/models/customer_spec.rb
+- spec/server/models/expense_category_spec.rb
+- spec/server/models/expense_entry_spec.rb
 - spec/server/models/gl_account_spec.rb
 - spec/server/models/gl_manual_entry_spec.rb
 - spec/server/models/gl_period_spec.rb
@@ -609,13 +639,13 @@ files:
 - spec/server/print/template_spec.rb
 - spec/server/spec_helper.rb
 - spec/server/time_entry_spec.rb
-- spec/skr/api/SingleItemCheckoutSpec.cjsx
 - spec/skr/components/SkuLinesSpec.coffee
 - spec/skr/concerns/code_identifier_spec.rb
 - spec/skr/models/AddressSpec.coffee
 - spec/skr/models/BankAccountSpec.coffee
 - spec/skr/models/CustomerProjectSpec.coffee
 - spec/skr/models/CustomerSpec.coffee
+- spec/skr/models/ExpenseAccountSpec.coffee
 - spec/skr/models/GlAccountSpec.coffee
 - spec/skr/models/GlManualEntrySpec.coffee
 - spec/skr/models/GlPeriodSpec.coffee
@@ -648,16 +678,12 @@ files:
 - spec/skr/models/VoucherSpec.coffee
 - spec/skr/screens/Base.coffee
 - spec/skr/screens/CustomerMaint.coffee
-- spec/skr/screens/bank-maint/BankMaintSpec.coffee
 - spec/skr/screens/customer-projects/CustomerProjectsSpec.coffee
+- spec/skr/screens/expense-categories/ExpenseCategoriesSpec.coffee
+- spec/skr/screens/expense-entry/ExpenseEntrySpec.coffee
 - spec/skr/screens/fresh-books-import/FreshBooksImportSpec.coffee
-- spec/skr/screens/gl-accounts/GlAccountsSpec.coffee
-- spec/skr/screens/invoice/InvoiceSpec.coffee
 - spec/skr/screens/locations/LocationsSpec.coffee
-- spec/skr/screens/payment-category/PaymentCategorySpec.coffee
 - spec/skr/screens/payment-terms/PaymentTermsSpec.coffee
-- spec/skr/screens/payments/PaymentsSpec.coffee
-- spec/skr/screens/sale-report/SaleReportSpec.coffee
 - spec/skr/screens/sales-order/SalesOrderSpec.coffee
 - spec/skr/screens/sku-maint/SkuMaintSpec.coffee
 - spec/skr/screens/time-invoicing/TimeInvoicingSpec.coffee

data/client/skr/api/onReady.coffee

@@ -1,23 +0,0 @@
-Skr.onDocumentReady = (fn) ->
-    if document.readyState isnt 'loading'
-        fn()
-    else if document.addEventListener
-        document.addEventListener 'DOMContentLoaded', fn
-    else
-        document.attachEvent 'onreadystatechange', ->
-            fn() if document.readyState != 'loading'
-
-
-SCRIPT_PATH = /\/assets\/skr\/api\.js$/
-
-Skr.onDocumentReady ->
-    for tag in document.querySelectorAll('script')
-        if tag.src.match SCRIPT_PATH
-            Lanes.config.api_host = tag.src.replace(SCRIPT_PATH, '')
-            Lanes.config.api_path = Lanes.config.api_host + "/api"
-            break
-    if Lanes.config.api_host
-        css = Lanes.config.api_host + "/assets/skr/api.css"
-        new Lanes.lib.AssetLoader([css], Lanes.emptyFn)
-    else
-        console.error("Unable to find script tag that Stockor was loaded from")

data/spec/skr/api/SingleItemCheckoutSpec.cjsx

@@ -1,10 +0,0 @@
-##=require 'skr/api'
-
-describe "Skr.Api.SingleItemCheckout", ->
-
-    # beforeEach ->
-    #     Lanes.Test.ModelSaver.setUser('admin')
-
-
-    it "sends failure messages when code isn't set", (done) ->
-        checkout = LT.renderComponent(Skr.Api.SingleItemCheckout, props: skuCode: 'HAT')

data/spec/skr/screens/bank-maint/BankMaintSpec.coffee

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

data/spec/skr/screens/gl-accounts/GlAccountsSpec.coffee

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

data/spec/skr/screens/invoice/InvoiceSpec.coffee

@@ -1,5 +0,0 @@
-describe "Skr.Screens.Invoice", ->
-
-    it "can be rendered", ->
-        screen = LT.renderComponent(Skr.Screens.Invoice)
-        expect(screen).toBeTruthy()

data/spec/skr/screens/payment-category/PaymentCategorySpec.coffee

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

data/spec/skr/screens/payments/PaymentsSpec.coffee

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

data/spec/skr/screens/sale-report/SaleReportSpec.coffee

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