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

you can check off individual invoices

Browse Source
This commit is contained in:
Bryce Covert
2018-05-10 21:30:50 -07:00
parent 5fb5b2d412
commit 7d5ae173f3
3 changed files with 176 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/clj/auto_ap/routes/checks.clj
View File

@@ -13,9 +13,38 @@
(wrap-routes (wrap-routes
(context "/checks" [] (context "/checks" []
(POST "/" {:keys [edn-params]} (POST "/" {:keys [edn-params]}
(invoices/get-multi (:invoice-ids edn-params)) (let [invoices (invoices/get-multi (:invoice-ids edn-params))
companies (into {}
{:status 200 (map (fn [c] [(:id c) c])
:body (pr-str (invoices/get-multi (:invoice-ids edn-params))) (companies/get-all)))
:headers {"Content-Type" "application/edn"}})) vendors (into {}
(map (fn [v] [(:id v) v])
(vendors/get-all)))
invoices-grouped-by-vendor (group-by :vendor-id invoices)]
{:status 200
:body (pr-str (for [[vendor-id invoices] invoices-grouped-by-vendor
:let [vendor (vendors vendor-id)
company (companies (:company-id (first invoices)))
memo (str "Invoice #'s: "
(str/join ", "
(map (fn [i]
(str (:invoice-number i) "(" (:total i) ")"))
invoices)
))]]
{:vendor-name (:name vendor)
:paid-to (:name company)
:amount (reduce + 0 (map :total invoices))
:check "1234"
:memo memo
:date "5/10/2018"
:company {:name (:name company)
:address1 "123 main st"
:city "Campbell"
:state "CA"
:zip "95008"
:bank {:name "Bank of America, NA"
:acct "11-35/2010"
:acct-number "123456789"}}}))
:headers {"Content-Type" "application/edn"}})))
wrap-secure)) wrap-secure))

288
src/cljs/auto_ap/views/pages/check.cljs
View File

