stockor 0.3.0 → 0.4.0

data/client/skr/components/address/index.js

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

data/client/skr/models/Address.coffee

@@ -12,6 +12,9 @@ class Skr.Models.Address extends Skr.Models.Base
         state:      "string"
         postal_code:"string"
 
+    session:
+        parent: 'object'
+
     modelForAccess: ->
         @parent || this
 

data/client/skr/models/CreditCard.coffee

@@ -0,0 +1,49 @@
+class Skr.Models.CreditCard extends Skr.Models.Base
+
+    props:
+        name:   'string'
+        number: 'string'
+        month:  'integer'
+        year:   'integer'
+        cvc:    'integer'
+
+    session:
+        parent: 'object'
+        expiry: 'string'
+        linkToAddress: 'object'
+
+    derived:
+        cardType:
+            deps: ['number'], fn: -> Skr.Vendor.Payment.fns.cardType(@number)
+        cardIsValid:
+            deps: ['name', 'number', 'month', 'year', 'cvc', 'cardType'], fn: ->
+                v = Skr.Vendor.Payment.fns
+                @name and _.trim(@name.length) > 2 and
+                    @cardType and
+                    v.validateCardNumber(@number) and
+                    v.validateCardExpiry(@month, @year) and
+                    v.validateCardCVC(@cvc, @cardType)
+
+
+    events:
+        'change:expiry': 'onExpiryChange'
+        'change:name': 'onNameChange'
+
+    initialize: ->
+        @listenTo(@linkToAddress, 'change:name', @onAddressNameChange) if @linkToAddress
+
+    onAddressNameChange: ->
+        if @name is @linkToAddress.previousAttributes().name
+            @name = @linkToAddress.name
+
+    onNameChange: ->
+        @parent.name = @name
+
+    onExpiryChange: ->
+        [@month, @year] = @expiry.split(' / ')
+
+    dataForSave: (options = {}) ->
+        attrs = super
+        # ActiveMerchant uses 'verification_value'
+        attrs.verification_value = attrs.cvc
+        attrs

data/client/skr/models/CreditCardGateway.coffee

@@ -0,0 +1,27 @@
+class Skr.Models.CreditCardGateway extends Skr.Models.Base
+
+    pubsub: false
+
+    props:
+        login:    "string"
+        password: "string"
+        type:     "string"
+
+    modelTypeIdentifier: -> 'credit-card-gateway'
+
+    @allTypes: ->
+        [
+            {id: 'authorize_net_gateway',    name: 'AuthorizeNet' }
+            {id: 'balanced_gateway',         name: 'Balanced' }
+            {id: 'card_stream_gateway',      name: 'Card Stream' }
+            {id: 'first_pay_gateway',        name: 'FirstPay' }
+            {id: 'global_transport_gateway', name: 'GlobalTransport' }
+            {id: 'link_point_gateway',       name: 'Linkpoint' }
+            {id: 'paypal_express_gateway',   name: 'Paypal Express' }
+            {id: 'paypal_gateway',           name: 'Paypal' }
+            {id: 'sage_gateway',             name: 'Sage' }
+            {id: 'sage_pay_gateway',         name: 'SagePay' }
+            {id: 'secure_net_gateway',       name: 'Secure Net' }
+            {id: 'secure_pay_gateway',       name: 'Secure Pay' }
+            {id: 'stripe_gateway',           name: 'Stripe' }
+        ]

data/client/skr/models/Invoice.coffee

@@ -13,7 +13,6 @@ class Skr.Models.Invoice extends Skr.Models.Base
         pick_ticket_id:     "integer"
         shipping_address_id:{type:"integer"}
         billing_address_id: {type:"integer"}
