stockor 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0380f6e7b42c7134dacab53717cda237178218d
-  data.tar.gz: ccd6d92f6a86ce3e8b40b91fd24e6038a4d499ba
+  metadata.gz: f560ee8a3baf00f8132abaa16e7102af0a754628
+  data.tar.gz: fc2279a4c83c7503f8ed05236ee15bb7a0c53f66
 SHA512:
-  metadata.gz: fb2b347c580c38411504b64097364cc2b89e2e2dd370e0ae4748835697eecb9acd3fc221511ac1bfca7d207beca9de85adc203ea5e3a3745543666a613a54f48
-  data.tar.gz: 030a173c0e3c6e662d3a6e0badf574934beb9962c896f33f51565df824bc418b3d5b211bcef4b862d4d77cb9e5118d84af4095b05cec411271c2060f0763f7d1
+  metadata.gz: 39612948c454591b7103a2528df39178141427af782c91e6f291a75772b467c2e535c2ce80b03060d56370ade3278ed7c621a9ca732f9e0d4b1040dfa9b40f48
+  data.tar.gz: ad721dbe0d756b452385afb05309ad9667d257ddccf011adceab0e7526cfdea17e34f0651d83df77de8589a1d971926900f2c362346cf3ea1141af06875fb5d0

data/.gitignore

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

data/Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
   remote: git://github.com/argosity/lanes.git
-  revision: 677204b46b9f22c78965fd70d01fd43a911db3ac
+  revision: 3574e2186fff13c0bc6203ce1fd437f30142e500
   branch: master
   specs:
-    lanes (0.1.8)
+    lanes (0.1.9)
       activerecord (~> 4.2)
       bcrypt (~> 3.1)
       closure-compiler (~> 1.1)
@@ -35,7 +35,7 @@ GIT
 PATH
   remote: .
   specs:
-    stockor (0.1.7)
+    stockor (0.1.8)
       aasm (~> 4.1)
       lanes
 
@@ -59,24 +59,24 @@ GEM
     arel (6.0.0)
     bcrypt (3.1.10)
     builder (3.2.2)
-    byebug (4.0.4)
+    byebug (4.0.5)
       columnize (= 0.9.0)
     celluloid (0.16.0)
       timers (~> 4.0.0)
-    childprocess (0.5.5)
+    childprocess (0.5.6)
       ffi (~> 1.0, >= 1.0.11)
     closure-compiler (1.1.11)
     coderay (1.1.0)
-    coffee-script (2.3.0)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1)
+    coffee-script-source (1.9.1.1)
     columnize (0.9.0)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    crass (1.0.1)
+    crass (1.0.2)
     eventmachine (1.0.7)
-    execjs (2.4.0)
+    execjs (2.5.2)
     faker (1.4.3)
       i18n (~> 0.5)
     ffi (1.9.8)
@@ -103,7 +103,7 @@ GEM
     guard-minitest (2.4.4)
       guard-compat (~> 1.2)
       minitest (>= 3.0)
-    hashie (3.4.0)
+    hashie (3.4.1)
     hike (1.2.3)
     hitimes (1.2.2)
     i18n (0.7.0)
@@ -126,7 +126,7 @@ GEM
     metaclass (0.0.4)
     method_source (0.8.2)
     mini_portile (0.6.2)
-    minitest (5.5.1)
+    minitest (5.6.0)
     minitest-around (0.3.1)
       minitest (~> 5.0)
     mocha (1.1.0)
@@ -140,7 +140,7 @@ GEM
     notiffany (0.0.6)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oj (2.12.1)
+    oj (2.12.4)
     pg (0.18.1)
     phantomjs (1.9.8.0)
     pry (0.10.1)
@@ -150,7 +150,7 @@ GEM
     pry-byebug (3.1.0)
       byebug (~> 4.0)
       pry (~> 0.10)
-    puma (2.11.1)
+    puma (2.11.2)
       rack (>= 1.1, < 2.0)
     rack (1.6.0)
     rack-protection (1.5.3)

data/client/skr/Extension.coffee

@@ -1,5 +1,15 @@
-#= require ./screens/customer-maint
-
 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: ->

data/client/skr/models/GlAccount.coffee

@@ -1,9 +1,20 @@
 class Skr.Models.GlAccount extends Skr.Models.Base
 
+    cacheDuration: [1,'day']
 
     props:
         id:         {"type":"integer","required":true}
         number:     {"type":"string","required":true}
         name:       {"type":"string","required":true}
-        description:{"type":"string","required":true}
         is_active:  {"type":"boolean","required":true,"default":"true"}
