stockor 0.4.0 → 0.5.0

data/client/skr/components/Currency.cjsx

@@ -12,8 +12,9 @@ class Skr.Components.Currency extends Lanes.React.Component
         symbol: React.PropTypes.string
 
     render: ->
+        colProps = _.omit(@props,  _.keys(@constructor.propTypes))
         className = _.classnames 'currency', @props.className
-        <span {...@props} className={className}>
+        <span {...colProps} className={className}>
             <span className="sym">{@props.symbol}</span>
             {Lanes.u.format.currency(@props.amount)}
         </span>

data/client/skr/components/CustomerFinder.cjsx

@@ -10,7 +10,7 @@ class Skr.Components.CustomerFinder extends Lanes.React.Component
     getDefaultProps: ->
         autoFocus: false, label: 'Customer Code', name: 'customer'
 
-    dataObjects:
+    modelBindings:
         query: ->
             new Lanes.Models.Query({
                 syncOptions: @props.syncOptions, autoRetrieve: true

data/client/skr/components/CustomerProjectFinder.cjsx

@@ -10,7 +10,7 @@ class Skr.Components.CustomerProjectFinder extends Lanes.React.Component
     getDefaultProps: ->
         autoFocus: false, label: 'Project Code', name: 'code'
 
-    dataObjects:
+    modelBindings:
         query: ->
             new Lanes.Models.Query({
                 autoRetrieve: true, syncOptions:

data/client/skr/components/ExpenseCategoryFinder.cjsx

@@ -0,0 +1,34 @@
+class Skr.Components.ExpenseCategoryFinder extends Lanes.React.Component
+
+    propTypes:
+        model:      Lanes.PropTypes.Model
+        commands:   React.PropTypes.object
+        autoFocus:  React.PropTypes.bool
+        name:       React.PropTypes.string
+        selectField:   React.PropTypes.bool
+
+    getDefaultProps: ->
+        autoFocus: false, label: 'Expense Category', name: 'code'
+
+    modelBindings:
+        query: ->
+            new Lanes.Models.Query({
+                syncOptions: @props.syncOptions, autoRetrieve: true
+                src: Skr.Models.ExpenseCategory, fields: [
+                    {id:'id', visible: false}
+                    {id: 'code', fixedWidth: 130 },
+                    {id: 'name', flex: 1}
+                ]
+            })
+
+    render: ->
+        props = _.clone(@props)
+
+        if props.selectField
+            <LC.SelectField queryModel={Skr.Models.ExpenseCategory}
+                labelField='code' sm=2 {...props} fetchOnSelect={false} />
+        else
+            <LC.RecordFinder ref="finder" sm=3 autoFocus
+                commands={@props.commands}
+                query={@query}
+                {...props} />

data/client/skr/components/GlAccountChooser.cjsx

@@ -9,7 +9,7 @@ class Skr.Components.GlAccountChooser extends Lanes.React.Component
     getDefaultProps: ->
         label: 'Account', name: 'gl_account'
 
-    dataObjects:
+    modelBindings:
         query: ->
             new Lanes.Models.Query({
                 syncOptions: @props.syncOptions, autoRetrieve: true
@@ -34,5 +34,6 @@ class Skr.Components.GlAccountChooser extends Lanes.React.Component
                 choices={Skr.Models.GlAccount.all.models}
                 labelField="combined_name"
                 model={@props.model}
+                filter='contains'
                 {...props}
             />

data/client/skr/components/InvoiceFinder.cjsx

@@ -7,7 +7,7 @@ class Skr.Components.InvoiceFinder extends Lanes.React.Component
     getDefaultProps: ->
         autoFocus: true, name: 'visible_id', label: 'Invoice #'
 
-    dataObjects:
+    modelBindings:
         query: ->
             new Lanes.Models.Query({
                 initialFieldIndex: 1

data/client/skr/components/LatexSnippets.cjsx

@@ -1,5 +1,8 @@
 class Skr.Components.LatexSnippets extends Lanes.React.Component
 
+    propTypes:
+        settings: React.PropTypes.object.isRequired
+
     getInitialState: ->
         name: ''
         latex: ''

data/client/skr/components/LocationChooser.cjsx

@@ -1,14 +1,13 @@
 class Skr.Components.LocationChooser extends Lanes.React.Component
 
     propTypes:
-        onModelSet: React.PropTypes.func
         name:       React.PropTypes.string
         hideSingle: React.PropTypes.bool
 
     getDefaultProps: ->
         label: 'Location', name: 'location'
 
-    dataObjects:
+    modelBindings:
         query: ->
             new Lanes.Models.Query({
                 autoRetrieve: true
@@ -26,7 +25,8 @@ class Skr.Components.LocationChooser extends Lanes.React.Component
         if @props.hideSingle and Skr.Models.Location.all.length < 2
             return LC.SelectField.renderEmptyColumn(@props)
 
-        props = _.clone(@props)
+        props = _.omit(@props, 'hideSingle')
+
         if props.displayFinder
             <LC.RecordFinder ref="finder" sm=3 autoFocus
                 commands={@state.commands}

data/client/skr/components/PaymentCategoryFinder.cjsx

@@ -10,7 +10,7 @@ class Skr.Components.PaymentCategoryFinder extends Lanes.React.Component
     getDefaultProps: ->
         autoFocus: false, label: 'Payment Category', name: 'payment_category'
 
-    dataObjects:
+    modelBindings:
         query: ->
             new Lanes.Models.Query({
                 syncOptions: @props.syncOptions, autoRetrieve: true

data/client/skr/components/SalesOrderFinder.cjsx

@@ -7,10 +7,9 @@ class Skr.Components.SalesOrderFinder extends Lanes.React.Component
         autoFocus:  React.PropTypes.bool
 
     getDefaultProps: ->
-        editing: true
         autoFocus: true, name: 'visible_id', label: 'Sales Order #'
 
-    dataObjects:
+    modelBindings:
         query: ->
             new Lanes.Models.Query({
                 initialFieldIndex: 1, title: 'Sales Order', autoRetrieve: true

data/client/skr/components/SkuFinder.cjsx

@@ -11,7 +11,7 @@ class Skr.Components.SkuFinder extends Lanes.React.Component
     getDefaultProps: ->
         autoFocus: false, label: 'SKU', name: 'code'
 
-    dataObjects:
+    modelBindings:
         query: ->
             new Lanes.Models.Query({
                 syncOptions: @props.syncOptions, autoRetrieve: true

data/client/skr/components/SystemSettings.cjsx

@@ -1,6 +1,9 @@
 class Skr.Components.SystemSettings extends Lanes.React.Component
 
-    dataObjects:
+    propTypes:
+        settings: React.PropTypes.object.isRequired
+
+    modelBindings:
         banks: ->
             Skr.Models.BankAccount.Collection.fetch()
         sequentialIds: ->

data/client/skr/components/TermsChooser.cjsx

@@ -9,7 +9,7 @@ class Skr.Components.TermsChooser extends Lanes.React.Component
     getDefaultProps: ->
         label: 'Payment Terms', name: 'terms'
 
-    dataObjects:
+    modelBindings:
         query: ->
             new Lanes.Models.Query({
                 syncOptions: @props.syncOptions, autoRetrieve: true
@@ -36,5 +36,5 @@ class Skr.Components.TermsChooser extends Lanes.React.Component
                 choices={Skr.Models.PaymentTerm.all.models}
                 labelField="code"
                 {...@props}
-                fetchWhenOpen={false}
+                fetchOnSelect={false}
                 model={@props.model} />

data/client/skr/components/ToolbarButton.cjsx

@@ -1,7 +1,11 @@
 class Skr.Components.ToolbarButton extends Lanes.React.BaseComponent
 
+    propTypes:
+        onClick: React.PropTypes.func.isRequired
+        className: React.PropTypes.string
+
     render: ->
-        cn = _.classnames "navbar-btn", "control", @props.classNames
-        <BS.Button navItem componentClass="button" {...@props} className={cn}>
+        cn = _.classnames "navbar-btn", "control", @props.className
+        <BS.NavItem onClick={@props.onClick} className={cn}>
             {@props.children}
-        </BS.Button>
+        </BS.NavItem>

data/client/skr/components/TotalsLine.cjsx

@@ -5,12 +5,16 @@ class Skr.Components.TotalsLine extends Lanes.React.Component
         attribute: React.PropTypes.string
         label: React.PropTypes.string
 
+
     getDefaultProps: ->
         attribute: 'total', label: 'Total:'
 
     render: ->
         <BS.Row className='totals'>
-            <BS.Col lg=11 sm=10 xs=9 className="text-right">
+            <BS.Col lg=10 sm=9 xs=8 className="text-right">
+                {@props.extraInfo}
+            </BS.Col>
+            <BS.Col xs=1 className="text-right">
                 <h4>{@props.label}</h4>
             </BS.Col>
             <BS.Col lg=1 sm=2 xs=3 className="total">

data/client/skr/components/UserPreferences.cjsx

@@ -1,5 +1,5 @@
 class Skr.Components.UserPreferences extends Lanes.React.Component
-    dataObjects:
+    modelBindings:
         user: -> Lanes.current_user
         projects: -> new Skr.Models.CustomerProject.Collection
 

data/client/skr/components/VendorFinder.cjsx

@@ -10,7 +10,7 @@ class Skr.Components.VendorFinder extends Lanes.React.Component
     getDefaultProps: ->
         autoFocus: false, name: 'vendor', label: 'Vendor Code'
 
-    dataObjects:
+    modelBindings:
         query: ->
             new Lanes.Models.Query({
                 title: 'Vendors'

data/client/skr/components/address/Address.cjsx

@@ -1,7 +1,20 @@
 class Skr.Components.Address extends Lanes.React.Component
 
     propTypes:
+        title: React.PropTypes.string
         model: Lanes.PropTypes.State.isRequired
+        copyFrom: Lanes.PropTypes.State
+
+    modelBindings:
+        model: 'props'
+        copyFrom: -> @props.copyFrom or false
+
+    setModelState: (addr) ->
+        if (addr is @props.copyFrom)
+            for attr, val of addr.changedAttributes() when attr isnt 'isDirty'
+                @model[attr] = val if addr.previous(attr) is @model[attr]
+        else
+            @forceUpdate()
 
     renderTitle: ->
         <BS.Row>
@@ -11,7 +24,7 @@ class Skr.Components.Address extends Lanes.React.Component
         </BS.Row>
 
     render: ->
-        colProps = _.omit(@props, 'name')
+        colProps = _.omit(@props,  _.keys(@constructor.propTypes))
         colProps.className = _.classnames("address", @props.className)
 
         <BS.Col {...colProps}>

data/client/skr/components/styles.scss

@@ -14,3 +14,9 @@
         margin-left: 5px;
     }
 }
+
+
+.totals.row {
+    display: flex;
+    align-items: baseline;
+}

data/client/skr/index.js

@@ -1,6 +1,7 @@
 //=require ./models/Base
 //=require ./screens/Base
 //=require ./screens/Commands
+//=require ./lib
 //=require_tree ./models/mixins
 //=require_tree ./models
 //=require_tree ./components

data/client/skr/lib/Remote.coffee

@@ -0,0 +1,32 @@
+readLoadUrl = (matchRegex) ->
+    src = document.createElement('a')
+    for tag in document.querySelectorAll('script')
+        if tag.src.match matchRegex
+            src.href = tag.src
+            Lanes.config.api_host = src.host
+            break
+    if Lanes.config.api_host
+        css = src.href.replace(/\.js$/, '.css')
+        new Lanes.lib.AssetLoader([css], Lanes.emptyFn)
+    else
+        console.error("Unable to find script tag that Stockor was loaded from")
+
+
+Skr.lib.Remote = {
+
+    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'
+
+    configFromScriptTag: (matchRegex = /\/assets\/skr\/api\.js$/) ->
+        new _.Promise (resolve) ->
+            Skr.lib.Remote.onDocumentReady ->
+                readLoadUrl(matchRegex)
+                resolve(Lanes.config)
+
+}

data/client/skr/lib/index.js

@@ -0,0 +1,2 @@
+//= require ./namespace
+//= require ./Remote

data/client/skr/lib/namespace.coffee

@@ -0,0 +1 @@
+Skr.lib ||= {}

data/client/skr/models/CreditCardGateway.coffee

@@ -1,6 +1,6 @@
 class Skr.Models.CreditCardGateway extends Skr.Models.Base
 
-    pubsub: false
+    registerForPubSub: false
 
     props:
         login:    "string"

data/client/skr/models/ExpenseCategory.coffee

@@ -0,0 +1,11 @@
+class Skr.Models.ExpenseCategory extends Skr.Models.Base
+
+    props:
+        id:           {"type":"integer"}
+        code:         {"type":"code",  "required":true}
+        name:         {"type":"string", "required":true}
+        is_active:    {"type":"boolean", "required":true, default: true}
+        gl_account_id:{"type":"integer", "required":true}
+
+    associations:
+        gl_account: { model: "GlAccount" }

data/client/skr/models/ExpenseEntry.coffee

@@ -0,0 +1,64 @@
+class ExpenseAssets extends Lanes.Models.AssociationCollection
+
+
+    comparator: (a) -> ! a.isPresent
+
+    constructor: ->
+        super
+        @listenTo(@parent, 'save', @onSave)
+        @on('change:length', @ensureBlank)
+        @on('change:isPresent', @ensureBlank)
+        @ensureBlank()
+        @present = @subcollection(watched: ['isPresent'], filter: (m) ->
+            m.isPresent
+        )
+
+
+    getId: -> @parent.getId()
+    modelTypeIdentifier: -> @parent.modelTypeIdentifier()
+    extensionIdentifier: -> @parent.extensionIdentifier()
+
+    ensureBlank: ->
+        blank = @find( (asset) -> !asset.isPresent )
+        @add({}) unless blank
+
+    onSave: ->
+        @each (asset) -> asset.save()
+
+    _prepareModel: (attrs, options) ->
+        attrs.parent || = @
+        attrs.parent_association = @options.association_name
+        super
+
+
+class Skr.Models.ExpenseEntry extends Skr.Models.Base
+
+    props:
+        id:                  {type:"integer"}
+        uuid:                {"type":"string"}
+        name:                {"type":"string", "required":true}
+        occured:             {"type":"date", "required":true}
+        gl_transaction_id:    "integer"
+        memo:                 "string"
+        expense_category_id: {"type":"integer", "required":true}
+
+    session:
+        category_total:       type:"bigdec", "required":true
+        category_list:        type: "object"
+        gl_transaction_ids:   type: 'array'
+        category_ids:         type: 'array'
+
+    associations:
+        categories:       { collection: "ExpenseEntryCategory", inverse: 'entry' }
+        gl_transaction:   { model: "GlTransaction"   }
+        attachments:      { collection: "Lanes.Models.Asset", options: { 'collectionClass': ExpenseAssets } }
+
+    dataForSave: ->
+        super(includeAssociations: [
+            'categories'
+        ])
+
+    total: ->
+        @categories.reduce (amt, cat) ->
+            cat.amount.add(amt)
+        , _.bigDecimal('0')

data/client/skr/models/ExpenseEntryCategory.coffee

@@ -0,0 +1,11 @@
+class Skr.Models.ExpenseEntryCategory extends Skr.Models.Base
+
+    props:
+        id:          {"type":"any",     "required":true}
+        entry_id:    "integer"
+        category_id: {"type":"integer", "required":true}
+        amount:      {"type":"bigdec"}
+
+    associations:
+        category:   { model: "ExpenseCategory" }
+        entry:      { model: "ExpenseEntry" }

data/client/skr/models/Invoice.coffee

@@ -25,11 +25,14 @@ class Skr.Models.Invoice extends Skr.Models.Base
 
     mixins: [ 'HasVisibleId', 'PrintSupport' ]
 
-    # optional attributes from details view
+    # optional attributes from details view and other fields
     session:
         customer_code: {type:"string"}
+        customer_name: {type:"string"}
         invoice_total: {type:"bigdec"}
         amount_paid:   {type:"bigdec", "default":"0"}
+        total_hours:   "bigdec"
+        num_lines:     {type:"integer"}
 
     derived:
         prev_amount_paid: deps:['updated_at'], fn: -> @amount_paid