removing dependency on old expense accounts.

This commit is contained in:
Bryce Covert
2019-04-12 18:18:09 -07:00
parent a2cd6d0759
commit 9be0c02347
7 changed files with 36 additions and 55 deletions

View File

@@ -10,7 +10,6 @@
[auto-ap.graphql.utils :refer [assert-admin can-see-client? assert-can-see-client]] [auto-ap.graphql.utils :refer [assert-admin can-see-client? assert-can-see-client]]
[auto-ap.datomic :refer [uri merge-query]] [auto-ap.datomic :refer [uri merge-query]]
[datomic.api :as d] [datomic.api :as d]
[auto-ap.expense-accounts :as e-expense-accounts]
[auto-ap.datomic.clients :as d-clients] [auto-ap.datomic.clients :as d-clients]
[auto-ap.datomic.checks :as d-checks] [auto-ap.datomic.checks :as d-checks]
[auto-ap.datomic.users :as d-users] [auto-ap.datomic.users :as d-users]

View File

@@ -5,7 +5,6 @@
[auto-ap.datomic.clients :as d-clients] [auto-ap.datomic.clients :as d-clients]
[auto-ap.datomic.invoices :as d-invoices] [auto-ap.datomic.invoices :as d-invoices]
[auto-ap.datomic.accounts :as d-accounts] [auto-ap.datomic.accounts :as d-accounts]
[auto-ap.expense-accounts :as expense-accounts]
[auto-ap.graphql.checks :as gq-checks] [auto-ap.graphql.checks :as gq-checks]
[auto-ap.time :refer [parse iso-date]] [auto-ap.time :refer [parse iso-date]]
[auto-ap.utils :refer [dollars=]] [auto-ap.utils :refer [dollars=]]

View File

