Merge branch 'master' into side-panel

src/clj/auto_ap/graphql/checks.clj

@@ -95,7 +95,7 @@
          [[:cell {:size 9 :leading 11.5} "\n\n\n\n\nMEMO"]
           [:cell {:colspan 5 :leading 11.5} (split-memo memo) 
            [:line {:line-width 0.15 :color [50 50 50]}]]
-          [:cell {:colspan 6  }  (if (:signature-file client)
+          [:cell {:colspan 6  }  (if (:client/signature-file client)
                                                         [:image { :top-margin 90 :xscale 0.30 :yscale 0.30 :align :center}
 
                                                          (:client/signature-file client)]

src/clj/auto_ap/graphql/invoices.clj

@@ -27,7 +27,20 @@
   (map
    ->graphql
    (d-invoices/get-graphql (assoc (<-graphql args)
-                                  :limit Integer/MAX_VALUE))))
+                                  :count Integer/MAX_VALUE))))
+
+(defn reject-invoices [context {:keys [invoices] :as in} value]
+  (assert-admin (:id context))
+  
+  (let [transactions (map (fn [i] [:db/retractEntity i ]) invoices)
+        transaction-result @(d/transact (d/connect uri) transactions)]
+    invoices))
+
+(defn approve-invoices [context {:keys [invoices] :as in} value]
+  (assert-admin (:id context))
+  (let [transactions (map (fn [i] {:db/id i :invoice/import-status :import-status/imported}) invoices)
+        transaction-result @(d/transact (d/connect uri) transactions)]
+    invoices))
 
 (defn add-invoice [context {{:keys [total invoice_number location client_id vendor_id vendor_name date] :as in} :invoice} value]
   (when (seq (d-invoices/find-conflicting {:invoice/invoice-number invoice_number
@@ -44,6 +57,7 @@
                       :invoice/invoice-number invoice_number
                       :invoice/client client_id
                       :invoice/vendor vendor_id
+                      :invoice/import-status :import-status/imported
                       :invoice/total total
                       :invoice/outstanding-balance total
                       :invoice/status :invoice-status/unpaid
@@ -82,12 +96,15 @@
 
 (defn void-invoice [context {id :invoice_id} value]
  (let [invoice (d-invoices/get-by-id id)
+       _ (println invoice)
   _ (assert-can-see-client (:id context) (:db/id (:invoice/client invoice)))
   updated-invoice (d-invoices/update {:db/id id
     :invoice/total 0.0
     :invoice/outstanding-balance 0.0
-    :invoice/status :invoice-status/voided})]
-    ;; TODO void out all expense accounts
+                                      :invoice/status :invoice-status/voided
+                                      :invoice/expense-accounts (map (fn [ea] {:db/id (:db/id ea)
+                                                                               :invoice-expense-account/amount 0.0})
+                                                                     (:invoice/expense-accounts invoice))})]
 
   (-> updated-invoice
    (->graphql))))