Added the ability to load historcial sales yourself.
This commit is contained in:
@@ -5,6 +5,8 @@
|
||||
[auto-ap.views.components.admin.side-bar :refer [admin-side-bar]]
|
||||
[auto-ap.views.components.layouts :refer [side-bar-layout]]
|
||||
[auto-ap.views.pages.admin.jobs.table :as table]
|
||||
[auto-ap.views.components.modal :as modal]
|
||||
[auto-ap.views.components :as com]
|
||||
[auto-ap.views.pages.data-page :as data-page]
|
||||
[auto-ap.views.utils :refer [dispatch-event with-user]]
|
||||
[clojure.set :as set]
|
||||
@@ -15,9 +17,10 @@
|
||||
[auto-ap.forms :as forms]
|
||||
[clojure.string :as str]))
|
||||
|
||||
(def a 1)
|
||||
|
||||
|
||||
(def default-read [:name :start-date :end-date :status])
|
||||
(def job-types [:yodlee2 :yodlee2-accounts :intuit :plaid :bulk-journal-import :register-invoice-import :ezcater-upsert])
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::params-change
|
||||
@@ -51,23 +54,38 @@
|
||||
:dispatch [::params-change]}))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::request
|
||||
::saving
|
||||
[with-user
|
||||
(re-frame/inject-cofx ::inject/sub [::forms/form ::bulk-journal-form])
|
||||
(re-frame/inject-cofx ::inject/sub [::forms/form ::form])
|
||||
]
|
||||
(fn [{:keys [user] ::forms/keys [form]} [_ which]]
|
||||
{:graphql {:token user
|
||||
:owns-state {:single which}
|
||||
:query-obj
|
||||
{:venia/operation {:operation/type :mutation
|
||||
:operation/name "RequestJob"}
|
||||
:venia/queries [{:query/data
|
||||
[:request-job
|
||||
{:which (name which)
|
||||
:args (when (#{:bulk-journal-import :register-invoice-import} which)
|
||||
(str/escape (pr-str (:data form)) {\" "\\\""}))}
|
||||
[:message]]}]}
|
||||
:on-success [::success]}}))
|
||||
(let [which (:job (:data form))]
|
||||
|
||||
{:graphql {:token user
|
||||
:owns-state {:single which}
|
||||
:query-obj
|
||||
{:venia/operation {:operation/type :mutation
|
||||
:operation/name "RequestJob"}
|
||||
:venia/queries [{:query/data
|
||||
[:request-job
|
||||
{:which (str which)
|
||||
:args (-> (cond (= which :bulk-journal-import)
|
||||
(select-keys (:data form) [:ledger-url])
|
||||
|
||||
(= which :register-invoice-import)
|
||||
(select-keys (:data form) [:invoice-url])
|
||||
|
||||
(= which :load-historical-sales)
|
||||
{:days (-> form :data :days)
|
||||
:client (-> form :data :client :id)}
|
||||
|
||||
:else
|
||||
nil
|
||||
)
|
||||
pr-str
|
||||
(str/escape {\" "\\\""}))}
|
||||
[:message]]}]}
|
||||
:on-success [::success]}})))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::mounted
|
||||
@@ -80,11 +98,7 @@
|
||||
(re-frame/reg-event-fx
|
||||
::unmounted
|
||||
(fn [{:keys [db]}]
|
||||
{:dispatch-n (into [[::data-page/dispose ::page]]
|
||||
(map (fn [jt]
|
||||
[::status/dispose-single jt]
|
||||
)
|
||||
job-types))
|
||||
{:dispatch-n [[::data-page/dispose ::page]]
|
||||
::track/dispose {:id ::params}
|
||||
:db (dissoc db ::msg)}))
|
||||
|
||||
@@ -98,42 +112,77 @@
|
||||
content]))
|
||||
|
||||
(defn notification []
|
||||
[:<>
|
||||
(when-let [msg @(re-frame/subscribe [::msg])]
|
||||
[:div.notification.is-info.is-light msg])
|
||||
(doall (for [status job-types
|
||||
:let [state @(re-frame/subscribe [::status/single status])]]
|
||||
^{:key (str status) }
|
||||
[:div
|
||||
(cond (:info state)
|
||||
[:div.notification.is-info.is-light (:info state)]
|
||||
(let [state @(re-frame/subscribe [::status/single ::form])]
|
||||
[:<>
|
||||
(when-let [msg @(re-frame/subscribe [::msg])]
|
||||
[:div.notification.is-info.is-light msg])
|
||||
[:div
|
||||
(cond (:info state)
|
||||
[:div.notification.is-info.is-light (:info state)]
|
||||
|
||||
(seq (:error state))
|
||||
[:div.notification.is-info.is-warning.is-light (:message (first (:error state)))]
|
||||
(seq (:error state))
|
||||
[:div.notification.is-info.is-warning.is-light (:message (first (:error state)))]
|
||||
|
||||
:else
|
||||
nil)]))])
|
||||
:else
|
||||
nil)]]))
|
||||
|
||||
(defn bulk-journal-import-button []
|
||||
[form-builder/builder {:submit-event [::request :bulk-journal-import]
|
||||
:id ::bulk-journal-form}
|
||||
[:p.field.has-addons
|
||||
[:p.control
|
||||
[:a.button.is-static.is-small
|
||||
"s3://data.prod.app.integreatconsult.com/bulk-import/"]]
|
||||
[:p.control
|
||||
[form-builder/raw-field-v2 {:field :ledger-url}
|
||||
[:input.input.is-small {:placeholder "ledger-data.csv"}]]]
|
||||
[:p.control
|
||||
[form-builder/submit-button {:class "is-small"} "Ledger Import"]
|
||||
]]])
|
||||
(defn new-job-form []
|
||||
(let [{:keys [data]} @(re-frame/subscribe [::forms/form ::form])
|
||||
clients @(re-frame/subscribe [::subs/clients])]
|
||||
[:<>
|
||||
[form-builder/builder {:submit-event [::saving]
|
||||
:id ::form}
|
||||
[form-builder/field-v2 {:required? true
|
||||
:field :job}
|
||||
"Job Type"
|
||||
[com/select-field {:options [[:yodlee2 "Yodlee Import"]
|
||||
[:yodlee2-accounts "Yodlee Account Import"]
|
||||
[:intuit "Intuit import"]
|
||||
[:plaid "Plaid import"]
|
||||
[:bulk-journal-import "Bulk Journal Import"]
|
||||
[:register-invoice-import "Register Invoice Import "]
|
||||
[:ezcater-upsert "Upsert recent ezcater orders"]
|
||||
[:load-historical-sales "Load Historical Square Sales"]]
|
||||
:allow-nil? true
|
||||
:keywordize? true}]]
|
||||
(cond (= :bulk-journal-import (:job data))
|
||||
[:<>
|
||||
[:label.label "Url"]
|
||||
[:p.field.has-addons
|
||||
[:p.control
|
||||
[:a.button.is-static
|
||||
"s3://data.prod.app.integreatconsult.com/bulk-import/"]]
|
||||
[:p.control
|
||||
[form-builder/raw-field-v2 {:field :ledger-url}
|
||||
[:input.input {:placeholder "ledger-data.csv"}]]]]]
|
||||
|
||||
(defn register-invoice-import-button []
|
||||
[form-builder/builder {:submit-event [::request :register-invoice-import]
|
||||
:id ::register-invoice-import-form}
|
||||
[:p.control
|
||||
[form-builder/submit-button {:class "is-small"} "Register Invoice Import"]
|
||||
]])
|
||||
(= :register-invoice-import (:job data))
|
||||
[:<>
|
||||
[:label.label "Url"]
|
||||
[:p.field.has-addons
|
||||
[:p.control
|
||||
[:a.button.is-static
|
||||
"s3://data.prod.app.integreatconsult.com/bulk-import/"]]
|
||||
[:p.control
|
||||
[form-builder/raw-field-v2 {:field :invoice-url}
|
||||
[:input.input {:placeholder "invoice-data.csv"}]]]]]
|
||||
|
||||
(= :load-historical-sales (:job data))
|
||||
[:<>
|
||||
[form-builder/field-v2 {:required? true
|
||||
:field [:client]}
|
||||
"Client"
|
||||
[com/entity-typeahead {:entities @(re-frame/subscribe [::subs/clients])
|
||||
:entity->text :name}]]
|
||||
|
||||
[form-builder/field-v2 {:field :days}
|
||||
"Days to load (recommended 60)"
|
||||
[com/number-input {:placeholder "60"
|
||||
:style {:width "7em"}}]]]
|
||||
:else
|
||||
nil)
|
||||
|
||||
[form-builder/hidden-submit-button]]]))
|
||||
|
||||
|
||||
|
||||
@@ -149,15 +198,18 @@
|
||||
(when (= "admin" (:user/role user))
|
||||
[:div
|
||||
[:div.is-pulled-right
|
||||
[:div.buttons
|
||||
|
||||
[job-button {:which :yodlee2} "Start Yodlee Import"]
|
||||
[job-button {:which :yodlee2-accounts} "Start Yodlee Account Import"]
|
||||
[job-button {:which :intuit} "Start Intuit"]
|
||||
[job-button {:which :plaid} "Start Plaid"]
|
||||
[job-button {:which :ezcater-upsert} "EZCater Sync"]
|
||||
[bulk-journal-import-button]
|
||||
[register-invoice-import-button]]]
|
||||
[:button.button.is-primary.is-small {:type "button"
|
||||
:on-click (dispatch-event [::modal/modal-requested
|
||||
{:title "Start a new job"
|
||||
:body [new-job-form]
|
||||
:cancel? false
|
||||
:confirm {:value "Submit"
|
||||
:status-from [::status/single ::form]
|
||||
:class "is-primary"
|
||||
:on-click (dispatch-event [::saving])
|
||||
:close-event [::status/completed ::form]}}])}
|
||||
"Run new job"]
|
||||
]
|
||||
[table/table {:id :jobs
|
||||
:data-page ::page}]])]))
|
||||
{:component-did-mount (dispatch-event [::mounted ])
|
||||
|
||||
Reference in New Issue
Block a user