stockor 0.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d734100c2a781d64262d82c9d253abbdeb944441
-  data.tar.gz: bc35cfaaecd7fb4ada61cc37838c64bcb9e21d0c
+  metadata.gz: 7d988a8e0b73432c66e3dc93eeeed449da3e30ce
+  data.tar.gz: 832a97c69b53d53f3a108342ec92008a0baafeed
 SHA512:
-  metadata.gz: c33358eb4136bfdd0da75142a5d383a65324588653386c6593d99b29ef904959093475c6863b02a29afee54a8e86d72b6aa84399dd34c54eae491cb758f11c2e
-  data.tar.gz: 6c20dc9ca46b14e0d720c8bb0729322e4db866323c0459fd5cc36097425597c78ccc84d2a59d26d7d31ef9632a4aad33fe7ce9fabd5352cac788fa35617e49f3
+  metadata.gz: 2c4adcf6481c6825caad4f0cbd5869bc2752484e7b834f0d430804d2f4965e8c6722071a713753da4f6d1d920280128ce22206ac34f7979e76b123951c1b5df0
+  data.tar.gz: c29089f8b3c4c45406278d764fd2a38b654565e1379f33353624e9a705baaed0e57542c01a1980a13b92c2d009f951619afe994e1fb4a513e7218da45631a4ab

data/Gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
-gem "lanes", github: "argosity/lanes", branch: 'master'
-gem "erb_latex", github: "nathanstitt/erb_latex", branch: 'master'
+# gem "lanes", github: "argosity/lanes", branch: 'master'
 
 gem "faker"
 gem 'puma'

data/Gemfile.lock

@@ -1,58 +1,10 @@
-GIT
-  remote: git://github.com/argosity/lanes.git
-  revision: 8347b9f30227829d8c52eb100299b9e30a455e02
-  branch: master
-  specs:
-    lanes (0.3.0)
-      activejob (~> 4.2)
-      activerecord (~> 4.2)
-      bcrypt (~> 3.1)
-      carrierwave (~> 0.10.0)
-      coffee-react (~> 3.0)
-      coffee-script (~> 2.3)
-      compass-import-once (~> 1.0)
-      execjs (~> 2.2)
-      fastimage (~> 1.8.1)
-      fog (~> 1.37.0)
-      guard (~> 2.0)
-      guard-jasmine (~> 2.0)
-      guard-minitest (~> 2.3)
-      hashie (~> 3.3)
-      jasmine-core (~> 2.0)
-      jobba (~> 1.4)
-      message_bus (= 2.0.0.beta.6)
-      mini_magick (~> 4.3.6)
-      minitest-around (~> 0.2)
-      mocha (~> 1.1)
-      oj (~> 2.1)
-      pg (~> 0.17)
-      rack-protection (~> 1.5)
-      rack-test (~> 0.6)
-      rake (~> 10.0)
-      require_all (~> 1.3)
-      resque (~> 1.25)
-      sanitize (~> 3.0)
-      sass (~> 3.4)
-      sinatra (~> 1.4)
-      sprockets (~> 3.0)
-      sprockets-helpers (~> 1.2)
-      thor (~> 0.19)
-      uglifier (~> 2.7)
-
-GIT
-  remote: git://github.com/nathanstitt/erb_latex.git
-  revision: 6d16aea21c99710be94445b610e3ba03485f9bc7
-  branch: master
-  specs:
-    erb_latex (0.3.0)
-
 PATH
   remote: .
   specs:
-    stockor (0.2)
+    stockor (0.3.0)
       aasm (~> 4.1)
       erb_latex (= 0.3)
-      lanes
+      lanes (~> 0.4.0)
       numbers_in_words (~> 0.4.0)
       ruby-freshbooks
 
@@ -102,6 +54,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     crass (1.0.2)
+    erb_latex (0.3.0)
     excon (0.49.0)
     execjs (2.6.0)
     faker (1.6.3)
@@ -263,6 +216,41 @@ GEM
       redis (~> 3.2)
       redis-namespace
     json (1.8.3)