+
+    derived:
+        combined_name:
+            deps: ['number','name'], fn:->
+                "#{@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)

data/client/skr/models/PurchaseOrder.coffee

@@ -8,11 +8,16 @@ class Skr.Models.PurchaseOrder extends Skr.Models.Base
         location_id:           {"type":"integer","required":true}
         ship_addr_id:          {"type":"integer","required":true}
         terms_id:              {"type":"integer","required":true}
-        state:                 {"type":"string","required":true}
+        state:              {"type":"integer"}
         is_revised:            {"type":"boolean","required":true,"default":"false"}
         order_date:            {"type":"any","required":true}
         receiving_completed_at:"date"
 
+    enums:
+        state:
+            open: 1
+            received: 2
+
     associations:
         terms:     { model: "PaymentTerm" }
         vendor:    { model: "Vendor" }

data/client/skr/models/SalesOrder.coffee

@@ -10,7 +10,7 @@ class Skr.Models.SalesOrder extends Skr.Models.Base
         billing_address_id: {"type":"integer","required":true}
         terms_id:           {"type":"integer","required":true}
         order_date:         {"type":"any","required":true}
-        state:              {"type":"string","required":true}
+        state:              {"type":"integer"}
         is_revised:         {"type":"boolean","required":true,"default":"false"}
         hash_code:          {"type":"string","required":true}
         ship_partial:       {"type":"boolean","required":true,"default":"false"}
@@ -19,6 +19,12 @@ class Skr.Models.SalesOrder extends Skr.Models.Base
         notes:              "string"
         options:            "any"
 
+    enums:
+        state:
+            open: 1
+            complete: 5
+            canceled: 9
+
     associations:
         customer:         { model: "Customer" }
         location:         { model: "Location" }

data/client/skr/models/Sku.coffee

@@ -4,7 +4,9 @@ class Skr.Models.Sku extends Skr.Models.Base
     props:
         id:                  {"type":"integer","required":true}
         default_vendor_id:   {"type":"integer","required":true}
-        gl_asset_account_id: {"type":"integer","required":true}
+        gl_asset_account_id: {"type":"integer","required":true, default: ->
+            Skr.Models.GlAccount.default_ids.asset
+        }
         default_uom_code:    {"type":"string","required":true}
         code:                {"type":"string","required":true}
         description:         {"type":"string","required":true}
@@ -14,7 +16,9 @@ class Skr.Models.Sku extends Skr.Models.Base
 
     associations:
         default_vendor:   { model: "Vendor" }
-        gl_asset_account: { model: "GlAccount" }
+        gl_asset_account: { model: "GlAccount", default: ->
+            Skr.Models.GlAccount.fetchById(this.gl_asset_account_id)
+        }
         sku_locs:         { collection: "SkuLoc" }
         sku_vendors:      { collection: "SkuVendor" }
         uoms:             { collection: "Uom" }

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

@@ -0,0 +1,5 @@
+Skr.Models.Mixins.VisibleID = {
+
+    invalidChars: /[^0-9]/
+
+}

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

@@ -1,7 +1,7 @@
 class Skr.Screens.CustomerMaint extends Skr.Screens.Base
 
     mixins:[
-        Skr.Screens.Mixins.Editing
+        Lanes.Screens.Mixins.Editing
     ]
 
     useFormBindings: true

data/client/skr/screens/mixins/index.js

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

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

@@ -0,0 +1,30 @@
+class Skr.Screens.SalesOrder extends Skr.Screens.Base
+
+    mixins:[
+        Lanes.Screens.Mixins.Editing
+    ]
+    formBindings: true
+    subviews:
+        terms:
+            component: 'SelectField'
+            model: 'model'
+            options: { association: 'terms'}
+        customer:
+            component: 'SelectField'
+            model: 'model'
+            options: { association: 'customer'}
+        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.SalesOrder
+        title: 'Find Sales Order',
+        invalid_chars: Skr.Models.Mixins.VisibleID.invalidChars
+        withAssociations: []
+        fields: ['visible_id', 'notes']

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

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

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

@@ -0,0 +1,8 @@
+/*
+ If your screen does not use any custom styles
+
+ You should remove this file and it's reference from config/screens.rb
+
+ Otherwise Lanes will continue to fetch an empty file whenever
+ the screen is displayed
+*/

data/client/skr/screens/sales-order/layout.html

