vendors can be updated through datomic.

2018-11-09 13:30:27 -08:00
parent de8563a60b
commit 8ea4ea0c73
12 changed files with 141 additions and 276 deletions
--- a/src/cljs/auto_ap/events.cljs
+++ b/src/cljs/auto_ap/events.cljs
@@ -111,17 +111,6 @@
 (fn  [db [_ new-invoices]]
   (assoc-in db [:invoices :pending] new-invoices)))

-(re-frame/reg-event-fx
- ::approve-invoices
- (fn  [cofx [_]]
-   {:http {:method :post
-           :token (-> cofx :db :user)
-           :uri (str "/api/invoices/approve"
-                     (when-let [company-id (:id @(re-frame/subscribe [::subs/company]))]
-                       (str "?company=" company-id)))
-           :on-success [::received-invoices :pending]
-           }}))
-
 (re-frame/reg-event-fx
 ::view-pending-invoices
 (fn [cofx []]
@@ -143,16 +132,6 @@
                                           [:id :total :invoice-number :date [:vendor [:name :id]] [:company [:name :id]]]]]} 
              :on-success [::received-invoices :unpaid]}}))

-(re-frame/reg-event-fx
- ::reject-invoices
- (fn  [cofx [_]]
-   {:http {:method :post
-           :token (-> cofx :db :user)
-           :uri (str "/api/invoices/reject"
-                     (when-let [company-id (:id @(re-frame/subscribe [::subs/company]))]
-                       (str "?company=" company-id)))
-           :on-success [::received-invoices :pending]
-           }}))
 (re-frame/reg-event-db
 ::submitted-new-invoice
 (fn  [db [_ invoice]]
--- a/src/cljs/auto_ap/events/admin/vendors.cljs
+++ b/src/cljs/auto_ap/events/admin/vendors.cljs
@@ -6,9 +6,17 @@
            [auto-ap.effects :as effects]
            [auto-ap.entities.vendors :as entity]
            [auto-ap.events :as events]
+            [auto-ap.utils :refer [by]]

            [bidi.bidi :as bidi]))

+(def vendor-query
+  [:id :name :default-expense-account
+   [:primary-contact [:name :phone :email :id]]
+   [:secondary-contact [:id :name :phone :email]]
+   :print-as :invoice-reminder-schedule :code
+   [:address [:street1 :street2 :city :state :zip]]])
+
 (re-frame/reg-event-fx
 ::edit
 (fn  [{:keys [db]} [_ vendor-id]]
@@ -16,11 +24,12 @@
                  (get  (:vendors db) vendor-id))
    :dispatch [::events/modal-status :auto-ap.views.pages.admin.vendors/admin-vendor {:visible? true}]}))