+    lanes (0.4.0)
+      activejob (~> 4.2)
+      activerecord (~> 4.2)
+      bcrypt (~> 3.1)
+      carrierwave (~> 0.10.0)
+      coffee-react (~> 3.0)
+      coffee-script (~> 2.3)
+      compass-import-once (~> 1.0)
+      execjs (~> 2.2)
+      fastimage (~> 1.8.1)
+      fog (~> 1.37.0)
+      guard (~> 2.0)
+      guard-jasmine (~> 2.0)
+      guard-minitest (~> 2.3)
+      hashie (~> 3.3)
+      jasmine-core (~> 2.0)
+      jobba (~> 1.4)
+      message_bus (= 2.0.0.beta.6)
+      mini_magick (~> 4.3.6)
+      minitest-around (~> 0.2)
+      mocha (~> 1.1)
+      oj (~> 2.1)
+      pg (~> 0.17)
+      rack-protection (~> 1.5)
+      rack-test (~> 0.6)
+      rake (~> 10.0)
+      require_all (~> 1.3)
+      resque (~> 1.25)
+      sanitize (~> 3.0)
+      sass (~> 3.4)
+      sinatra (~> 1.4)
+      sprockets (~> 3.0)
+      sprockets-helpers (~> 1.2)
+      thor (~> 0.19)
+      uglifier (~> 2.7)
     listen (3.0.6)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9.7)
@@ -318,7 +306,7 @@ GEM
       builder
       nokogiri (>= 1.4.1)
       trollop
-    redis (3.2.2)
+    redis (3.3.0)
     redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
     require_all (1.3.3)
@@ -343,7 +331,7 @@ GEM
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     slop (3.6.0)
-    sprockets (3.5.2)
+    sprockets (3.6.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-helpers (1.2.1)
@@ -371,12 +359,10 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.5)
-  erb_latex!
   faker
   growl
   guard
   guard-minitest
-  lanes!
   pry-byebug
   puma
   rake

data/client/skr/components/BankAccountFinder.cjsx

@@ -26,7 +26,8 @@ class Skr.Components.BankAccountFinder extends Lanes.React.Component
         props = _.clone(@props)
 
         if props.selectField
-            <LC.SelectField queryModel={Skr.Models.BankAccount} sm=2 {...props} />
+            <LC.SelectField queryModel={Skr.Models.BankAccount}
+                labelField='code' sm=2 {...props} />
         else
             <LC.RecordFinder ref="finder" sm=3 autoFocus
                 commands={@props.commands}

data/client/skr/components/CustomerFinder.cjsx

@@ -29,7 +29,7 @@ class Skr.Components.CustomerFinder extends Lanes.React.Component
             props.defaultLabel = @model.customer_code
 
         if props.selectField
-            <LC.SelectField sm=2 labelField="code" {...props} />
+            <LC.SelectField labelField='code' sm=2 labelField="code" {...props} />
         else
             <LC.RecordFinder ref="finder" sm=3 autoFocus
                 commands={@props.commands}

data/client/skr/components/CustomerProjectFinder.cjsx

@@ -36,11 +36,8 @@ class Skr.Components.CustomerProjectFinder extends Lanes.React.Component
         props = _.clone(@props)
 
         if props.selectField
-            <LC.SelectField sm=2
-                labelField="code"
-                {...props}
-                model={@props.model}
-            />
+            <LC.SelectField sm=2 labelField="code"
+                {...props} model={@props.model} />
         else
             <LC.RecordFinder ref="finder" sm=3 autoFocus
                 query={@query}

data/client/skr/components/LocationChooser.cjsx

@@ -30,8 +30,5 @@ class Skr.Components.LocationChooser extends Lanes.React.Component
                 query={@query}
                 {...props} />
         else
-            <LC.SelectField
-                {...props}
-                choices={Skr.Models.Location.all.models}
-                labelField='code'
-                model={@props.model} />
+            <LC.SelectField {...props} choices={Skr.Models.Location.all.models}
+                labelField='code' model={@props.model} />

data/client/skr/components/PaymentCategoryFinder.cjsx

@@ -26,7 +26,8 @@ class Skr.Components.PaymentCategoryFinder extends Lanes.React.Component
         props = _.clone(@props)
 
         if props.selectField
-            <LC.SelectField queryModel={Skr.Models.PaymentCategory} sm=2 {...props} />
+            <LC.SelectField queryModel={Skr.Models.PaymentCategory}
+                labelField='code' sm=2 {...props} />
         else
             <LC.RecordFinder ref="finder" sm=3 autoFocus
                 commands={@props.commands}

data/client/skr/components/SkuFinder.cjsx

