diff --git a/src/clj/auto_ap/graphql.clj b/src/clj/auto_ap/graphql.clj index 8e7ed9f5..4ea56b0c 100644 --- a/src/clj/auto_ap/graphql.clj +++ b/src/clj/auto_ap/graphql.clj @@ -10,7 +10,6 @@ [auto-ap.graphql.utils :refer [assert-admin can-see-client? assert-can-see-client]] [auto-ap.datomic :refer [uri merge-query]] [datomic.api :as d] - [auto-ap.expense-accounts :as e-expense-accounts] [auto-ap.datomic.clients :as d-clients] [auto-ap.datomic.checks :as d-checks] [auto-ap.datomic.users :as d-users] diff --git a/src/clj/auto_ap/graphql/invoices.clj b/src/clj/auto_ap/graphql/invoices.clj index 5532c0c5..97ceefd6 100644 --- a/src/clj/auto_ap/graphql/invoices.clj +++ b/src/clj/auto_ap/graphql/invoices.clj @@ -5,7 +5,6 @@ [auto-ap.datomic.clients :as d-clients] [auto-ap.datomic.invoices :as d-invoices] [auto-ap.datomic.accounts :as d-accounts] - [auto-ap.expense-accounts :as expense-accounts] [auto-ap.graphql.checks :as gq-checks] [auto-ap.time :refer [parse iso-date]] [auto-ap.utils :refer [dollars=]] diff --git a/src/cljs/auto_ap/subs.cljs b/src/cljs/auto_ap/subs.cljs index fae11a8f..e4b5cfdb 100644 --- a/src/cljs/auto_ap/subs.cljs +++ b/src/cljs/auto_ap/subs.cljs @@ -1,7 +1,6 @@ (ns auto-ap.subs (:require [re-frame.core :as re-frame] [clojure.string :as str] - [auto-ap.expense-accounts :refer [expense-accounts chooseable-expense-accounts]] [goog.crypt.base64 :as base64])) (re-frame/reg-sub @@ -132,13 +131,6 @@ (fn [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 ::query-params (fn [db] diff --git a/src/cljs/auto_ap/views/components/expense_accounts_dialog.cljs b/src/cljs/auto_ap/views/components/expense_accounts_dialog.cljs index f18fdc02..8b7f214a 100644 --- a/src/cljs/auto_ap/views/components/expense_accounts_dialog.cljs +++ b/src/cljs/auto_ap/views/components/expense_accounts_dialog.cljs @@ -1,21 +1,16 @@ (ns auto-ap.views.components.expense-accounts-dialog - (:require [re-frame.core :as re-frame] - [reagent.core :as r] - [clojure.string :as str] - [clojure.spec.alpha :as s] - [cljs-time.core :as c] - [goog.string :as gstring] + (:require [auto-ap.entities.invoices-expense-accounts + :as + invoices-expense-accounts] + [auto-ap.events :as events] [auto-ap.subs :as subs] - [auto-ap.entities.clients :as client] - [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.modal :refer [action-modal]] [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 ::change-expense-accounts diff --git a/src/cljs/auto_ap/views/components/vendor_dialog.cljs b/src/cljs/auto_ap/views/components/vendor_dialog.cljs index 45a2e8ff..7064eb10 100644 --- a/src/cljs/auto_ap/views/components/vendor_dialog.cljs +++ b/src/cljs/auto_ap/views/components/vendor_dialog.cljs @@ -4,8 +4,6 @@ [auto-ap.views.components.modal :refer [action-modal]] [auto-ap.views.components.address :refer [address-field]] [auto-ap.views.components.typeahead :refer [typeahead]] - - [auto-ap.expense-accounts :refer [chooseable-expense-accounts]] [clojure.spec.alpha :as s] [auto-ap.entities.vendors :as entity] [auto-ap.entities.contact :as contact] diff --git a/src/cljs/auto_ap/views/pages/admin/vendors.cljs b/src/cljs/auto_ap/views/pages/admin/vendors.cljs index e8cb29df..1a5d2897 100644 --- a/src/cljs/auto_ap/views/pages/admin/vendors.cljs +++ b/src/cljs/auto_ap/views/pages/admin/vendors.cljs @@ -15,7 +15,6 @@ [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.expense-accounts :refer [expense-accounts]] [cljs.reader :as edn] [auto-ap.routes :as routes] [bidi.bidi :as bidi])) diff --git a/src/cljs/auto_ap/views/pages/unpaid_invoices.cljs b/src/cljs/auto_ap/views/pages/unpaid_invoices.cljs index 0c186a70..b37b9146 100644 --- a/src/cljs/auto_ap/views/pages/unpaid_invoices.cljs +++ b/src/cljs/auto_ap/views/pages/unpaid_invoices.cljs @@ -1,33 +1,33 @@ (ns auto-ap.views.pages.unpaid-invoices - (:require [re-frame.core :as re-frame] - [reagent.core :as r] - [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] + (:require [auto-ap.entities.invoice :as invoice] + [auto-ap.events :as events] [auto-ap.forms :as forms] - [auto-ap.views.components.layouts :refer [side-bar-layout appearing-side-bar]] - [auto-ap.routes :as routes] - [auto-ap.views.components.dropdown :refer [drop-down drop-down-contents]] - [auto-ap.views.components.expense-accounts-dialog :as expense-accounts-dialog] + [auto-ap.subs :as subs] + [auto-ap.utils :refer [by replace-if]] + [auto-ap.views.components.dropdown :refer [drop-down]] + [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-filter :refer [vendor-filter]] - [auto-ap.views.components.invoices.side-bar :refer [invoices-side-bar]] - [auto-ap.expense-accounts :as expense-accounts] - [auto-ap.entities.invoices-expense-accounts :as invoices-expense-accounts] - [auto-ap.views.utils :refer [active-when dispatch-event bind-field horizontal-field date->str date-time->str str->date pretty standard date-picker]] - [auto-ap.utils :refer [by replace-if]] - [auto-ap.views.pages.check :as check] - [auto-ap.views.components.invoice-table :refer [invoice-table] :as invoice-table] - [auto-ap.views.components.modal :refer [modal action-modal]] - [auto-ap.views.components.expense-accounts-dialog :refer [change-expense-accounts-modal ] :as change-expense-accounts] - [auto-ap.views.components.typeahead :refer [typeahead]] - [auto-ap.subs :as subs] - [auto-ap.events :as events])) + [auto-ap.views.utils + :refer + [bind-field + date->str + date-picker + dispatch-event + horizontal-field + standard]] + [cljs-time.core :as c] + [clojure.spec.alpha :as s] + [clojure.string :as str :refer [blank?]] + [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 [:client [:id :name :locations]] [:payments [:amount [:payment [:amount :s3_url :check_number ]]]] @@ -661,7 +661,6 @@ [:input.input {:type "number" :field [:check-number] :event change-event - #_#_:spec ::check/date :subscription handwrite-checks}]]] [:table.table.is-fullwidth [:thead