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

Allows you to filter down to ccp-processor

Browse Source
This commit is contained in:
Bryce Covert
2021-06-18 07:09:48 -07:00
parent 7c98fe7d51
commit f40d1f4fb8
6 changed files with 150 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cljs/auto_ap/views/pages/pos/sales_orders.cljs
View File

@@ -25,6 +25,7 @@
:total-gte (:amount-gte (:total-range params))
:total-lte (:amount-lte (:total-range params))
:date-range (:date-range params)
: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]]
@@ -32,7 +33,9 @@
[:client [:name :id]]]]
:total
:start
:end]]]}
:end
:sales_order_total
:sales_order_tax]]]}
:on-success (fn [result]
(let [result (set/rename-keys (:sales-order-page result)
{:sales-orders :data})]
@@ -67,7 +70,6 @@
:reagent-render
(fn []
(let [{form-active? :active?} @(re-frame/subscribe [::forms/form ::form/form])]
(println form-active?)
[side-bar-layout {:side-bar [side-bar/side-bar {:data-page ::page}]
:main [content]
:right-side-bar [appearing-side-bar {:visible? form-active?}

25
src/cljs/auto_ap/views/pages/pos/side_bar.cljs
View File

@@ -1,17 +1,15 @@
(ns auto-ap.views.pages.pos.side-bar
(:require [auto-ap.routes :as routes]
[auto-ap.subs :as subs]
[auto-ap.views.utils :refer [active-when dispatch-value-change]]
[auto-ap.views.utils :refer [active-when dispatch-event]]
[auto-ap.views.components.date-range-filter :refer [date-range-filter]]
[auto-ap.views.components.number-filter :refer [number-filter]]
[auto-ap.views.components.bank-account-filter :refer [bank-account-filter]]
[bidi.bidi :as bidi]
[re-frame.core :as re-frame]
[auto-ap.views.pages.data-page :as data-page]))
(defn side-bar [{:keys [data-page]}]
(let [ap @(re-frame/subscribe [::subs/active-page])
user @(re-frame/subscribe [::subs/user])]
(let [ap @(re-frame/subscribe [::subs/active-page])]
[:div
[:div [:p.menu-label "Type"]
[:ul.menu-list
@@ -37,4 +35,21 @@
[:div
[number-filter
{:on-change-event [::data-page/filter-changed data-page :total-range]
:value @(re-frame/subscribe [::data-page/filter data-page :total-range])}]]]]))
:value @(re-frame/subscribe [::data-page/filter data-page :total-range])}]]
(when (= :sales-orders ap)
[:<>
[:p.menu-label "Processor"]
[:div
[:nav.panel
[:a.panel-block {:on-click (dispatch-event [::data-page/filter-changed data-page :processor "doordash"])}
[:span.panel-icon [:img.level-item {:src "/img/doordash.png"}]]
"Doordash"]
[:a.panel-block {:on-click (dispatch-event [::data-page/filter-changed data-page :processor "uber-eats"])}
[:span.panel-icon [:img.level-item {:src "/img/ubereats.png" }]]
"Uber Eats"]
[:a.panel-block {:on-click (dispatch-event [::data-page/filter-changed data-page :processor "grubhub"])}
[:span.panel-icon [:img.level-item {:src "/img/grubhub.png"}]]
"Grubhub"]]]])]]))

29
src/cljs/auto_ap/views/pages/pos/table.cljs
View File

@@ -13,10 +13,10 @@
[grid/row {:class (:class sales-order) :id id}
(when-not selected-client
[grid/cell {} (:name client)])
[grid/cell {} (date->str date) ]
[grid/cell {:class "has-text-right"} (nf total )]
[grid/cell {:class "has-text-right"} (nf tax )]
[grid/cell {:class "has-text-right"} (nf tip )]
[grid/cell {} (date->str date)]
[grid/cell {:class "has-text-right"} (nf total)]
[grid/cell {:class "has-text-right"} (nf tax)]
[grid/cell {:class "has-text-right"} (nf tip)]
[grid/cell {}
[:div.level
[:div.level-left
@@ -43,22 +43,27 @@
"SQUARE_GIFT_CARD"
[:span.icon.level-item {:style {:font-size "24px"}} [:span {:class "icon-gift-box" :style {:font-weight "400"}}]]
[:span.level-item "Other (" (:type-name charge) ")"]
))
{:key (:id charge)}))]]
[:span.level-item "Other (" (:type-name charge) ")"]))
{:key (:id charge)}))]]]
]
[grid/cell {} (str/join ", " (map :item-name line-items))]
[grid/button-cell {}
[:div.buttons
[buttons/fa-icon {:event [::form/editing sales-order] :icon "fa-pencil"}]]]]))
[grid/button-cell {}
[:div.buttons
[buttons/fa-icon {:event [::form/editing sales-order] :icon "fa-pencil"}]]]]))
(defn table [{:keys [data-page]}]
(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
:column-count (if selected-client 7 8)}
[grid/controls data]
[grid/controls data
[:div.level-item
[:div.tag "Total: " (nf (:sales-order-total data))]
]
[:div.level-item
[:div.tag " Tax: " (nf (:sales-order-tax data))]]]
[grid/table {:fullwidth true}
[grid/header {}
[grid/row {}