Improves IOL. Adds saved queries. Adds expected deposits in app.

src/cljs/auto_ap/views/pages/pos/expected_deposits.cljs

@@ -0,0 +1,72 @@
+(ns auto-ap.views.pages.pos.expected-deposits
+  (:require [auto-ap.forms :as forms]
+            [auto-ap.subs :as subs]
+            [auto-ap.views.components.layouts :refer [side-bar-layout appearing-side-bar]]
+            [auto-ap.views.pages.data-page :as data-page]
+            [auto-ap.views.pages.pos.form :as form]
+            [auto-ap.views.pages.pos.side-bar :as side-bar]
+            [auto-ap.views.pages.pos.expected-deposits.table :as table]
+            [auto-ap.views.utils :refer [with-user]]
+            [clojure.set :as set]
+            [re-frame.core :as re-frame]
+            [reagent.core :as reagent]
+            [vimsical.re-frame.fx.track :as track]))
+
+(re-frame/reg-event-fx
+ ::params-change
+ [with-user]
+ (fn [{:keys [user db ]}[_ params]]
+   {:graphql {:token user
+              :owns-state {:single [::data-page/page ::page]}
+              :query-obj {:venia/queries [[:expected_deposit_page
+                                           {:start (:start params 0)
+                                            :sort (:sort params)
+                                            :per-page (:per-page params)
+                                            :total-gte (:amount-gte (:total-range params))
+                                            :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
+                                                            [:client [:name :id]]]]
+                                            :total
+                                            :start
+                                            :end]]]} 
+              :on-success (fn [result]
+                            (let [result (set/rename-keys (:expected-deposit-page result)
+                                                          {:expected-deposits :data})]
+                              [::data-page/received ::page result]))}}))
+
+
+(re-frame/reg-event-fx
+ ::unmounted
+ (fn [{:keys [db]} _]
+   {:dispatch [::data-page/dispose ::page]
+    ::track/dispose {:id ::params}}))
+
+(re-frame/reg-event-fx
+ ::mounted
+ (fn [{:keys [db]} _]
+   {::track/register {:id ::params
+                      :subscription [::data-page/params ::page]
+                      :event-fn (fn [params]
+                                  [::params-change params])}}))
+
+(defn content []
+  [:div
+   [:h1.title "Expected Deposits"]
+   [table/table {:id :expected-deposits
+                 :data-page ::page}]])
+
+(defn expected-deposits-page []
+  (reagent/create-class
+   {:display-name "expected-deposits-page"
+    :component-will-unmount #(re-frame/dispatch-sync [::unmounted])
+    :component-did-mount #(re-frame/dispatch [::mounted])
+    :reagent-render
+    (fn []
+      (let [{form-active? :active?} @(re-frame/subscribe [::forms/form ::form/form])]
+        [side-bar-layout {:side-bar [side-bar/side-bar {:data-page ::page}]
+                          :main [content]
+                          :right-side-bar [appearing-side-bar {:visible? form-active?}
+                                           [form/form {}]]}]))}))
+

src/cljs/auto_ap/views/pages/pos/expected_deposits/table.cljs

