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

makes sales queries go for 120 days, fixes Youngs Market

Browse Source
This commit is contained in:
Bryce
2023-10-20 22:15:06 -07:00
parent 6059e8a4ca
commit e66d93989c
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/clj/auto_ap/graphql/clients.clj
View File

@@ -246,7 +246,7 @@
:with ?s :with ?s
:in $ :in $
:where :where
[(ground (iol-ion.query/recent-date)) ?min-d] [(ground (iol-ion.query/recent-date 120)) ?min-d]
[(ground #inst \"2040-01-01\") ?max-d] [(ground #inst \"2040-01-01\") ?max-d]
[?c :client/code \"%s\"] [?c :client/code \"%s\"]
[(iol-ion.query/sales-orders-in-range $ ?c ?min-d ?max-d) [?s ...]] [(iol-ion.query/sales-orders-in-range $ ?c ?min-d ?max-d) [?s ...]]
@@ -265,7 +265,7 @@
:with ?s ?li :with ?s ?li
:in $ :in $
:where :where
[(ground (iol-ion.query/recent-date)) ?min-d] [(ground (iol-ion.query/recent-date 120)) ?min-d]
[(ground #inst \"2040-01-01\") ?max-d] [(ground #inst \"2040-01-01\") ?max-d]
[?c :client/code \"%s\"] [?c :client/code \"%s\"]
[(iol-ion.query/sales-orders-in-range $ ?c ?min-d ?max-d) [?s ...]] [(iol-ion.query/sales-orders-in-range $ ?c ?min-d ?max-d) [?s ...]]
@@ -282,7 +282,7 @@
"[:find ?d4 ?t ?f "[:find ?d4 ?t ?f
:in $ :in $
:where :where
[(ground (iol-ion.query/recent-date)) ?min-d] [(ground (iol-ion.query/recent-date 120)) ?min-d]
[?c :client/code \"%s\"] [?c :client/code \"%s\"]
[?s :expected-deposit/client ?c] [?s :expected-deposit/client ?c]
[?s :expected-deposit/sales-date ?date] [?s :expected-deposit/sales-date ?date]
@@ -297,7 +297,7 @@
:with ?charge :with ?charge
:in $ :in $
:where :where
[(ground (iol-ion.query/recent-date)) ?min-d] [(ground (iol-ion.query/recent-date 120)) ?min-d]
[?c :client/code \"%s\"] [?c :client/code \"%s\"]
[?s :sales-order/client ?c] [?s :sales-order/client ?c]
[?s :sales-order/date ?date] [?s :sales-order/date ?date]
@@ -317,7 +317,7 @@
:with ?charge :with ?charge
:in $ :in $
:where :where
[(ground (iol-ion.query/recent-date)) ?min-d] [(ground (iol-ion.query/recent-date 120)) ?min-d]
[?charge :charge/date ?date] [?charge :charge/date ?date]
[(>= ?date ?min-d)] [(>= ?date ?min-d)]
[?charge :charge/client ?c] [?charge :charge/client ?c]
@@ -344,7 +344,7 @@
:with ?r :with ?r
:in $ :in $
:where :where
[(ground (iol-ion.query/recent-date)) ?min-d] [(ground (iol-ion.query/recent-date 120)) ?min-d]
[?r :sales-refund/client [:client/code \"%s\"]] [?r :sales-refund/client [:client/code \"%s\"]]
[?r :sales-refund/date ?date] [?r :sales-refund/date ?date]
[(>= ?date ?min-d)] [(>= ?date ?min-d)]
@@ -360,7 +360,7 @@
:in $ :in $
:where :where
[?cds :cash-drawer-shift/date ?date] [?cds :cash-drawer-shift/date ?date]
[(ground (iol-ion.query/recent-date)) ?min-d] [(ground (iol-ion.query/recent-date 120)) ?min-d]
[(>= ?date ?min-d)] [(>= ?date ?min-d)]
[?cds :cash-drawer-shift/client [:client/code \"%s\"]] [?cds :cash-drawer-shift/client [:client/code \"%s\"]]
[?cds :cash-drawer-shift/paid-in ?paid-in] [?cds :cash-drawer-shift/paid-in ?paid-in]

3
src/clj/auto_ap/parse/templates.clj
View File

@@ -273,7 +273,8 @@
:account-number #"Store Number:\s+(\d+)" :account-number #"Store Number:\s+(\d+)"
:invoice-number #"(?:INVOICE|CREDIT) DATE\n(?:.*?)\s{2,}(\d+?)\s+\S+\n" :invoice-number #"(?:INVOICE|CREDIT) DATE\n(?:.*?)\s{2,}(\d+?)\s+\S+\n"
:total #"Net Amount(?:.*\n){4}(?:.*?)([\-]?[0-9\.]+)\n"} :total #"Net Amount(?:.*\n){4}(?:.*?)([\-]?[0-9\.]+)\n"}
:parser {:date [:clj-time "dd-MMM-yy"] :parser {:date [:clj-time ["MM/dd/yy"
"dd-MMM-yy"]]
:total [:trim-commas-and-negate nil]}} :total [:trim-commas-and-negate nil]}}
;; WINE WAREHOUSE ;; WINE WAREHOUSE

4
start-solr.sh
View File

@@ -1,3 +1,5 @@
#!/bin/bash #!/bin/bash
sudo docker run --rm -ti -v ~/dev/integreat/data/solr:/var/solr --network=bridge -p 8983:8983 solr #sudo docker run --rm -ti -v ~/dev/integreat/data/solr:/var/solr --network=bridge -p 8983:8983 solr
sudo podman container run --user 1000 --privileged --volume /home/notid/dev/integreat/data/solr:/var/solr -p 8983:8983 solr