notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

new approach to adding invoices.

Browse Source
This commit is contained in:
BC
2019-02-18 16:23:05 -08:00
parent f1a6ada3b8
commit e2b99961e4
3 changed files with 334 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/cljs/auto_ap/forms.cljs Normal file
View File

@@ -0,0 +1,55 @@
(ns auto-ap.forms
(:require [re-frame.core :as re-frame]
[auto-ap.views.utils :refer [dispatch-event]]))
(re-frame/reg-sub
::form
(fn [db [_ x]]
(-> db ::forms x)))
(re-frame/reg-sub
::loading-class
(fn [db [_ x]]
(if (= (get-in db [::forms x :status]) "loading")
"is-loading"
"")))
(defn start-form [db form data]
(assoc-in db [::forms form] {:error nil
:active? true
:status nil
:data data}))
(defn stop-form [db form]
(update db ::forms dissoc form))
(re-frame/reg-event-db
::form-closing
(fn [db [_ f]]
(-> db
(stop-form f))))
(defn in-form
[form-name]
(re-frame/path [::forms form-name]))
(re-frame/reg-event-db
::change
(fn [db [_ form & path-pairs]]
(println path-pairs)
(reduce
(fn [db [path value]]
(assoc-in db (into [::forms form :data] path) value))
db
(partition 2 path-pairs))))
(re-frame/reg-event-db
::save-error
(fn [db [_ form result]]
(-> db
(assoc-in [::forms form :status] :error)
(assoc-in [::forms form :error] (:message (first result))))))
(defn side-bar-form [{:keys [form]} children]
[:div [:a.delete.is-pulled-right {:on-click (dispatch-event [::form-closing form])}] [:div children]])

267
src/cljs/auto_ap/views/pages/admin/clients.cljs
View File

