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

adds general ledger links, allows starting new.

Browse Source
This commit is contained in:
Bryce
2024-03-25 21:02:35 -07:00
parent ea7ad57da2
commit 506c075846
5 changed files with 153 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/clj/auto_ap/ssr/components/multi_modal.clj
View File

@@ -21,7 +21,7 @@
:hx-target-400 "#form-errors .error-content" :hx-target-400 "#form-errors .error-content"
:hx-trigger "submit" :hx-trigger "submit"
:hx-target "this" :hx-target "this"
"x-trap" "true" }) "x-trap" "true"})
(defprotocol ModalWizardStep (defprotocol ModalWizardStep
(step-key [this]) (step-key [this])
@@ -226,10 +226,8 @@
:else :else
"forward"))) "forward")))
(def next-handler (defn render-navigate [{ {:keys [wizard] :as request} :request to-step :to-step}]
(-> (fn [{:keys [wizard] :as request}]
(let [current-step (get-current-step wizard) (let [current-step (get-current-step wizard)
to-step (:to (:query-params request))
wizard (navigate wizard to-step) wizard (navigate wizard to-step)
new-step (get-current-step wizard) new-step (get-current-step wizard)
transition-type (get-transition-type wizard (step-key current-step) to-step)] transition-type (get-transition-type wizard (step-key current-step) to-step)]
@@ -245,6 +243,11 @@
(init-step-params new-step % request)))))))) (init-step-params new-step % request))))))))
:headers {"HX-reswap" (when transition-type "outerHTML swap:0.16s") :headers {"HX-reswap" (when transition-type "outerHTML swap:0.16s")
"x-transition-type" (or transition-type "none")}))) "x-transition-type" (or transition-type "none")})))
(def next-handler
(-> (fn [{:keys [wizard] :as request}]
(render-navigate {:request request
:to-step (:to (:query-params request))}))
(wrap-ensure-step) (wrap-ensure-step)
(wrap-schema-enforce :query-schema (wrap-schema-enforce :query-schema
[:map [:map
@@ -374,6 +377,4 @@
"1" {"invoice_id" "17592297837049", "amount" "23.00"}}}}) "1" {"invoice_id" "17592297837049", "amount" "23.00"}}}})
(mc/decode [:map [:step-params {:optional true} [:maybe :any]]] (mc/decode [:map [:step-params {:optional true} [:maybe :any]]]
f f
main-transformer) main-transformer))
)

2
src/clj/auto_ap/ssr/invoice/common.clj
View File

