diff --git a/resources/schema.edn b/resources/schema.edn
index 6164a195..660cef0a 100644
--- a/resources/schema.edn
+++ b/resources/schema.edn
@@ -1898,6 +1898,10 @@
   :db/cardinality :db.cardinality/one
   :db/index       true}
 
+{:db/ident       :sales-summary/discount
+  :db/noHistory   true,
+  :db/valueType   :db.type/double
+  :db/cardinality :db.cardinality/one}
  {:db/ident       :sales-summary/total-card-payments
   :db/noHistory   true,
   :db/valueType   :db.type/double
@@ -1906,11 +1910,11 @@
   :db/noHistory   true,
   :db/valueType   :db.type/double
   :db/cardinality :db.cardinality/one}
-{:db/ident       :sales-summary/total-returns
+ {:db/ident       :sales-summary/total-returns
   :db/noHistory   true,
   :db/valueType   :db.type/double
   :db/cardinality :db.cardinality/one}
-{:db/ident       :sales-summary/total-tip
+ {:db/ident       :sales-summary/total-tip
   :db/noHistory   true,
   :db/valueType   :db.type/double
   :db/cardinality :db.cardinality/one}
diff --git a/src/clj/auto_ap/jobs/sales_summaries.clj b/src/clj/auto_ap/jobs/sales_summaries.clj
index b501f21d..0277e5ac 100644
--- a/src/clj/auto_ap/jobs/sales_summaries.clj
+++ b/src/clj/auto_ap/jobs/sales_summaries.clj
@@ -46,8 +46,7 @@
 (defn sales-summaries []
   (doseq [[c client-code] (dc/q '[:find ?c ?client-code
                                   :in $
-                                  :where [?c :client/code ?client-code]
-                                  [(= ?client-code "NGCL")]]
+                                  :where [?c :client/code ?client-code] ]
                                 (dc/db conn))
           {:sales-summary/keys [date] :db/keys [id]}  (dirty-sales-summaries c)]
     (mu/with-context {:client-code client-code
@@ -78,18 +77,18 @@
                                                                (dc/db conn)
                                                                [[c] date date]))
                                                  0.0)
-:sales-summary/total-returns  (or (let [[t f] (first (dc/q '[:find  (sum ?t) (sum ?f)
-                                                             :with ?e
-                                                             :in $ [?clients ?start-date ?end-date]
-                                                             :where  [(iol-ion.query/scan-sales-refunds $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]
-                                                             [?e :sales-refund/total ?t]
-                                                             [?e :sales-refund/fee ?f]]
-                                                           (dc/db conn)
-                                                           [[c] date date]))]
-                                    (when (and t f)
-                                      (- t f)))
+                    :sales-summary/total-returns  (or (ffirst (dc/q '[:find  (sum ?r)
+                                                                      :with ?e
+                                                                      :in $ [?clients ?start-date ?end-date]
+                                                                      :where  [(iol-ion.query/scan-sales-orders $ ?clients ?start-date ?end-date) [[?e _ ?sort-default] ...]]
+                                                                      [?e :sales-order/returns ?r]
+                                                                      
+                                                                      #_[?e :sales-order/charges ?c]
+                                                                      #_[?c :charge/tax ?tax]]
+                                      (dc/db conn)
+                                      [[c] date date]))
+                        0.0)
 
-                            0.0)
                     :sales-summary/sales-items
 
 
@@ -230,7 +229,7 @@
 
   (apply mark-dirty [:client/code "NGCL"] (last-n-days 12))
   
-  #_(mark-all-dirty 700)
+  (mark-all-dirty 30)
 
   (sales-summaries)
 
diff --git a/src/clj/auto_ap/ssr/admin/sales_summaries.clj b/src/clj/auto_ap/ssr/admin/sales_summaries.clj
index cf808d66..ad99ae4d 100644
--- a/src/clj/auto_ap/ssr/admin/sales_summaries.clj
+++ b/src/clj/auto_ap/ssr/admin/sales_summaries.clj
@@ -154,10 +154,10 @@
                                                  [:li n ": " (format "$%,.2f" (- (+ (reduce + 0.0 (map :sales-summary-item/total x))
                                                                                     (reduce + 0.0 (map :sales-summary-item/discount x)))
                                                                                  (reduce + 0.0 (map :sales-summary-item/tax x))))])
-                                               [:li "Sales subtotal: " (- (+ (reduce + 0.0 (map :sales-summary-item/total (:sales-summary/sales-items ss)))
-                                                                             (reduce + 0.0 (map :sales-summary-item/discount (:sales-summary/sales-items ss))))
+                                               [:li "Sales subtotal: " (format "$%,.2f" (- (+ (reduce + 0.0 (map :sales-summary-item/total (:sales-summary/sales-items ss)))
+                                                                                     (reduce + 0.0 (map :sales-summary-item/discount (:sales-summary/sales-items ss))))
 
-                                                                          (reduce + 0.0 (map :sales-summary-item/tax (:sales-summary/sales-items ss))))]
+                                                                                  (reduce + 0.0 (map :sales-summary-item/tax (:sales-summary/sales-items ss)))))]
                                                [:li "Tax: " (format "$%,.2f" (:sales-summary/total-tax ss))]
                                                [:li "Tips: " (format "$%,.2f" (:sales-summary/total-tip ss))]
                                                [:li (com/pill {:color (if (dollars= total-credits total-debits)