@@ -1,7 +1,6 @@
(ns auto-ap.subs (ns auto-ap.subs
(:require [re-frame.core :as re-frame] (:require [re-frame.core :as re-frame]
[clojure.string :as str] [clojure.string :as str]
[auto-ap.expense-accounts :refer [expense-accounts chooseable-expense-accounts]]
[goog.crypt.base64 :as base64])) [goog.crypt.base64 :as base64]))
(re-frame/reg-sub (re-frame/reg-sub
@@ -132,13 +131,6 @@
(fn [db] (fn [db]
(:new-invoice db))) (:new-invoice db)))
(re-frame/reg-sub
::expense-accounts
(fn [db]
(map (fn [[k v]] (assoc v :id k))
expense-accounts)))
(re-frame/reg-sub (re-frame/reg-sub
::query-params ::query-params
(fn [db] (fn [db]

View File

@@ -1,21 +1,16 @@
(ns auto-ap.views.components.expense-accounts-dialog (ns auto-ap.views.components.expense-accounts-dialog
(:require [re-frame.core :as re-frame] (:require [auto-ap.entities.invoices-expense-accounts
[reagent.core :as r] :as
[clojure.string :as str] invoices-expense-accounts]
[clojure.spec.alpha :as s] [auto-ap.events :as events]
[cljs-time.core :as c]
[goog.string :as gstring]
[auto-ap.subs :as subs] [auto-ap.subs :as subs]
[auto-ap.entities.clients :as client] [auto-ap.views.components.modal :refer [action-modal]]
[auto-ap.entities.invoice :as invoice]
[auto-ap.entities.vendors :as vendor]
[auto-ap.expense-accounts :as expense-accounts]
[auto-ap.entities.invoices-expense-accounts :as invoices-expense-accounts]
[auto-ap.views.components.modal :refer [modal action-modal]]
[auto-ap.views.utils :refer [dispatch-event bind-field horizontal-field date->str str->date pretty standard]]
[auto-ap.utils :refer [by replace-if]]
[auto-ap.views.components.typeahead :refer [typeahead]] [auto-ap.views.components.typeahead :refer [typeahead]]
[auto-ap.events :as events])) [auto-ap.views.utils :refer [bind-field dispatch-event]]
[clojure.spec.alpha :as s]
[clojure.string :as str]
[goog.string :as gstring]
[re-frame.core :as re-frame]))
(re-frame/reg-sub (re-frame/reg-sub
::change-expense-accounts ::change-expense-accounts

View File

@@ -4,8 +4,6 @@
[auto-ap.views.components.modal :refer [action-modal]] [auto-ap.views.components.modal :refer [action-modal]]
[auto-ap.views.components.address :refer [address-field]] [auto-ap.views.components.address :refer [address-field]]
[auto-ap.views.components.typeahead :refer [typeahead]] [auto-ap.views.components.typeahead :refer [typeahead]]
[auto-ap.expense-accounts :refer [chooseable-expense-accounts]]
[clojure.spec.alpha :as s] [clojure.spec.alpha :as s]
[auto-ap.entities.vendors :as entity] [auto-ap.entities.vendors :as entity]
[auto-ap.entities.contact :as contact] [auto-ap.entities.contact :as contact]

View File

@@ -15,7 +15,6 @@
[auto-ap.views.utils :refer [login-url dispatch-value-change dispatch-event bind-field horizontal-field]] [auto-ap.views.utils :refer [login-url dispatch-value-change dispatch-event bind-field horizontal-field]]
[auto-ap.views.components.typeahead :refer [typeahead]] [auto-ap.views.components.typeahead :refer [typeahead]]
[auto-ap.expense-accounts :refer [expense-accounts]]
[cljs.reader :as edn] [cljs.reader :as edn]
[auto-ap.routes :as routes] [auto-ap.routes :as routes]
[bidi.bidi :as bidi])) [bidi.bidi :as bidi]))

View File

@@ -1,33 +1,33 @@
(ns auto-ap.views.pages.unpaid-invoices (ns auto-ap.views.pages.unpaid-invoices
(:require [re-frame.core :as re-frame] (:require [auto-ap.entities.invoice :as invoice]
[reagent.core :as r] [auto-ap.events :as events]
[clojure.string :as str :refer [blank?]]
[clojure.spec.alpha :as s]
[cljs-time.core :as c]
[goog.string :as gstring]
[auto-ap.entities.clients :as client]
[auto-ap.entities.invoice :as invoice]
[auto-ap.entities.vendors :as vendor]
[bidi.bidi :as bidi]
[auto-ap.forms :as forms] [auto-ap.forms :as forms]
[auto-ap.views.components.layouts :refer [side-bar-layout appearing-side-bar]] [auto-ap.subs :as subs]
[auto-ap.routes :as routes] [auto-ap.utils :refer [by replace-if]]
[auto-ap.views.components.dropdown :refer [drop-down drop-down-contents]] [auto-ap.views.components.dropdown :refer [drop-down]]
[auto-ap.views.components.expense-accounts-dialog :as expense-accounts-dialog] [auto-ap.views.components.expense-accounts-dialog :as expense-accounts-dialog :refer [change-expense-accounts-modal]]
[auto-ap.views.components.invoice-table :as invoice-table :refer [invoice-table]]
[auto-ap.views.components.invoices.side-bar :refer [invoices-side-bar]]
[auto-ap.views.components.layouts :refer [appearing-side-bar side-bar-layout]]
[auto-ap.views.components.modal :refer [action-modal modal]]
[auto-ap.views.components.typeahead :refer [typeahead]]
[auto-ap.views.components.vendor-dialog :refer [vendor-dialog]] [auto-ap.views.components.vendor-dialog :refer [vendor-dialog]]
[auto-ap.views.components.vendor-filter :refer [vendor-filter]] [auto-ap.views.components.vendor-filter :refer [vendor-filter]]
[auto-ap.views.components.invoices.side-bar :refer [invoices-side-bar]] [auto-ap.views.utils
[auto-ap.expense-accounts :as expense-accounts] :refer
[auto-ap.entities.invoices-expense-accounts :as invoices-expense-accounts] [bind-field
[auto-ap.views.utils :refer [active-when dispatch-event bind-field horizontal-field date->str date-time->str str->date pretty standard date-picker]] date->str
[auto-ap.utils :refer [by replace-if]] date-picker
[auto-ap.views.pages.check :as check] dispatch-event
[auto-ap.views.components.invoice-table :refer [invoice-table] :as invoice-table] horizontal-field
[auto-ap.views.components.modal :refer [modal action-modal]] standard]]
[auto-ap.views.components.expense-accounts-dialog :refer [change-expense-accounts-modal ] :as change-expense-accounts] [cljs-time.core :as c]
[auto-ap.views.components.typeahead :refer [typeahead]] [clojure.spec.alpha :as s]
[auto-ap.subs :as subs] [clojure.string :as str :refer [blank?]]
[auto-ap.events :as events])) [goog.string :as gstring]
[re-frame.core :as re-frame]
[reagent.core :as r]))
(def invoice-read [:id :total :outstanding-balance :date :invoice-number :status (def invoice-read [:id :total :outstanding-balance :date :invoice-number :status
[:client [:id :name :locations]] [:client [:id :name :locations]]
[:payments [:amount [:payment [:amount :s3_url :check_number ]]]] [:payments [:amount [:payment [:amount :s3_url :check_number ]]]]
@@ -661,7 +661,6 @@
[:input.input {:type "number" [:input.input {:type "number"
:field [:check-number] :field [:check-number]
:event change-event :event change-event
#_#_:spec ::check/date
:subscription handwrite-checks}]]] :subscription handwrite-checks}]]]
[:table.table.is-fullwidth [:table.table.is-fullwidth
[:thead [:thead