merged.

src/clj/auto_ap/routes/ezcater_xls.clj

@@ -85,7 +85,6 @@
                               :tip         (fmt-amount tip)}]
             :total          (fmt-amount (+ food-total
                                            tax
-                                           tip
                                            (or adjustments 0.0)))
             :discount       (fmt-amount (or adjustments 0.0))
             :service-charge (fmt-amount (+ fee commission))

src/clj/auto_ap/solr.clj

@@ -136,7 +136,7 @@
   (index-documents-raw [this index xs]
     (client/post
       (str (assoc (url/url solr-uri "solr" index "update")
-                  :query {"commitWithin" 60000}))
+                  :query {"commitWithin" 5000}))
       
       {:headers            {"Content-Type" "application/json"}
        :socket-timeout     30000
@@ -147,7 +147,7 @@
   (index-documents [this index xs]
     (client/post
       (str (assoc (url/url solr-uri "solr" index "update")
-                   :query {"commitWithin" 60000}))
+                   :query {"commitWithin" 5000}))
       {:headers            {"Content-Type" "application/json"}
        :socket-timeout     30000
        :connection-timeout 30000