stockor 0.3.0 → 0.4.0

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

@@ -1,28 +1,109 @@
+##=require skr/vendor
+
 class Skr.Screens.Invoice.Payment extends Lanes.React.Component
 
+    statics:
+        onPayment: (modal, ev) ->
+            {invoice, payment} = modal.refs.body
+            payment.save(include: 'invoice').then (pymnt) ->
+                invoice.amount_paid = invoice.amount_paid.minus(pymnt.amount)
+                modal.hide() unless pymnt.hasErrors
+
+        display: (viewport, invoice) ->
+            viewport.displayModal
+                title: "Accept Payment", size: 'lg',
+                onCancel: (m) ->
+                    unsaved = invoice.payments.filter (pymnt) -> not pymnt.isNew()
+                    invoice.payments.remove(unsaved)
+                    m.hide()
+                onOk: @onPayment, className: "invoice-payment"
+                invoice: invoice
+                body: Skr.Screens.Invoice.Payment
+
+    getInitialState: ->
+        type: 'credit-card'
+
     dataObjects:
         invoice: 'props'
-
-    componentDidMount: ->
-        @invoice.amount_paid = @invoice.open_amount
+        payment: ->
+            payment = @props.invoice.payments.find (pymnt) -> pymnt.isNew()
+            payment ||= this.props.invoice.payments.add({
+                amount: @props.invoice.open_amount
+            })
+            payment
 
     onEnter: -> @props.modal.onButton()
 
-    render: ->
-        <LC.ScreenWrapper identifier="payment">
+    onTypeChange: (ev) ->
+        @setState(type: ev.target.value)
+
+    visitPayment: (payment) ->
+        @props.modal.hide()
+        Lanes.Screens.Definitions.all.get('payments')
+            .display(props: {payment: payment})
+
+    PreviousPayments: (props) ->
+        previous = props.invoice.payments.filter (pymnt) -> not pymnt.isNew()
+        return null if _.isEmpty(previous)
+
+        <BS.Table striped bordered condensed className="prior-payments">
+            <thead>
+                <tr>
+                    <th>ID</th>
+                    <th>Date</th>
+                    <th>Info</th>
+                    <th className="align-right">Amount</th>
+                </tr>
+            </thead>
+            <tbody>
+                {for pym in previous
+                    <tr key={pym.id}>
+                        <td><a onClick={_.partial(@visitPayment, pym)}>{pym.visible_id}</a></td>
+                        <td>{Lanes.u.format.shortDateTime(pym.date)}</td>
+                        <td>{pym.describe()}</td>
+                        <td className="align-right">{Lanes.u.format.currency(pym.amount)}</td>
+                    </tr>}
+            </tbody>
+        </BS.Table>
+
+    NewPayment: (props) ->
+        {invoice} = props
+        return null if invoice.isPaidInFull()
+
+        <div className="new-payment">
+            <BS.FormGroup className="toggles">
+                <BS.Radio onChange={@onTypeChange}
+                    checked={@state.type is 'cash'}
+                    name="type" value="cash" inline>Cash</BS.Radio>
+                <BS.Radio onChange={@onTypeChange}
+                    checked={@state.type is 'credit-card'}
+                    name="type" value="credit-card" inline>Credit Card</BS.Radio>
+            </BS.FormGroup>
+
             <BS.Row>
+                {<Skr.Components.CreditCardForm
+                    card={@payment.credit_card } /> if @state.type is 'credit-card'}
+            </BS.Row>
+
+            <LC.ErrorDisplay model={@payment} />
 
+            <BS.Row className="input-fields">
                 <LC.DisplayValue name='total' getValue={->
-                    _.sprintf('%0.2f', Number(@total))
-                } model={@invoice} align='right' />
+                    Lanes.u.format.currency(@total)
+                } model={invoice} align='right' />
 
                 <LC.DisplayValue name='prev_amount_paid' label='Amount Paid' getValue={->
-                    _.sprintf('%0.2f', Number(@prev_amount_paid))
-                } model={@invoice} align='right' />
-
-                <LC.Input label='Amount' editOnly autoFocus getValue={->
-                    _.sprintf('%0.2f', Number(@amount_paid))
-                } onEnter={@onEnter} name='amount_paid' align='right' model={@invoice} />
+                    Lanes.u.format.currency(@amount_paid)
+                } model={invoice} align='right' />
 