@@ -0,0 +1,30 @@
+<div>
+  <%= h.toolbar buttons: ['save','reset'] %>
+  <div class="header">
+        <div class="row">
+            <%= h.subview 'finder',  widths: [12,4,4,3], label: 'Number' %>
+            <%= h.text_field 'notes', widths: [12,8,8,9] %>
+        </div>
+        <div class="row">
+            <%= h.subview 'customer', widths: [12,3] %>
+            <%= h.text_field 'po_num', widths: [12,6] %>
+            <%= h.subview 'terms', widths: [12,3] %>
+        </div>
+    </div>
+    <div class="row">
+        <div class="<%= h.grid_widths 12,6 %>">
+            <fieldset class="addresses bordered">
+                <legend>Billing Address</legend>
+                <%= h.subview 'billaddr', unwrapped: true %>
+
+            </fieldset>
+        </div>
+        <div class="<%= h.grid_widths 12,6 %>">
+            <fieldset class="addresses bordered">
+                <legend>Shiping Address</legend>
+                <%= h.subview 'shipaddr', unwrapped: true %>
+            </fieldset>
+        </div>
+    </div>
+
+</div>

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

@@ -1,9 +1,14 @@
 class Skr.Screens.SkuMaint extends Skr.Screens.Base
 
     mixins:[
-        Skr.Screens.Mixins.Editing
+        Lanes.Screens.Mixins.Editing
     ]
-    useFormBindings: true
+
+    subviews:
+        glacct:
+            component: 'SelectField'
+            model: 'model'
+            options: { association: 'gl_asset_account', mappings: { title: 'combined_name' } }
 
     finderOptions: ->
         modelClass: Skr.Models.Sku

data/client/skr/screens/sku-maint/layout.html

@@ -9,4 +9,8 @@
 
     </div>
 
+    <div class="row">
+      <%= h.subview 'glacct', label: "GL Asset Account", widths: [12,3] %>
+    </div>
+
 </div>

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

@@ -1,7 +1,7 @@
 class Skr.Screens.VendorMaint extends Skr.Screens.Base
 
     mixins:[
-        Skr.Screens.Mixins.Editing
+        Lanes.Screens.Mixins.Editing
     ]
 
     useFormBindings: true

data/client/skr/styles.scss

@@ -5,6 +5,7 @@
         height: 48px;
         width: 150px;
         margin: 2px;
+        text-indent: -9999px;
         background: url(asset_path('images/skr/logo-sm.png')) no-repeat;
     }
 }

data/config/screens.rb

@@ -1,13 +1,19 @@
 Lanes::Screen.define_group 'maint' do | group |
-    group.title       = "Customers"
-    group.description = "Maintain records related to Customers"
-    group.icon        = "icon-users"
+    group.title       = "Maintenance"
+    group.description = "Maintain records"
+    group.icon        = "icon-wrench"
+end
+
+Lanes::Screen.define_group 'customer' do | group |
+    group.title       = "Customer"
+    group.description = "Custoemr records"
+    group.icon        = "icon-wrench"
 end
 
 
 Lanes::Screen.define "customer-maint" do | screen |
     screen.title       = "Customer Maintenance"
-    screen.icon        = "icon-wrench2"
+    screen.icon        = "icon-users"
     screen.group_id    = "maint"
     screen.model_class = "Customer"
     screen.view_class  = "Skr.Screens.CustomerMaint"
@@ -17,7 +23,7 @@ end
 
 Lanes::Screen.define "sku-maint" do | screen |
     screen.title       = "SKU Maintenance"
-    screen.icon        = "icon-wrench2"
+    screen.icon        = "icon-gift"
     screen.group_id    = "maint"
     screen.model_class = "Sku"
     screen.view_class  = "Skr.Screens.SkuMaint"
@@ -27,10 +33,20 @@ end
 
 Lanes::Screen.define "vendor-maint" do | screen |
     screen.title       = "Vendor Maintenance"
-    screen.icon        = "icon-wrench2"
+    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"
+end

data/db/migrate/20140322223912_create_skr_sales_orders.rb

@@ -11,7 +11,7 @@ class CreateSkrSalesOrders < ActiveRecord::Migration
             t.skr_reference :billing_address,  to_table: 'addresses'
             t.skr_reference :terms,            to_table: 'payment_terms'
             t.date     "order_date",           null: false
-            t.string   "state",                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

data/db/migrate/20140327202102_create_skr_purchase_orders.rb

@@ -9,7 +9,7 @@ class CreateSkrPurchaseOrders < ActiveRecord::Migration
             t.skr_reference :location,  single: true
             t.skr_reference :ship_addr, to_table: 'addresses'
             t.skr_reference :terms,     to_table: 'payment_terms'
-            t.string   "state",         null: false
+            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/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 state not in ('canceled', 'complete')
+                  and so.state not in (5,9) -- 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 state not in ('canceled', 'complete')
+                  and po.state not in (5,9) -- complete, 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