Makes sales orders link to their deposits
This commit is contained in:
@@ -28,7 +28,7 @@
|
||||
:processor (some-> (:processor params) keyword)
|
||||
:client-id (:id @(re-frame/subscribe [::subs/client]))}
|
||||
[[:sales-orders [:id :total :tax :tip :discount :service-charge :returns :date
|
||||
[:charges [:type-name :total :processor :id]]
|
||||
[:charges [:type-name :total :processor :id [:expected-deposit [:id]] ]]
|
||||
[:line-items [:item-name :total :category]]
|
||||
[:client [:name :id]]]]
|
||||
:total
|
||||
|
||||
@@ -1,15 +1,24 @@
|
||||
(ns auto-ap.views.pages.pos.table
|
||||
(:require [auto-ap.subs :as subs]
|
||||
[auto-ap.views.components.buttons :as buttons] [auto-ap.views.components.grid :as grid]
|
||||
[auto-ap.routes :as routes]
|
||||
[auto-ap.events :as events]
|
||||
[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]]
|
||||
[bidi.bidi :as bidi]
|
||||
[cemerick.url :as url]
|
||||
[auto-ap.views.components.dropdown
|
||||
:refer
|
||||
[drop-down drop-down-contents]]
|
||||
[auto-ap.views.utils :refer [date->str nf dispatch-event-with-propagation]]
|
||||
[clojure.string :as str]
|
||||
[re-frame.core :as re-frame]))
|
||||
|
||||
(defn row [{sales-order :sales-order
|
||||
selected-client :selected-client}]
|
||||
(let [{:keys [client date total tax tip charges line-items id]} sales-order]
|
||||
(let [{:keys [client date total tax tip charges line-items id]} sales-order
|
||||
expected-deposits (->> charges (filter :expected-deposit) (map :expected-deposit))]
|
||||
[grid/row {:class (:class sales-order) :id id}
|
||||
(when-not selected-client
|
||||
[grid/cell {} (:name client)])
|
||||
@@ -51,6 +60,32 @@
|
||||
[grid/cell {} (str/join ", " (map :item-name line-items))]
|
||||
[grid/button-cell {}
|
||||
[:div.buttons
|
||||
(when (seq expected-deposits)
|
||||
[:<>
|
||||
[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 (clojure.core/count expected-deposits))
|
||||
:icon "fa-paperclip"}]}
|
||||
[drop-down-contents
|
||||
[:div.dropdown-item
|
||||
[:table.table.grid.compact
|
||||
[:tbody
|
||||
(for [ed expected-deposits]
|
||||
^{:key (:id ed)}
|
||||
[:tr
|
||||
[:td
|
||||
"Expected Deposit " (:id ed)
|
||||
]
|
||||
[:td
|
||||
[buttons/fa-icon {:icon "fa-external-link"
|
||||
:href (str (bidi/path-for routes/routes :expected-deposits )
|
||||
"?"
|
||||
(url/map->query {:exact-match-id (:id ed)}))}]]])]]]]]
|
||||
[:span {:style {:margin-left "1em"}}]])
|
||||
|
||||
|
||||
[buttons/fa-icon {:event [::form/editing sales-order] :icon "fa-pencil"}]]]]))
|
||||
|
||||
(defn table [{:keys [data-page]}]
|
||||
@@ -75,7 +110,7 @@
|
||||
[grid/sortable-header-cell {:sort-key "tip" :sort-name "Tip" :class "has-text-right" :style {:width "7em"}} "Tip"]
|
||||
[grid/header-cell {} "Payment Methods"]
|
||||
[grid/header-cell {} "Line Items"]
|
||||
[grid/header-cell {:style {:width "4em"}}]]]
|
||||
[grid/header-cell {:style {:width "8em"}}]]]
|
||||
[grid/body
|
||||
(for [sales-order (:data data)]
|
||||
^{:key (:id sales-order)}
|
||||
|
||||
Reference in New Issue
Block a user