stockor 0.4.0 → 0.5.0

data/client/skr/models/Payment.coffee

@@ -14,7 +14,7 @@ class Skr.Models.Payment extends Skr.Models.Base
         amount:         {type:"bigdec", required: true, default: ->
             _.bigDecimal('0')
         }
-        check_number:   {type:"integer"}
+        check_number:   {type:"string"}
         date:           {type:"date", default: ->
             new Date
         }
@@ -51,6 +51,6 @@ class Skr.Models.Payment extends Skr.Models.Base
 
     onSetVendor: ->
         return unless @vendor and @vendor.isPersistent()
-        @name = @vendor.name
+        @name = @vendor.billing_address.name
         @vendor.withAssociations(['billing_address']).then (v) =>
             @address = v.billing_address.toString()

data/client/skr/models/SalesOrder.coffee

@@ -27,7 +27,10 @@ class Skr.Models.SalesOrder extends Skr.Models.Base
     # optional attributes from details view
     session:
         customer_code:      {type:"string"}
+        customer_name:      {type:"string"}
+        bill_addr_name:     {type:"string"}
         order_total:        {type:"bigdec"}
+        num_lines:          {type:"integer"}
 
     derived:
         total: deps: ['order_total'], fn: ->
@@ -65,11 +68,9 @@ class Skr.Models.SalesOrder extends Skr.Models.Base
 
     onCustomerChange: ->
         return if @customer.isProxy or not @isNew()
-
         associations = ['billing_address', 'shipping_address']
         for attr in ['terms_id']
             @set(attr, @customer[attr])
