stockor 0.4.0 → 0.5.0

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

@@ -0,0 +1,54 @@
+class Attachments extends Lanes.React.Component
+    modelBindings:
+        attachments: 'props'
+
+    render: ->
+        <LC.FieldSet
+             title={"Attachments (#{@attachments.length-1})"}
+         >
+             <LC.AssetsListing assets={@attachments}
+                 name='attachments' size="thumb" />
+         </LC.FieldSet>
+
+class Skr.Screens.ExpenseEntry.Form extends Lanes.React.Component
+
+    propTypes:
+        onEntrySave: React.PropTypes.func.isRequired
+
+    modelBindings:
+        entry: 'props'
+
+    getInitialState: ->
+        isEditing: true
+
+    mixins: [
+        Lanes.React.Mixins.RelayEditingState
+    ]
+
+    focus: ->
+        _.defer => @refs.name.focus()
+
+    render: ->
+        <div className="form">
+            <LC.NetworkActivityOverlay model={@entry} />
+            <BS.Row>
+                <LC.Input sm=8 name='name' ref="name" model={@entry} />
+                <Skr.Screens.ExpenseEntry.Categories
+                    categories={@props.categories}
+                    entry={@entry} sm={4} />
+            </BS.Row>
+
+            <BS.Row>
+                <Attachments attachments={@entry.attachments} />
+            </BS.Row>
+
+            <BS.Row>
+                <LC.Input sm=10 name='memo' model={@entry} />
+                <LC.FormGroup className='controls' sm=2>
+                    <BS.ButtonGroup>
+                        <BS.Button tabIndex={-1} onClick={@props.onEntryReset}>Reset</BS.Button>
+                        <BS.Button onClick={@props.onEntrySave}>Save</BS.Button>
+                    </BS.ButtonGroup>
+                </LC.FormGroup>
+            </BS.Row>
+        </div>

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

@@ -0,0 +1,51 @@
+class Skr.Screens.ExpenseEntry.Grid extends Lanes.React.Component
+
+    propTypes:
+        onRecordSelect: React.PropTypes.func.isRequired
+
+    modelBindings:
+        categories: 'props'
+        query: 'props'
+
+    getInitialState: ->
+        category: new Skr.Models.ExpenseCategory
+
+    getCurrentCategory: -> @state.category
+
+    renderReviewCheckbox: ->
+        return null unless Lanes.current_user.roles.includes('accounting')
+        <BS.Checkbox className="all-users" checked={!!@query.syncOptions.queryParams?.review}
+            onChange={(ev) => @props.setReviewState(ev.target.checked)}
+        > Review</BS.Checkbox>
+
+    renderApproveToggle: ->
+        return null unless @props.isReviewing
+        <span className="approved-toggle">
+            <LC.IndeterminateCheckbox checked={@props.isConfirmationChecked}
+                onChange={(ev) => @props.onConfirmationToggle(ev.target.checked)}
+            />
+        </span>
+
+    toolbarControls: ->
+        <BS.Navbar.Form className="controls">
+            {@renderApproveToggle()}
+            <div className="spacer" />
+            <div className="right">
+                {@renderReviewCheckbox()}
+                <SC.ExpenseCategoryFinder
+                    choices={@categories.models} fetchOnSelect={false}
+                    withClearBtn fieldOnly editOnly selectField unlabeled
+                    model={@state.category} getSelection={@getCurrentCategory}
+                    setSelection={@props.onCategorySelect} />
+                </div>
+        </BS.Navbar.Form>
+
+    render: ->
+        <LC.Grid
+            expandY={true}
+            onColumnClick={@onColumnSort}
+            isRowFocused={@props.isRowFocused}
+            query={@query} height=200 autoLoadQuery
+            onSelectionChange={@props.onRecordSelect}
+            toolbarChildren={@toolbarControls()}
+        />

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

@@ -0,0 +1 @@
+class Skr.Screens.ExpenseEntry.ScreenState extends Lanes.Models.State

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

@@ -0,0 +1 @@
+//= require ./ExpenseEntry

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

