diff --git a/resources/public/css/main.css b/resources/public/css/main.css index 25346710..e354a7b5 100644 --- a/resources/public/css/main.css +++ b/resources/public/css/main.css @@ -153,7 +153,7 @@ .slide-in-right { animation: grow-width 0.5s ease both; } - .slide-in-right div { + .slide-in-right > div { width: 1000px; overflow: hidden; } diff --git a/src/cljs/auto_ap/views/components/invoice_table.cljs b/src/cljs/auto_ap/views/components/invoice_table.cljs index ee2bc102..1b1e5031 100644 --- a/src/cljs/auto_ap/views/components/invoice_table.cljs +++ b/src/cljs/auto_ap/views/components/invoice_table.cljs @@ -112,11 +112,11 @@ :asc asc} "Date"] [sorted-column {:on-sort opc - :style {:width "8em" :cursor "pointer"} + :style {:width "5em" :cursor "pointer"} :sort-key "location" :sort-by sort-by :asc asc} - "Location"] + "Loc"] [sorted-column {:on-sort opc :style {:width "8em" :cursor "pointer"} :sort-key "total" diff --git a/src/cljs/auto_ap/views/pages/invoices/form.cljs b/src/cljs/auto_ap/views/pages/invoices/form.cljs index c4912179..3dab245c 100644 --- a/src/cljs/auto_ap/views/pages/invoices/form.cljs +++ b/src/cljs/auto_ap/views/pages/invoices/form.cljs @@ -104,7 +104,7 @@ (re-frame/reg-event-db ::adding (fn [db [_ new]] - (-> db (forms/start-form ::form (assoc new :expense-accounts [{:id (str "new-" (random-uuid))}]))))) + (-> db (forms/start-form ::form (assoc new :expense-accounts [{:amount 0 :id (str "new-" (random-uuid))}]))))) (re-frame/reg-event-db ::editing diff --git a/src/cljs/auto_ap/views/pages/unpaid_invoices.cljs b/src/cljs/auto_ap/views/pages/unpaid_invoices.cljs index 538d9601..8e839623 100644 --- a/src/cljs/auto_ap/views/pages/unpaid_invoices.cljs +++ b/src/cljs/auto_ap/views/pages/unpaid_invoices.cljs @@ -128,7 +128,7 @@ (fn [db _] (let [{:keys [checked invoices]} (get-in db [::invoice-page])] (-> db - (forms/stop-form ::new-invoice) + (forms/stop-form ::form/form) (update-in [::invoice-page :print-checks-shown?] #(not %) ) (assoc-in [::advanced-print-checks] {:shown? true :bank-account-id (:id (first @(re-frame/subscribe [::subs/bank-accounts]))) @@ -146,7 +146,7 @@ {:dispatch [::events/modal-status ::handwrite-checks {:visible? true}] :db (-> db - (forms/stop-form ::new-invoice) + (forms/stop-form ::form/form) (update-in [::invoice-page :print-checks-shown?] #(not %) ) (assoc-in [::handwrite-checks] {:bank-account-id (:id (first @(re-frame/subscribe [::subs/real-bank-accounts]))) :invoices invoices } ))}))) @@ -287,13 +287,6 @@ :location (first (:locations @(re-frame/subscribe [::subs/client])))}]})) - - - - - - - (re-frame/reg-event-fx ::unvoid-invoice (fn [{:keys [db]} [_ {id :id}]]