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

more vendor replacement.

Browse Source
This commit is contained in:
Bryce Covert
2022-04-11 10:16:49 -07:00
parent 8bba073e07
commit e4da1376f8
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/clj/auto_ap/datomic/invoices.clj
View File

@@ -303,6 +303,7 @@
schedule-payment-dom schedule-payment-dom
(-> date (-> date
coerce/to-date-time
(next-dom schedule-payment-dom) (next-dom schedule-payment-dom)
coerce/to-date) coerce/to-date)
:else nil) :else nil)

18
src/cljs/auto_ap/views/pages/admin/rules/side_bar.cljs
View File

@@ -1,21 +1,21 @@
(ns auto-ap.views.pages.admin.rules.side-bar (ns auto-ap.views.pages.admin.rules.side-bar
(:require (:require
[re-frame.core :as re-frame] [auto-ap.views.components.typeahead.vendor
[auto-ap.subs :as subs] :refer [search-backed-typeahead]]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.utils :refer [dispatch-value-change]] [auto-ap.views.utils :refer [dispatch-value-change]]
[auto-ap.views.components.typeahead :refer [typeahead-v3]] [re-frame.core :as re-frame]))
[auto-ap.views.pages.data-page :as data-page]))
(defn rule-side-bar [{:keys [data-page]}] (defn rule-side-bar [{:keys [data-page]}]
[:div [:div
[:p.menu-label "Vendor"] [:p.menu-label "Vendor"]
[:div [:div
[typeahead-v3 {:entities-by-id @(re-frame/subscribe [::subs/vendors-by-id]) [search-backed-typeahead {:search-query (fn [i]
:entity-index @(re-frame/subscribe [::subs/searchable-vendors-index]) [:search_vendor
:on-change #(re-frame/dispatch [::data-page/filter-changed data-page :vendor (some-> % (select-keys [:name :id]))]) {:query i}
:entity->text :name [:name :id]])
:type "typeahead-v3" :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])}]] :value @(re-frame/subscribe [::data-page/filter data-page :vendor])}]]
[:p.menu-label "Note"] [:p.menu-label "Note"]

16
src/cljs/auto_ap/views/pages/import_invoices.cljs
View File

@@ -7,7 +7,6 @@
[auto-ap.views.components.invoices.side-bar :refer [invoices-side-bar]] [auto-ap.views.components.invoices.side-bar :refer [invoices-side-bar]]
[auto-ap.views.utils :refer [dispatch-event with-user ->%]] [auto-ap.views.utils :refer [dispatch-event with-user ->%]]
[auto-ap.utils :refer [by]] [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] [auto-ap.views.components.invoice-table :refer [invoice-table] :as invoice-table]
[cljs.reader :as edn] [cljs.reader :as edn]
[auto-ap.status :as status] [auto-ap.status :as status]
@@ -18,7 +17,7 @@
[clojure.set :as set] [clojure.set :as set]
[auto-ap.effects.forward :as forward] [auto-ap.effects.forward :as forward]
[goog.string :as gstring] [goog.string :as gstring]
)) [auto-ap.views.components.typeahead.vendor :refer [search-backed-typeahead]]))
(defn dropzone [] (defn dropzone []
@@ -57,15 +56,16 @@
[:p.control [:p.control
[:a.button.is-static "Force vendor"]] [:a.button.is-static "Force vendor"]]
[:div.control {:style {:width "400px"}} [: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]) [search-backed-typeahead {:search-query (fn [i]
:entity->text :name [:search_vendor
:name "vendor" {:query i}
[:name :id]])
:type "typeahead-v3" :type "typeahead-v3"
:name "vendor"
:on-change (fn [v] :on-change (fn [v]
(reset! vendor v)) (reset! vendor v))
:value @vendor}]] :value @vendor}]]]
]
[:div.tile.notification [:div.tile.notification
[:div.has-text-centered {:style {:padding "80px 0px" :width "100%"}} [:div.has-text-centered {:style {:padding "80px 0px" :width "100%"}}
[:span [:span