@@ -0,0 +1,47 @@
+
+(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]))
+
+(defn row [{sales-order :sales-order
+            selected-client :selected-client}]
+  (let [{:keys [client 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 {:class "has-text-right"} (nf total )]
+     [grid/cell {:class "has-text-right"} (nf fee )]
+     
+[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/table {:fullwidth true}
+      [grid/header {}
+       [grid/row {}
+        (when-not selected-client
+          [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 "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"]
+        
+        [grid/header-cell {:style {:width "4em"}}]]]
+      [grid/body
+       (for [sales-order (:data data)]
+         ^{:key (:id sales-order)}
+         [row {:sales-order sales-order
+               :selected-client selected-client}])]]]))

src/cljs/auto_ap/views/pages/pos/form.cljs

@@ -0,0 +1,96 @@
+(ns auto-ap.views.pages.pos.form
+  (:require 
+            [auto-ap.events :as events]
+            [auto-ap.forms :as forms]
+            [auto-ap.subs :as subs]
+            [auto-ap.utils :refer [dollars=]]
+            [auto-ap.views.components.dropdown :refer [drop-down]]
+            [auto-ap.views.components.expense-accounts-field :as expense-accounts-field :refer [expense-accounts-field recalculate-amounts]]
+            [auto-ap.views.components.layouts :as layouts]
+            [auto-ap.views.components.money-field :refer [money-field]]
+            [auto-ap.views.components.typeahead :refer [typeahead-v3]]
+            [auto-ap.status :as status]
+            [auto-ap.views.utils :refer [date->str date-picker dispatch-event standard with-user]]
+            [cljs-time.core :as c]
+            [clojure.spec.alpha :as s]
+            [clojure.string :as str]
+            [re-frame.core :as re-frame]))
+(re-frame/reg-sub
+ ::can-submit
+ :<- [::forms/form ::form]
+ (fn [{:keys [data status]} _]
+   false))
+
+(re-frame/reg-event-db
+ ::editing
+ (fn [db [_ which]]
+   (let [which (update which :date #(date->str % standard))]
+     (forms/start-form db ::form which))))
+
+(def sales-order-form (forms/vertical-form {:can-submit [::can-submit]
+                                        :change-event [::forms/changed]
+                                        :submit-event [::saving ]
+                                        :id ::form}))
+
+(defn form [{:keys [can-change-amount?] :as params}]
+  [layouts/side-bar {:on-close   (dispatch-event [::forms/form-closing ::form ])}
+   (let [{:keys [data active? error id]} @(re-frame/subscribe [::forms/form ::form])
+         {:keys [form-inline field raw-field error-notification submit-button ]} sales-order-form]
+     (with-meta 
+       (form-inline (assoc params :title "Sales order") 
+                    [:<>
+                     (when-not @(re-frame/subscribe [::subs/client])
+                       (field [:span "Client"
+                               [:span.has-text-danger " *"]]
+                              [typeahead-v3 {:entities @(re-frame/subscribe [::subs/clients])
+                                             :entity->text :name
+                                             :type "typeahead-v3"
+                                             :field [:client]
+                                             :disabled true}]))
+
+
+                     (field "Date"
+                            [date-picker {:class-name "input"
+                                          :class "input"
+                                          :type "date"
+                                          :disabled true
+                                          :field [:date]}])
+                     (field "Total"
+                            [money-field {:type "money"
+                                          :field [:total]
+                                          :disabled true}])
+                     (field "Tax"
+                            [money-field {:type "money"
+                                          :field [:tax]
+                                          :disabled true}])
+                     (field "Discount"
+                            [money-field {:type "money"
+                                          :field [:discount]
+                                          :disabled true}])
+
+                     (field "Returns"
+                            [money-field {:type "money"
+                                          :field [:returns]
+                                          :disabled true}])
+
+                     (field "Service Charge"
+                            [money-field {:type "money"
+                                          :field [:service-charge]
+                                          :disabled true}])
+
+                     (field "Tip"
+                            [money-field {:type "money"
+                                          :field [:tip]
+                                          :disabled true}])
+
+                     [:h1.subtitle.is-4 "Charges"]
+                     [:ul 
+                      (for [charge (:charges data)]
+                        [:li (:type-name charge) ": " (:total charge)])]
+
+                     [:h1.subtitle.is-4 "Line Items"]
+                     [:ul 
+                      (for [line-item (:line-items data)]
+                        [:li (:item-name line-item) ": " (:total line-item) [:span.tag (:category line-item)]])]])
+       {:key (:id data)}))])
+

src/cljs/auto_ap/views/pages/pos/sales_orders.cljs

@@ -0,0 +1,75 @@
+(ns auto-ap.views.pages.pos.sales-orders
+  (:require [auto-ap.forms :as forms]
+            [auto-ap.subs :as subs]
+            [auto-ap.views.components.layouts :refer [side-bar-layout appearing-side-bar]]
+            [auto-ap.views.pages.data-page :as data-page]
+            [auto-ap.views.pages.pos.form :as form]
+            [auto-ap.views.pages.pos.side-bar :as side-bar]
+            [auto-ap.views.pages.pos.table :as table]
+            [auto-ap.views.utils :refer [with-user]]
+            [clojure.set :as set]
+            [re-frame.core :as re-frame]
+            [reagent.core :as reagent]
+            [vimsical.re-frame.fx.track :as track]))
+
+(re-frame/reg-event-fx
+ ::params-change
+ [with-user]
+ (fn [{:keys [user db ]}[_ params]]
+   {:graphql {:token user
+              :owns-state {:single [::data-page/page ::page]}
+              :query-obj {:venia/queries [[:sales_order_page
+                                           {:start (:start params 0)
+                                            :sort (:sort params)
+                                            :per-page (:per-page params)
+                                            :total-gte (:amount-gte (:total-range params))
+                                            :total-lte (:amount-lte (:total-range params))
+                                            :date-range (:date-range params)
+                                            :client-id (:id @(re-frame/subscribe [::subs/client]))}
+                                           [[:sales-orders [:id :total :tax :tip :discount :service-charge :returns :date
+                                                            [:charges [:type-name :total]]
+                                                            [:line-items [:item-name :total :category]]
+                                                            [:client [:name :id]]]]
+                                            :total
+                                            :start
+                                            :end]]]} 
+              :on-success (fn [result]
+                            (let [result (set/rename-keys (:sales-order-page result)
+                                                          {:sales-orders :data})]
+                              [::data-page/received ::page result]))}}))
+
+
+(re-frame/reg-event-fx
+ ::unmounted
+ (fn [{:keys [db]} _]
+   {:dispatch [::data-page/dispose ::page]
+    ::track/dispose {:id ::params}}))
+
+(re-frame/reg-event-fx
+ ::mounted
+ (fn [{:keys [db]} _]
+   {::track/register {:id ::params
+                      :subscription [::data-page/params ::page]
+                      :event-fn (fn [params]
+                                  [::params-change params])}}))
+
+(defn content []
+  [:div
+   [:h1.title "Sales Orders"]
+   [table/table {:id :sales-orders
+                 :data-page ::page}]])
+
+(defn sales-orders-page []
+  (reagent/create-class
+   {:display-name "sales-orders-page"
+    :component-will-unmount #(re-frame/dispatch-sync [::unmounted])
+    :component-did-mount #(re-frame/dispatch [::mounted])
+    :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?}
+                                           [form/form {}]]}]))}))
+

