stockor 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f560ee8a3baf00f8132abaa16e7102af0a754628
-  data.tar.gz: fc2279a4c83c7503f8ed05236ee15bb7a0c53f66
+  metadata.gz: 0a414367906d22c62241eefcdd7dd7e1222f5f14
+  data.tar.gz: 5c774edc4a5bebe21b462e00c815201a71bb8d8a
 SHA512:
-  metadata.gz: 39612948c454591b7103a2528df39178141427af782c91e6f291a75772b467c2e535c2ce80b03060d56370ade3278ed7c621a9ca732f9e0d4b1040dfa9b40f48
-  data.tar.gz: ad721dbe0d756b452385afb05309ad9667d257ddccf011adceab0e7526cfdea17e34f0651d83df77de8589a1d971926900f2c362346cf3ea1141af06875fb5d0
+  metadata.gz: a3e8300d12e447cf2dc450ee1e62949926e797327a8210b92bb7fea109860d5dd76a60fc123f190186c20eed38cb21be252984d912949109821afb7b98e753c1
+  data.tar.gz: 928f00055f0c0269c863169e08997c6501bc2b2f3fd4612eae934ffef4eed3361ef880f203f07250c65630a3991ed8eaa2cefa2243a2291a85a92ca83fc5bf35

data/.gitignore

@@ -2,4 +2,5 @@ public/assets
 tmp/cache
 log/
 secrets.yml
+.DS_Store
 pkg

data/Gemfile.lock

@@ -1,12 +1,13 @@
 GIT
   remote: git://github.com/argosity/lanes.git
-  revision: 3574e2186fff13c0bc6203ce1fd437f30142e500
+  revision: 208a0fafd5337b4299e2f123c97e8ddee6a19d32
   branch: master
   specs:
-    lanes (0.1.9)
+    lanes (0.1.9.5)
       activerecord (~> 4.2)
       bcrypt (~> 3.1)
       closure-compiler (~> 1.1)
+      coffee-react (~> 3.0)
       coffee-script (~> 2.3)
       compass-import-once (~> 1.0)
       execjs (~> 2.2)
@@ -35,22 +36,22 @@ GIT
 PATH
   remote: .
   specs:
-    stockor (0.1.8)
+    stockor (0.1.9)
       aasm (~> 4.1)
       lanes
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aasm (4.1.0)
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    aasm (4.2.0)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
       arel (~> 6.0)
-    activesupport (4.2.1)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -61,12 +62,12 @@ GEM
     builder (3.2.2)
     byebug (4.0.5)
       columnize (= 0.9.0)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
     childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
     closure-compiler (1.1.11)
     coderay (1.1.0)
+    coffee-react (3.0.1)
+      execjs
     coffee-script (2.4.1)
       coffee-script-source
       execjs
@@ -75,16 +76,15 @@ GEM
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
     crass (1.0.2)
-    eventmachine (1.0.7)
     execjs (2.5.2)
     faker (1.4.3)
       i18n (~> 0.5)
-    ffi (1.9.8)
+    ffi (1.9.10)
     formatador (0.2.5)
     growl (1.0.3)
-    guard (2.12.5)
+    guard (2.12.8)
       formatador (>= 0.2.4)