+                <LC.NumberInput label='Amount' editOnly autoFocus getValue={->
+                    Lanes.u.format.currency(@amount)
+                } onEnter={@onEnter} name='amount' align='right' model={@payment} />
             </BS.Row>
+        </div>
+
+    render: ->
+        <LC.ScreenWrapper identifier="payment">
+            <@PreviousPayments invoice={@invoice} />
+            <@NewPayment invoice={@invoice} />
         </LC.ScreenWrapper>

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

@@ -0,0 +1,32 @@
+.invoice {
+
+
+
+}
+
+.invoice-payment {
+    .credit-card-form {
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+    }
+
+    .input-fields {
+        display: flex;
+        justify-content: space-around;
+        margin-top: 15px;
+        padding-top: 15px;
+        border-top: 2px solid lightgray;
+    }
+
+    .toggles {
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
+        label {
+            input{ margin-top: 0; }
+            display: flex;
+            align-items: center;
+        }
+    }
+}

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

@@ -1,7 +1,7 @@
 class Skr.Screens.Locations extends Skr.Screens.Base
 
     syncOptions:
-        include: [ 'address' ]
+        include: [ 'address', 'logo' ]
 
     dataObjects:
         location: ->
@@ -18,11 +18,12 @@ class Skr.Screens.Locations extends Skr.Screens.Base
             <SC.ScreenControls commands={@state.commands} />
             <BS.Row>
                 <SC.LocationChooser label='Code' editOnly displayFinder
+                    syncOptions={@syncOptions}
                     commands={@state.commands} model={@location} name="code" />
                 <LC.Input sm=6 name='name' model={@location} />
             </BS.Row>
             <BS.Row>
-                <LC.ImageSaver label='Logo' sm=3 model={@location} name='logo' />
+                <LC.ImageAsset sm=3 model={@location} name='logo' label='Logo' size='thumb' />
             </BS.Row>
             <BS.Row>
                 <SC.Address lg=6 model={@location.address}  />

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

@@ -15,7 +15,7 @@ class Skr.Screens.PaymentCategory extends Skr.Screens.Base
             <SC.ScreenControls commands={@state.commands} />
             <BS.Row>
 
-                <SC.PaymentCategoryFinder name='code'
+                <SC.PaymentCategoryFinder name='code' editOnly
                     commands={@state.commands} model={@category} />
 
                 <LC.Input sm=9 name='name' model={@category} />

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

@@ -32,15 +32,16 @@ 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
+                <LC.RecordFinder ref="finder" sm=3 autoFocus editOnly
                     commands={@state.commands} model={@category}
                     label='Payment ID' name='visible_id' model={@payment} query={@query}
                 />
-                <SC.BankAccountFinder smOffset=1 selectField name='bank_account'
+                <SC.LocationChooser hideSingle sm=2 model={@payment} />
+                <SC.BankAccountFinder selectField name='bank_account'
                     model={@payment} />
                 <SC.PaymentCategoryFinder selectField name='category' labelField='code'
                     model={@payment} />
-                <LC.DateTime smOffset=1 name='date' format='ddd, MMM Do YYYY'
+                <LC.DateTime name='date' format='ddd, MMM Do YYYY'
                     sm=3 model={@payment} />
             </BS.Row>
             <BS.Row>
@@ -50,7 +51,7 @@ class Skr.Screens.Payments extends Skr.Screens.Base
                 <LC.NumberInput smOffset=1 sm=3 name="amount" align='right' model={@payment} />
             </BS.Row>
             <BS.Row>
-                <LC.Input type='textarea' smOffset=2 sm=6 name="address" model={@payment} />
+                <LC.TextArea smOffset=2 sm=6 name="address" model={@payment} />
             </BS.Row>
             <BS.Row>
                <LC.Input sm=12 name="notes" model={@payment} />

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

