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

adds linkage changing date

Browse Source
This commit is contained in:
Bryce Covert
2021-01-24 10:00:13 -08:00
parent 10785b9c85
commit e2cdb3c719
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/clj/auto_ap/datomic/transactions.clj
View File

@@ -164,9 +164,13 @@
ids) ids)
(map #(update % :transaction/date c/from-date)) (map #(update % :transaction/date c/from-date))
(map #(update % :transaction/post-date c/from-date)) (map #(update % :transaction/post-date c/from-date))
(map #(update-in % [:transaction/payment :payment/date] c/from-date)) (map (fn [transaction]
(if (:transaction/payment transaction)
(update-in transaction [:transaction/payment :payment/date] c/from-date)
transaction)))
(map #(dissoc % :transaction/id)) (map #(dissoc % :transaction/id))
(group-by :db/id))] (group-by :db/id))]
(clojure.pprint/pprint results)
(->> ids (->> ids
(map results) (map results)
(map first)))) (map first))))

5
src/clj/auto_ap/graphql/transactions.clj
View File

@@ -106,6 +106,7 @@
{:transaction/payment [{:payment/status [:db/ident]} :db/id]} ] {:transaction/payment [{:payment/status [:db/ident]} :db/id]} ]
transaction-id) transaction-id)
_ (log/info "Unlinking" transaction)
payment (-> transaction :transaction/payment ) payment (-> transaction :transaction/payment )
is-autopay-payment? (some->> (doto (d/query {:query {:find ['?sp] is-autopay-payment? (some->> (doto (d/query {:query {:find ['?sp]
:in ['$ '?payment] :in ['$ '?payment]
@@ -265,7 +266,9 @@
(throw (ex-info "Amounts don't match" {:validation-error "Amounts don't match"}))) (throw (ex-info "Amounts don't match" {:validation-error "Amounts don't match"})))
(audit-transact (into (audit-transact (into
[{:db/id (:db/id payment) [{:db/id (:db/id payment)
:payment/status :payment-status/cleared} :payment/status :payment-status/cleared
:payment/date (coerce/to-date (first (sort [(:payment/date payment)
(:transaction/date transaction)])))}
{:db/id (:db/id transaction) {:db/id (:db/id transaction)
:transaction/payment (:db/id payment) :transaction/payment (:db/id payment)

6
src/cljs/auto_ap/views/pages/payments/table.cljs
View File

@@ -97,9 +97,11 @@
(when (or (= :pending status) (when (or (= :pending status)
(and (#{":cash" :cash ":debit" :debit} type) (and (#{":cash" :cash ":debit" :debit} type)
(not= :voided status))) (not= :voided status)
(not transaction)))
[buttons/sl-icon {:event [::void-check check] :icon :icon-bin-2 [buttons/sl-icon {:event [::void-check check] :icon :icon-bin-2
:class (status/class-for (get states (:id check)))}])]]])) :class (status/class-for (get states (:id check)))}]
)]]]))
(defn table [{:keys [data-page]}] (defn table [{:keys [data-page]}]
(let [selected-client @(re-frame/subscribe [::subs/client]) (let [selected-client @(re-frame/subscribe [::subs/client])