-(re-frame/reg-event-db
+(re-frame/reg-event-fx
 ::new
- (fn  [db _]
-   (assoc-in db [:admin :vendor]
-             {})))
+ (fn  [{:keys [db]} _]
+   {:db (assoc-in db [:admin :vendor]
+                  {})
+   :dispatch [::events/modal-status :auto-ap.views.pages.admin.vendors/admin-vendor {:visible? true}]}))

 (re-frame/reg-event-fx
 ::save
@@ -28,21 +37,16 @@
   (let [edited-vendor (get-in db [:admin :vendor])
         fx {:db (assoc-in db [:admin :vendor :saving?] true)}]
     (when (s/valid? ::entity/vendor edited-vendor)
-       (if (:id edited-vendor)
-         (assoc fx :http {:method :put
-                          :token (:user db)
-                          :body (pr-str edited-vendor)
-                          :headers {"Content-Type" "application/edn"}
-                          :uri (str "/api/vendors/" (:id edited-vendor))
-                          :on-success [::save-complete]
-                          :on-error [::save-error]})
-         (assoc fx :http {:method :post
-                          :token (:user db)
-                          :body (pr-str edited-vendor)
-                          :headers {"Content-Type" "application/edn"}
-                          :uri (str "/api/vendors")
-                          :on-success [::save-complete]
-                          :on-error [::save-error]}))))))
+       (assoc fx :graphql
+              {:token (-> db :user)
+               :query-obj {:venia/operation {:operation/type :mutation
+                                             :operation/name "UpsertVendor"}
+                           
+                           :venia/queries [{:query/data [:upsert-vendor
+                                                         {:vendor edited-vendor}
+                                                         vendor-query]}]}  
+               :on-success [::save-complete]
+               :on-error [::save-error]})))))

 (re-frame/reg-event-fx
 ::remind
@@ -69,7 +73,7 @@

 (re-frame/reg-event-fx
 ::save-complete
- (fn  [{:keys [db]} [_ vendor]]
+ (fn  [{:keys [db]} [_ {vendor :upsert-vendor} ]]
   {:dispatch [::events/modal-completed :auto-ap.views.pages.admin.vendors/admin-vendor ]
    :db (-> db
            
@@ -107,15 +111,11 @@
 (re-frame/reg-event-fx
 ::mounted
 (fn  [{:keys [db]} _]
-   {:http {:method :get
-           :token (:user db)
-           :uri "/api/vendors"
-           :on-success [::received-vendors]}}))
+   {:graphql {:token (:user db)
+              :query-obj {:venia/queries [[:vendor vendor-query]]} 
+              :on-success [::received-vendors]}}))

 (re-frame/reg-event-db
 ::received-vendors
 (fn  [db [_ vendors]]
-   (assoc db :vendors (reduce (fn [vendors vendor]
-                                (assoc vendors (:id vendor) vendor))
-                              {}
-                              vendors))))
+   (assoc db :vendors (by :id (:vendor vendors )))))
--- a/src/cljs/auto_ap/views/components/vendor_dialog.cljs
+++ b/src/cljs/auto_ap/views/components/vendor_dialog.cljs
@@ -8,10 +8,11 @@
           [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]
           [auto-ap.subs :as subs]))

 (defn vendor-dialog [{:keys [vendor save-event change-event id] {:keys [name]} :vendor}]
-  
+  (println (s/explain ::entity/vendor vendor) )
  (let [companies-by-id @(re-frame/subscribe [::subs/companies-by-id])]
    [action-modal {:id id
                   :title [:span (if (:id vendor)
@@ -82,7 +83,7 @@
       [bind-field
        [:input.input.is-expanded {:type "text"
                                   :field [:primary-contact :name]
-                                   :spec ::entity/primary-contact
+                                   :spec ::contact/name
                                   :event change-event
                                   :subscription vendor}]]
       [:span.icon.is-small.is-left
@@ -94,7 +95,7 @@
       [bind-field
        [:input.input {:type "email"
                       :field [:primary-contact :email]
-                       :spec ::entity/primary-email
+                       :spec ::contact/email
                       :event change-event
                       :subscription vendor}]]]

@@ -102,7 +103,7 @@
       [bind-field
        [:input.input {:type "phone"
                       :field [:primary-contact :phone]
-                       :spec ::entity/primary-phone
+                       :spec ::contact/phone
                       :event change-event
                       :subscription vendor}]]
       [:span.icon.is-small.is-left
@@ -114,7 +115,7 @@
       [bind-field
        [:input.input.is-expanded {:type "text"
                                   :field [:secondary-contact :name]
-                                   :spec ::entity/secondary-contact
+                                   :spec ::contact/name
                                   :event change-event
                                   :subscription vendor}]]
       [:span.icon.is-small.is-left
@@ -125,14 +126,14 @@
       [bind-field
        [:input.input {:type "email"
                       :field [:secondary-contact :email]
-                       :spec ::entity/secondary-email
+                       :spec ::contact/email
                       :event change-event
                       :subscription vendor}]]]
      [:div.control.has-icons-left
       [bind-field
        [:input.input {:type "phone"
                       :field [:secondary-contact :phone]
-                       :spec ::entity/secondary-phone
+                       :spec ::contact/phone
                       :event change-event
                       :subscription vendor}]]
       [:span.icon.is-small.is-left
--- a/src/cljs/auto_ap/views/pages/admin/vendors.cljs
+++ b/src/cljs/auto_ap/views/pages/admin/vendors.cljs
@@ -55,197 +55,6 @@
    (vec (concat [dom keys] rest))))


-#_(defn edit-dialog []
-  (let [editing-vendor (:vendor @(re-frame/subscribe [::subs/admin]))
-        companies-by-id @(re-frame/subscribe [::subs/companies-by-id])]
-   
-    [modal {:title [:span (if (:id editing-vendor)
-                            (str "Edit " (or (:name editing-vendor) "<vendor>"))
-                            (str "Add " (or (:name editing-vendor) "<new vendor>")))
-                    (when (:error editing-vendor)
-                      [:span.icon.has-text-danger
-                       [:i.fa.fa-exclamation-triangle]])]
-            :foot [:button.button.is-primary {:on-click (fn [] (re-frame/dispatch [::events/save]))
-                                              :disabled (when (not (s/valid? ::entity/vendor editing-vendor ))
-                                                          "disabled")}
-                   [:span "Save"] 
-                   (when (:saving? editing-vendor)
-                     [:span.icon
-                      [:i.fa.fa-spin.fa-spinner]])]
-            :hide-event [::events/edit nil]}
-     
-     [horizontal-field
-      [:label.label "Name"]
-      [:div.control
-       [bind-field
-        [:input.input {:type "text"
-                       :field :name
-                       :spec ::entity/name
-                       :event ::events/change
-                       :subscription editing-vendor}]]]]
-     
-     [horizontal-field
-      [:label.label "Code"]
-      [:div.control
-
-       [bind-field
-        [:input.input.is-expanded {:type "text"
-                                   :field :code
-                                   :spec ::entity/code
-                                   :event ::events/change
-                                   :subscription editing-vendor}]]
-       [:p.help "The vendor code is used for invoice parsing. Only one vendor at a time can use a code"]]] 
-
-     [:h2.subtitle "Address"]
-     [address-field {:field [:address]
-                     :event ::events/change
-                     :subscription editing-vendor}]
-     
-     
-     
-     [:h2.subtitle "Contact"]
-     [horizontal-field
-      [:label.label "Primary"]
-      [:div.control.has-icons-left
-       [bind-field
-        [:input.input.is-expanded {:type "text"
-                                   :field :primary-contact
-                                   :spec ::entity/primary-contact
-                                   :event ::events/change
-                                   :subscription editing-vendor}]]
-       [:span.icon.is-small.is-left
-        [:i.fa.fa-user]]]
-
-      [:div.control.has-icons-left
-       [:span.icon.is-small.is-left
-        [:i.fa.fa-envelope]]
-       [bind-field
-        [:input.input {:type "email"
-                       :field :primary-email
-                       :spec ::entity/primary-email
-                       :event ::events/change
-                       :subscription editing-vendor}]]]
-
-      [:div.control.has-icons-left
-       [bind-field
-        [:input.input {:type "phone"
-                       :field :primary-phone
-                       :spec ::entity/primary-phone
-                       :event ::events/change
-                       :subscription editing-vendor}]]
-       [:span.icon.is-small.is-left
-        [:i.fa.fa-phone]]]]
-     
-     [horizontal-field
-      [:label.label "Secondary"]
-      [:div.control.has-icons-left
-       [bind-field
-        [:input.input.is-expanded {:type "text"
-                                   :field :secondary-contact
-                                   :spec ::entity/secondary-contact
-                                   :event ::events/change
-                                   :subscription editing-vendor}]]
-       [:span.icon.is-small.is-left
-        [:i.fa.fa-user]]]
-      [:div.control.has-icons-left
-       [:span.icon.is-small.is-left
-        [:i.fa.fa-envelope]]
-       [bind-field
-        [:input.input {:type "email"
-                       :field :secondary-email
-                       :spec ::entity/secondary-email
-                       :event ::events/change
-                       :subscription editing-vendor}]]]
-      [:div.control.has-icons-left
-       [bind-field
-        [:input.input {:type "phone"
-                       :field :secondary-phone
-                       :spec ::entity/secondary-phone
-                       :event ::events/change
-                       :subscription editing-vendor}]]
-       [:span.icon.is-small.is-left
-        [:i.fa.fa-phone]]]]
-     
-     [horizontal-field
-      [:label.label "Invoice Reminders"]
-      [:div.control
-       [:label.radio 
-        [bind-field
-         [:input {:type "radio"
-                  :name "schedule"
-                  :value "Weekly"
-                  :field :invoice-reminder-schedule
-                  :spec ::entity/invoice-reminder-schedule
-                  :event ::events/change
-                  :subscription editing-vendor}]]
-        " Send weekly"]
-
-       [:label.radio 
-        [bind-field
-         [:input {:type "radio"
-                  :name "schedule"
-                  :value "Never"
-                  :field :invoice-reminder-schedule
-                  :spec ::entity/invoice-reminder-schedule
-                  :event ::events/change
-                  :subscription editing-vendor}]]
-        " Never"]]]
-
-     [:h2.subtitle "Expense Accounts"]
-     [horizontal-field
-      [:label.label "Default"]
-      [bind-field
-       [typeahead {:matches (map (fn [[k v]] [k (:name v)]) expense-accounts)
-                   :type "typeahead"
-                   :field [:default-expense-account]
-                   :spec ::entity/default-expense-account
-                   :event ::events/change
-                   :subscription editing-vendor}]]]
-
-     
-     
-
-     #_[:h2.subtitle "Clients"]
-
-     #_[horizontal-field
-      nil
-      [:div.control@(re-frame/subscribe [::subs/exp])
-       [:div.select.is-expanded
-        [bind-field
-         [:select {:type "select"
-          :field :new-relationship-company
-          :event ::events/change
-          :subscription editing-vendor}
-          (for [company @(re-frame/subscribe [::subs/companies])]
-            [:option {:value (:id company)} (:name company)])]]]]
-      [:div.control
-       [bind-field
-        [:input.input {:type "text"
-                       :field :new-relationship-account-number
-                       :subscription editing-vendor
-                       :event ::events/change
-                       :placeholder "Account number"}]]]
-      [:div.control
-       [:button.button.is-primary
-        {:on-click (dispatch-event [::events/add-relationship])}
-        [:span.icon
-         [:i.fa.fa-plus]]]]]
-     #_[horizontal-field
-      nil
-      [:ul
-       (for [[i r] (map vector (range) (:relationships editing-vendor))]
-         ^{:key i}
-         [:li
-          (:name (companies-by-id (js/parseInt (:company-id r)))) ": "
-          (:account-number r)
-          [:a
-           {:on-click (dispatch-event [::events/remove-relationship i])}
-           [:span.icon
-            [:i.fa.fa-times]]]])]] 
-     
-     
-     (when (:saving? editing-vendor) [:div.is-overlay {:style {"backgroundColor" "rgba(150,150,150, 0.5)"}}])]))
-
 (defn admin-vendors-page []
  [(with-meta
     (fn []