@@ -0,0 +1,73 @@
+class Filters extends Lanes.Models.State
+
+    session:
+        start_at: type: 'date', default: -> _.moment().subtract(1, 'week').toDate()
+        end_at:   type: 'date', default: -> new Date()
+        sku:      type: 'state'
+        customer: type: 'state'
+
+    derived:
+        query: deps: ['start_at', 'end_at', 'sku', 'customer'], fn: ->
+            options =
+                with: {'with_details': true}
+                query:
+                    invoice_date:
+                        op: 'in', value: [ @start_at.toISOString(), @end_at.toISOString() ]
+            if @sku
+                options['with']['with_sku_id'] = @sku.id
+            if @customer
+                options['query']['customer_id'] = @customer.id
+            new Lanes.Models.Query
+                title: 'Lines', src: Skr.Models.Invoice
+                syncOptions: options
+                fields: [
+                    { id: 'id', visible: false }
+                    { id: 'visible_id', title: 'Invoice #', fixedWidth: 100}
+                    { id: 'invoice_date', title: 'Date', format: Lanes.u.format.shortDate, fixedWidth: 100 }
+                    { id: 'customer_code', title: 'Customer', fixedWidth: 120}
+
+                    { id: 'customer_name' }
+                    {
+                        id: 'invoice_total', title: 'Total', fixedWidth: 120,
+                        textAlign: 'right', format: Lanes.u.format.currency
+                    }
+                ]
+
+
+class Skr.Screens.SaleReport extends Skr.Screens.Base
+
+    dataObjects:
+        filters: -> new Filters
+
+    resetQuery: ->
+        @filters.clear()
+
+    onPrint: (isPrinting) ->
+        @setState({isPrinting})
+        if isPrinting
+            @filters.query.results.loadFully()
+
+
+    render: ->
+        props = {sm:3, xs: 4, writable: true, editOnly: true, model: @filters, step: 15}
+        <LC.ScreenWrapper flexVertical identifier="sales-report">
+            <BS.Panel header={
+                <LC.PanelHeader title="Sales Report">
+                    <SC.PrintButton onPrint={@onPrint} iconOnly />
+                    <LC.Icon onClick={@resetQuery} type="repeat" noPrint />
+                </LC.PanelHeader>
+            }>
+                <BS.Row>
+                    <LC.DateTime  {...props} name="start_at"/>
+                    <LC.DateTime  {...props} name="end_at"/>
+                    <SC.SkuFinder {...props}
+                        parentModel={@filters} associationName='sku' />
+                    <SC.CustomerFinder {...props} name='code'
+                        parentModel={@filters} associationName='customer' />
+
+                </BS.Row>
+            </BS.Panel>
+            <LC.Grid
+                renderCompleteResults={@state.isPrinting}
+                query={@filters.query}  />
+        </LC.ScreenWrapper>

data/client/skr/screens/sale-report/index.js

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

data/client/skr/screens/sale-report/index.scss

@@ -0,0 +1,9 @@
+/*
+ You should remove this file if your screen does not use any custom styles
+
+ Otherwise Lanes will continue to fetch an empty file whenever
+ the screen is displayed
+*/
+.sale-report {
+
+}

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

@@ -26,8 +26,9 @@ class Skr.Screens.SalesOrder extends Lanes.React.Screen
                     syncOptions={@syncOptions} model={@sales_order}
                     commands={@state.commands} />
 
-                <SC.CustomerFinder selectField sm=3 xs=4
-                    customer={@sales_order.customer} model={@sales_order} />
+                <SC.CustomerFinder
+                    syncOptions={ include: ['billing_address', 'shipping_address' ] }
+                    selectField sm=3 xs=4 model={@sales_order} />
 
                 <LC.Input sm=3 xs=4 name='po_num' model={@sales_order} />
 
@@ -43,8 +44,7 @@ class Skr.Screens.SalesOrder extends Lanes.React.Screen
             </BS.Row>
 
             <BS.Row>
-               <LC.Input sm=12
-                   type='textarea'
+               <LC.TextArea sm=12
                    name="notes"
                    model={@sales_order} />
             </BS.Row>

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

@@ -34,6 +34,11 @@ class Skr.Screens.SkuMaint extends Skr.Screens.Base
                 <Skr.Screens.SkuMaint.SkuUomList label={"UOMs"} model={@sku} name='uoms' sm=4 />
             </BS.Row>
             <BS.Row>
+                <LC.ToggleField sm=2
+                    label="Is Public?"
+                    name="is_public"
+                    model={@sku} />
+
                 <LC.ToggleField sm=2
                     label="Other Charge?"
                     name="is_other_charge"

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

@@ -11,7 +11,7 @@ class UomList extends Lanes.Models.State
         @expanded = expanded or @uoms.first()
 
     save: ->
-        @sku.associations.replace(@sku, 'uoms', uoms)
+        @sku.associations.replace(@sku, 'uoms', @uoms)
         @sku.default_uom_code = @default.code
 
     add: ->
@@ -60,18 +60,16 @@ class UomEdit extends Lanes.React.Component
                 </span>
             </div>
 
