Making it so manual ledger is searchable and usable

src/clj/auto_ap/datomic/ledger.clj

@@ -18,7 +18,9 @@
                                                           '[?c :client/name ?sort-client]]
                                                 "date" ['[?e :journal-entry/date ?sort-date]]
                                                 "vendor" ['[?e :journal-entry/vendor ?sort-vendor]]
-                                                "amount" ['[?e :journal-entry/amount ?sort-amount]]}
+                                                 "amount" ['[?e :journal-entry/amount ?sort-amount]]
+                                                 "external-id" ['[?e :journal-entry/external-id ?sort-external-id]]
+                                                 "source" ['[?e :journal-entry/source ?sort-source]]}
                                                args)
 
                 (limited-clients (:id args))
@@ -31,6 +33,15 @@
                                       :where ['[?e :journal-entry/client ?client-id]]}
                               :args [(:client-id args)]})
 
+                (:only-external args) 
+                (merge-query {:query {:where ['(not [?e :journal-entry/original-entity ])]}})
+
+                (seq (:external-id-like args))
+                (merge-query {:query {:in ['?external-id-like]
+                                      :where ['[?e :journal-entry/external-id ?external-id]
+                                              '[(.contains ^String ?external-id ?external-id-like)]]}
+                              :args [(:external-id-like args)]})
+
                 (:vendor-id args) 
                 (merge-query {:query {:in ['?vendor-id]
                                       :where ['[?e :journal-entry/vendor ?vendor-id]]}

src/clj/auto_ap/graphql.clj

@@ -188,6 +188,7 @@
     :journal_entry
     {:fields {:id {:type :id}
               :source {:type 'String}
+              :external_id {:type 'String}
               :amount {:type 'String}
               :note {:type 'String}
               :cleared_against {:type 'String}
@@ -538,20 +539,7 @@
                 :resolve :get-transaction-rule-page}
 
     :ledger_page {:type :ledger_page
-                  :args {:client_id {:type :id}
+                  :args {:filters {:type :ledger_filters}}
-                         :vendor_id {:type :id}
-                         :account_id {:type :id}
-                         :amount_lte {:type :money}
-                         :amount_gte {:type :money}
-                         :bank_account_id {:type :id}
-                         :date_range {:type :date_range}
-                         :location {:type 'String}
-                         :from_numeric_code {:type 'Int}
-                         :to_numeric_code {:type 'Int}
-                         :start {:type 'Int}
-                         :per_page {:type 'Int}
-                         :sort {:type '(list :sort_item)}}
-                  
                   :resolve :get-ledger-page}
 
     :sales_order_page {:type :sales_order_page
@@ -607,6 +595,22 @@
                                    :per_page {:type 'Int}
                                    :sort {:type '(list :sort_item)}
                                    :approval_status {:type :transaction_approval_status} }}
+
+    :ledger_filters {:fields {:client_id {:type :id}
+                              :vendor_id {:type :id}
+                              :account_id {:type :id}
+                              :amount_lte {:type :money}
+                              :amount_gte {:type :money}
+                              :bank_account_id {:type :id}
+                              :date_range {:type :date_range}
+                              :location {:type 'String}
+                              :from_numeric_code {:type 'Int}
+                              :to_numeric_code {:type 'Int}
+                              :start {:type 'Int}
+                              :per_page {:type 'Int}
+                              :only_external {:type 'Boolean}
+                              :external_id_like {:type 'String}
+                              :sort {:type '(list :sort_item)}}}
     :invoice_payment_amount {:fields {:invoice_id {:type :id}
                                :amount {:type 'Float}}}
     :edit_location_match {:fields {:location {:type 'String}

src/clj/auto_ap/graphql/ledger.clj

@@ -22,7 +22,7 @@
 
 (defn get-ledger-page [context args value]
   (let [args (assoc args :id (:id context))
-        [journal-entries journal-entries-count] (l/get-graphql (<-graphql args))
+        [journal-entries journal-entries-count] (l/get-graphql (<-graphql (:filters args)))
         journal-entries (mapv
                          (fn [je]
                            (update je :journal-entry/line-items

src/cljc/auto_ap/client_routes.cljc

@@ -31,4 +31,5 @@
                   "ledger/" {"" :ledger
                              "profit-and-loss" :profit-and-loss
                              "balance-sheet" :balance-sheet
+                             "external" :external-ledger
                              "external-import" :external-import-ledger}}])

src/cljs/auto_ap/views/main.cljs

@@ -15,6 +15,7 @@
    [auto-ap.views.pages.error :refer [error-page]]
    [auto-ap.views.pages.ledger.balance-sheet :refer [balance-sheet-page]]
    [auto-ap.views.pages.ledger.external-import :refer [external-import-page]]
+   [auto-ap.views.pages.ledger.external-ledger :refer [external-ledger-page]]
    [auto-ap.views.pages.ledger.profit-and-loss :refer [profit-and-loss-page]]
    [auto-ap.views.pages.login :refer [login-page]]
    [auto-ap.views.pages.payments :refer [payments-page]]
@@ -118,6 +119,9 @@
 (defmethod page :external-import-ledger [_]
   [external-import-page])
 
+(defmethod page :external-ledger [_]
+  [external-ledger-page])
+
 (defmethod page :admin-excel-import [_]
   [admin-excel-import-page])
 

src/cljs/auto_ap/views/pages/ledger/external_ledger.cljs

@@ -0,0 +1,94 @@
+(ns auto-ap.views.pages.ledger.external-ledger
+  (:require [auto-ap.subs :as subs]
+            [auto-ap.views.components.layouts :refer [side-bar-layout]]
+            [auto-ap.views.pages.data-page :as data-page]
+            [auto-ap.views.pages.ledger.side-bar :as side-bar :refer [ledger-side-bar]]
+            [auto-ap.views.pages.ledger.external-ledger-table :as table]
+            [auto-ap.views.utils :refer [with-user]]
+            [clojure.set :as set]
+            [re-frame.core :as re-frame]
+            [reagent.core :as reagent]
+            [vimsical.re-frame.fx.track :as track]))
+
+(defn data-params->query-params [params]
+  {:start (:start params 0)
+   :sort (:sort params)
+   :per-page (:per-page params)
+   :client-id (:id @(re-frame/subscribe [::subs/client]))
+   :vendor-id (:id (:vendor params))
+   :date-range (:date-range params)
+   :account-id (:id (:account params))
+   :bank-account-id (:id (:bank-account params))
+   :external-id-like (:external-id params)
+   :amount-gte (:amount-gte (:amount-range params))
+   :amount-lte (:amount-lte (:amount-range params))
+   :only-external true})
+
+
+(re-frame/reg-event-fx
+ ::params-change
+ [with-user]
+ (fn [{:keys [user db]} [_ params]]
+   {:graphql {:token user
+              :owns-state {:single [::data-page/page ::page]}
+              :query-obj {:venia/queries [[:ledger-page
+                                           {:filters (data-params->query-params params)}
+                                           [[:journal-entries [:id
+                                                               :external_id
+                                                               :source
+                                                               :amount
+                                                               :note
+                                                               :cleared-against
+                                                               :alternate-description
+                                                               [:vendor
+                                                                [:name :id]]
+                                                               [:client
+                                                                [:name :id]]
+                                                               [:line-items
+                                                                [:id :debit :credit :location :running-balance
+                                                                 [:account [:id]]]]
+                                                               :date]]
+                                            :total
+                                            :start
+                                            :end]]]} 
+              :on-success (fn [result]
+                            [::data-page/received ::page (set/rename-keys (:ledger-page result)
+                                                                          {:journal-entries :data})])}}))
+
+(re-frame/reg-event-fx
+ ::unmounted
+ (fn [{:keys [db]} _]
+   {:dispatch [::data-page/dispose ::page]
+    ::track/dispose {:id ::params}}))
+
+(re-frame/reg-event-fx
+ ::mounted
+ (fn [{:keys [db]} _]
+   {::track/register {:id ::params
+                      :subscription [::data-page/params ::page]
+                      :event-fn (fn [params] [::params-change params])}}))
+
+
+
+(defn ledger-content []
+  (let [current-client @(re-frame/subscribe [::subs/client])]
+    [:div 
+     [:h1.title "External Ledger"]
+     [table/table {:id :ledger
+                   :data-page ::page}]]))
+
+
+(defn external-ledger-page []
+  (let [user (re-frame/subscribe [::subs/user])]
+    (reagent/create-class
+     {:display-name "external-ledger-page"
+      :component-did-mount #(re-frame/dispatch [::mounted])
+      :component-will-unmount #(re-frame/dispatch [::unmounted])
+      :reagent-render
+      (fn []
+        (if (= "admin" (:user/role @user))
+          [side-bar-layout
+           {:side-bar [ledger-side-bar {:data-page ::page}]
+            :main [ledger-content]}]
+          [:div "Not authorized"]))})))
+

src/cljs/auto_ap/views/pages/ledger/external_ledger_table.cljs

@@ -0,0 +1,75 @@
+(ns auto-ap.views.pages.ledger.external-ledger-table
+  (:require [auto-ap.subs :as subs]
+            [auto-ap.views.components.paginator :refer [paginator]]
+            [auto-ap.views.components.sorter :refer [sorted-column]]
+            [auto-ap.views.components.sort-by-list :refer [sort-by-list]]
+            [auto-ap.views.utils :refer [date->str dispatch-event nf]]
+            [goog.string :as gstring]
+            [re-frame.core :as re-frame]
+            [auto-ap.views.components.grid :as grid]
+            [auto-ap.views.pages.data-page :as data-page]))
+
+
+(defn external-ledger-row [{{:keys [client vendor alternate-description status date amount id source external-id line-items] :as i} :row
+                   :keys [selected-client accounts-by-id bank-accounts-by-id]}]
+  [:<>
+   [grid/row {:class (:class i) :id id}
+    (when-not selected-client
+      [grid/cell {} (:name client)])
+    [grid/cell {} source ]
+    [grid/cell {} external-id ]
+    [grid/cell {} (if vendor
+                    (:name vendor)
+                    [:i.has-text-grey (or (when alternate-description (str "Bank Description: " alternate-description))
+                                          "Unknown Merchant")])]
+    [grid/cell {} (date->str date) ]
+    [grid/cell {} ]
+    [grid/cell {:class "has-text-right"} (nf amount )]
+    [grid/cell {:class "has-text-right"} (nf amount )]]
+   [:<>
+    (for [{:keys [debit credit location account id running-balance]} line-items
+          :let [account (or (accounts-by-id (:id account))
+                            (bank-accounts-by-id (:id account)))]]
+      ^{:key id}
+      [grid/row {}
+       (when-not selected-client
+         [grid/cell {} ])
+       [grid/cell {} ]
+       [grid/cell {} ]
+       [grid/cell {} ]
+       [grid/cell {} ]
+       [grid/cell {} (if (:name account)
+                       [:span.has-tooltip-arrow.has-tooltip-right {:data-tooltip (str "Balance as of this entry: " (nf running-balance ))}
+                        (str location ": " (:name account)) ]
+                       [:i "unknown"])]
+       [grid/cell {:class "has-text-right"} (when debit (nf debit ))]
+       [grid/cell {:class "has-text-right"} (when credit (nf credit ))]])]])
+
+(defn table [{:keys [id data-page status vendors on-check-changed expense-event]}]
+  (let [{:keys [data status]} @(re-frame/subscribe [::data-page/page data-page])
+        selected-client @(re-frame/subscribe [::subs/client])
+        accounts-by-id @(re-frame/subscribe [::subs/accounts-by-id selected-client])
+        bank-accounts-by-id @(re-frame/subscribe [::subs/bank-accounts-by-id])]
+    [grid/grid {:data-page data-page
+                :column-count (if selected-client 7 8)}
+     [grid/controls data]
+     [grid/table {:fullwidth true :class ["wrappable"]}
+      [grid/header 
+       [grid/row {}
+        (when-not selected-client
+          [grid/sortable-header-cell {:sort-key "client" :sort-name "Client"} "Client"])
+        [grid/sortable-header-cell {:sort-key "source" :sort-name "Source" :style {:width "10em"}} "Source"]
+        [grid/sortable-header-cell {:sort-key "external-id" :sort-name "External Id"} "External Id"]
+        [grid/sortable-header-cell {:sort-key "vendor" :sort-name "Vendor"} "Vendor"]
+        [grid/sortable-header-cell {:sort-key "date" :sort-name "Date" :style {:width "8em"}} "Date"]
+        [grid/header-cell {} "Account"]
+        [grid/sortable-header-cell {:sort-key "amount" :sort-name "Amount" :class "has-text-right" :style {:width "7em"}} "Debit"]
+        [grid/sortable-header-cell {:sort-key "amount" :sort-name "Amount" :class "has-text-right" :style {:width "7em"}} "Credit"]]]
+      [grid/body
+       (for [{:keys [client vendor status date amount id line-items] :as i} (:data data)]
+         ^{:key id}
+         [external-ledger-row {:row i
+                      :selected-client selected-client
+                      :accounts-by-id accounts-by-id
+                      :bank-accounts-by-id bank-accounts-by-id}])]]]))
+

src/cljs/auto_ap/views/pages/ledger/side_bar.cljs

@@ -5,7 +5,7 @@
             [auto-ap.views.components.number-filter :refer [number-filter]]
             [auto-ap.views.components.typeahead :refer [typeahead-entity]]
             [auto-ap.views.pages.data-page :as data-page]
-            [auto-ap.views.utils :refer [active-when]]
+            [auto-ap.views.utils :refer [active-when dispatch-value-change]]
             [bidi.bidi :as bidi]
             [re-frame.core :as re-frame]))
 
@@ -32,13 +32,19 @@
 
         [:span {:class "icon icon-accounting-abacus" :style {:font-size "25px"}}]
         [:span {:class "name"} "Balance Sheet"]]]
+      (when (= "admin" (:user/role user))
+        [:li.menu-item
+         [:a.item {:href (bidi/path-for routes/routes :external-ledger)
+                   :class [(active-when ap = :external-ledger)]}
+          [:span {:class "icon icon-receipt" :style {:font-size "25px"}}]
+          [:span {:class "name"} "External Ledger"]]])
       (when (= "admin" (:user/role user))
         [:li.menu-item
          [:a.item {:href (bidi/path-for routes/routes :external-import-ledger)
                    :class [(active-when ap = :external-import-ledger)]}
           [:span.icon [:i {:class "fa fa-download"}]]
-          [:span {:class "name"} "External Import"]]])
+          [:span {:class "name"} "External Ledger Import"]]])
-      (when (= :ledger ap)
+      (when (#{ :ledger :external-ledger} ap)
         [:div
          [:p.menu-label "Bank Account"]
          [:div
@@ -80,4 +86,13 @@
          [:div
           [number-filter
            {:on-change-event [::data-page/filter-changed data-page :amount-range]
-            :value @(re-frame/subscribe [::data-page/filter data-page :amount-range])}]]])]]))
+            :value @(re-frame/subscribe [::data-page/filter data-page :amount-range])}]]
+
+         (when (= :external-ledger ap)
+           [:<> 
+            [:p.menu-label "External ID"]
+            [:div
+             [:div.field
+              [:div.control [:input.input {:placeholder "External id"
+                                           :value @(re-frame/subscribe [::data-page/filter data-page :external-id])
+                                           :on-change (dispatch-value-change [::data-page/filter-changed data-page :external-id])} ]]]]])])]]))