src/cljs/auto_ap/views/pages/pos/side_bar.cljs

@@ -0,0 +1,40 @@
+(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.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])]
+    [:div
+     [:div [:p.menu-label "Type"]
+      [:ul.menu-list
+       [:li.menu-item
+        [:a.item {:href (bidi/path-for routes/routes :sales-orders)
+                  :class [(active-when ap = :sales-orders)]}
+         [:span {:class "icon icon-accounting-invoice-mail" :style {:font-size "25px"}}]
+         [:span {:class "name"} "Sales Orders"]]]
+       [:li.menu-item
+        [:a.item {:href (bidi/path-for routes/routes :expected-deposits)
+                  :class [(active-when ap = :expected-deposits)]}
+         [:span {:class "icon icon-accounting-invoice-mail" :style {:font-size "25px"}}]
+         [:span {:class "name"} "Expected Deposits"]]]]]
+
+     [:div
+      [:p.menu-label "Date Range"]
+      [:div
+       [date-range-filter
+        {:on-change-event [::data-page/filter-changed data-page :date-range]
+         :value @(re-frame/subscribe [::data-page/filter data-page :date-range])}]]
+
+      [:p.menu-label "Total"]
+      [: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])}]]]]))

src/cljs/auto_ap/views/pages/pos/table.cljs

@@ -0,0 +1,48 @@
+(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.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]))
+
+(defn row [{sales-order :sales-order
+            selected-client :selected-client}]
+  (let [{:keys [client date total tax tip charges line-items id]} sales-order]
+    [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 {} (str/join ", " (map :type-name charges))]
+     [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"}]]]]))
+
+(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/table {:fullwidth true}
+      [grid/header {}
+       [grid/row {}
+        (when-not selected-client
+          [grid/sortable-header-cell {:sort-key "client" :sort-name "Client"} "Client"])
+        [grid/sortable-header-cell {:sort-key "date" :sort-name "Date" :style {:width "8em"}} "Date"]
+        [grid/sortable-header-cell {:sort-key "total" :sort-name "Total" :class "has-text-right" :style {:width "8em"}} "Total"]
+        [grid/sortable-header-cell {:sort-key "tax" :sort-name "Tax" :class "has-text-right" :style {:width "7em"}} "Tax"]
+        [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/body
+       (for [sales-order (:data data)]
+         ^{:key (:id sales-order)}
+         [row {:sales-order sales-order
+               :selected-client selected-client}])]]]))