@@ -10,178 +10,156 @@
[bidi.bidi :as bidi] [bidi.bidi :as bidi]
[goog.string :as gstring])) [goog.string :as gstring]))
(re-frame/reg-sub
::checks
(fn [db]
(-> db ::checks)))
(defn check-page [] (defn check-page []
[:div (let [checks @(re-frame/subscribe [::checks])]
(for [{:keys [vendor-name paid-to company check date amount memo]} [:div
[{:vendor-name "Covert Affairs, INC" (for [{:keys [vendor-name paid-to company check date amount memo]} checks
:paid-to "Covert Affairs, INC"
:amount 1234.56
:check "1234" :let [amount (gstring/format "--%.2f--" amount)]]
:memo "Invoice #'s: 870034 ($400.34), 77335 ($732.55), 76668 ($101.67)" [:div
:date "5/10/2018" [:div.columns
:company {:name "Campbell Brewing Company LLC" (let [{:keys [name address1 city state zip bank]} company]
:address1 "200 E Campbell Ave" (list
:city "Campbell" [:div.column.is-4
:state "CA" [:p name]
:zip "95008" [:p address1]
:bank {:name "Bank of America, NA" [:p city ", " state zip]]
:acct "11-35/2010" [:div.column.is-7
:acct-number "123456789"}}}
{:vendor-name "Good meat, INC" [:p.has-text-centered (:name bank)]
:paid-to "Good meat, INC" [:p.has-text-centered (:acct bank)]
:amount 973.45 ]))
:check "1235"
:memo "Invoice #'s: 070034 ($400.34), 77335 ($732.55), 76668 ($101.67)"
:date "5/10/2018"
:company {:name "Campbell Brewing Company LLC"
:address1 "200 E Campbell Ave"
:city "Campbell"
:state "CA"
:zip "95008"
:bank {:name "Bank of America, NA"
:acct "11-35/2010"
:acct-number "123456789"}}}]
:let [amount (gstring/format "--%.2f--" amount)]]
[:div
[:div.columns
(let [{:keys [name address1 city state zip bank]} company]
(list
[:div.column.is-4
[:p name]
[:p address1]
[:p city ", " state zip]]
[:div.column.is-7
[:p.has-text-centered (:name bank)] [:div.column
[:p.has-text-centered (:acct bank)] check]
])) ]
[:div.columns
[:div.column.is-11]
[:div.column date]
]
[:div.columns
[:div.column
"PAY"
]
[:div.column
"TO THE ORDER OF"]
[:div.column.is-9
vendor-name]
[:div.column
amount]]
[:div.column [:div.columns
check] [:div.column]
] [:div.column.is-8 {:style {"border-bottom" "1px solid black"}} "One thousand two hundred thirty four and fifty six cents"]
[:div.columns [:div.column.is-3]]
[:div.column.is-11]
[:div.column date] [:div.columns
] [:div.column ""]]
[:div.columns [:div.columns
[:div.column [:div.column " "]]
"PAY"
]
[:div.column
"TO THE ORDER OF"]
[:div.column.is-9
vendor-name]
[:div.column
amount]]
[:div.columns [:div.columns
[:div.column] [:div.column
[:div.column.is-8 {:style {"border-bottom" "1px solid black"}} "One thousand two hundred thirty four and fifty six cents"] "MEMO"]
[:div.column.is-3]] [:div.column.is-7 {:style {"border-bottom" "1px solid black"}}
memo]
[:div.column.is-4]]
[:div.columns [:div.columns
[:div.column ""]] [:div.column.is-2 ]
[:div.columns [:div.column.is-10 {:style {"font-family" "MICR" "font-size" "20pt"}}
[:div.column " "]] (str "c" check "c a" (:acct-number (:bank company)) "a 10302c")]]
[:div.columns
[:div.column
"MEMO"]
[:div.column.is-7 {:style {"border-bottom" "1px solid black"}}
memo]
[:div.column.is-4]]
[:div.columns
[:div.column.is-2 ]
[:div.column.is-10 {:style {"font-family" "MICR" "font-size" "20pt"}}
(str "c" check "c a" (:acct-number (:bank company)) "a 10302c")]]
[:div.columns [:div.columns
[:div.column " "]] [:div.column " "]]
[:div.columns [:div.columns
[:div.column " "]] [:div.column " "]]
[:div.columns [:div.columns
[:div.column " "]] [:div.column " "]]
[:div.columns [:div.columns
[:div.column " "]] [:div.column " "]]
[:div.columns [:div.columns
[:div.column] [:div.column]
[:div.column.is-10 [:div.column.is-10
(let [{:keys [name address1 city state zip bank]} company] (let [{:keys [name address1 city state zip bank]} company]
(list (list
[:p name] [:p name]
[:p address1] [:p address1]
[:p city ", " state zip] [:p city ", " state zip]
)) ))
] ]
[:div.column [:div.column
check]] check]]
[:div.columns [:div.columns
[:div.column " "]] [:div.column " "]]
[:div.columns [:div.columns
[:div.column " "]] [:div.column " "]]
[:div.columns [:div.columns
[:div.column " "]] [:div.column " "]]
[:div.columns [:div.columns
[:div.column " "]] [:div.column " "]]
[:div.columns [:div.columns
[:div.column " "]] [:div.column " "]]
[:div.columns [:div.columns
[:div.column] [:div.column]
[:div.column.is-5 [:div.column.is-5
vendor-name] vendor-name]
[:div.column [:div.column
[:p.has-text-right "Paid to:"] [:p.has-text-right "Paid to:"]
[:p.has-text-right "Amount:"] [:p.has-text-right "Amount:"]
[:p.has-text-right "Date:"]] [:p.has-text-right "Date:"]]
[:div.column.is-5 [:div.column.is-5
[:p paid-to] [:p paid-to]
[:p amount] [:p amount]
[:p date]]] [:p date]]]
[:div.columns [:div.columns
[:div.column "MEMO"] [:div.column "MEMO"]
[:div.column.is-11 [:div.column.is-11
memo memo
]] ]]
[:div.columns [:div.columns
[:div.column " "]] [:div.column " "]]
[:div.columns [:div.columns
[:div.column.is-6] [:div.column.is-6]
[:div.column [:div.column
[:p.has-text-right "Check:"] [:p.has-text-right "Check:"]
[:p.has-text-right "Vendor:"] [:p.has-text-right "Vendor:"]
[:p.has-text-right "Bank Account:"] [:p.has-text-right "Bank Account:"]
[:p.has-text-right "Paid To:"] [:p.has-text-right "Paid To:"]
[:p.has-text-right "Amount:"] [:p.has-text-right "Amount:"]
[:p.has-text-right "Date:"]] [:p.has-text-right "Date:"]]
[:div.column.is-5 [:div.column.is-5
[:p check] [:p check]
[:p vendor-name] [:p vendor-name]
[:p (:name (:bank company))] [:p (:name (:bank company))]
[:p paid-to] [:p paid-to]
[:p amount] [:p amount]
[:p date]]] [:p date]]]
[:div.columns [:div.columns
[:div.column "MEMO"] [:div.column "MEMO"]
[:div.column.is-11 [:div.column.is-11
memo]] memo]]
[:footer]])]) [:footer]])]))

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

@@ -4,6 +4,7 @@
[auto-ap.entities.vendors :as vendor] [auto-ap.entities.vendors :as vendor]
[auto-ap.events :as events] [auto-ap.events :as events]
[auto-ap.views.utils :refer [dispatch-event]] [auto-ap.views.utils :refer [dispatch-event]]
[auto-ap.views.pages.check :as check]
[auto-ap.views.components.invoice-table :refer [invoice-table] :as invoice-table] [auto-ap.views.components.invoice-table :refer [invoice-table] :as invoice-table]
[auto-ap.subs :as subs] [auto-ap.subs :as subs]
[auto-ap.events :as events])) [auto-ap.events :as events]))
@@ -54,9 +55,16 @@
:body (pr-str {:invoice-ids (get-in db [::invoice-page :checked])}) :body (pr-str {:invoice-ids (get-in db [::invoice-page :checked])})
:headers {"Content-Type" "application/edn"} :headers {"Content-Type" "application/edn"}
:uri (str "/api/checks/") :uri (str "/api/checks/")
:on-success [::save-complete] :on-success [::checks-created]
:on-error [::save-error]}})) :on-error [::save-error]}}))
(re-frame/reg-event-fx
::checks-created
(fn [{:keys [db]} [_ data]]
{:dispatch [:auto-ap.events/set-active-page :check]
:db (-> db
(assoc ::check/checks data))}))
(re-frame/reg-event-fx (re-frame/reg-event-fx
::invalidated ::invalidated
(fn [cofx [_ params]] (fn [cofx [_ params]]