@@ -6,6 +6,7 @@
:invoice/outstanding-balance :invoice/outstanding-balance
:invoice/source-url :invoice/source-url
[:invoice/date :xform clj-time.coerce/from-date] [:invoice/date :xform clj-time.coerce/from-date]
{:invoice/client [:client/code :db/id :client/name] {:invoice/client [:client/code :db/id :client/name]
:invoice/expense-accounts [* {:invoice-expense-account/account [:account/name :db/id :invoice/expense-accounts [* {:invoice-expense-account/account [:account/name :db/id
@@ -13,6 +14,7 @@
{:account/client-overrides [:account-client-override/name {:account/client-overrides [:account-client-override/name
{:account-client-override/client [:db/id]}]}]}] {:account-client-override/client [:db/id]}]}]}]
[:transaction/_invoices :as :invoice/transaction] [:db/id] [:transaction/_invoices :as :invoice/transaction] [:db/id]
[:journal-entry/_original-entity :as :invoice/journal-entry] [:db/id]
[:payment/_invoices :as :invoice/payments] [:db/id :payment/date :payment/amount [:payment/_invoices :as :invoice/payments] [:db/id :payment/date :payment/amount
{[:transaction/_payment :as :payment/transaction] [:db/id] {[:transaction/_payment :as :payment/transaction] [:db/id]

88
src/clj/auto_ap/ssr/invoice/new_invoice_wizard.clj
View File

@@ -3,7 +3,6 @@
:refer [audit-transact conn pull-attr]] :refer [audit-transact conn pull-attr]]
[auto-ap.datomic.accounts :as d-accounts] [auto-ap.datomic.accounts :as d-accounts]
[auto-ap.datomic.invoices :as d-invoices] [auto-ap.datomic.invoices :as d-invoices]
[auto-ap.ssr.invoice.common :refer [default-read]]
[auto-ap.graphql.utils :refer [assert-can-see-client [auto-ap.graphql.utils :refer [assert-can-see-client
assert-not-locked exception->4xx]] assert-not-locked exception->4xx]]
[auto-ap.logging :as alog] [auto-ap.logging :as alog]
@@ -28,6 +27,7 @@
[clj-time.coerce :as coerce] [clj-time.coerce :as coerce]
[clj-time.core :as time] [clj-time.core :as time]
[datomic.api :as dc] [datomic.api :as dc]
[hiccup.util :as hu]
[iol-ion.query :refer [dollars=]] [iol-ion.query :refer [dollars=]]
[malli.core :as mc] [malli.core :as mc]
[malli.util :as mut])) [malli.util :as mut]))
@@ -193,7 +193,6 @@
:name (fc/field-name) :name (fc/field-name)
:error? (fc/field-errors) :error? (fc/field-errors)
:x-model "date" :x-model "date"
;; "@change" "date=$event.target.value" ;; TODO x-model does not work
:placeholder "1/1/2024"})])) :placeholder "1/1/2024"})]))
(fc/with-field :invoice/due (fc/with-field :invoice/due
(com/validated-field (com/validated-field
@@ -259,8 +258,7 @@
(defn- location-select* (defn- location-select*
[{:keys [name account-location client-locations value]}] [{:keys [name account-location client-locations value]}]
(com/select {:options (into [["" ""]] (let [options (into (cond account-location
(cond account-location
[[account-location account-location]] [[account-location account-location]]
(seq client-locations) (seq client-locations)
@@ -268,10 +266,11 @@
(for [cl client-locations] (for [cl client-locations]
[cl cl])) [cl cl]))
:else :else
[["Shared" "Shared"]])) [["Shared" "Shared"]]))]
(com/select {:options options
:name name :name name
:value value :value (ffirst options)
:class "w-full"})) :class "w-full"})))
(defn- account-typeahead* (defn- account-typeahead*
[{:keys [name value client-id x-model]}] [{:keys [name value client-id x-model]}]
@@ -406,7 +405,8 @@
(format "$%,.2f" (:invoice/total snapshot))) (format "$%,.2f" (:invoice/total snapshot)))
(com/data-grid-cell {})))))]) (com/data-grid-cell {})))))])
:footer :footer
(mm/default-step-footer linear-wizard this :validation-route ::route/new-wizard-navigate) (mm/default-step-footer linear-wizard this :validation-route ::route/new-wizard-navigate
:next-button (com/button {:color :primary :x-ref "next" :class "w-32"} "Save"))
:validation-route ::route/new-wizard-navigate)) :validation-route ::route/new-wizard-navigate))
mm/Initializable mm/Initializable
(init-step-params (init-step-params
@@ -420,6 +420,44 @@
:invoice-expense-account/amount (:invoice/total (:step-params current))}]) :invoice-expense-account/amount (:invoice/total (:step-params current))}])
(:step-params current)))) (:step-params current))))
;; TODO closing should render the final row
(defrecord NextSteps [linear-wizard]
mm/ModalWizardStep
(step-name [_]
"Next Steps")
(step-key [_]
:next-steps)
(edit-path [_ _]
[])
(step-schema [_]
(mut/select-keys (mm/form-schema linear-wizard) #{}))
(render-step [this {{:keys [snapshot] :as multi-form-state} :multi-form-state :as request}]
(mm/default-render-step
linear-wizard this
:head [:div.p-2 "Invoice accounts "]
:body (mm/default-step-body
{}
[:p.text-lg "Would you like to pay this invoice now?"]
[:div.flex.flex-col.gap-2
(com/button {:color :primary
:class "w-24"
:hx-get (hu/url (bidi.bidi/path-for ssr-routes/only-routes ::route/pay-wizard)
{:selected (:db/id snapshot)})} "Pay now")
(com/button {:color :secondary
:class "w-24"
:hx-get (bidi.bidi/path-for ssr-routes/only-routes ::route/new-wizard)} "Add another")
(com/button {:class "w-24"
"@click" "$dispatch('modalclose')"}
"Close")])
:footer
nil
:validation-route ::route/new-wizard-navigate)))
(defn assert-no-conflicting [{:invoice/keys [invoice-number client vendor]}] (defn assert-no-conflicting [{:invoice/keys [invoice-number client vendor]}]
(when (seq (d-invoices/find-conflicting {:invoice/invoice-number invoice-number (when (seq (d-invoices/find-conflicting {:invoice/invoice-number invoice-number
@@ -455,13 +493,15 @@
(str (bidi/path-for ssr-routes/only-routes ::route/new-invoice-submit)))))) (str (bidi/path-for ssr-routes/only-routes ::route/new-invoice-submit))))))
(steps [_] (steps [_]
[:basic-details [:basic-details
:accounts]) :accounts
:next-steps])
(get-step [this step-key] (get-step [this step-key]
(let [step-key-result (mc/parse mm/step-key-schema step-key) (let [step-key-result (mc/parse mm/step-key-schema step-key)
[step-key-type step-key] step-key-result] [step-key-type step-key] step-key-result]
(get {:basic-details (->BasicDetailsStep this) (get {:basic-details (->BasicDetailsStep this)
:accounts (->AccountsStep this)} :accounts (->AccountsStep this)
:next-steps (->NextSteps this)}
step-key))) step-key)))
(form-schema [_] new-form-schema) (form-schema [_] new-form-schema)
(submit [this {:keys [multi-form-state request-method identity] :as request}] (submit [this {:keys [multi-form-state request-method identity] :as request}]
@@ -494,7 +534,9 @@
(exception->4xx #(assert-not-locked client-id (:invoice/date invoice))) (exception->4xx #(assert-not-locked client-id (:invoice/date invoice)))
(let [transaction-result (audit-transact [transaction] (:identity request))] (let [transaction-result (audit-transact [transaction] (:identity request))]
(solr/touch-with-ledger (get-in transaction-result [:tempids "invoice"])) (solr/touch-with-ledger (get-in transaction-result [:tempids "invoice"]))
(html-response (mm/render-navigate {:request (assoc-in request [:multi-form-state :snapshot :db/id] (get-in transaction-result [:tempids "invoice"]))
:to-step :next-steps})
#_(html-response
(@(resolve 'auto-ap.ssr.invoices/row*) (@(resolve 'auto-ap.ssr.invoices/row*)
identity identity
@@ -529,12 +571,11 @@
(defn due-date [{:keys [multi-form-state]}] (defn due-date [{:keys [multi-form-state]}]
(alog/peek ::date multi-form-state)
(let [vendor (clientize-vendor (get-vendor (:invoice/vendor (:step-params multi-form-state))) (let [vendor (clientize-vendor (get-vendor (:invoice/vendor (:step-params multi-form-state)))
(->db-id (:invoice/client (:step-params multi-form-state)))) (->db-id (:invoice/client (:step-params multi-form-state))))
good-date good-date
(or (when (and (:invoice/date (:step-params multi-form-state)) (or (when (and (:invoice/date (:step-params multi-form-state))
(-> vendor :vendor/terms)) ;; TODO get specific terms (-> vendor :vendor/terms))
(time/plus (:invoice/date (:step-params multi-form-state)) (time/plus (:invoice/date (:step-params multi-form-state))
(time/days (-> vendor :vendor/terms)))) (time/days (-> vendor :vendor/terms))))
(:invoice/due (:step-params multi-form-state)))] (:invoice/due (:step-params multi-form-state)))]
@@ -554,7 +595,7 @@
(->db-id (:invoice/client (:step-params multi-form-state)))) (->db-id (:invoice/client (:step-params multi-form-state))))
good-date good-date
(when (and (:invoice/due (:step-params multi-form-state)) (when (and (:invoice/due (:step-params multi-form-state))
(:vendor/automatically-paid-when-due vendor)) ;; TODO get specific terms (:vendor/automatically-paid-when-due vendor))
(:invoice/due (:step-params multi-form-state)))] (:invoice/due (:step-params multi-form-state)))]
@@ -568,32 +609,13 @@
(def key->handler (def key->handler
(apply-middleware-to-all-handlers (apply-middleware-to-all-handlers
{::route/new-wizard (-> mm/open-wizard-handler {::route/new-wizard (-> mm/open-wizard-handler
(mm/wrap-wizard new-wizard) (mm/wrap-wizard new-wizard)
(mm/wrap-init-multi-form-state initial-new-wizard-state)) (mm/wrap-init-multi-form-state initial-new-wizard-state))
::route/due-date (-> due-date ::route/due-date (-> due-date
#_(wrap-schema-decode :form-schema [:map
[:step-params {:optional true}
[:maybe
[:map
[:invoice/due {:optional true} [:maybe clj-date-schema]]]]]
[:date {:optional true} [:maybe clj-date-schema]]
[:due-date {:optional true} [:maybe clj-date-schema]]
[:client-id {:optional true} [:maybe entity-id]]
[:vendor-id {:optional true} [:maybe entity-id]]])
(mm/wrap-wizard new-wizard) (mm/wrap-wizard new-wizard)
(mm/wrap-decode-multi-form-state) (mm/wrap-decode-multi-form-state)
(wrap-nested-form-params)) (wrap-nested-form-params))
::route/scheduled-payment-date (-> scheduled-payment-date ::route/scheduled-payment-date (-> scheduled-payment-date
#_(wrap-schema-decode :form-schema [:map
[:step-params {:optional true}
[:maybe
[:map
[:invoice/due {:optional true} [:maybe clj-date-schema]]]]]
[:date {:optional true} [:maybe clj-date-schema]]
[:due-date {:optional true} [:maybe clj-date-schema]]
[:client-id {:optional true} [:maybe entity-id]]
[:vendor-id {:optional true} [:maybe entity-id]]])
(mm/wrap-wizard new-wizard) (mm/wrap-wizard new-wizard)
(mm/wrap-decode-multi-form-state) (mm/wrap-decode-multi-form-state)
(wrap-nested-form-params)) (wrap-nested-form-params))

5
src/clj/auto_ap/ssr/invoices.clj
View File

@@ -496,6 +496,11 @@
{:exact-match-id (:db/id (first (:payment/transaction p)))}) {:exact-match-id (:db/id (first (:payment/transaction p)))})
:color :secondary :color :secondary
:content "Transaction"}))))) :content "Transaction"})))))
(when (:invoice/journal-entry i)
[{:link (hu/url (bidi/path-for client-routes/routes :ledger)
{:exact-match-id (:db/id (first (:invoice/journal-entry i)))})
:color :yellow
:content "Ledger entry"}])
(when (:invoice/source-url i) (when (:invoice/source-url i)
[{:link (:invoice/source-url i) [{:link (:invoice/source-url i)
:color :secondary :color :secondary

5
src/cljs/auto_ap/views/components/layouts.cljs
View File

@@ -7,6 +7,7 @@
[auto-ap.routes :as routes] [auto-ap.routes :as routes]
[auto-ap.ssr-routes :as ssr-routes] [auto-ap.ssr-routes :as ssr-routes]
[auto-ap.routes.payments :as payment-routes] [auto-ap.routes.payments :as payment-routes]
[auto-ap.routes.invoice :as invoice-routes]
[auto-ap.subs :as subs] [auto-ap.subs :as subs]
[auto-ap.views.components.modal :as modal] [auto-ap.views.components.modal :as modal]
[auto-ap.views.components.search :as search] [auto-ap.views.components.search :as search]
@@ -176,11 +177,11 @@
"Home" ] "Home" ]
(when (p/can? @user {:subject :invoice-page}) (when (p/can? @user {:subject :invoice-page})
[:a.navbar-item {:class [(active-when ap #{:unpaid-invoices :paid-invoices})] [:a.navbar-item {:class [(active-when ap #{:unpaid-invoices :paid-invoices})]
:href (bidi/path-for routes/routes :unpaid-invoices)} :href (str (bidi/path-for ssr-routes/only-routes ::invoice-routes/all-page) "?date-range=month")}
"Invoices" ]) "Invoices" ])
(when (p/can? @user {:subject :payment-page}) (when (p/can? @user {:subject :payment-page})
[:a.navbar-item {:class [(active-when ap = :payments)] [:a.navbar-item {:class [(active-when ap = :payments)]
:href (bidi/path-for ssr-routes/only-routes ::payment-routes/all-page)} :href (str (bidi/path-for ssr-routes/only-routes ::payment-routes/all-page) "?date-range=month")}
"Payments" ]) "Payments" ])
(when (p/can? @user {:subject :pos-page}) (when (p/can? @user {:subject :pos-page})
[:a.navbar-item {:class [(active-when ap = :pos-sales)] [:a.navbar-item {:class [(active-when ap = :pos-sales)]