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

makes expected deposit linking work.

Browse Source
This commit is contained in:
Bryce Covert
2022-01-13 08:08:20 -08:00
parent f27e5aacdf
commit d6211c778b
9 changed files with 181 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cljs/auto_ap/views/pages/pos/expected_deposits.cljs
View File

@@ -27,7 +27,8 @@
:total-lte (:amount-lte (:total-range params))
:date-range (:date-range params)
:client-id (:id @(re-frame/subscribe [::subs/client]))}
[[:expected-deposits [:id :total :fee :location :date
[[:expected-deposits [:id :total :fee :location :date :status
[:transaction [:id :date]]
[:client [:name :id]]]]
:total
:start

59
src/cljs/auto_ap/views/pages/pos/expected_deposits/table.cljs
View File

@@ -1,32 +1,62 @@
(ns auto-ap.views.pages.pos.expected-deposits.table
(:require [auto-ap.subs :as subs]
[auto-ap.views.components.buttons :as buttons] [auto-ap.views.components.grid :as grid]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.pages.pos.form :as form]
[auto-ap.views.utils :refer [date->str nf]]
[clojure.string :as str]
[re-frame.core :as re-frame]))
(:require
[auto-ap.events :as events]
[auto-ap.subs :as subs]
[auto-ap.views.components.buttons :as buttons]
[auto-ap.views.components.grid :as grid]
[auto-ap.views.pages.data-page :as data-page]
[auto-ap.views.pages.pos.form :as form]
[auto-ap.views.utils :refer [date->str nf dispatch-event-with-propagation pretty str->date standard]]
[auto-ap.views.components.dropdown
:refer
[drop-down drop-down-contents]]
(defn row [{sales-order :sales-order
[bidi.bidi :as bidi]
[cemerick.url :as url]
[re-frame.core :as re-frame]
[auto-ap.routes :as routes]))
(defn row [{sales-order :sales-order
selected-client :selected-client}]
(let [{:keys [client location date total fee id]} sales-order]
(let [{:keys [client transaction status location date total fee id]} sales-order]
[grid/row {:class (:class sales-order) :id id}
(when-not selected-client
[grid/cell {} (:name client)])
[grid/cell location ]
[grid/cell {} (date->str date) ]
[grid/cell {} status ]
[grid/cell {:class "has-text-right"} (nf total )]
[grid/cell {:class "has-text-right"} (nf fee )]
[grid/button-cell {}
[grid/button-cell {}
[:div.buttons
[buttons/fa-icon {:event [::form/editing sales-order] :icon "fa-pencil"}]]]]))
[buttons/fa-icon {:event [::form/editing sales-order] :icon "fa-pencil"}]]
(when transaction
[drop-down {:id [::links id]
:is-right? true
:header [buttons/fa-icon {:class "badge"
:on-click (dispatch-event-with-propagation [::events/toggle-menu [::links id]])
:data-badge (str 1)
:icon "fa-paperclip"}]}
[drop-down-contents
[:div.dropdown-item
[:table.table.grid.compact
[:tbody
(when transaction
[:tr
[:td
"Transaction"]
[:td (some-> transaction :date (date->str pretty))]
[:td
[buttons/fa-icon {:icon "fa-external-link"
:href (str (bidi/path-for routes/routes :transactions )
"?"
(url/map->query {:exact-match-id (:id transaction)}))}]]])]]]]])]]))
(defn table [{:keys [data-page]}]
(let [selected-client @(re-frame/subscribe [::subs/client])
(let [selected-client @(re-frame/subscribe [::subs/client])
{:keys [data status]} @(re-frame/subscribe [::data-page/page data-page])]
[grid/grid {:data-page data-page
[grid/grid {:data-page data-page
:column-count (if selected-client 7 8)}
[grid/controls data]
[grid/table {:fullwidth true}
@@ -36,6 +66,7 @@
[grid/sortable-header-cell {:sort-key "client" :sort-name "Client"} "Client"])
[grid/sortable-header-cell {:sort-key "location" :sort-name "Location" :style {:width "7em"}} "Location"]
[grid/sortable-header-cell {:sort-key "date" :sort-name "Date" :style {:width "8em"}} "Date"]
[grid/sortable-header-cell {:sort-key "status" :sort-name "Status" :style {:width "8em"}} "Status"]
[grid/sortable-header-cell {:sort-key "total" :sort-name "Total" :class "has-text-right" :style {:width "8em"}} "Total"]
[grid/sortable-header-cell {:sort-key "fee" :sort-name "Fee" :class "has-text-right" :style {:width "7em"}} "Fee"]