-        <BS.Panel ref="panel" className='form-horizontal' collapsible
+        <BS.Panel ref="panel" collapsible
             expanded={@list.expanded is @uom} header={header}>
-
-            <LC.Input type="text"  label='Price' name='price' labelClassName="col-xs-3"
-                model={@props.uom} wrapperClassName="col-xs-6" />
-
-            <LC.Input type="number" label='Size' name='size'  labelClassName="col-xs-3"
-                model={@props.uom} wrapperClassName="col-xs-6" />
-
-            <LC.Input type="text"  label='Code' name='code'  labelClassName="col-xs-3"
-                model={@props.uom} wrapperClassName="col-xs-6"/>
-
+            <BS.Row>
+                <LC.Input type="text"  label='Code'
+                    name='code' model={@props.uom} xs=4 />
+                <LC.NumberInput type="number" label='Size' name='size' format='#,###'
+                    model={@props.uom} xs=3 />
+                <LC.NumberInput type="text"  label='Price' name='price'
+                    model={@props.uom} xs=5 />
+            </BS.Row>
         </BS.Panel>
 
 
@@ -121,11 +119,6 @@ class Skr.Screens.SkuMaint.SkuUomList extends Lanes.React.Component
     getInitialState: ->
         editing: false
 
-    renderDisplayValue: ->
-        value = @model.uoms.map (uom) ->
-            uom.combined
-        <span>{value.join(', ')}</span>
-
     onEdit: (selected = @model.uoms.first()) ->
         @setState
             editing: new UomList(@model)
@@ -151,6 +144,7 @@ class Skr.Screens.SkuMaint.SkuUomList extends Lanes.React.Component
 
         <BS.Popover
             ref="popover"
+            className='sm'
             id='sku-edit-uoms'
             title={header} placement='left'>
 
@@ -167,43 +161,38 @@ class Skr.Screens.SkuMaint.SkuUomList extends Lanes.React.Component
                 </div>
         </BS.Popover>
 
-    renderEdit: (label) ->
-        colProps = _.omit(@props, 'name', 'label')
-        classNames = _.classnames(@formGroupClassNames(), 'sku-uom-list')
-
-        <BS.Col {...colProps}>
-            <div className={classNames}>
-                <label className='control-label'>
-                    <div className="title">{label}</div>
-                </label>
-                <div className="input-group">
-                    <div className="read-only form-control value" name={@props.name}>
-                        <ul>
-                        {@model.uoms.map (uom) =>
-                            <UOMToken key={uom.cid} uom=uom onEdit={@onEdit} />}
-                        </ul>
-                    </div>
-                    <span className="input-group-btn">
-                        <BS.OverlayTrigger
-                            trigger="click"
-                            ref="overlay"
-                            rootClose
-                            arrowOffsetTop={'130px'}
-                            container={@}
-                            show={@state.editing}
-                            onExit={@onCancel}
-                            placement="left"
-                            overlay={@renderEditingPopup()}>
-
-                            <BS.Button ref="addButton" onClick={ =>
-                                @onEdit(@model.uoms.first())}
-                            >
-                                <LC.Icon type="gear" />
-                            </BS.Button>
-                        </BS.OverlayTrigger>
-
-                    </span>
-                </div>
+    renderDisplay: ->
+        value = @model.uoms.map (uom) ->
+            uom.combined
+        <span>{value.join(', ')}</span>
 
-            </div>
-        </BS.Col>
+    renderEdit: (props) ->
+        classNames = _.classnames('sku-uom-list', props.className)
+
+        <div className={classNames}>
+            <ul className="form-control">
+            {@model.uoms.map (uom) =>
+                <UOMToken key={uom.cid} uom=uom onEdit={@onEdit} />}
+            </ul>
+            <span className="input-group-btn">
+
+                <BS.OverlayTrigger
+                    classNames={classNames}
+                    trigger="click"
+                    ref="overlay"
+                    rootClose
+                    arrowOffsetTop={'130px'}
+                    container={@}
+                    show={@state.editing}
+                    onExit={@onCancel}
+                    placement="left"
+                    overlay={@renderEditingPopup()}>
+
+                    <BS.Button ref="addButton" onClick={ =>
+                        @onEdit(@model.uoms.first())}
+                    >
+                        <LC.Icon type="gear" />
+                    </BS.Button>
+                </BS.OverlayTrigger>
+            </span>
+        </div>