From e4da1376f84c286518fe5cf638157accd30d9501 Mon Sep 17 00:00:00 2001
From: Bryce Covert <bryce@brycecovertoperations.com>
Date: Mon, 11 Apr 2022 10:16:49 -0700
Subject: [PATCH] more vendor replacement.

---
 src/clj/auto_ap/datomic/invoices.clj          |  1 +
 .../views/pages/admin/rules/side_bar.cljs     | 22 +++++++++----------
 .../auto_ap/views/pages/import_invoices.cljs  | 22 +++++++++----------
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/clj/auto_ap/datomic/invoices.clj b/src/clj/auto_ap/datomic/invoices.clj
index 66acaa95..1c53e157 100644
--- a/src/clj/auto_ap/datomic/invoices.clj
+++ b/src/clj/auto_ap/datomic/invoices.clj
@@ -303,6 +303,7 @@
 
                                 schedule-payment-dom
                                 (-> date
+                                    coerce/to-date-time
                                     (next-dom schedule-payment-dom)
                                     coerce/to-date)
                                 :else nil)
diff --git a/src/cljs/auto_ap/views/pages/admin/rules/side_bar.cljs b/src/cljs/auto_ap/views/pages/admin/rules/side_bar.cljs
index c16556ac..2c2d7187 100644
--- a/src/cljs/auto_ap/views/pages/admin/rules/side_bar.cljs
+++ b/src/cljs/auto_ap/views/pages/admin/rules/side_bar.cljs
@@ -1,22 +1,22 @@
 (ns auto-ap.views.pages.admin.rules.side-bar
   (:require
-   [re-frame.core :as re-frame]
-   [auto-ap.subs :as subs]
+   [auto-ap.views.components.typeahead.vendor
+    :refer [search-backed-typeahead]]
+   [auto-ap.views.pages.data-page :as data-page]
    [auto-ap.views.utils :refer [dispatch-value-change]]
-   [auto-ap.views.components.typeahead :refer [typeahead-v3]]
-   [auto-ap.views.pages.data-page :as data-page]))
-
+   [re-frame.core :as re-frame]))
 
 (defn rule-side-bar [{:keys [data-page]}]
   [:div
    [:p.menu-label "Vendor"]
    [:div
-    [typeahead-v3 {:entities-by-id @(re-frame/subscribe [::subs/vendors-by-id])
-                   :entity-index  @(re-frame/subscribe [::subs/searchable-vendors-index])
-                   :on-change #(re-frame/dispatch [::data-page/filter-changed data-page :vendor (some-> % (select-keys [:name :id]))])
-                   :entity->text :name
-                   :type "typeahead-v3"
-                   :value @(re-frame/subscribe [::data-page/filter data-page :vendor])}]]
+    [search-backed-typeahead {:search-query (fn [i]
+                                              [:search_vendor
+                                               {:query i}
+                                               [:name :id]])
+                              :type         "typeahead-v3"
+                              :on-change    #(re-frame/dispatch [::data-page/filter-changed data-page :vendor %])
+                              :value        @(re-frame/subscribe [::data-page/filter data-page :vendor])}]]
 
    [:p.menu-label "Note"]
    [:div
diff --git a/src/cljs/auto_ap/views/pages/import_invoices.cljs b/src/cljs/auto_ap/views/pages/import_invoices.cljs
index c67fb76e..68a7de8e 100644
--- a/src/cljs/auto_ap/views/pages/import_invoices.cljs
+++ b/src/cljs/auto_ap/views/pages/import_invoices.cljs
@@ -7,7 +7,6 @@
             [auto-ap.views.components.invoices.side-bar :refer [invoices-side-bar]]
             [auto-ap.views.utils :refer [dispatch-event with-user ->%]]
             [auto-ap.utils :refer [by]]
-            [auto-ap.views.components.typeahead :refer [typeahead-v3]]
             [auto-ap.views.components.invoice-table :refer [invoice-table] :as invoice-table]
             [cljs.reader :as edn]
             [auto-ap.status :as status]
@@ -18,7 +17,7 @@
             [clojure.set :as set]
             [auto-ap.effects.forward :as forward]
             [goog.string :as gstring]
-            ))
+            [auto-ap.views.components.typeahead.vendor :refer [search-backed-typeahead]]))
 
 
 (defn dropzone []
@@ -57,15 +56,16 @@
                           [:p.control
                            [:a.button.is-static "Force vendor"]]
                           [:div.control {:style {:width "400px"}}
-                           [typeahead-v3 {:entities-by-id @(re-frame/subscribe [::subs/vendors-by-id])
-                                          :entity-index @(re-frame/subscribe [::subs/searchable-vendors-index])
-                                          :entity->text :name
-                                          :name "vendor"
-                                          :type "typeahead-v3"
-                                          :on-change (fn [v]
-                                                       (reset! vendor v))
-                                          :value @vendor}]]
-                          ]
+
+                           [search-backed-typeahead {:search-query (fn [i]
+                                                                     [:search_vendor
+                                                                      {:query i}
+                                                                      [:name :id]])
+                                                     :type         "typeahead-v3"
+                                                     :name "vendor"
+                                                     :on-change (fn [v]
+                                                                  (reset! vendor v))
+                                                     :value        @vendor}]]]
                          [:div.tile.notification
                           [:div.has-text-centered {:style {:padding "80px 0px" :width "100%"}}
                            [:span