@@ -0,0 +1,106 @@
+/*
+ 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-entry {
+    $first-column-width: 90px;
+    .footer {
+        display: none;
+        button {
+            width: $first-column-width;
+            border-top-left-radius: 0;
+            border-top-right-radius: 0;
+        }
+    }
+    &.is-reviewing {
+        .footer { display: block; }
+    }
+
+    .selection {
+        //margin: 5px;
+    }
+
+    .form {
+        .controls {
+            text-align: center;
+        }
+
+    }
+
+    .grid-component .toolbar .controls {
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+        .approved-toggle {
+            width: $first-column-width;
+            text-align: center;
+        }
+        .all-users {
+            margin-right: 20px;
+        }
+        .spacer { flex: 1; }
+    }
+
+
+    .categories {
+        display: flex;
+        align-items: flex-end;
+        position: relative;
+        .add { margin-left: 5px; }
+        .multiple {
+            .controls {
+                display: flex;
+                align-items: center;
+                justify-content: flex-end;
+                p {
+                    flex: 1;
+                    .pair + .pair { margin-left: 0.5em; }
+                }
+                .btn.view {
+                    margin-right: 1em;
+                }
+            }
+            .form-control-static { padding-top: 0; padding-bottom: 0; }
+            .pair {
+                max-width: 100px;
+                display: inline-block;
+                text-overflow: ellipsis;
+                overflow: hidden;
+                white-space: nowrap;
+                max-height: 35px;
+            }
+        }
+
+        .category {
+            display: flex;
+            align-items: center;
+            margin-bottom: 15px;
+            .form-group { margin-bottom: 0; }
+            .lanes-field { flex: 1; }
+            .btn {
+                margin-left: 0.5rem;
+                &.delete { display: none; }
+            }
+        }
+
+        .popover-content {
+            width: 320px;
+            .category {
+                label { display: none; }
+                .btn.delete { display: block; }
+            }
+        }
+    }
+
+    #choose-bank-account {
+        .popover-content {
+            display: flex;
+            button { margin-left: 0.5rem; }
+        }
+
+        //height: 200px;
+
+    }
+}

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

@@ -1,6 +1,6 @@
 class Skr.Screens.FreshBooksImport.ApiInfo extends Lanes.React.Component
     listenNetworkEvents: true
-    dataObjects:
+    modelBindings:
         import: 'props'
     startImport: ->
         @import.save()
@@ -20,10 +20,10 @@ class Skr.Screens.FreshBooksImport.ApiInfo extends Lanes.React.Component
                     <p>Your access information will not be stored and is only used to download records</p>
                 </BS.Col>
             </BS.Row>
-            <BS.Row>
+            <BS.Row className="api-info">
                 <LC.Input name='api_key' label='API Key' sm=7 model={@import} />
                 <LC.Input name='domain' label='Company' sm=3 model={@import} />
-                <BS.FormGroup className='domain' sm=2 label=''>.freshbooks.com</BS.FormGroup>
+                <BS.Col sm=2 className="domain">.freshbooks.com</BS.Col>
             </BS.Row>
             <BS.Row>
                 <BS.Col smOffset=9 sm=2>

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

@@ -11,7 +11,7 @@ class TextInput extends Lanes.React.Component
         <input value={@props.row.customer_code || ''} onChange={@setCode} />
 
 class UserSelect extends Lanes.React.Component
-    dataObjects:
+    modelBindings:
         user: -> new Lanes.Models.User
 
     getUser: ->
@@ -58,7 +58,7 @@ class RecordRow extends Lanes.React.BaseComponent
 
 class Skr.Screens.FreshBooksImport.ChooseRecords extends Lanes.React.Component
     listenNetworkEvents: true
-    dataObjects:
+    modelBindings:
         import: 'props'
         job: -> @props.import.job
 
@@ -107,9 +107,11 @@ class Skr.Screens.FreshBooksImport.ChooseRecords extends Lanes.React.Component
         return null unless @import.hasPendingRecords()
         <div className="import-records">
             {@renderHeader()}
-            <BS.Tabs animation={false} defaultActiveKey={0}>
+            <BS.Tabs id='choose-records'>
             {for type, i in @import.recordTypes when @import.recordsForType(type)
-                <BS.Tab eventKey={i} key={i} title={_.titleize(type)} animation={false}>
+                <BS.Tab eventKey={i} key={i}
+                    title={_.titleize(type)} animation={false}
+                >
                     <@RecordTable type={type} />
                 </BS.Tab>}
             </BS.Tabs>

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

@@ -7,7 +7,7 @@
 class Skr.Screens.FreshBooksImport extends Skr.Screens.Base
     modelForAccess: 'invoice'
     getInitialState: -> isEditing: true
-    dataObjects:
+    modelBindings:
         import: ->
             new Skr.Screens.FreshBooksImport.Import
 

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

@@ -1,7 +1,7 @@
 # coffeelint: disable=max_line_length
 class Skr.Screens.FreshBooksImport.ViewRecords extends Lanes.React.Component
     listenNetworkEvents: true
-    dataObjects:
+    modelBindings:
         import: 'props'
         job: -> @props.import.job
 
@@ -87,7 +87,7 @@ class Skr.Screens.FreshBooksImport.ViewRecords extends Lanes.React.Component
         return null unless @import.hasImportedRecords()
 
         <h3>Import Success!</h3>
-        <BS.Tabs animation={false} defaultActiveKey={0}>
+        <BS.Tabs id='view-records'>
         {for type, i in @import.recordTypes
             TableType = @[_.capitalize(type)] || @BlankTable
             <BS.Tab eventKey={i} key={i} title={_.titleize(type)} animation={false}>

data/client/skr/screens/fresh-books-import/index.scss

@@ -1,12 +1,13 @@
 .fresh-books-import {
-    .domain .value {
-        margin-top: 15px;
-    }
     .job-executing {
         width: 80%;
         margin: 80px auto;
     }
-
+    .api-info {
+        .domain {
+            padding-top: 35px;
+        }
+    }
     .import-records {
         .clients tbody tr td:last-child {
             width: 130px;

data/client/skr/screens/gl-accounts/GlAccounts.cjsx

@@ -1,6 +1,6 @@
 class Skr.Screens.GlAccounts extends Skr.Screens.Base
 
-    dataObjects:
+    modelBindings:
         account: ->
             @loadOrCreateModel({
                 klass: Skr.Models.GlAccount,

data/client/skr/screens/gl-transactions/GlTransactions.cjsx

@@ -35,7 +35,7 @@ class Skr.Screens.GlTransactions extends Skr.Screens.Base
 
     modelForAccess: 'gl-transaction'
 
-    dataObjects:
+    modelBindings:
         transactions: -> new Transactions(account: @props.account)
 
     render: ->

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

@@ -1,5 +1,6 @@
 ##= require_self
 ##= require ./Payment
+##= require ./TotalExtraInfo
 
 class Skr.Screens.Invoice extends Skr.Screens.Base
 
@@ -7,7 +8,7 @@ class Skr.Screens.Invoice extends Skr.Screens.Base
         with: [ 'with_details' ]
         include: [ 'sales_order', 'billing_address', 'shipping_address', 'lines', 'payments' ]
 
-    dataObjects:
+    modelBindings:
         invoice: ->
             @loadOrCreateModel({
                 syncOptions: @syncOptions, klass: Skr.Models.Invoice,
@@ -49,6 +50,7 @@ class Skr.Screens.Invoice extends Skr.Screens.Base
                     parentModel={@invoice} />
 
                 <SC.CustomerFinder
+                    fallBackValue={@invoice.customer_code}
                     syncOptions={ include: ['billing_address', 'shipping_address' ] }
                     selectField sm=3 xs=6 model={@invoice} />
 
@@ -87,5 +89,7 @@ class Skr.Screens.Invoice extends Skr.Screens.Base
                 saveImmediately={@shouldSaveLinesImmediately}
                 commands={@state.commands} lines={@invoice.lines} />
 
-            <SC.TotalsLine model={@invoice} />
+            <SC.TotalsLine model={@invoice} extraInfo={
+                <Skr.Screens.Invoice.TotalExtraInfo invoice={@invoice} />
+            } />
         </LC.ScreenWrapper>

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

@@ -23,7 +23,7 @@ class Skr.Screens.Invoice.Payment extends Lanes.React.Component
     getInitialState: ->
         type: 'credit-card'
 
-    dataObjects:
+    modelBindings:
         invoice: 'props'
         payment: ->
             payment = @props.invoice.payments.find (pymnt) -> pymnt.isNew()

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

@@ -0,0 +1,32 @@
+class Skr.Screens.Invoice.TotalExtraInfo extends Lanes.React.Component
+
+    modelBindings:
+        invoice: 'props'
+
+    checkLoading: ->
+        unless @invoice.total_hours
+            @invoice.fetch({
+                fields: ['total_hours']
+            })
+
+    TotalHours: ->
+        body = if @invoice.total_hours
+            <span>Hours: {Lanes.u.format.currency(@invoice.total_hours)}</span>
+        else
+            [
+                <LC.Icon key="icon" type='spinner' />,
+                <span key='msg'> Loading...</span>
+            ]
+        <div className="invoice-total-hours-tooltip">
+            {body}
+        </div>
+
+
+    render: ->
+        return null if @invoice.form isnt 'labor' or @invoice.isNew()
+
+        <LC.Icon
+            className='total-hours'
+            tooltipProps={onEntering: @checkLoading}
+            type='clock-o' tooltip={<@TotalHours />}
+        />

data/client/skr/screens/invoice/index.scss

@@ -1,7 +1,9 @@
 .invoice {
+    .total-hours { margin-right: 0.5rem; }
+}
 
-
-
+.invoice-total-hours-tooltip {
+    width: 100px;
 }
 
 .invoice-payment {

data/client/skr/screens/locations/Locations.cjsx

@@ -3,7 +3,7 @@ class Skr.Screens.Locations extends Skr.Screens.Base
     syncOptions:
         include: [ 'address', 'logo' ]
 
-    dataObjects:
+    modelBindings:
         location: ->
             @loadOrCreateModel({
                 syncOptions: @syncOptions, klass: Skr.Models.Location

data/client/skr/screens/payment-category/PaymentCategory.cjsx

@@ -1,6 +1,6 @@
 class Skr.Screens.PaymentCategory extends Skr.Screens.Base
 
-    dataObjects:
+    modelBindings:
         category: ->
             @loadOrCreateModel({
                 klass: Skr.Models.PaymentCategory

data/client/skr/screens/payment-terms/PaymentTerms.cjsx

@@ -1,6 +1,6 @@
 class Skr.Screens.PaymentTerms extends Skr.Screens.Base
 
-    dataObjects:
+    modelBindings:
         term: ->
             @loadOrCreateModel({
                 klass: Skr.Models.PaymentTerm