-      listen (~> 2.7)
+      listen (>= 2.7, <= 4.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
@@ -92,7 +92,7 @@ GEM
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
-    guard-jasmine (2.0.5)
+    guard-jasmine (2.0.6)
       childprocess (~> 0.5)
       guard (~> 2.8)
       guard-compat (~> 1.2)
@@ -103,35 +103,32 @@ GEM
     guard-minitest (2.4.4)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
-    hashie (3.4.1)
+    hashie (3.4.2)
     hike (1.2.3)
-    hitimes (1.2.2)
     i18n (0.7.0)
-    jasmine (2.2.0)
-      jasmine-core (~> 2.2)
+    jasmine (2.3.0)
+      jasmine-core (~> 2.3)
       phantomjs
       rack (>= 1.2.1)
       rake
-    jasmine-core (2.2.0)
-    json (1.8.2)
-    listen (2.10.0)
-      celluloid (~> 0.16.0)
+    jasmine-core (2.3.4)
+    json (1.8.3)
+    listen (3.0.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     lumberjack (1.0.9)
-    message_bus (1.0.9)
-      eventmachine
+    message_bus (1.0.14)
       rack (>= 1.1.3)
       redis
     metaclass (0.0.4)
     method_source (0.8.2)
     mini_portile (0.6.2)
-    minitest (5.6.0)
+    minitest (5.7.0)
     minitest-around (0.3.1)
       minitest (~> 5.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.0)
+    multi_json (1.11.2)
     nenv (0.2.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
@@ -140,8 +137,8 @@ GEM
     notiffany (0.0.6)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oj (2.12.4)
-    pg (0.18.1)
+    oj (2.12.9)
+    pg (0.18.2)
     phantomjs (1.9.8.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
@@ -150,9 +147,9 @@ GEM
     pry-byebug (3.1.0)
       byebug (~> 4.0)
       pry (~> 0.10)
-    puma (2.11.2)
+    puma (2.11.3)
       rack (>= 1.1, < 2.0)
-    rack (1.6.0)
+    rack (1.6.4)
     rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
@@ -160,7 +157,7 @@ GEM
     rack_csrf (2.5.0)
       rack (>= 1.1.0)
     rake (10.4.2)
-    rb-fsevent (0.9.4)
+    rb-fsevent (0.9.5)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
     redis (3.2.1)
@@ -169,25 +166,23 @@ GEM
       crass (~> 1.0.1)
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.2.0)
-    sass (3.4.13)
+    sass (3.4.15)
     shellany (0.0.1)
     sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     slop (3.6.0)
-    sprockets (2.12.3)
+    sprockets (2.12.4)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-helpers (1.1.0)
-      sprockets (~> 2.0)
+    sprockets-helpers (1.2.1)
+      sprockets (>= 2.2)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
-    timers (4.0.1)
-      hitimes
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     yui-compressor (0.12.0)
@@ -206,3 +201,6 @@ DEPENDENCIES
   puma
   rake
   stockor!
+
+BUNDLED WITH
+   1.10.5

data/client/skr/Extension.coffee

@@ -2,14 +2,13 @@ class Skr.Extension extends Lanes.Extensions.Base
 
     identifier: "skr"
 
-    # This method is called when the extension is registered
-    # Not all of Lanes will be available yet
-    onRegistered: ->
-
     # Data that is provided by lib/skr/extension.rb's
     # client_bootstrap_data method ends up here
-    setBootstrapData: (data)->
-        Skr.Models.GlAccount.initialize(data)
-
-    # All of lanes is loaded and it is in the process of booting
-    onAvailable: ->
+    setBootstrapData: (data) ->
+        Skr.Models.GlAccount.initialize(
+            accounts: data.gl_accounts
+            default_ids: data.default_gl_account_ids,
+        )
+
+    rootComponent: (viewport) ->
+        Lanes.Workspace.Layout

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

@@ -0,0 +1,51 @@
+class Skr.Components.Address extends Lanes.React.Component
+
+    propTypes:
+        model: Lanes.PropTypes.State.isRequired
+
+    renderTitle: ->
+        <BS.Row>
+            <BS.Col xs=12>
+                <h3 className="address-title">{@props.title}</h3>
+            </BS.Col>
+        </BS.Row>
+
+    render: ->
+        colProps = _.omit(@props, 'name')
+        colProps.className = _.classnames("address", @props.className)
+
+        <BS.Col {...colProps}>
+            {@renderTitle() if @props.title}
+            <BS.Row>
+                <BS.Col xs=12>
+                    <LC.TextField name="name" model={@model} />
+                </BS.Col>
+            </BS.Row>
+            <BS.Row>
+                <BS.Col sm=6>
+                    <LC.TextField name="phone" model={@model} />
+                </BS.Col>
+                <BS.Col sm=6>
+                    <LC.TextField name="email" model={@model} />
+                </BS.Col>
+            </BS.Row>
+            <BS.Row>
+                <BS.Col md=6>
+                    <LC.TextField name="line1" model={@model} />
+                </BS.Col>
+                <BS.Col md=6>
+                    <LC.TextField name="line2" model={@model} />
+                </BS.Col>
+            </BS.Row>
+            <BS.Row>
+                <BS.Col md=7>
+                    <LC.TextField name="city" model={@model} />
+                </BS.Col>
+                <BS.Col sm=8 md=3>
+                    <LC.TextField name="state" model={@model} />
+                </BS.Col>
+                <BS.Col sm=4 md=2>
+                    <LC.TextField name="postal_code" model={@model} />
+                </BS.Col>
+            </BS.Row>
+        </BS.Col>

data/client/skr/components/address/styles.scss

@@ -0,0 +1,6 @@
+.address {
+    .address-title {
+        margin-top: 10px;
+        border-bottom: 1px solid $input-border;
+    }
+}

data/client/skr/index.js

@@ -1,11 +1,8 @@
 //=require ./models/Base
-//=require ./views/Base
+
 //=require_tree ./models/mixins
 //=require_tree ./models
-//=require_tree ./views
 //=require_tree ./components
-//=require ./screens/Base
-//=require ./screens/mixins
 //=require ./Extension
 
 /*

data/client/skr/models/Customer.coffee

@@ -3,7 +3,7 @@ class Skr.Models.Customer extends Skr.Models.Base
 
     props:
         id:                       {"type":"integer","required":true}
-        code:                     {"type":"string","required":true}
+        code:                     {"type":"code","required":true}
         billing_address_id:       {"type":"integer","required":true}
         shipping_address_id:      {"type":"integer","required":true}
         terms_id:                 {"type":"integer","required":true}

data/client/skr/models/GlAccount.coffee

@@ -1,20 +1,20 @@
 class Skr.Models.GlAccount extends Skr.Models.Base
 
-    cacheDuration: [1,'day']
+    cacheDuration: [1, 'day']
 
     props:
-        id:         {"type":"integer","required":true}
-        number:     {"type":"string","required":true}
-        name:       {"type":"string","required":true}
-        is_active:  {"type":"boolean","required":true,"default":"true"}
+        id:         {"type":"integer", "required":true}
+        number:     {"type":"string",  "required":true}
+        name:       {"type":"string",  "required":true}
+        is_active:  {"type":"boolean", "required":true, "default":true}
 
     derived:
         combined_name:
-            deps: ['number','name'], fn:->
-                "#{@number}: #{@name}"
+            deps: ['number', 'name'], fn: ->
+                if @isNew() then "" else "#{@number}: #{@name}"
 
 
-    @initialize: (data)->
-        this.default_ids = data.default_gl_account_ids
-        ms=Lanes.Vendor.Moment.duration(this::cacheDuration...).asMilliseconds()
-        Lanes.Models.ServerCache.store(this::urlRoot(), data.gl_accounts, ms)
+    @initialize: (data) ->
+        this.default_ids = data.default_ids
+        ms = Lanes.Vendor.Moment.duration(this::cacheDuration...).asMilliseconds()
+        Lanes.Models.ServerCache.store(this::urlRoot(), data.accounts, ms)

data/client/skr/models/SalesOrder.coffee

@@ -1,6 +1,5 @@
 class Skr.Models.SalesOrder extends Skr.Models.Base
 
-
     props:
         id:                 {"type":"integer","required":true}
         visible_id:         {"type":"integer","required":true}
@@ -14,7 +13,6 @@ class Skr.Models.SalesOrder extends Skr.Models.Base
         is_revised:         {"type":"boolean","required":true,"default":"false"}
         hash_code:          {"type":"string","required":true}
         ship_partial:       {"type":"boolean","required":true,"default":"false"}
-        is_complete:        {"type":"boolean","required":true,"default":"false"}
         po_num:             "string"
         notes:              "string"
         options:            "any"

data/client/skr/screens/Base.coffee

@@ -1,3 +1,9 @@
-class Skr.Screens.Base extends Lanes.Screens.Base
+Skr.Screens.Base = {
 
-    abstractClass: true
+    # An extension point to modify the prototypes for screens
+    extend: (klass) ->
+        # Extend screen component with Lanes defaults,
+        # which will eventually call React.createClass
+        Lanes.React.Screen.extend(klass)
+
+}

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

@@ -0,0 +1,58 @@
+class Skr.Screens.CustomerMaint extends Lanes.React.Screen
+
+    dataObjects:
+        customer: ->
+            @props.customer || new Skr.Models.Customer
+        query: ->
+            new Lanes.Models.Query({
+                loadAssociations: ['billing_address', 'shipping_address']
+                modelClass: Skr.Models.Customer, fields: [
+                    {id:'id', visible: false}
+                    'code', 'name', 'notes',
+                    { id: 'open_balance', flex: 0.5, textAlign: 'center' }
+                ]
+            })
+
+    getInitialState: ->
+        commands: new Lanes.Screens.Commands(this, modelName: 'customer')
+
+    modelForAccess: 'customer'
+
+    render: ->
+        <div className="customer-maint">
+            <LC.Toolbar commands={@state.commands} />
+            <LC.ErrorDisplay model={@customer} />
+            <BS.Row>
+                <LC.RecordFinder ref="finder" sm=4 autoFocus
+                    model={@customer}
+                    commands={@state.commands}
+                    query={@query} />
+                <LC.TextField sm=8 name="name" model={@customer} />
+            </BS.Row>
+            <BS.Row>
+               <LC.TextArea sm=12
+                   name="notes"
+                   model={@customer} />
+            </BS.Row>
+            <BS.Row>
+                <LC.SelectField sm=6
+                    label="Receivables Account"
+                    name="gl_receivables_account"
+                    labelField="combined_name"
+                    model={@customer} />
+                <LC.SelectField sm=6
+                    label="Payment Terms"
+                    name="terms"
+                    labelField="code"
+                    model={@customer} />
+            </BS.Row>
+            <BS.Row>
+                <LC.FieldSet sm=12 title="Address">
+                    <Skr.Components.Address lg=6 title="Billing"
+                        model={@customer.billing_address}  />
+                    <Skr.Components.Address lg=6 title="Shipping"
+                        model={@customer.shipping_address} />
+                </LC.FieldSet>
+            </BS.Row>
+
+        </div>

data/client/skr/screens/customer-maint/index.js

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

data/client/skr/screens/customer-maint/index.scss

@@ -7,3 +7,5 @@
  Otherwise Lanes will continue to fetch an empty file whenever
  the screen is displayed
 */
+@import "lanes/screens/styles";
+

data/client/skr/screens/sales-order/index.js

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

data/client/skr/screens/sku-maint/index.js

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

data/client/skr/screens/vendor-maint/index.js

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

data/client/skr/styles.scss

@@ -1,4 +1,5 @@
 /* Enter styles for your application in scss format here */
+
 .header-top {
     .logo {
         display: inline-block;
@@ -9,3 +10,25 @@
         background: url(asset_path('images/skr/logo-sm.png')) no-repeat;
     }
 }
+
+
+.record-finder-dialog {
+    min-height: 250px;
+    .clause {
+        .dropdown-menu {
+            min-width: 300px;
+            padding: 0.5rem;
+            .row {
+                margin-bottom: 5px;
+            }
+            input[type=radio] { margin-right: 0.5rem; }
+        }
+
+    }
+
+    .grid-component {
+        margin-top: 10px;
+    }
+}
+
+@import "components/address/styles.scss";

data/coffeelint.json

@@ -0,0 +1,49 @@
+{
+    "coffeelint": {
+        "transforms": [
+            "coffee-react-transform"
+        ]
+    },
+    "indentation": {
+        "level": "error",
+        "value": 4
+    },
+    "line_endings": {
+        "value": "unix",
+        "level": "error"
+    },
+    "arrow_spacing": {
+        "level": "error"
+    },
+    "no_empty_functions": {
+        "level": "error"
+    },
+    "no_empty_param_list": {
+        "level": "error"
+    },
+    "no_interpolation_in_single_quotes": {
+        "level": "error"
+    },
+    "no_throwing_strings": {
+        "level": "error"
+    },
+    "no_unnecessary_double_quotes": {
+        "level": "ignore"
+    },
+    "no_unnecessary_fat_arrows": {
+        "level": "error"
+    },
+    "prefer_english_operator": {
+        "level": "ignore"
+    },
+    "space_operators": {
+        "level": "error"
+    },
+    "spacing_after_comma": {
+        "level": "error"
+    },
+    "max_line_length": {
+        "value": 135,
+        "level": "error"
+    }
+}

data/config/screens.rb

@@ -1,52 +1,49 @@
 Lanes::Screen.define_group 'maint' do | group |
     group.title       = "Maintenance"
     group.description = "Maintain records"
-    group.icon        = "icon-wrench"
+    group.icon        = "pencil-square"
 end
-
 Lanes::Screen.define_group 'customer' do | group |
     group.title       = "Customer"
-    group.description = "Custoemr records"
-    group.icon        = "icon-wrench"
+    group.description = "Customer records"
+    group.icon        = "heart"
 end
-
-
-Lanes::Screen.define "customer-maint" do | screen |
-    screen.title       = "Customer Maintenance"
-    screen.icon        = "icon-users"
-    screen.group_id    = "maint"
-    screen.model_class = "Customer"
-    screen.view_class  = "Skr.Screens.CustomerMaint"
-    screen.js          = 'skr/screens/customer-maint.js'
-    screen.css         = 'skr/screens/customer-maint.css'
-end
-
-Lanes::Screen.define "sku-maint" do | screen |
-    screen.title       = "SKU Maintenance"
-    screen.icon        = "icon-gift"
-    screen.group_id    = "maint"
-    screen.model_class = "Sku"
-    screen.view_class  = "Skr.Screens.SkuMaint"
-    screen.js          = "skr/screens/sku-maint.js"
-    screen.css         = "skr/screens/sku-maint.css"
-end
-
-Lanes::Screen.define "vendor-maint" do | screen |
-    screen.title       = "Vendor Maintenance"
-    screen.icon        = "icon-truck"
-    screen.group_id    = "maint"
-    screen.model_class = "Vendor"
-    screen.view_class  = "Skr.Screens.VendorMaint"
-    screen.js          = "skr/screens/vendor-maint.js"
-    screen.css         = "skr/screens/vendor-maint.css"
-end
-Lanes::Screen.define "sales-order" do | screen |
-    screen.title       = "Sales Order"
-    screen.description = ""
-    screen.icon        = ""
-    screen.group_id    = "customer"
-    screen.model_class = "SalesOrder"
-    screen.view_class  = "Skr.Screens.SalesOrder"
-    screen.js          = "skr/screens/sales-order.js"
-    screen.css         = "skr/screens/sales-order.css"
+Lanes::Screen.for_extension 'Skr' do | screens |
+    screens.define "customer-maint" do | screen |
+        screen.title       = "Customer Maintenance"
+        screen.icon        = "heartbeat"
+        screen.group_id    = "maint"
+        screen.model_class = "Customer"
+        screen.view_class  = "CustomerMaint"
+        screen.js          = 'customer-maint.js'
+        screen.css         = 'customer-maint.css'
+    end
+    # screens.define "sku-maint" do | screen |
+    #     screen.title       = "SKU Maintenance"
+    #     screen.icon        = "archive"
+    #     screen.group_id    = "maint"
+    #     screen.model_class = "Sku"
+    #     screen.view_class  = "SkuMaint"
+    #     screen.js          = "sku-maint.js"
+    #     screen.css         = "sku-maint.css"
+    # end
+    # screens.define "vendor-maint" do | screen |
+    #     screen.title       = "Vendor Maintenance"
+    #     screen.icon        = "truck"
+    #     screen.group_id    = "maint"
+    #     screen.model_class = "Vendor"
+    #     screen.view_class  = "Skr.Screens.VendorMaint"
+    #     screen.js          = "vendor-maint.js"
+    #     screen.css         = "vendor-maint.css"
+    # end
+    # screens.define "sales-order" do | screen |
+    #     screen.title       = "Sales Order"
+    #     screen.description = ""
+    #     screen.icon        = "shopping-cart"
+    #     screen.group_id    = "customer"
+    #     screen.model_class = "SalesOrder"
+    #     screen.view_class  = "Skr.Screens.SalesOrder"
+    #     screen.js          = "sales-order.js"
+    #     screen.css         = "sales-order.css"
+    # end
 end

data/db/migrate/20140322014401_create_skr_inventory_adjustments.rb

@@ -5,9 +5,9 @@ class CreateSkrInventoryAdjustments < ActiveRecord::Migration
 
         create_skr_table "inventory_adjustments" do |t|
             t.skr_visible_id
+            t.skr_state
             t.skr_reference :location,  null: false, single: true
             t.skr_reference :reason,    null: false, to_table: 'ia_reasons'
-            t.string   "state",         null: false
             t.text     "description",   null: false
             t.skr_track_modifications
           end

data/db/migrate/20140322223912_create_skr_sales_orders.rb

@@ -5,17 +5,16 @@ class CreateSkrSalesOrders < ActiveRecord::Migration
 
         create_skr_table "sales_orders" do |t|
             t.skr_visible_id
+            t.skr_state
             t.skr_reference :customer,         single: true
             t.skr_reference :location,         single: true
             t.skr_reference :shipping_address, to_table: 'addresses'
             t.skr_reference :billing_address,  to_table: 'addresses'
             t.skr_reference :terms,            to_table: 'payment_terms'
             t.date     "order_date",           null: false
-            t.integer  "state",                null: false, limit: 2
             t.boolean  "is_revised",           null: false, default: false
             t.string   "hash_code",            null: false
             t.boolean  "ship_partial",         null: false, default: false
-            t.boolean  "is_complete",          null: false, default: false
             t.string   "po_num"
             t.text     "notes"
             t.hstore   "options", default: {}

data/db/migrate/20140327202102_create_skr_purchase_orders.rb

@@ -5,11 +5,11 @@ class CreateSkrPurchaseOrders < ActiveRecord::Migration
 
         create_skr_table "purchase_orders" do |t|
             t.skr_visible_id
+            t.skr_state
             t.skr_reference :vendor,    single: true
             t.skr_reference :location,  single: true
             t.skr_reference :ship_addr, to_table: 'addresses'
             t.skr_reference :terms,     to_table: 'payment_terms'
-            t.integer  "state",                null: false, limit: 2
             t.boolean  "is_revised",    null: false, default: false
             t.date     "order_date",    null: false
             t.datetime "receiving_completed_at"

data/db/migrate/20140327224000_create_skr_invoices.rb

@@ -5,6 +5,7 @@ class CreateSkrInvoices < ActiveRecord::Migration
     def change
         create_skr_table "invoices" do |t|
             t.skr_visible_id
+            t.skr_state
             t.skr_reference :terms,            to_table: 'payment_terms'
             t.skr_reference :customer,         single: true
             t.skr_reference :location,         single: true
@@ -13,7 +14,6 @@ class CreateSkrInvoices < ActiveRecord::Migration
             t.skr_reference :shipping_address, to_table: 'addresses'
             t.skr_reference :billing_address,  to_table: 'addresses'
             t.skr_currency  :amount_paid,      null: false, default: 0.0
-            t.string   "state",                null: false
             t.string   "hash_code",            null: false
             t.date     "invoice_date",         null: false
             t.string   "po_num"

data/db/migrate/20140330232810_create_skr_sku_qty_details_view.rb

@@ -21,7 +21,7 @@ class CreateSkrSkuQtyDetailsView < ActiveRecord::Migration
                  sum( ( sol.qty - sol.qty_canceled ) * sol.uom_size ) as qty
                from #{skr_prefix}so_lines sol
                join #{skr_prefix}sales_orders so on so.id = sol.sales_order_id
-                  and so.state not in (5,9) -- complete, canceled
+                  and so.state not in (5,10) -- complete, canceled
                join #{skr_prefix}sku_locs sl on sl.id = sol.sku_loc_id
                join #{skr_prefix}skus s on s.id = sl.sku_id
                group by s.id
@@ -33,7 +33,7 @@ class CreateSkrSkuQtyDetailsView < ActiveRecord::Migration
                  sum( ( pol.qty - pol.qty_canceled ) * pol.uom_size ) as qty
                from #{skr_prefix}po_lines pol
                join #{skr_prefix}purchase_orders po on po.id = pol.purchase_order_id
-                  and po.state not in (5,9) -- complete, canceled
+                  and po.state not in (5,15) -- received, canceled
                join #{skr_prefix}sku_locs sl on sl.id = pol.sku_loc_id
                join #{skr_prefix}skus s on s.id = sl.sku_id
                group by s.id

data/db/migrate/20140400164729_create_skr_vouchers.rb

@@ -5,16 +5,12 @@ class CreateSkrVouchers < ActiveRecord::Migration
 
         create_skr_table "vouchers" do |t|
             t.skr_visible_id
-
+            t.skr_state
             t.skr_reference :vendor,         single: true, null: false
             t.skr_reference :purchase_order, single: true, null: true
-
             t.skr_reference :terms,          to_table: 'payment_terms'
-
-            t.string   "state",              null: false
+            t.date     "confirmation_date",  null: true # starts out as non-confirmed
             t.string   "refno"
-
-            t.date     "confirmation_date",     null: true # starts out as non-confirmed
             t.skr_track_modifications
         end
 

data/db/schema.sql

@@ -530,7 +530,6 @@ CREATE TABLE skr_sales_orders (
     is_revised boolean DEFAULT false NOT NULL,
     hash_code character varying NOT NULL,
     ship_partial boolean DEFAULT false NOT NULL,
-    is_complete boolean DEFAULT false NOT NULL,
     po_num character varying,
     notes text,
     options hstore DEFAULT ''::hstore,
@@ -1499,6 +1498,39 @@ CREATE SEQUENCE skr_vouchers_id_seq
 ALTER SEQUENCE skr_vouchers_id_seq OWNED BY skr_vouchers.id;
 
 
+--
+-- Name: testers; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE testers (
+    id integer NOT NULL,
+    name character varying,
+    email character varying,
+    visits text[] DEFAULT '{}'::text[],
+    created_at timestamp without time zone NOT NULL,
+    updated_at timestamp without time zone NOT NULL
+);
+
+
+--
+-- Name: testers_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE testers_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: testers_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE testers_id_seq OWNED BY testers.id;
+
+
 --
 -- Name: id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -1716,6 +1748,13 @@ ALTER TABLE ONLY skr_vo_lines ALTER COLUMN id SET DEFAULT nextval('skr_vo_lines_
 ALTER TABLE ONLY skr_vouchers ALTER COLUMN id SET DEFAULT nextval('skr_vouchers_id_seq'::regclass);
 
 
+--
+-- Name: id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY testers ALTER COLUMN id SET DEFAULT nextval('testers_id_seq'::regclass);
+
+
 --
 -- Name: lanes_users_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
 --
@@ -1972,6 +2011,14 @@ ALTER TABLE ONLY skr_vouchers
     ADD CONSTRAINT skr_vouchers_pkey PRIMARY KEY (id);
 
 
+--
+-- Name: testers_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY testers
+    ADD CONSTRAINT testers_pkey PRIMARY KEY (id);
+
+
 --
 -- Name: index_lanes_users_on_role_names; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
@@ -2660,3 +2707,5 @@ INSERT INTO schema_migrations (version) VALUES ('20140422024010');
 
 INSERT INTO schema_migrations (version) VALUES ('20140615031600');
 
+INSERT INTO schema_migrations (version) VALUES ('20150220015108');
+

data/db/seed.rb

@@ -7,7 +7,7 @@ module Skr
     user = Lanes::User.where(login: 'admin').first
     if user.nil?
         user = Lanes::User.create!(name: "Admin", email: "admin@test.com",
-                                   password: 'senal', password_confirmation: 'senal',
+                                   password: 'password', password_confirmation: 'password',
                                    login: 'admin', role_names: ['administrator'])
 
     end

data/lib/skr/access_roles.rb

@@ -19,8 +19,9 @@ module Lanes::Access
                   Skr::PaymentTerm,
                   Skr::Sku,
                   Skr::SalesOrder
-            lock_writes Skr::Sku, :gl_asset_account_id
-            lock_writes Skr::Customer, :terms_id
+            lock_writes Skr::Customer, :terms
+            lock Skr::Sku, :gl_asset_account
+            lock Skr::Customer, :gl_receivables_account
         end
 
 

data/lib/skr/db/migration_helpers.rb

@@ -18,6 +18,10 @@ module Skr
                 }
             end
 
+            def skr_state
+                column( :state, :integer, null: false, default: 0, limit: 2 )
+            end
+
             # track modifications
             def skr_track_modifications( create_only: false )
                 column( :created_at, :datetime,   :null=>false )

data/lib/skr/extension.rb

@@ -5,9 +5,10 @@ module Skr
     class Extension < Lanes::Extensions::Definition
 
         identifier "skr"
-        self.uses_pub_sub = true
+
         root_path Pathname.new(__FILE__).dirname.join("..","..").expand_path
-        components "record-finder", "select-field"
+
+        components 'record-finder', 'select-field'
 
         def client_bootstrap_data(view)
             gl_accounts = Skr::GlAccount.all.as_json

data/lib/skr/models/inventory_adjustment.rb

@@ -19,6 +19,10 @@ module Skr
         delegate_and_export :location_code
         delegate_and_export :reason_code
 
+        enum state: {
+            pending:  0,
+            applied:  5
+        }
         state_machine do
             state :pending , :initial=>true
             state :applied

data/lib/skr/models/invoice.rb

@@ -60,6 +60,12 @@ module Skr
             compose_query_using_detail_view( view: 'inv_details', join_to: 'invoice_id' )
         }, export: true
 
+        enum state: {
+            open:     0,
+            paid:     5,
+            partial: 10
+        }
+
         state_machine do
             state :open, initial: true
             state :paid

data/lib/skr/models/purchase_order.rb

@@ -51,13 +51,17 @@ module Skr
         }
 
         enum state: {
-            open: 1,
-            received: 2
+            open:      0,
+            received:  5,
+            paid:     10,
+            canceled: 15
         }
 
         state_machine do
             state :open, initial: true
             state :received
+            state :paid
+            state :canceled
 
             event :mark_received do
                 transitions from: :open, to: :received

data/lib/skr/models/sales_order.rb

@@ -90,9 +90,9 @@ module Skr
         end
 
         enum state: {
-            open: 1,
-            complete: 5,
-            canceled: 9
+            open:      0,
+            complete:  5,
+            canceled: 10
         }
 
         state_machine do

data/lib/skr/models/voucher.rb

@@ -36,6 +36,12 @@ module Skr
             where(['vouchers.state <> ? and payment_lines.id is null', 'pending']).includes(:payment_line)
         }
 
+        enum state: {
+            pending:    0,
+            confirmed:  5,
+            paid:      10
+        }
+
         state_machine do
             state :pending, initial: true
             state :confirmed

data/lib/skr/version.rb

@@ -1,3 +1,3 @@
 module Skr
-    VERSION='0.1.8'
+    VERSION='0.1.9'
 end

data/spec/skr/models/CustomerSpec.coffee

@@ -3,24 +3,18 @@ describe "Skr.Models.Customer", ->
     beforeEach ->
         Lanes.Test.ModelSaver.setUser('admin')
 
-    it "can be instantiated", ->
+    xit "sends failure messages when code isn't set", (done) ->
         model = new Skr.Models.Customer()
-        expect(model).toEqual(jasmine.any(Skr.Models.Customer))
-
-
-    it "sends failure messages when code isn't set", (done)->
-        model = new Skr.Models.Customer()
-        Lanes.Test.ModelSaver.perform(model, done).then (save)->
-            expect(save.error).toHaveBeenCalled()
+        Lanes.Test.ModelSaver.perform(model, done).then (save) ->
             expect(model.errors?.code).toContain("blank")
 
-    it "saves when fields are set", (done)->
+    it "saves when fields are set", (done) ->
         model = new Skr.Models.Customer(
             code: "SPECTEST", name: "A Spec Test Customer"
-            terms_id: 1,
+            terms: {code: 'SPECTESTER'}
             billing_address:  { name: "Billing Address" }
             shipping_address: { name: "Shipping Address" }
         )
-        Lanes.Test.ModelSaver.perform(model, done).then (save)->
-            expect(save.error).not.toHaveBeenCalled()
+
+        Lanes.Test.ModelSaver.perform(model, done).then (save) ->
             expect(model.errors).toBeNull()

data/spec/skr/models/SalesOrderSpec.coffee

@@ -1,6 +1,6 @@
 describe "Skr.Models.SalesOrder", ->
 
-    it "must have a customer to save", (done)->
+    xit "must have a customer to save", (done)->
         model = new Skr.Models.SalesOrder()
         Lanes.Test.ModelSaver.perform(model, done).then (save)->
             expect(save.error).toHaveBeenCalled()

data/spec/skr/screens/CustomerMaint.coffee

@@ -2,6 +2,6 @@
 
 describe "CustomerMaint Screen Suite", ->
 
-    it "can be instantiated", ->
+    xit "can be instantiated", ->
         view = new Skr.Screens.CustomerMaint()
         expect(view).toEqual(jasmine.any(Skr.Screens.CustomerMaint));

data/spec/skr/screens/sales-order/SalesOrderSpec.coffee

@@ -1,5 +1,5 @@
 describe "Skr.Screens.SalesOrder", ->
 
-    it "can be instantiated", ->
+    xit "can be instantiated", ->
         view = new Skr.Screens.SalesOrder()
         expect(view).toEqual(jasmine.any(Skr.Screens.SalesOrder));

data/spec/skr/screens/sku-maint/SkuMaintSpec.coffee

@@ -1,5 +1,5 @@
 describe "Skr.Screens.SkuMaint", ->
 
-    it "can be instantiated", ->
+    xit "can be instantiated", ->
         view = new Skr.Screens.SkuMaint()
         expect(view).toEqual(jasmine.any(Skr.Screens.SkuMaint));

data/spec/skr/screens/vendor-maint/VendorMaintSpec.coffee

@@ -1,5 +1,5 @@
 describe "Skr.Screens.VendorMaint", ->
 
-    it "can be instantiated", ->
+    xit "can be instantiated", ->
         view = new Skr.Screens.VendorMaint()
         expect(view).toEqual(jasmine.any(Skr.Screens.VendorMaint));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stockor
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Nathan Stitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-24 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -141,8 +141,9 @@ files:
 - client/images/skr/logo-sm.png
 - client/skr/Extension.coffee
 - client/skr/components/.gitkeep
-- client/skr/components/address/Address.coffee
+- client/skr/components/address/Address.cjsx
 - client/skr/components/address/address.html
+- client/skr/components/address/styles.scss
 - client/skr/index.js
 - client/skr/models/Address.coffee
 - client/skr/models/Base.coffee
@@ -182,7 +183,7 @@ files:
 - client/skr/screens/base/index.js
 - client/skr/screens/base/index.scss
 - client/skr/screens/base/layout.html
-- client/skr/screens/customer-maint/CustomerMaint.coffee
+- client/skr/screens/customer-maint/CustomerMaint.cjsx
 - client/skr/screens/customer-maint/index.js
 - client/skr/screens/customer-maint/index.scss
 - client/skr/screens/customer-maint/layout.html
@@ -202,6 +203,7 @@ files:
 - client/skr/styles.scss
 - client/skr/views/.gitkeep
 - client/skr/views/Base.coffee
+- coffeelint.json
 - config.ru
 - config/database.yml
 - config/lanes.rb
@@ -424,7 +426,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Stockor is a complete ERP system

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

@@ -1,20 +0,0 @@
-class Skr.Components.Address extends Lanes.Components.Base
-
-
-    writeTemplateName: -> 'address'
-
-    constructor: (options={})->
-        super
-        this.access = 'write'
-        if @copyFrom = options.copyFrom
-            this.bindCopyFrom()
-            this.listenTo(this.copyFrom,'change:model', @bindCopyFrom )
-
-    bindCopyFrom: ->
-        old = this.copyFrom.changedAttributes()['model']
-        this.stopListening( old, 'change', @applyChange    ) if old
-        this.listenTo(this.copyFrom.model,'change', @applyChange )
-
-    applyChange: (model,value,field)->
-        for name,value of model.changedAttributes()
-            this.model.set(name,value) if this.model.get(name) == model.previous(name)

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

@@ -1,28 +0,0 @@
-class Skr.Screens.CustomerMaint extends Skr.Screens.Base
-
-    mixins:[
-        Lanes.Screens.Mixins.Editing
-    ]
-
-    useFormBindings: true
-
-    subviews:
-        terms:
-            component: 'SelectField'
-            model: 'model'
-            options: { association: 'terms', mappings: { title: 'code' } }
-        billaddr:
-            component: 'Address'
-            model: 'model.billing_address'
-            options: { field_name: 'billing_address_id' }
-        shipaddr:
-            component: 'Address'
-            model: 'model.shipping_address'
-            options: ->{ copyFrom: this.billaddr, field_name: 'shipping_address_id' }
-
-    finderOptions: ->
-        modelClass: Skr.Models.Customer
-        title: 'Find Customer',
-        invalid_chars: Skr.Models.Mixins.CodeField.invalidChars
-        withAssociations: ['billing_address', 'shipping_address', 'terms']
-        fields: [ 'code', 'name', 'notes', 'credit_limit' ]