stockor 0.4.0 → 0.5.0

data/client/skr/screens/payments/Payments.cjsx

@@ -3,7 +3,7 @@ class Skr.Screens.Payments extends Skr.Screens.Base
     syncOptions:
         include: [ 'address', 'bank_account', 'category', 'vendor' ]
 
-    dataObjects:
+    modelBindings:
         payment: ->
             @loadOrCreateModel({
                 syncOptions: @syncOptions
@@ -16,7 +16,8 @@ class Skr.Screens.Payments extends Skr.Screens.Base
                 syncOptions: @syncOptions
                 src: Skr.Models.Payment, fields: [
                     {id:'id',   visible: false}
-                    {id:'visible_id', label: 'Payment ID', fixedWidth: 130 },
+                    {id:'visible_id',  title: 'Payment ID', fixedWidth: 130 },
+                    {id:'check_number', title: 'Check #',  fixedWidth: 130 },
                     {id:'name', flex: 1}
                     {
                         id:'amount',  fixedWidth: 120, textAlign: 'right',
@@ -32,17 +33,23 @@ class Skr.Screens.Payments extends Skr.Screens.Base
         <LC.ScreenWrapper identifier="payments">
             <SC.ScreenControls commands={@state.commands} />
             <BS.Row>
-                <LC.RecordFinder ref="finder" sm=3 autoFocus editOnly
+                <LC.RecordFinder ref="finder" sm=2 autoFocus editOnly
                     commands={@state.commands} model={@category}
                     label='Payment ID' name='visible_id' model={@payment} query={@query}
                 />
                 <SC.LocationChooser hideSingle sm=2 model={@payment} />
                 <SC.BankAccountFinder selectField name='bank_account'
                     model={@payment} />
-                <SC.PaymentCategoryFinder selectField name='category' labelField='code'
+                <SC.PaymentCategoryFinder selectField name='category' sm=2
+                    labelField='code' label="Cateogry" model={@payment} />
+                <LC.DateTime name='date' format='ddd, MMM Do YYYY' sm=3
                     model={@payment} />
-                <LC.DateTime name='date' format='ddd, MMM Do YYYY'
-                    sm=3 model={@payment} />
+                {<LC.DisplayValue align='right' label='Number' model={@payment}
+                    name='check_number' sm=1
+                /> unless @payment.isNew()}
+            </BS.Row>
+            <BS.Row>
+
             </BS.Row>
             <BS.Row>
                 <SC.VendorFinder sm=2 selectField

data/client/skr/screens/sale-report/SaleReport.cjsx

@@ -36,7 +36,7 @@ class Filters extends Lanes.Models.State
 
 class Skr.Screens.SaleReport extends Skr.Screens.Base
 
-    dataObjects:
+    modelBindings:
         filters: -> new Filters
 
     resetQuery: ->

data/client/skr/screens/sales-order/SalesOrder.cjsx

@@ -4,7 +4,7 @@ class Skr.Screens.SalesOrder extends Lanes.React.Screen
         include: [ 'billing_address', 'shipping_address', 'lines' ]
         with: [ 'with_details' ]
 
-    dataObjects:
+    modelBindings:
         sales_order: ->
             @loadOrCreateModel({
                 syncOptions: @syncOptions, klass: Skr.Models.SalesOrder
@@ -27,6 +27,7 @@ class Skr.Screens.SalesOrder extends Lanes.React.Screen
                     commands={@state.commands} />
 
                 <SC.CustomerFinder
+                    fallBackValue={@sales_order.customer_code}
                     syncOptions={ include: ['billing_address', 'shipping_address' ] }
                     selectField sm=3 xs=4 model={@sales_order} />
 

data/client/skr/screens/sku-maint/SkuMaint.cjsx

@@ -3,7 +3,7 @@ class Skr.Screens.SkuMaint extends Skr.Screens.Base
     syncOptions:
         {include: ['default_vendor', 'uoms']}
 
-    dataObjects:
+    modelBindings:
         sku: ->
             @loadOrCreateModel({
                 syncOptions: @syncOptions, klass: Skr.Models.Sku, prop: 'sku', attribute: 'code'

data/client/skr/screens/sku-maint/SkuUomList.cjsx

@@ -35,7 +35,7 @@ class UomEdit extends Lanes.React.Component
         list: React.PropTypes.instanceOf(UomList).isRequired
         uom:  React.PropTypes.instanceOf(Skr.Models.Uom).isRequired
 
-    dataObjects:
+    modelBindings:
         list: 'props'
         uom:  'props'
 
@@ -79,7 +79,7 @@ class EditBody extends Lanes.React.Component
         selected: React.PropTypes.instanceOf(Skr.Models.Uom)
         uoms: Lanes.PropTypes.Collection.isRequired
 
-    dataObjects:
+    modelBindings:
         uoms: 'props'
 
     add: ->

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

@@ -4,7 +4,7 @@ class Skr.Screens.TimeInvoicing extends Skr.Screens.Base
         isEditing: true
         commands: new Skr.Screens.Commands(this, modelName: 'request')
 
-    dataObjects:
+    modelBindings:
         request: -> new InvoiceRequest
         query: ->
             @gridSelections = new LC.Grid.Selections(onChange: @updateTotal)
@@ -27,7 +27,7 @@ class Skr.Screens.TimeInvoicing extends Skr.Screens.Base
                 ]
             })
 
-    setDataState: (state) ->
+    setModelState: (state) ->
         @updateTotal()
         @setState(state)
 
@@ -37,7 +37,7 @@ class Skr.Screens.TimeInvoicing extends Skr.Screens.Base
         return unless rate # the first call is when the model isn't parsed yet
         selectedRows = 0
         @query.results.eachRow (row, xd) ->
-            unless xd && false == xd.selected
+            if LC.Grid.Selections.isSelected(row, xd)
                 selectedRows += 1
                 total = total.add( hoursForRow(row) * rate )
         selectionState = if selectedRows is @query.results.length then 'all'
@@ -86,7 +86,7 @@ class Skr.Screens.TimeInvoicing extends Skr.Screens.Base
         rs.eachRow (row) ->
             xd = rs.xtraData(row)
             xd.selected = false == xd.selected
-        @query.changeCount++
+        @query.markModified()
     renderToggleAllButton: ->
         return null if 0 is @query.results.length
 

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

@@ -1,9 +1,9 @@
 class Skr.Screens.TimeTracking.EditEntry extends Lanes.React.Component
 
-    dataObjects:
+    modelBindings:
         entry: -> @props.event?.get('entry')
 
-    setDataState: (change) ->
+    setModelState: (change) ->
         if change.event
             @entry.fromCalEvent(change.event)
             change.event.set({content: @entry.content}, {silent: true})

data/client/skr/screens/time-tracking/Entries.coffee

@@ -11,8 +11,7 @@ class TimeEntries extends Skr.Models.TimeEntry.Collection
         query.start_at  = { op: 'lt', value: range.end.toISOString() }
         @fetch({query, reset: true})
 
-    resetEntries: (projectId, range) ->
-        @projectId = projectId
+    resetEntries: (@projectId, range) ->
         query = if @projectId and @projectId isnt -1
             {customer_project_id: @projectId}
         else {}
@@ -71,6 +70,9 @@ class Skr.Screens.TimeTracking.Entries extends Lanes.Models.Base
         for event in @calEvents().events
             event.setEditing(event is editingEvent)
 
+    removeEntry: (entry) ->
+        @entries.remove(entry)
+
     stopEditing: ->
         for event in @calEvents().events when event.isEditing()
             entry = event.get('entry')
@@ -85,7 +87,7 @@ class Skr.Screens.TimeTracking.Entries extends Lanes.Models.Base
         date.minute(rounded).second(0)
         entry = @entries.add({
             start_at: date.subtract(1, 'hour'), end_at: date.clone().add(2, 'hour')
-            customer_project: @project unless @project.id is -1
+            customer_project: @project unless @project?.id is -1
         })
         @calEvents().add( entry.toCalEvent() )
 
@@ -105,7 +107,7 @@ class Skr.Screens.TimeTracking.Entries extends Lanes.Models.Base
         @entries.resetEntries(@customer_project_id, @range)
 
     calEvents: ->
-        @_cachedEvents ||= new LC.Calendar.Events( @entries.invoke('toCalEvent') )
+        @_cachedEvents ||= new LC.Calendar.Events( @entries.invokeMap('toCalEvent') )
 
     back: ->
         @set(editing: false, date: @date.clone().subtract(1, @display) )

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

@@ -1,6 +1,7 @@
 ##= require ./PopoverMiniControls
 ##= require ./EditEntry
 
+MARGIN = 10
 class Skr.Screens.TimeTracking.Popover extends Lanes.React.Component
 
     componentWillReceiveProps: (nextProps) ->
@@ -10,8 +11,11 @@ class Skr.Screens.TimeTracking.Popover extends Lanes.React.Component
             @setState(isCanceled: false)
 
     onCancel: ->
-        if @state.editing?.get('entry').isNew()
+        entry = @state.editing.get('entry')
+        if entry.isNew()
             @state.editing.remove()
+            @props.entries.removeEntry(entry)
+
         @props.entries.stopEditing()
         @setState(isCanceled: true, editing: null)
 
@@ -51,19 +55,20 @@ class Skr.Screens.TimeTracking.Popover extends Lanes.React.Component
         else
             [175, 60]
 
-        # expand to show edit button
         width += 60 if @props.event and not @state.editing
-
-        placement = if x > (this.props.bounds.width / 2) then 'left' else 'right'
-
+        placement = if x > (@props.bounds.width / 2) then 'left' else 'right'
         x -= width if placement is 'left'
+        top = Math.max( MARGIN, y - (height / 2) )
+        if top + height > @props.bounds.height
+            top = @props.bounds.height - height - MARGIN
 
         <BS.Popover className={classes}
             style={{width, height}}
             id='edit-controls'
+            arrowOffsetTop={y - top}
             placement={placement}
             positionLeft={x}
-            positionTop={y - (height / 2)}
+            positionTop={top}
         >
             <@MiniControls />
             <@EditEntry />

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

@@ -6,7 +6,7 @@
 
 class Skr.Screens.TimeTracking extends Skr.Screens.Base
 
-    dataObjects:
+    modelBindings:
         entries: ->
             new Skr.Screens.TimeTracking.Entries
 
@@ -14,10 +14,9 @@ class Skr.Screens.TimeTracking extends Skr.Screens.Base
         @showPopup(ev, date)
 
     showPopup: (ev, date, eventEditing = false) ->
-        rect = _.dom(this).el.getBoundingClientRect()
+        rect = _.dom(this).bounds
         @entries.editing = {
-            event: eventEditing,
-            date: date, bounds: rect,
+            date: date, event: eventEditing, bounds: rect
             position: {x: ev.clientX - rect.left, y: ev.clientY - rect.top}
         }
 
@@ -42,9 +41,17 @@ class Skr.Screens.TimeTracking extends Skr.Screens.Base
         return null unless @entries.isMonth
         <div className="monthly-totals">{@entries.totalHours().toFixed(2)}</div>
 
+    getHeight: ->
+        _.dom(@).getBoundingClientRect().height
+
     render: ->
+
         <LC.ScreenWrapper identifier="time-tracking" flexVertical>
-            <Skr.Screens.TimeTracking.Popover entries={@entries} {...@entries.editing} />
+            <Skr.Screens.TimeTracking.Popover
+                getHeight={@getHeight}
+                entries={@entries}
+                {...@entries.editing}
+            />
             <LC.NetworkActivityOverlay visible={@entries.isLoading} model={@entries}/>
             <Skr.Screens.TimeTracking.Header entries={@entries} />
             <BS.Row className="calendar-panel">

data/client/skr/screens/vendor-maint/VendorMaint.cjsx

@@ -3,7 +3,7 @@ class Skr.Screens.VendorMaint extends Lanes.React.Screen
     syncOptions:
         include: ['billing_address', 'shipping_address']
 
-    dataObjects:
+    modelBindings:
         vendor: ->
             @loadOrCreateModel({
                 syncOptions: @syncOptions, klass: Skr.Models.Vendor,
@@ -31,9 +31,9 @@ class Skr.Screens.VendorMaint extends Lanes.React.Screen
             <BS.Row>
                 <SC.GlAccountChooser sm=4 label="Payables Account"
                     name="gl_payables_account" model={@vendor} />
+                <SC.TermsChooser sm=4 model={@vendor} />
                 <SC.GlAccountChooser sm=4 label="Freight Account"
                     name="gl_freight_account" model={@vendor} />
-                <SC.TermsChooser sm=4 model={@vendor} />
             </BS.Row>
             <BS.Row>
                 <LC.FieldSet sm=12 title="Address">

data/config/database.yml

@@ -2,8 +2,10 @@ development:
   adapter: postgresql
   database: skr_dev
   host: /tmp
+  pool: 12
 
 test:
   adapter: postgresql
   database: skr_test
   host: /tmp
+  pool: 12

data/config/puma.rb

@@ -1,4 +0,0 @@
-require 'message_bus'
-on_worker_boot do
-  MessageBus.after_fork
-end

data/config/routes.rb

@@ -37,9 +37,13 @@ Lanes::API.routes.for_extension 'skr' do
     resources Skr::VoLine
     resources Skr::SalesOrder
     resources Skr::SoLine
+    resources Skr::ExpenseCategory
+    resources Skr::ExpenseEntry
     resources Skr::SequentialId, controller: Skr::Handlers::SequentialIds
     resources Skr::Invoice, controller: Skr::Handlers::InvoiceFromTimeEntries,
               path: 'invoices/from-time-entries'
+    resources Skr::ExpenseEntry, controller: Skr::Handlers::ApproveExpenseEntries,
+              path: 'expense-entries/approve'
     resources Skr::Sku, path: 'public/skus', controller: Skr::Handlers::Skus, cors: '*', public: true
     resources Skr::Invoice, path: 'public/sales', controller: Skr::Handlers::Sales, cors: '*', public: true
     get  'credit-card-gateways.json', &Skr::Handlers::CreditCardGateway.get

data/config/screens.rb

@@ -79,6 +79,14 @@ Lanes::Screen.for_extension 'skr' do | screens |
         screen.model_class = "PaymentTerm"
         screen.view_class  = "PaymentTerms"
     end
+    screens.define "expense-categories" do | screen |
+        screen.title       = "Expense Categories"
+        screen.description = ""
+        screen.icon        = "folder-open"
+        screen.group_id    = "accounting"
+        screen.model_class = "ExpenseCategory"
+        screen.view_class  = "ExpenseCategories"
+    end
     screens.define "payment-category" do | screen |
         screen.title       = "Payment Categories"
         screen.description = ""
@@ -187,4 +195,13 @@ Lanes::Screen.for_extension 'skr' do | screens |
         screen.model_class = "TimeEntry"
         screen.view_class  = "TimeTracking"
     end
+    screens.define "expense-entry" do | screen |
+        screen.title       = "Expense Entry"
+        screen.description = ""
+        screen.icon        = "shopping-bag"
+        screen.group_id    = "customer"
+        screen.model_class = "ExpenseEntry"
+        screen.view_class  = "ExpenseEntry"
+    end
+
 end

data/db/migrate/20140323001446_create_so_details_view.rb

@@ -2,7 +2,7 @@ require 'skr/db/migration_helpers'
 
 class CreateSoDetailsView < ActiveRecord::Migration
     def up
-        fk = "#{skr_prefix}sales_order_id"
+        fk = "sales_order_id"
         execute <<-EOS.squish
             create view #{skr_prefix}so_details as
               select so.id as #{fk},
@@ -76,7 +76,7 @@ class CreateSoDetailsView < ActiveRecord::Migration
     end
 
     def down
-        execute "drop view #{skr_prefix}so_amount_details"
+        execute "drop view #{skr_prefix}so_details"
         execute "drop view #{skr_prefix}so_allocation_details"
         execute "drop view #{skr_prefix}so_dailly_sales_history"
     end

data/db/migrate/20151121211323_create_customer_project_details_views.rb

@@ -6,7 +6,7 @@ class CreateCustomerProjectDetailsViews < ActiveRecord::Migration
         execute <<-EOS
         create view #{view} as
           select
-            cp.id as skr_customer_project_id,
+            cp.id as customer_project_id,
             c.code as customer_code,
             c.name as customer_description,
             s.code as sku_code,

data/db/migrate/20160216142845_create_gl_account_balances_view.rb

@@ -4,7 +4,7 @@ class CreateGlAccountBalancesView < ActiveRecord::Migration
     def up
         execute <<-EOS.squish
         create view #{skr_prefix}gl_account_balances as select
-          gla.id as skr_gl_account_id,
+          gla.id as gl_account_id,
           right(glp.account_number,2) as branch_number,
           coalesce(sum(glp.amount), 0.00) as balance
         from skr_gl_accounts gla

data/db/migrate/20160726004411_string_check_numbers.rb

@@ -0,0 +1,5 @@
+class StringCheckNumbers < ActiveRecord::Migration
+    def change
+        change_column :skr_payments, :check_number, :varchar
+    end
+end

data/db/migrate/20160805002717_create_expenses.rb

@@ -0,0 +1,65 @@
+require 'skr/db/migration_helpers'
+
+class CreateExpenses < ActiveRecord::Migration
+    def up
+
+        create_skr_table :expense_categories do |t|
+            t.skr_code_identifier
+            t.string :name, null: false
+            t.boolean :is_active, null: false, default: true
+            t.skr_reference :gl_account, null: false, single: true
+            t.skr_track_modifications
+        end
+
+        create_skr_table(:expense_entries) do |t|
+            t.column :uuid, 'uuid', null: false
+            t.text :name, null: false
+            t.text :memo
+            t.timestamp :occured, null: false
+            t.jsonb :metadata, default: {}
+            t.skr_track_modifications create_only: true
+        end
+        skr_add_index :expense_entries, :uuid, unique: true
+
+        create_skr_table(:expense_entry_categories) do |t|
+            t.skr_reference :category, to_table: 'expense_categories', single: true
+            t.skr_reference :entry,    to_table: 'expense_entries',    single: true
+            t.skr_currency :amount, null: false
+        end
+        skr_add_index :expense_entry_categories, :entry_id, unique: false
+
+        execute <<-EOS
+          create or replace view skr_expense_entry_details as
+          select
+            xref.expense_entry_id,
+            array_agg(xref.gl_transaction_id) filter (where xref.gl_transaction_id is not NULL) as gl_transaction_ids,
+            array_agg(xref.category_id) as category_ids,
+            sum(amount) as category_total,
+            json_agg(row_to_json(
+                (select t from (select category_id, amount, balance) as t(category_id, amount, balance))
+              )
+            ) category_list
+          from (
+            select
+              entry.id as expense_entry_id,
+              gl.id as gl_transaction_id,
+              category_id, ec.amount,
+              sum(amount) over (partition by category_id order by occured) as balance
+            from
+              skr_expense_entries entry
+            left join skr_gl_transactions gl on
+              gl.source_type='Skr::ExpenseEntry' and gl.source_id = entry.id
+            join
+              skr_expense_entry_categories ec on entry.id = ec.entry_id
+          ) as xref
+          group by expense_entry_id
+        EOS
+    end
+
+    def down
+        execute "drop view skr_expense_entry_details"
+        drop_skr_table :expense_entry_categories
+        drop_skr_table :expense_categories
+        drop_skr_table :expense_entries
+    end
+end