@@ -85,7 +85,7 @@
{:edit-client new-client-req} {:edit-client new-client-req}
[:id :name :code :email :locations [:address [:street1 :street2 :city :state :zip]] [:bank-accounts [:id :number :check-number :name :code :bank-code :bank-name :routing :type :visible :sort-order]]]]}]} [:id :name :code :email :locations [:address [:street1 :street2 :city :state :zip]] [:bank-accounts [:id :number :check-number :name :code :bank-code :bank-name :routing :type :visible :sort-order]]]]}]}
:on-success [::save-complete] :on-success [::save-complete]
:on-error [::save-error]}} :on-error [::forms/save-error ::new-client]}}
{:db new-client-form})))) {:db new-client-form}))))
@@ -97,19 +97,9 @@
(assoc-in [:clients (:id (:edit-client client))] (update (:edit-client client) :bank-accounts (fn [bas] (->> bas (sort-by :sort-order) vec))))))) (assoc-in [:clients (:id (:edit-client client))] (update (:edit-client client) :bank-accounts (fn [bas] (->> bas (sort-by :sort-order) vec)))))))
(re-frame/reg-event-db
::save-error
[(forms/in-form ::new-client)]
(fn [db [_ result]]
(-> db
(assoc :status :error)
(assoc :error (:message (first result))))))
(re-frame/reg-event-db
::change-new
[(forms/in-form ::new-client) (re-frame/path [:data])]
(fn [client [_ path value]]
(assoc-in client path value)))
(re-frame/reg-event-db (re-frame/reg-event-db
::add-new-location ::add-new-location
@@ -200,138 +190,137 @@
[clients-table]])]) [clients-table]])])
(defn side-bar-form [_ children]
[:div [:a.delete.is-pulled-right {:on-click (dispatch-event [::forms/form-closing ::new-client])}] [:div children]])
(defn bank-account-card [new-client {:keys [active? new? type visible code name number check-number id sort-order] :as bank-account} first? last?] (defn bank-account-card [new-client {:keys [active? new? type visible code name number check-number id sort-order] :as bank-account} first? last?]
(let [change-event [::forms/change ::new-client]]
[:div.card {:style {:margin-bottom "1em"}}
[:div.card {:style {:margin-bottom "1em"}} [:header.card-header
[:header.card-header [:p.card-header-title {:style {:text-overflow "ellipsis"}}
[:p.card-header-title {:style {:text-overflow "ellipsis"}}
[:span.icon
(if ({:check ":check"} type)
[:span.icon-check-payment-sign]
[:span.icon-accounting-bill])]
code ": " name]
[:p {:style {:padding "0.75em 0.25em"}}
[:a.button.is-outlined {:on-click (dispatch-event [::toggle-visible sort-order])} [:span.icon (if visible
[:span.fa.fa-eye]
[:span.fa.fa-eye-slash]
)]]]
(when-not last?
[:p {:style {:padding "0.75em 0.25em"}}
[:a.button.is-primary.is-outlined {:on-click (dispatch-event [::sort-swapped sort-order (inc sort-order)])} [:span.icon [:span.fa.fa-sort-down]]]])
(when-not first?
[:p {:style {:padding "0.75em 0.25em"}}
[:a.button.is-primary.is-outlined {:on-click (dispatch-event [::sort-swapped sort-order (dec sort-order)])} [:span.icon [:span.fa.fa-sort-up]]]])
(if active?
[:a.card-header-icon
{:on-click (dispatch-event [::bank-account-deactivated sort-order])}
[:span.icon [:span.icon
[:span.fa.fa-angle-up]]] (if ({:check ":check"} type)
[:a.card-header-icon [:span.icon-check-payment-sign]
{:on-click (dispatch-event [::bank-account-activated sort-order])} [:span.icon-accounting-bill])]
[:span.icon code ": " name]
[:span.fa.fa-angle-down]]])] [:p {:style {:padding "0.75em 0.25em"}}
(when active? [:a.button.is-outlined {:on-click (dispatch-event [::toggle-visible sort-order])} [:span.icon (if visible
[:div.card-content [:span.fa.fa-eye]
[:label.label "General"] [:span.fa.fa-eye-slash]
[horizontal-field )]]]
nil (when-not last?
[:div.control [:p {:style {:padding "0.75em 0.25em"}}
[:p.help "Account Code"] [:a.button.is-primary.is-outlined {:on-click (dispatch-event [::sort-swapped sort-order (inc sort-order)])} [:span.icon [:span.fa.fa-sort-down]]]])
(if new? (when-not first?
[:div.field.has-addons.is-extended [:p {:style {:padding "0.75em 0.25em"}}
[:p.control [:a.button.is-static (:code new-client) "-" ]] [:a.button.is-primary.is-outlined {:on-click (dispatch-event [::sort-swapped sort-order (dec sort-order)])} [:span.icon [:span.fa.fa-sort-up]]]])
[:p.control (if active?
[bind-field [:a.card-header-icon
[:input.input {:type "code" {:on-click (dispatch-event [::bank-account-deactivated sort-order])}
:field [:bank-accounts sort-order :code] [:span.icon
:spec ::entity/code [:span.fa.fa-angle-up]]]
:event ::change-new [:a.card-header-icon
:subscription new-client}]]]] {:on-click (dispatch-event [::bank-account-activated sort-order])}
[:div.field [:p.control code]])] [:span.icon
[:span.fa.fa-angle-down]]])]
(when active?
[:div.card-content
[:label.label "General"]
[horizontal-field
nil
[:div.control
[:p.help "Account Code"]
(if new?
[:div.field.has-addons.is-extended
[:p.control [:a.button.is-static (:code new-client) "-" ]]
[:p.control
[bind-field
[:input.input {:type "code"
:field [:bank-accounts sort-order :code]
:spec ::entity/code
:event change-event
:subscription new-client}]]]]
[:div.field [:p.control code]])]
[:div.control [:div.control
[:p.help "Nickname"] [:p.help "Nickname"]
[bind-field [bind-field
[:input.input {:placeholder "BOA Checking #1" [:input.input {:placeholder "BOA Checking #1"
:type "text" :type "text"
:field [:bank-accounts sort-order :name] :field [:bank-accounts sort-order :name]
:event ::change-new :event change-event
:subscription new-client}]]]] :subscription new-client}]]]]
(when (#{:check ":check"} type ) (when (#{:check ":check"} type )
[:div [:div
[:label.label "Bank"] [:label.label "Bank"]
[horizontal-field [horizontal-field
nil nil
[:div.control [:div.control
[:p.help "Bank Name"] [:p.help "Bank Name"]
[bind-field [bind-field
[:input.input {:placeholder "Bank of America" [:input.input {:placeholder "Bank of America"
:type "text" :type "text"
:field [:bank-accounts sort-order :bank-name] :field [:bank-accounts sort-order :bank-name]
:event ::change-new :event change-event
:subscription new-client}]]] :subscription new-client}]]]
[:div.control [:div.control
[:p.help "Routing #"] [:p.help "Routing #"]
[bind-field [bind-field
[:input.input {:placeholder "104819123" [:input.input {:placeholder "104819123"
:type "text" :type "text"
:field [:bank-accounts sort-order :routing] :field [:bank-accounts sort-order :routing]
:event ::change-new :event change-event
:subscription new-client}]]] :subscription new-client}]]]
[:div.control [:div.control
[:p.help "Bank code"] [:p.help "Bank code"]
[bind-field [bind-field
[:input.input {:placeholder "12/10123" [:input.input {:placeholder "12/10123"
:type "text" :type "text"
:field [:bank-accounts sort-order :bank-code] :field [:bank-accounts sort-order :bank-code]
:event ::change-new :event change-event
:subscription new-client}]]]] :subscription new-client}]]]]
[:label.label "Checking account"] [:label.label "Checking account"]
[horizontal-field [horizontal-field
nil nil
[:div.control [:div.control
[:p.help "Account #"] [:p.help "Account #"]
[bind-field [bind-field
[:input.input {:placeholder "123456789" [:input.input {:placeholder "123456789"
:type "text" :type "text"
:field [:bank-accounts sort-order :number] :field [:bank-accounts sort-order :number]
:event ::change-new :event change-event
:subscription new-client}]]] :subscription new-client}]]]
[:div.control [:div.control
[:p.help "Check Number"] [:p.help "Check Number"]
[bind-field [bind-field
[:input.input {:placeholder "10000" [:input.input {:placeholder "10000"
:type "text" :type "text"
:field [:bank-accounts sort-order :check-number] :field [:bank-accounts sort-order :check-number]
:event ::change-new :event change-event
:subscription new-client}]]]] :subscription new-client}]]]]
[:div.field [:div.field
[:label.label "Yodlee Account"] [:label.label "Yodlee Account"]
[:div.control [:div.control
[bind-field [bind-field
[:input.input {:placeholder "Yodlee Account #" [:input.input {:placeholder "Yodlee Account #"
:type "text" :type "text"
:field [:bank-accounts :yodlee-account-id] :field [:bank-accounts :yodlee-account-id]
:event ::change-new :event change-event
:subscription new-client}]]]]])]) :subscription new-client}]]]]])])
(when active? (when active?
[:footer.card-footer [:footer.card-footer
[:a.card-footer-item {:href "#" :on-click (dispatch-event [::bank-account-deactivated sort-order])} "Done"] [:a.card-footer-item {:href "#" :on-click (dispatch-event [::bank-account-deactivated sort-order])} "Done"]
(when new? (when new?
[:a.card-footer-item.is-warning {:href "#" :on-click (dispatch-event [::bank-account-removed sort-order])} "Remove"])])] [:a.card-footer-item.is-warning {:href "#" :on-click (dispatch-event [::bank-account-removed sort-order])} "Remove"])])])
) )
(defn new-client-form [] (defn new-client-form []
(let [{error :error new-client :data } @(re-frame/subscribe [::forms/form ::new-client])] (let [{error :error new-client :data } @(re-frame/subscribe [::forms/form ::new-client])
change-event [::forms/change ::new-client]]
[side-bar-form {} [forms/side-bar-form {:form ::new-client}
[:form [:form
[:h1.title.is-2 "Add client"] [:h1.title.is-2 "Add client"]
[:div.field [:div.field
@@ -341,7 +330,7 @@
[:input.input {:type "text" [:input.input {:type "text"
:field :name :field :name
:spec ::entity/name :spec ::entity/name
:event ::change-new :event change-event
:subscription new-client}]]]] :subscription new-client}]]]]
[:div.field [:div.field
@@ -355,7 +344,7 @@
[:input.input {:type "code" [:input.input {:type "code"
:field :code :field :code
:spec ::entity/code :spec ::entity/code
:event ::change-new :event change-event
:subscription new-client}]]])] :subscription new-client}]]])]
[:div.field [:div.field
@@ -365,7 +354,7 @@
[:input.input {:type "email" [:input.input {:type "email"
:field :email :field :email
:spec ::entity/email :spec ::entity/email
:event ::change-new :event change-event
:subscription new-client}]]]] :subscription new-client}]]]]
[:div.field [:div.field
@@ -376,7 +365,7 @@
[bind-field [bind-field
[:input.input {:type "text" [:input.input {:type "text"
:field :location :field :location
:event ::change-new :event change-event
:subscription new-client}]]] :subscription new-client}]]]
[:p.control [:button.button.is-primary {:on-click (dispatch-event [::add-new-location])} "Add"]]] [:p.control [:button.button.is-primary {:on-click (dispatch-event [::add-new-location])} "Add"]]]
[:ul [:ul
@@ -386,7 +375,7 @@
[:div {:style {:padding-bottom "0.75em" :padding-top "0.75em"}} [:div {:style {:padding-bottom "0.75em" :padding-top "0.75em"}}
[:h2.subtitle "Address"] [:h2.subtitle "Address"]
[address-field {:field [:address] [address-field {:field [:address]
:event ::change-new :event change-event
:subscription new-client}]] :subscription new-client}]]
[:h2.subtitle "Bank accounts"] [:h2.subtitle "Bank accounts"]

182
src/cljs/auto_ap/views/pages/unpaid_invoices.cljs
View File

@@ -9,7 +9,8 @@
[auto-ap.entities.invoice :as invoice] [auto-ap.entities.invoice :as invoice]
[auto-ap.entities.vendors :as vendor] [auto-ap.entities.vendors :as vendor]
[bidi.bidi :as bidi] [bidi.bidi :as bidi]
[auto-ap.views.components.layouts :refer [side-bar-layout]] [auto-ap.forms :as forms]
[auto-ap.views.components.layouts :refer [side-bar-layout appearing-side-bar]]
[auto-ap.routes :as routes] [auto-ap.routes :as routes]
[auto-ap.views.components.expense-accounts-dialog :as expense-accounts-dialog] [auto-ap.views.components.expense-accounts-dialog :as expense-accounts-dialog]
[auto-ap.views.components.vendor-dialog :refer [vendor-dialog]] [auto-ap.views.components.vendor-dialog :refer [vendor-dialog]]
@@ -258,12 +259,12 @@
{:dispatch [::params-change @(re-frame/subscribe [::params])]})) {:dispatch [::params-change @(re-frame/subscribe [::params])]}))
(re-frame/reg-event-fx (re-frame/reg-event-fx
::new-invoice ::new-invoice-clicked
(fn [{:keys [db]} _] (fn [{:keys [db]} _]
{:dispatch [::events/modal-status ::new-invoice {:visible? true}] {:db (forms/start-form db ::new-invoice {:client-id (:id @(re-frame/subscribe [::subs/client]))
:db (assoc-in db [::new-invoice] {:client-id (:id @(re-frame/subscribe [::subs/client])) :status :unpaid
:date (date->str (c/now) standard) :date (date->str (c/now) standard)
:location (first (:locations @(re-frame/subscribe [::subs/client])))})})) :location (first (:locations @(re-frame/subscribe [::subs/client])))})}))
(re-frame/reg-event-fx (re-frame/reg-event-fx
::edit-invoice ::edit-invoice
@@ -278,17 +279,23 @@
(re-frame/reg-event-fx (re-frame/reg-event-fx
::create-invoice ::create-invoice
(fn [{:keys [db]} _] (fn [{:keys [db]} _]
(let [new-invoice @(re-frame/subscribe [::new-invoice])] (let [{:keys [data]} @(re-frame/subscribe [::forms/form ::new-invoice])]
{:graphql {:graphql
{:token (-> db :user) {:token (-> db :user)
:query-obj {:venia/operation {:operation/type :mutation :query-obj {:venia/operation {:operation/type :mutation
:operation/name "AddInvoice"} :operation/name "AddInvoice"}
:venia/queries [{:query/data [:add-invoice :venia/queries [{:query/data [:add-invoice
{:invoice new-invoice} {:invoice {:date (:date data)
:vendor-id (:vendor-id data)
:client-id (:client-id data)
:invoice-number (:invoice-number data)
:location (:location data)
:total (:total data)
}}
invoice-read]}]} invoice-read]}]}
:on-success [::invoice-created] :on-success [::invoice-created]
:on-error [::invoice-create-failed]}}))) :on-error [::forms/save-error ::new-invoice]}})))
@@ -373,8 +380,8 @@
(re-frame/reg-event-fx (re-frame/reg-event-fx
::invoice-created ::invoice-created
(fn [{:keys [db]} [_ {:keys [add-invoice]}]] (fn [{:keys [db]} [_ {:keys [add-invoice]}]]
{:dispatch [::events/modal-completed ::new-invoice] {:db (-> db
:db (-> db (forms/stop-form ::new-invoice)
(update-in [::invoice-page :invoices] (update-in [::invoice-page :invoices]
(fn [is] (fn [is]
(into [(assoc add-invoice :class "live-added")] (into [(assoc add-invoice :class "live-added")]
@@ -431,9 +438,7 @@
{:dispatch [::events/modal-completed ::expense-accounts-dialog/change-expense-accounts] {:dispatch [::events/modal-completed ::expense-accounts-dialog/change-expense-accounts]
:db (-> db :db (-> db
(update-in [::invoice-page :invoices] (update-in [::invoice-page :invoices]
(fn [is] (fn [is]
(replace-if #(= (:id %1) (:id %2)) updated is))) (replace-if #(= (:id %1) (:id %2)) updated is)))
(dissoc ::change-expense-accounts))}))) (dissoc ::change-expense-accounts))})))
@@ -552,9 +557,9 @@
(let [first-location (-> @(re-frame/subscribe [::subs/clients-by-id]) (let [first-location (-> @(re-frame/subscribe [::subs/clients-by-id])
(get-in [value :locations]) (get-in [value :locations])
first)] first)]
{:dispatch [::events/change-form location field value] {:dispatch [::forms/change ::new-invoice
:db (-> db [:client-id] value
(assoc-in [::new-invoice :location] first-location))}))) [:location] first-location]})))
(defn new-invoice-modal [] (defn new-invoice-modal []
(let [data @(re-frame/subscribe [::new-invoice]) (let [data @(re-frame/subscribe [::new-invoice])
@@ -637,6 +642,119 @@
:step "0.01"}]]]]] :step "0.01"}]]]]]
])) ]))
(defn edit-invoice-form [{:keys [can-change-amount?]}]
[forms/side-bar-form {:form ::new-invoice }
(let [{:keys [data status active? error]} @(re-frame/subscribe [::forms/form ::new-invoice])
can-change-amount? (= (:status data) :unpaid)
change-event [::forms/change ::new-invoice]
locations (get-in @(re-frame/subscribe [::subs/clients-by-id]) [(:client-id data) :locations])
min-total (if (= (:total (:original data)) (:outstanding-balance (:original data)))
nil
(- (:total (:original data)) (:outstanding-balance (:original data))))
should-select-location? (and locations
(> (count locations) 1))]
[:form
[:h1.title.is-2 "New Invoice"]
(when-not @(re-frame/subscribe [::subs/client])
[:div.field
[:p.help "Client"]
[:div.control
[bind-field
[typeahead {:matches (map (fn [x] [(:id x) (:name x)]) @(re-frame/subscribe [::subs/clients]))
:type "typeahead"
:field [:client-id]
:event [::change-new-invoice-client [::new-invoice]]
:spec ::invoice/client-id
:subscription data}]]]])
(when should-select-location?
[horizontal-field
[:label.label "Location"]
[:div.select
[bind-field
[:select {:type "select"
:field [:location]
:spec (set locations)
:event change-event
:subscription data}
(map (fn [l] [:option {:value l} l]) locations)]]]])
[:div.field
[:p.help "Vendor"]
[:div.control
[bind-field
[typeahead {:matches (map (fn [x] [(:id x) (:name x)]) @(re-frame/subscribe [::subs/vendors]))
:type "typeahead"
:auto-focus true
:field [:vendor-id]
:text-field [:vendor-name]
:event change-event
:spec (s/nilable ::invoice/vendor-id)
:subscription data}]]]]
[:div.field
[:p.help "Date"]
[:div.control
[bind-field
[:input.input {:type "date"
:field [:date]
:event change-event
:spec ::invoice/date
:subscription data}]]]]
[:div.field
[:p.help "Invoice #"]
[:div.control
[bind-field
[:input.input {:type "text"
:field [:invoice-number]
:event change-event
:spec ::invoice/invoice-number
:subscription data}]]]]
[:div.field
[:p.help "Total"]
[:div.control
[:div.field.has-addons.is-extended
[:p.control [:a.button.is-static "$"]]
[:p.control
[bind-field
[:input.input {:type "number"
:field [:total]
:disabled (if can-change-amount? "" "disabled")
:event change-event
:min min-total
:subscription data
:spec ::invoice/total
:step "0.01"}]]]]]]
(when error
[:div.notification.is-warning.animated.fadeInUp
error])
(println (s/explain-data ::invoice/invoice data))
[:submit.button.is-large.is-primary {:disabled (if (and (s/valid? ::invoice/invoice data)
(or (not min-total) (>= (:total data) min-total)))
""
"disabled")
:on-click (dispatch-event [::create-invoice])
:class (str @(re-frame/subscribe [::forms/loading-class ::new-invoice]) (when error " animated shake"))} "Save"]
]
#_[action-modal {:id ::edit-invoice
:title "Update Invoice"
:action-text "Save"
:save-event [::edit-invoice-save]
:can-submit? (and #_(s/valid? ::invoice/invoice data)
(or (not min-total) (>= (:total data) min-total)))}
])]
)
(defn edit-invoice-modal [{:keys [can-change-amount?]}] (defn edit-invoice-modal [{:keys [can-change-amount?]}]
(let [data @(re-frame/subscribe [::edit-invoice]) (let [data @(re-frame/subscribe [::edit-invoice])
change-event [::events/change-form [::edit-invoice]] change-event [::events/change-form [::edit-invoice]]
@@ -734,7 +852,7 @@
[:div.is-pulled-right [:div.is-pulled-right
[:button.button.is-danger {:on-click (dispatch-event [::new-invoice])} "New Invoice"] [:button.button.is-success {:on-click (dispatch-event [::new-invoice-clicked])} "New Invoice"]
(when current-client (when current-client
@@ -850,17 +968,19 @@
:component-will-mount #(re-frame/dispatch-sync [::params-change {:status status}]) })) :component-will-mount #(re-frame/dispatch-sync [::params-change {:status status}]) }))
(defn unpaid-invoices-page [{:keys [status]}] (defn unpaid-invoices-page [{:keys [status]}]
[side-bar-layout {:side-bar [invoices-side-bar {} (let [{invoice-bar-active? :active?} @(re-frame/subscribe [::forms/form ::new-invoice])]
^{:key "extra-filter"} [side-bar-layout {:side-bar [invoices-side-bar {}
[:div ^{:key "extra-filter"}
[:p.menu-label "Vendor"] [:div
[:div [vendor-filter {:on-change-event [::change-selected-vendor] [:p.menu-label "Vendor"]
:value (:vendor-filter @(re-frame/subscribe [::invoice-page])) [:div [vendor-filter {:on-change-event [::change-selected-vendor]
:vendors @(re-frame/subscribe [::subs/vendors])}]] :value (:vendor-filter @(re-frame/subscribe [::invoice-page]))
[:p.menu-label "Invoice #"] :vendors @(re-frame/subscribe [::subs/vendors])}]]
[:div [:p.menu-label "Invoice #"]
[invoice-number-filter]]]] [:div
:main [unpaid-invoices-content {:status status}] [invoice-number-filter]]]]
:bottom [vendor-dialog {:vendor @(re-frame/subscribe [::subs/user-editing-vendor]) :main [unpaid-invoices-content {:status status}]
:save-event [::events/save-vendor] :bottom [vendor-dialog {:vendor @(re-frame/subscribe [::subs/user-editing-vendor])
:change-event [::events/change-nested-form-state [:user-editing-vendor]] :id :auto-ap.views.main/user-editing-vendor}]}]) :save-event [::events/save-vendor]
:change-event [::events/change-nested-form-state [:user-editing-vendor]] :id :auto-ap.views.main/user-editing-vendor}]
:right-side-bar [appearing-side-bar {:visible? invoice-bar-active?} [edit-invoice-form]]}]))