@@ -25,6 +25,7 @@ class Skr.Components.SkuFinder extends Lanes.React.Component
     render: ->
         props = _.extend( {}, @props )
         if @props.selectField
-            <LC.SelectField labelField="code" displayFallback={@model.sku_code} {...props} />
+            <LC.SelectField labelField="code"
+                displayFallback={@model.sku_code} {...props} />
         else
             <LC.RecordFinder commands={@props.commands} query={@query} {...props} />

data/client/skr/components/SkuLines.cjsx

@@ -4,8 +4,12 @@ class Skr.Components.SkuLines extends Lanes.React.Component
         lines:    Lanes.PropTypes.Collection.isRequired
         commands: React.PropTypes.object.isRequired
         location: Lanes.PropTypes.Model.isRequired
+        queryBuilder: React.PropTypes.func.isRequired
         saveImmediately: React.PropTypes.func.isRequired
 
+    getDefaultProps: ->
+        queryBuilder: (a) -> a
+
     componentWillMount: ->
         @createQuery(@props.lines)
 
@@ -13,16 +17,17 @@ class Skr.Components.SkuLines extends Lanes.React.Component
         @createQuery(nextProps.lines) if nextProps.lines
 
     createQuery: (lines) ->
-        @query = new Lanes.Models.Query
+        @query = new Lanes.Models.Query(@props.queryBuilder({
             title: 'Lines'
             defaultSort: false
-            src: lines, fields: [
+            src: lines,
+            fields: [
                 { id:'id', visible: false         }
                 { id: 'sku_code', fixedWidth: 150 }
                 { id: 'description', flex: 2      }
                 {
                     id: 'uom', title: 'UOM', query: false, fixedWidth: 100,
-                    format: (v, r, q)  -> v?.combined_uom
+                    format: (v, r, q)  -> v?.combined
                     sortBy: (a, b) ->
                         Lanes.u.comparator(a.uom_size, b.uom_size) or
                             Lanes.u.comparator(a.uom_code, b.uom_code)
@@ -33,6 +38,7 @@ class Skr.Components.SkuLines extends Lanes.React.Component
                     format: (v, r, q) -> v?.toFixed(2)
                 }
             ]
+        }))
 
     onSkuChange: (sku, options) ->
         options.model.set({sku})
@@ -40,22 +46,24 @@ class Skr.Components.SkuLines extends Lanes.React.Component
             _.dom(@, 'input[name="qty"]').focusAndSelect() if @isMounted()
 
     editors: ->
+
         sku_code: ({model, props}) =>
             options = {
                 with: {in_location: props.location.id}
                 include: ['sku_locs', 'uoms']
             }
             <SC.SkuFinder
-                writable
+                writable selectField unstyled
                 setSelection={@onSkuChange}
                 name='sku' model={model}
-                selectField unstyled syncOptions={options} />
+                syncOptions={options}
+            />
 
         uom: ({model}) ->
             <SC.UOMChooser writable unstyled model={model} />
 
     onSelectionChange:  (model) ->
-        return unless model and @props.commands.isEditing()
+        return Promise.resolve() unless model and not model.isNew() and @props.commands.isEditing()
         new _.Promise (res, rej) ->
             model.withAssociations([
                 'sku_loc', 'sku', 'uom_choices'

data/client/skr/components/SystemSettings.cjsx

@@ -18,6 +18,7 @@ class Skr.Components.SystemSettings extends Lanes.React.Component
 
             <SC.BankAccountFinder selectField
                 sm=3 label="Default Bank Account"
+                model={Lanes.config.system_settings}
                 choices={this.banks.models}
                 setSelection={@setBankAccount}
                 getSelection={@getBankAccount}

data/client/skr/components/UOMChooser.cjsx

@@ -10,15 +10,15 @@ class Skr.Components.UOMChooser extends Lanes.React.Component
     render: ->
         props = _.clone(@props)
         props.choices ||= @props.model.uom_choices.models
+
         <LC.SelectField
-            key="uom"
             syncOptions={with: 'with_combined_uom'}
             displayFallback={@props.model.uom.combined_uom}
             editOnly writable unstyled
             model={@props.model}
             fetchWhenOpen={false}
             queryOrder={size: 'desc'}
-            labelField="combined_uom"
+            labelField="combined"
             name="uom"
             {...props}
         />

data/client/skr/models/Invoice.coffee

@@ -70,6 +70,8 @@ class Skr.Models.Invoice extends Skr.Models.Base
 
     onSetCustomer: (newCustomer) ->
         return if not newCustomer or newCustomer.isNew()
+        for attr in ['terms_id']
+            @set(attr, newCustomer[attr])
         @copyAssociationsFrom( newCustomer, 'billing_address', 'shipping_address')
 
     setFromSalesOrder: (so) ->

data/client/skr/models/SalesOrder.coffee

@@ -66,7 +66,8 @@ class Skr.Models.SalesOrder extends Skr.Models.Base
     onCustomerChange: ->
         return unless @isNew()
         associations = ['billing_address', 'shipping_address']
-
+        for attr in ['terms_id']
+            @set(attr, @customer[attr])
         @customer.withAssociations(associations).then =>
             for name in associations
                 @associations.replace(@, name, @customer[name])

data/client/skr/models/TimeEntry.coffee

@@ -50,7 +50,8 @@ class Skr.Models.TimeEntry extends Skr.Models.Base
         @set('hours', _.moment(this.end_at).diff(this.start_at, 'hour', true).toFixed(2),
             silent: true)
     onHoursChange: ->
-        @end_at = _.moment(@start_at).add(@hours.toFixed(), 'hour').toDate()
+        hours = @hours || _.bigDecimal('0')
+        @end_at = _.moment(@start_at).add(hours.toFixed(), 'hour').toDate()
 
     length: (duration = 'hour') ->
         @range.end.diff(@range.start, duration, true)

data/client/skr/models/mixins/PrintSupport.coffee

@@ -1,6 +1,6 @@
 Skr.Models.Mixins.PrintSupport = {
 
     pdfDownloadUrl: ->
-        "#{Lanes.config.api_path}skr/print/#{@modelTypeIdentifier()}/#{@hash_code}.pdf"
+        "#{Lanes.config.api_path}/skr/print/#{@modelTypeIdentifier()}/#{@hash_code}.pdf"
 
 }

data/client/skr/screens/customer-projects/CustomerProjects.cjsx

@@ -23,7 +23,7 @@ class Skr.Screens.CustomerProjects extends Skr.Screens.Base
         @forceUpdate()
     getColorReadOnly: ->
         index = @getColor()
-        color = _.findWhere(Skr.Models.CustomerProject.COLORS, id: index)
+        color = _.find(Skr.Models.CustomerProject.COLORS, id: index)
         <div className={"ro color-#{index}"}>{color?.name}</div>
 
     getColor: ->

data/client/skr/screens/fresh-books-import/ChooseRecords.cjsx

@@ -8,7 +8,7 @@ class TextInput extends Lanes.React.Component
         @forceUpdate()
 
     render: ->
-        <input value={@props.row.customer_code} onChange={@setCode} />
+        <input value={@props.row.customer_code || ''} onChange={@setCode} />
 
 class UserSelect extends Lanes.React.Component
     dataObjects:

data/client/skr/screens/invoice/Invoice.cjsx

@@ -35,6 +35,12 @@ class Skr.Screens.Invoice extends Skr.Screens.Base
     shouldSaveLinesImmediately: ->
         not @invoice.isNew()
 
+    linesQueryBuilder: (attrs) ->
+        unless this.invoice.isNew()
+            sc = _.find attrs.fields, id: 'sku_code'
+            sc.editable = false
+        attrs
+
     render: ->
         <LC.ScreenWrapper identifier="invoice" flexVertical>
 
@@ -85,6 +91,7 @@ class Skr.Screens.Invoice extends Skr.Screens.Base
             </BS.Row>
 
             <SC.SkuLines location={@invoice.location}
+                queryBuilder={@linesQueryBuilder}
                 saveImmediately={@shouldSaveLinesImmediately}
                 commands={@state.commands} lines={@invoice.lines} />
 

data/client/skr/screens/time-invoicing/TimeInvoicing.cjsx

@@ -149,7 +149,7 @@ class InvoiceRequest extends Lanes.Models.Base
         time_entry_ids: { type: 'array', default: -> [] }
 
     api_path: ->
-        'skr/invoices/from-time-entries'
+        "/skr/invoices/from-time-entries"
 
     associations:
         customer_project: { model: "CustomerProject", autoCreate: true }

data/client/skr/screens/time-tracking/PopoverMiniControls.cjsx

@@ -12,8 +12,8 @@ class Skr.Screens.TimeTracking.MiniControls extends Lanes.React.Component
     render: ->
         <div className="mini-controls">
             <div className='l'>
-                {@props.date.format('MMM')}
-                {@props.date.format('Do')}
+                <span>{@props.date.format('MMM')}</span>
+                <span>{@props.date.format('Do')}</span>
             </div>
             <BS.Button onClick={@props.onCancel} title="Hide Controls">
                 <LC.Icon type='ban' 2x flush />

data/lib/skr/version.rb

@@ -1,3 +1,3 @@
 module Skr
-    VERSION='0.2'
+    VERSION='0.3.0'
 end

data/stockor.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'aasm', '~>4.1'
   spec.add_dependency 'erb_latex', '0.3'
-  spec.add_dependency 'lanes'
+  spec.add_dependency 'lanes', '~> 0.4.0'
   spec.add_dependency 'numbers_in_words', '~> 0.4.0'
   spec.add_dependency 'ruby-freshbooks'
 

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

@@ -11,7 +11,7 @@
   \multicolumn{<%=ncols%>}{r}{Continued on next page...} \\
   \endfoot
   \hline
-<%= partial @footer || 'skus_table_footer', record: @record, ncols: ncols %>
+<%= partial @footer || 'skus_table_footer', record: @record, ncols: ncols, lines: @lines %>
 \endlastfoot
 <% if @groups %>
   <% @groups.each_with_index do | group, i | -%>

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

@@ -1,7 +1,17 @@
+<% hours = @lines.reduce(BigDecimal.new('0')){|t, l| l.time_entry ? t+l.qty : t } %>
 <%= partial 'skus_table_other_charge_lines', record: @record, ncols: @ncols %>
-  \multicolumn{<%= @ncols-1%>}{r}{{\textbf{Total}}} &
+  \multicolumn{<%= @ncols-3 %>}{r}{{
+<% unless hours.zero? %>
+    \textbf{<%= '%0.2f' % hours %>}
+<% end %>
+  }} &
+<% unless hours.zero? %>
+  \textbf{Hours} &
+<% end %>
+  \textbf{Total} &
   \textbf{\textsuperscript{\$}<%= Skr::String.number_with_delimiter @record.total %>} \\
-  \cline{<%= @ncols-3%>-<%= @ncols%>}
+  \cline{<%= @ncols - 3%>-<%= @ncols%>}
+
 %  \hline
 <% unless @record.open? -%>
   \multicolumn{<%= @ncols-1%>}{r}{{\textbf{Amount Paid}}} &

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

@@ -0,0 +1,7 @@
+<%= partial 'skus_table_other_charge_lines', record: @record, ncols: @ncols %>
+\multicolumn{<%= @ncols-4%>}{r}{} &
+  \textbf{<%= '%0.2f' % @lines.to_a.sum{|l| l.time_entry.hours } %>} &
+  \textbf{Hours} &
+  \textbf{Total} &
+  \textbf{\textsuperscript{\$}<%=  Skr::String.number_with_delimiter @record.total %>} \\
+  \cline{<%= @ncols-3%>-<%= @ncols%>} \\

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

@@ -4,7 +4,7 @@
   form_title: "Invoice # #{@invoice.visible_id}"
 } ) %>
 <%= partial 'bill_to_ship_to', record: @invoice -%>
-<%= partial 'invoice_paid_state', invoice: @invoice -%>
+<%=partial 'skus_table_invoice_info_line', invoice: @invoice -%>
 <%= partial 'skus_table',
     record: @invoice,
     lines: @invoice.lines.regular,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stockor
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: 0.3.0
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -42,16 +42,16 @@ dependencies:
   name: lanes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: numbers_in_words
   requirement: !ruby/object:Gem::Requirement
@@ -633,6 +633,7 @@ files:
 - templates/print/partials/skus_table_invoice_footer.tex.erb
 - templates/print/partials/skus_table_invoice_info_line.tex.erb
 - templates/print/partials/skus_table_labor_col_hdr.tex.erb
+- templates/print/partials/skus_table_labor_footer.tex.erb
 - templates/print/partials/skus_table_labor_group_footer.tex.erb
 - templates/print/partials/skus_table_labor_line.tex.erb
 - templates/print/partials/skus_table_line.tex.erb
@@ -663,7 +664,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Stockor is a complete ERP system