-        amount_paid:        {type:"bigdec", "default":"0"}
         state:              {type:"string"}
         hash_code:          {type:"string"}
         invoice_date:       {type:"date", default: ->
@@ -30,6 +29,7 @@ class Skr.Models.Invoice extends Skr.Models.Base
     session:
         customer_code: {type:"string"}
         invoice_total: {type:"bigdec"}
+        amount_paid:   {type:"bigdec", "default":"0"}
 
     derived:
         prev_amount_paid: deps:['updated_at'], fn: -> @amount_paid
@@ -58,6 +58,7 @@ class Skr.Models.Invoice extends Skr.Models.Base
         pick_ticket:      { model: "PickTicket",  readOnly:true }
         lines:            { collection: "InvLine", inverse: 'invoice'  }
         gl_transactions:  { collection: "GlTransaction", readOnly:true }
+        payments:         { collection: "Payment", inverse: 'invoice' }
 
     events:
         'change:customer': 'onSetCustomer'
@@ -68,8 +69,8 @@ class Skr.Models.Invoice extends Skr.Models.Base
         @unCacheDerived('total')
         @unset('invoice_total')
 
-    onSetCustomer: (newCustomer) ->
-        return if not newCustomer or newCustomer.isNew()
+    onSetCustomer: ->
+        return if not @customer or @customer.isNew() or @customer.id is @customer_id
         for attr in ['terms_id']
             @set(attr, newCustomer[attr])
         @copyAssociationsFrom( newCustomer, 'billing_address', 'shipping_address')
@@ -89,15 +90,22 @@ class Skr.Models.Invoice extends Skr.Models.Base
                 @trigger('change', @, {})
 
     copyAssociationsFrom: ( model, associations... ) ->
+        addrs = ['billing_address', 'shipping_address']
         new _.Promise (res, rej) =>
             model.withAssociations(associations).then =>
-                for name in associations
+                for name in addrs
+                    @[name].set(
+                        _.omit( @customer[name].serialize(), 'id' )
+                    )
+                for name in _.without associations, addrs
                     @associations.replace(@, name, model[name])
                 res(@)
 
     dataForSave: ->
         # only send some associations
-        super(onlyAssociations: ['lines', 'billing_address', 'shipping_address'])
+        super(onlyAssociations: [
+            'lines', 'billing_address', 'shipping_address', 'payments', 'credit_card'
+        ])
 
     isPaidInFull: ->
         @state == 'paid'

data/client/skr/models/Location.coffee

@@ -3,8 +3,6 @@ SHARED_COLLECTION = null
 
 class Skr.Models.Location extends Skr.Models.Base
 
-    cacheDuration: [1, 'day']
-
     mixins: [ 'FileSupport', 'HasCodeField' ]
 
     props:
@@ -14,16 +12,20 @@ class Skr.Models.Location extends Skr.Models.Base
         address_id:    {type:"integer"}
         is_active:     {type:"boolean", "default":true}
         gl_branch_code:{type:"string", "default":"01"}
-        logo:     "file"
-        options:  "any"
+        options: "any"
 
     associations:
         address:  { model: "Address" }
         sku_locs: { collection: "SkuLoc" }
+        logo:     { model: "Lanes.Models.Asset" }
 
     @initialize: (data) ->
         SHARED_DATA = data.locations
 
+    addChangeSet: (change) ->
+        if change.update.logo
+            change.update.logo[1] = change.update.logo[1].logo
+        super
 
 Object.defineProperties Skr.Models.Location, {
     all:

data/client/skr/models/Payment.coffee

@@ -2,13 +2,18 @@ class Skr.Models.Payment extends Skr.Models.Base
 
     props:
         id:             {type:"integer"}
-        visible_id:     {type:"string"}
+        visible_id:     {type:"visible_id"}
         hash_code:      {type:"string"}
         bank_account_id:{type:"integer"}
         category_id:    {type:"integer"}
         vendor_id:      "integer"
-        location_id:    "integer"
-        amount:         {type:"bigdec",  required:true}
+        invoice_id:     "integer"
+        location_id:    {type:"integer", default: ->
+            Skr.Models.Location.default.id
+        }
+        amount:         {type:"bigdec", required: true, default: ->
+            _.bigDecimal('0')
+        }
         check_number:   {type:"integer"}
         date:           {type:"date", default: ->
             new Date
@@ -16,21 +21,36 @@ class Skr.Models.Payment extends Skr.Models.Base
         name:           {type: "string", required: true}
         address:        "string"
         notes:          "string"
+        metadata:       "object"
 
     mixins: [ 'PrintSupport', 'HasVisibleId' ]
 
+    derived:
+        is_incoming: deps:['invoice'], fn: -> !!@invoice
+        is_outgoing: deps:['is_incoming'], fn: -> !@is_incoming
+
     associations:
-        category:       { model: "PaymentCategory" }
-        vendor:         { model: "Vendor" }
-        bank_account:   { model: "BankAccount" }
-        location:       { model: "Location" }
-        gl_transaction: { model: "GlTransaction" }
+        category:       { model: "PaymentCategory", readOnly: true}
+        invoice:        { model: "Invoice", readOnly: true }
+        vendor:         { model: "Vendor", readOnly: true   }
+        bank_account:   { model: "BankAccount", readOnly: true  }
+        location:       { model: "Location", readOnly: true, default: ->
+            Skr.Models.Location.all.get(@location_id) if @location_id
+        }
+        gl_transaction: { model: "GlTransaction", readOnly: true }
+        credit_card:    { model: "CreditCard", inverse: 'payment' }
 
     events:
         'change:vendor': 'onSetVendor'
 
-    onSetVendor: (newVendor) ->
-        return unless newVendor and Lanes.u.isModel(newVendor)
-        @name = newVendor.name
-        newVendor.withAssociations(['billing_address']).then =>
-            @address = newVendor.billing_address.toString()
+    describe: ->
+        metadata = _.toSentence( _.map(@metadata, (value, key) ->
+            _.titleize(key) + ': ' + value
+        ))
+        #{@name} #{metadata}"
+
+    onSetVendor: ->
+        return unless @vendor and @vendor.isPersistent()
+        @name = @vendor.name
+        @vendor.withAssociations(['billing_address']).then (v) =>
+            @address = v.billing_address.toString()

data/client/skr/models/SalesOrder.coffee

@@ -55,8 +55,8 @@ class Skr.Models.SalesOrder extends Skr.Models.Base
         pick_tickets:     { collection: "PickTicket", inverse: 'sales_order' }
 
     events:
-        'change:customer': 'onCustomerChange'
         'lines add remove change:total': 'onTotalChange'
+        'change:customer': 'onCustomerChange'
 
     onTotalChange: ->
         @trigger('change', @, {})
@@ -64,10 +64,14 @@ class Skr.Models.SalesOrder extends Skr.Models.Base
         @unset('order_total')
 
     onCustomerChange: ->
-        return unless @isNew()
+        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
-                @associations.replace(@, name, @customer[name])
+                @[name].set(
+                    _.omit( @customer[name].serialize(), 'id' )
+                )

data/client/skr/models/SequentialId.coffee

@@ -0,0 +1,17 @@
+class Skr.Models.SequentialId extends Skr.Models.Base
+
+    props:
+        id: 'integer'
+        ids:
+            type: 'array', required: true, default: -> []
+
+    registerforPubSub: false
+
+    modelTypeIdentifier: ->
+        'sequential-ids'
+
+    updateValue: (id, count) ->
+        @ids = _.map @ids, (si) ->
+            si = _.clone si
+            si.count = parseInt(count) if si.id is id
+            si

data/client/skr/models/Sku.coffee

@@ -5,7 +5,7 @@ class Skr.Models.Sku extends Skr.Models.Base
         id:                  {type:"integer"}
         default_vendor_id:   {type:"integer"}
         gl_asset_account_id: {type:"integer", default: ->
-            Skr.Models.GlAccount.default_ids.asset
+            Skr.Models.GlAccount.default_ids?.asset
         }
         default_uom_code:    {type:"string"}
         code:                {type:"code",   required:true}

data/client/skr/models/TimeEntry.coffee

@@ -68,9 +68,8 @@ class Skr.Models.TimeEntry extends Skr.Models.Base
             _.extend attrs, colorIndex: project.options.color
         attrs
 
-    fromCalEvent: (event) ->
-        attrs =
-            id: event.entryId,
+    setTimeFromCalEvent: (event) ->
+        return this.set(
             start_at:    event.start()
             end_at:      event.end()
-        this.set(_.pick(attrs, _.identity))
+        )

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

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

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

@@ -40,7 +40,7 @@ Skr.Models.Mixins.SkuLine = {
         this.uom.set( uom.serialize() ) if uom
 
     onSkuChange: ->
-        return unless @sku
+        return if @sku.isProxy
         sl = @sku.sku_locs.findWhere(sku_id: @sku.id)
         if sl
             @set(sku_loc: sl)

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

@@ -26,8 +26,7 @@ class Skr.Screens.CustomerMaint extends Skr.Screens.Base
                 <LC.Input sm=8 name="name" model={@customer} />
             </BS.Row>
             <BS.Row>
-                <LC.Input sm=12
-                    type='textarea'
+                <LC.TextArea sm=12
                     name="notes"
                     model={@customer} />
             </BS.Row>

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

@@ -15,6 +15,7 @@ class Skr.Screens.CustomerProjects extends Skr.Screens.Base
     getHourlyRate: -> @project.rates?.hourly
     setHourlyRate: (value) ->
         @project.rates = _.extend({}, @project.rates, {hourly: value.replace(/[^0-9.]/g, '')})
+
     ColorOption: (props) ->
         <div className={"color-#{props.item.id}"}>{props.item.name}</div>
 
@@ -24,7 +25,7 @@ class Skr.Screens.CustomerProjects extends Skr.Screens.Base
     getColorReadOnly: ->
         index = @getColor()
         color = _.find(Skr.Models.CustomerProject.COLORS, id: index)
-        <div className={"ro color-#{index}"}>{color?.name}</div>
+        <div className={"ro color-#{index}"}>{color?.name or ''}</div>
 
     getColor: ->
         @project.options?.color
@@ -48,14 +49,17 @@ class Skr.Screens.CustomerProjects extends Skr.Screens.Base
 
                 <LC.FieldWrapper sm=2
                     label="Entry Color"
+                    model={@project}
+                    name={'color'}
                     className="color-selection"
-                    value={@getColorReadOnly()}
+                    displayComponent={@getColorReadOnly}
                 >
                     <Lanes.Vendor.ReactWidgets.DropdownList
                         className='colors'
                         data={Skr.Models.CustomerProject.COLORS}
                         valueField='id' textField='name'
-                        value={@getColor()} onChange={@setColor}
+                        value={@getColor()}
+                        onChange={@setColor}
                         valueComponent={@ColorOption}
                         disabled={!@state.commands.isEditing()}
                         itemComponent={@ColorOption} />

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

@@ -20,6 +20,7 @@
     .color-selection {
         .ro {
             padding-left: 0.5rem;
+            line-height: 30px;
         }
     }
 }

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

@@ -23,7 +23,7 @@ class Skr.Screens.FreshBooksImport.ApiInfo extends Lanes.React.Component
             <BS.Row>
                 <LC.Input name='api_key' label='API Key' sm=7 model={@import} />
                 <LC.Input name='domain' label='Company' sm=3 model={@import} />
-                <LC.FormGroup className='domain' sm=2 label=''>.freshbooks.com</LC.FormGroup>
+                <BS.FormGroup className='domain' sm=2 label=''>.freshbooks.com</BS.FormGroup>
             </BS.Row>
             <BS.Row>
                 <BS.Col smOffset=9 sm=2>

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

@@ -26,6 +26,6 @@ class Skr.Screens.GlAccounts extends Skr.Screens.Base
 
             </BS.Row>
             <BS.Row>
-                <LC.Input type='textarea' sm=12 name="description" model={@account} />
+                <LC.TextArea sm=12 name="description" model={@account} />
             </BS.Row>
         </LC.ScreenWrapper>

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

@@ -13,7 +13,7 @@ class Transactions extends Skr.Models.Base
         syncOptions: { with: ['with_details'] }
         fields: [
             { id: 'id', visible: false }
-            { id: 'created_at', title: 'Date', format: Lanes.u.format.shartDate, fixedWidth: 100 }
+            { id: 'created_at', title: 'Date', format: Lanes.u.format.shortDate, fixedWidth: 100 }
             { id: 'debit_details',  title: 'Debit',  component: RenderPosting }
             { id: 'credit_details', title: 'Credit', component: RenderPosting }
             { id: 'source_type', fixedWidth: 180  }

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

@@ -5,7 +5,7 @@ class Skr.Screens.Invoice extends Skr.Screens.Base
 
     syncOptions:
         with: [ 'with_details' ]
-        include: [ 'sales_order', 'billing_address', 'shipping_address', 'lines'   ]
+        include: [ 'sales_order', 'billing_address', 'shipping_address', 'lines', 'payments' ]
 
     dataObjects:
         invoice: ->
@@ -18,29 +18,19 @@ class Skr.Screens.Invoice extends Skr.Screens.Base
         commands: new Skr.Screens.Commands(this, modelName: 'invoice', print: true)
 
     setSalesOrder: (so) -> @invoice.setFromSalesOrder(so)
-    onPayment: -> @invoice.save()
 
-    getPayment: ->
-        @context.viewport.displayModal
-            title: "Accept Payment", autoHide: true, size: 'sm', onOk: @onPayment,
-            body: =>
-                <Skr.Screens.Invoice.Payment invoice={@invoice} />
+    showPayment: ->
+        Skr.Screens.Invoice.Payment.display(@context.viewport, @invoice)
 
     PaymentButton: ->
-        return null if @invoice.isNew() or @invoice.isPaidInFull()
-        <SC.ToolbarButton onClick={@getPayment}>
+        return null if @invoice.isNew()
+        <SC.ToolbarButton onClick={@showPayment}>
             <LC.Icon type="money" />Payment
         </SC.ToolbarButton>
 
     shouldSaveLinesImmediately: ->
         not @invoice.isNew()
 
-    linesQueryBuilder: (attrs) ->
-        unless this.invoice.isNew()
-            sc = _.find attrs.fields, id: 'sku_code'
-            sc.editable = false
-        attrs
-
     render: ->
         <LC.ScreenWrapper identifier="invoice" flexVertical>
 
@@ -55,9 +45,11 @@ class Skr.Screens.Invoice extends Skr.Screens.Base
 
                 <SC.SalesOrderFinder autoFocus={false} sm=2 xs=3 editOnly={false}
                     onModelSet={@setSalesOrder} associationName='sales_order'
-                    syncOptions={@syncOptions} parentModel={@invoice} />
+                    syncOptions={ include: ['customer', 'billing_address', 'shipping_address' ] }
+                    parentModel={@invoice} />
 
                 <SC.CustomerFinder
+                    syncOptions={ include: ['billing_address', 'shipping_address' ] }
                     selectField sm=3 xs=6 model={@invoice} />
 
                 <SC.TermsChooser model={@invoice} sm=3 xs=6 />
@@ -78,7 +70,7 @@ class Skr.Screens.Invoice extends Skr.Screens.Base
             </BS.Row>
 
             <BS.Row>
-               <LC.Input sm=12 type='textarea' name="notes" model={@invoice} />
+               <LC.TextArea name="notes" model={@invoice} xs=12 />
             </BS.Row>
 
             <BS.Row>