-
         @customer.withAssociations(associations).then =>
             for name in associations
                 @[name].set(

data/client/skr/models/SequentialId.coffee

@@ -5,7 +5,7 @@ class Skr.Models.SequentialId extends Skr.Models.Base
         ids:
             type: 'array', required: true, default: -> []
 
-    registerforPubSub: false
+    registerForPubSub: false
 
     modelTypeIdentifier: ->
         'sequential-ids'

data/client/skr/models/Vendor.coffee

@@ -22,7 +22,7 @@ class Skr.Models.Vendor extends Skr.Models.Base
         shipping_address:    { model: "Address" }
         terms:               { model: "PaymentTerm", required: true }
         gl_payables_account: { model: "GlAccount",   required: true }
-        gl_freight_account:  { model: "GlAccount",   required: true }
+        gl_freight_account:  { model: "GlAccount" }
         purchase_orders:     { collection: "PurchaseOrder" }
         vouchers:            { collection: "Voucher" }
         vendor_skus:         { collection: "SkuVendor" }

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

@@ -4,6 +4,6 @@ Skr.Models.Mixins.PrintSupport = {
         if @printFormIdentifier then @printFormIdentifier() else @modelTypeIdentifier()
 
     pdfDownloadUrl: ->
-        "#{Lanes.config.api_path}/skr/print/#{@_mixinPrintFormIdentifier()}/#{@hash_code}.pdf"
+        "//#{Lanes.config.api_host}#{Lanes.config.api_path}/skr/print/#{@_mixinPrintFormIdentifier()}/#{@hash_code}.pdf"
 
 }

data/client/skr/screens/bank-maint/BankMaint.cjsx

@@ -2,7 +2,7 @@ class Skr.Screens.BankMaint extends Skr.Screens.Base
     syncOptions:
         include: [ 'address' ]
 
-    dataObjects:
+    modelBindings:
         bank: ->
             @loadOrCreateModel({
                 syncOptions: @syncOptions, klass: Skr.Models.BankAccount

data/client/skr/screens/chart-of-accounts/ChartOfAccounts.cjsx

@@ -1,7 +1,7 @@
 class Skr.Screens.ChartOfAccounts extends Skr.Screens.Base
 
     modelForAccess: 'gl-transaction'
-    dataObjects:
+    modelBindings:
         query: ->
             new Lanes.Models.Query
                 title: 'Lines', src: Skr.Models.GlAccount

data/client/skr/screens/customer-maint/CustomerMaint.cjsx

@@ -1,7 +1,7 @@
 class Skr.Screens.CustomerMaint extends Skr.Screens.Base
 
     syncOptions: {include: ['billing_address', 'shipping_address']}
-    dataObjects:
+    modelBindings:
         customer: ->
             @loadOrCreateModel({
                 syncOptions: @syncOptions, klass: Skr.Models.Customer,

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

@@ -3,7 +3,7 @@ class Skr.Screens.CustomerProjects extends Skr.Screens.Base
     getInitialState: ->
         commands: new Skr.Screens.Commands(this, modelName: 'project')
 
-    dataObjects:
+    modelBindings:
         project: ->
             @loadOrCreateModel({
                 klass: Skr.Models.CustomerProject,

data/client/skr/screens/expense-categories/ExpenseCategories.cjsx

@@ -0,0 +1,31 @@
+class Skr.Screens.ExpenseCategories extends Skr.Screens.Base
+
+    modelBindings:
+        category: ->
+            @loadOrCreateModel({
+                klass: Skr.Models.ExpenseCategory
+                prop: 'category', attribute: 'code'
+            })
+
+    getInitialState: ->
+        commands: new Skr.Screens.Commands(this, modelName: 'category')
+
+    render: ->
+        <LC.ScreenWrapper identifier="expense-categories">
+            <SC.ScreenControls commands={@state.commands} />
+
+            <BS.Row>
+                <SC.ExpenseCategoryFinder sm=2 autoFocus editOnly
+                    commands={@state.commands} model={@category}
+                />
+
+                <LC.Input sm=9 name='name' model={@category} />
+            </BS.Row>
+            <BS.Row>
+                <SC.GlAccountChooser sm=3 label="GL Account"
+                    name="gl_account" model={@category} />
+
+                <LC.ToggleField model={@category} name='is_active' sm=2 />
+            </BS.Row>
+
+        </LC.ScreenWrapper>

data/client/skr/screens/expense-categories/index.js

@@ -0,0 +1,5 @@
+//= require_tree .
+
+/*
+ Add additional requirement statements for other files that the screen uses
+*/

data/client/skr/screens/expense-categories/index.scss

@@ -0,0 +1,9 @@
+/*
+ You should remove this file if your screen does not use any custom styles
+
+ Otherwise Lanes will continue to fetch an empty file whenever
+ the screen is displayed
+*/
+.expense-categories {
+
+}

data/client/skr/screens/expense-entry/ApprovalRequest.coffee

@@ -0,0 +1,14 @@
+class Skr.Screens.ExpenseEntry.ApprovalRequest extends Lanes.Models.Base
+
+    props:
+        bank_account_id:{"type":"integer"}
+        expense_ids: { type: 'array', default: -> [] }
+
+    api_path: ->
+        '/skr/expense-entries/approve'
+
+    associations:
+        bank_account: { model: "BankAccount" }
+
+
+    isValid: -> !!@bank_account_id

data/client/skr/screens/expense-entry/ApproveDialog.cjsx

@@ -0,0 +1,30 @@
+class Skr.Screens.ExpenseEntry.Approve extends Lanes.React.Component
+
+    modelBindings:
+        approvalRequest: ->
+            new Skr.Screens.ExpenseEntry.ApprovalRequest
+
+        query: 'props'
+
+    approveSelected: ->
+        @approvalRequest.expense_ids = []
+        @query.results.eachRow (row, xd) =>
+            if LC.Grid.Selections.isSelected(row, xd)
+                @approvalRequest.expense_ids.push(@query.results.idForRow(row))
+        @approvalRequest.save().then @props.onApproved
+
+    render: ->
+        props = _.omit(@props, 'query', 'onApproved')
+
+        <BS.Popover
+            {...props}
+            id="choose-bank-account" title="Choose bank account">
+            <SC.BankAccountFinder
+                selectField fieldOnly editOnly
+                model={@approvalRequest} name="bank_account"
+            />
+            <BS.Button
+                disabled={not @approvalRequest.isValid()}
+                bsStyle="success" onClick={@approveSelected}
+            >Approve</BS.Button>
+        </BS.Popover>

data/client/skr/screens/expense-entry/Categories.cjsx

@@ -0,0 +1,112 @@
+class TextCategory extends Lanes.React.Component
+    modelBindings:
+        category: 'props'
+
+    render: ->
+        code = @props.categories.get(@category.category_id).code
+        <span className='pair'>
+            {Lanes.u.format.currency(@category.amount)} {code}
+        </span>
+
+
+class Category extends Lanes.React.Component
+
+    modelBindings:
+        category: 'props'
+
+    delete: ->
+        @props.onEntryDestroy(@props.category)
+
+    render: ->
+        <div className="category">
+            <SC.ExpenseCategoryFinder selectField
+                choices={@props.categories.models} fetchOnSelect={false}
+                model={@category} name='category' />
+            <LC.NumberInput name='amount' model={@category} align="right" />
+            <BS.Button className="delete"
+                onClick={@delete}
+            >
+                <LC.Icon type="trash-o" lg />
+            </BS.Button>
+
+        </div>
+
+class Skr.Screens.ExpenseEntry.Categories extends Lanes.React.Component
+
+    modelBindings:
+        entry: 'props'
+        categories: 'props'
+        entryCategories: ->
+            if @props.entry.categories.isEmpty()
+                @props.entry.categories.add({})
+            @props.entry.categories
+
+    addCategory: ->
+        @entry.categories.add({})
+        @setState(overlayShown: true)
+        _.defer =>
+            _.dom(@, '.popover-content .category:last-child .select input').focus()
+
+    onMultiClick: ->
+        @setState(overlayShown: true)
+
+    getPopOverTarget: ->
+        _.dom(@refs.overlayTarget).el
+
+    onEntryDestroy: (cat) ->
+        @setState(overlayShown: false)
+        @props.entry.categories.remove(cat)
+
+    renderMultiple: ->
+
+        entries = @entry.categories.map (category) =>
+            <Category key={category.cid} category={category}
+                onEntryDestroy={@onEntryDestroy}
+                categories={@props.categories} />
+        msg =
+            @entry.categories.map (expcat) =>
+                category = @categories.get( expcat.category_id )
+                return null unless category
+                <TextCategory key={expcat.cid} category={expcat} categories={@categories} />
+
+        <BS.Col sm=12 className="multiple">
+            <BS.FormGroup>
+                <BS.ControlLabel>Categories</BS.ControlLabel>
+                <div className='controls'>
+                    <BS.FormControl.Static onClick={@onMultiClick}>{msg}</BS.FormControl.Static>
+                    <LC.IconButton icon="edit" className="view" ref="overlayTarget"
+                        onClick={=> @setState(overlayShown: true)}
+                    />
+                    <BS.Overlay
+                        show={@state.overlayShown}
+                        rootClose=true
+                        onHide={=> @setState(overlayShown: false)}
+                        placement="bottom"
+                        container={@}
+                        target={@getPopOverTarget}
+                    >
+                        <BS.Popover id="popover-positioned-bottom" title="Entries">
+                            {entries}
+                        </BS.Popover>
+                    </BS.Overlay>
+                </div>
+            </BS.FormGroup>
+        </BS.Col>
+
+    render: ->
+
+        body = switch @entry.categories.length
+            when 1
+                <Category category={@entry.categories.first()}
+                    categories={@props.categories} />
+            else
+                @renderMultiple()
+
+        props = _.without( @props, _.keys(@constructor.propTypes) )
+
+        <BS.Col  {...props} className="categories">
+            {body}
+            <BS.FormGroup className='add'>
+                <LC.IconButton icon="plus" onClick={@addCategory} />
+            </BS.FormGroup>
+        </BS.Col>

data/client/skr/screens/expense-entry/ExpenseEntry.cjsx

@@ -0,0 +1,193 @@
+##= require_self
+##= require ./Form
+##= require ./Grid
+##= require ./Categories
+##= require ./ApprovalRequest
+##= require ./ApproveDialog
+
+isApproved = (row) ->
+    !!row[2]
+
+getCategoryVal = (type, fields, q) ->
+    list = fields[1]
+    if _.isArray(q.syncOptions.with)
+        _.reduce(list, (amt, cat) ->
+            amt + cat[type]
+        , 0)
+    else
+        category_id = q.syncOptions.with.with_category_details
+        cat = _.find(list , (f) ->
+            f.category_id = category_id
+        )
+        cat?[type] || 0.0
+
+BALANCE_FIELD = {
+    id: 'balance', title: 'Balance',
+    fixedWidth: 100, textAlign: 'right', query: false,
+    format: (e, fields, q) ->
+        Lanes.u.format.currency getCategoryVal('balance', fields, q)
+}
+
+class Skr.Screens.ExpenseEntry extends Skr.Screens.Base
+
+    getInitialState: ->
+        isReviewing: false
+
+    syncOptions:
+        include: ['categories', 'attachments' ]
+
+    modelBindings:
+        categories: ->
+            Skr.Models.ExpenseCategory.Collection.fetch()
+
+        entry: ->
+            @loadOrCreateModel({
+                syncOptions: @syncOptions, klass: Skr.Models.ExpenseEntry
+                prop: 'entry', attribute: 'id'
+            })
+
+        query: ->
+            new Lanes.Models.Query({
+                autoRetrieve: true, sortAscending: false,
+                src: Skr.Models.ExpenseEntry,
+                syncOptions: _.extend({}, @syncOptions,
+                    with: ['with_category_details']
+                ),
+                fields: [
+                    { id: 'id', visible: false }
+                    { id: 'category_list', visible: false }
+                    { id: 'gl_transaction_ids', visible: false }
+                    { id: 'occured', fixedWidth: 200, textAlign: 'center', format: Lanes.u.format.dateTime }
+                    { id: 'name', flex: 1 }
+                    {
+                        id: 'amount',  fixedWidth: 100, textAlign: 'right', query: false,
+                        format: (e, fields, q) ->
+                            Lanes.u.format.currency getCategoryVal('amount', fields, q)
+                    }
+                ]
+            })
+
+    getSelectionAttributes: ({row}) ->
+        if isApproved(row) then {checked: true, disabled: true} else {}
+
+    setReviewState: (@isReviewing) ->
+        @setState({@isReviewing})
+        @query.syncOptions.with = ['with_category_details']
+        if @isReviewing
+            @query.syncOptions.queryParams = {review: true}
+            @query.syncOptions.with.push('with_user_logins')
+            @query.fields.add({ id: 'created_by_user.login', title: 'User', fixedWidth: 120 }, at: 3)
+            @gridSelections = new LC.Grid.Selections(
+                onChange: @rowSelectChanged, attributesGetter: @getSelectionAttributes
+            )
+            @query.fields.add(@gridSelections, at: 2)
+        else
+            delete @query.syncOptions.queryParams
+            delete @gridSelections
+            @query.fields.remove(['selected', 'created_by_user.login'])
+
+        @query.results.reload()
+
+    rowSelectChanged: ->
+        @forceUpdate()
+
+    onEntrySelect: (entry, index) ->
+        entry.fetch(@syncOptions).then (e) =>
+            @modelBindings.reset({entry})
+            @query.markModified()
+            @refs.form.focus()
+
+    onEntryReset: ->
+        entry = new Skr.Models.ExpenseEntry
+        entry.categories.add({})
+        @modelBindings.reset({entry})
+        @refs.form.focus()
+
+    onCategoryChange: ->
+        @query.results.reload()
+
+    onEntrySave: ->
+        isNew = @entry.isNew()
+        isCategoriesChanged = @entry.categories.isDirty()
+        @entry.save().then =>
+            return if @entry.hasErrors
+            if isNew or isCategoriesChanged
+                @query.results.reload()
+            else
+                @query.results.saveModelChanges(@entry)
+            @onEntryReset()
+
+    onConfirmationToggle: (selected) ->
+        @query.results.eachRow (row, xd) ->
+            LC.Grid.Selections.setRow(row, xd, selected)
+        @query.markModified()
+
+    onApproved: ->
+        @refs.overlay.hide()
+        @query.results.reload()
+
+    selectedState: ->
+        none = all = true
+        @query.results.eachRow (row, xd) ->
+            if LC.Grid.Selections.isSelected(row, xd) and not isApproved(row)
+                none = false
+            else
+                all = false
+            if none is false and all is false
+                return 'break'
+        if all then true else if none then false else null
+
+    onCategorySelect: (category) ->
+        if category
+            @query.syncOptions.with = { with_category_details:  category.id }
+            @query.fields.add(BALANCE_FIELD)
+        else
+            @query.fields.remove(BALANCE_FIELD.id)
+            category = new Skr.Models.ExpenseCategory
+            @query.syncOptions.with = [ 'with_category_details' ]
+        @setState({category})
+        @query.results.reload()
+
+    isRowEditing: (row) ->
+        @entry.id is row[0]
+
+    render: ->
+        selectionState = @selectedState()
+        <LC.ScreenWrapper flexVertical
+            identifier="expense-entry"
+            className={_.classnames('is-reviewing': @isReviewing)}
+        >
+
+            <Skr.Screens.ExpenseEntry.Form
+                ref="form"
+                categories={@categories}
+                entry={@entry}
+                onEntryReset={@onEntryReset}
+                onEntrySave={@onEntrySave}
+            />
+
+            <Skr.Screens.ExpenseEntry.Grid
+                onCategorySelect={@onCategorySelect}
+                setReviewState={@setReviewState}
+                isReviewing={@isReviewing}
+                isRowFocused={@isRowEditing}
+                isConfirmationChecked={selectionState}
+                categories={@categories}
+                onRecordSelect={@onEntrySelect}
+                onConfirmationToggle={@onConfirmationToggle}
+                query={@query}
+            />
+
+            <BS.Row className='footer'>
+                <BS.Col sm=12>
+                    <BS.OverlayTrigger
+                        rootClose={true} container={@} trigger="click" ref="overlay" placement="top"
+                        overlay={<Skr.Screens.ExpenseEntry.Approve
+                            query={@query} onApproved={@onApproved}/>}
+                    >
+                        <BS.Button bsStyle="primary" disabled={selectionState is false}>Approve</BS.Button>
+                    </BS.OverlayTrigger>
+                </BS.Col>
+            </BS.Row>
+
+        </LC.ScreenWrapper>