tweaks to checkout.

docker-compose.prod.yml

@@ -26,5 +26,6 @@ services:
       LETSENCRYPT_EMAIL: le@brycecovertoperations.com
   database:
     restart: always
+    ports: []
     volumes:
       - /opt/integreat/prod/var/lib/postgresql/data:/var/lib/postgresql/data

docker-compose.staging.yml

@@ -3,8 +3,11 @@ services:
   nginx-proxy:
     restart: "always"
     ports:
-      - "8080:80"
+      - "80:80"
+      - "443:443"
       - "8443:443"
+    labels:
+      - com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy=true
     volumes:
       - /var/run/docker.sock:/tmp/docker.sock:ro
       - /opt/integreat/staging/certs/:/etc/nginx/certs:ro
@@ -22,7 +25,7 @@ services:
     environment:
       config: /usr/local/config/staging.edn
       VIRTUAL_HOST: staging.app.integreatconsult.com
-      LETSENCRYPT_HOST: staging.app.integreatconsult.com,app.integreatconsult.com
+      LETSENCRYPT_HOST: staging.app.integreatconsult.com
       LETSENCRYPT_EMAIL: le@brycecovertoperations.com
   database:
     restart: always

docker-compose.yml

@@ -27,8 +27,6 @@ services:
       VIRTUAL_HOST: local.app.integreatconsult.com
   database:
     image: postgres:9-alpine
-    ports:
-      - "5432:5432"
     environment:
       POSTGRES_USER: ap
       POSTGRES_PASSWORD: fifteen-invoices-imported!

src/clj/auto_ap/graphql.clj

@@ -46,6 +46,11 @@
               :name {:type 'String}
               :bank_code {:type 'String}
               :bank_name {:type 'String}}}
+    :address
+    {:fields {:street1 {:type 'String}
+              :city {:type 'String}
+              :state {:type 'String}
+              :zip {:type 'String}}}
     :vendor
     {:fields {:id {:type 'Int}
               :name {:type 'String}
@@ -53,6 +58,7 @@
 
               :print_as {:type 'String}
               :primary_contact {:type 'String}
+              :address {:type :address}
               :primary_email {:type 'String}
               :primary_phone {:type 'String}
 
@@ -176,10 +182,7 @@
                              :start {:type 'Int}
                              :end {:type 'Int}}}
     :check_result {:fields {:invoices {:type '(list :invoice)}
-                            :pdf_url {:type 'String}}}
+                            :pdf_url {:type 'String}}}}
-
-    
-    }
 
    
 

src/clj/auto_ap/routes/exports.clj

@@ -27,21 +27,21 @@
                   (let [query [[:all_invoices
                                 {:company-id (query-params "company")} 
                                 [:id :total :outstanding-balance :invoice-number :date
-                                 [:checks [:amount [:check [:check-number]]]]
+                                 [:checks [:amount [:check [:check-number :memo [:bank_account [:id :number :bank-name :bank-code]]]]]]
-                                 [:vendor [:name :id]]
+                                 [:vendor [:name :id :primary_contact [:address [:street1 :city :state :zip]]]]
                                  [:expense_accounts [:amount :id :expense_account_id :location
                                                      [:expense_account [:id :name [:parent [:id :name]]]]]]
                                  [:company [:name :id :locations]]]]]
                         invoices (graphql/query identity (venia/graphql-query {:venia/queries (->graphql query)}))]
                     (list (:all-invoices (:data invoices)))))
-             (GET "/checks/export" {:keys [query-params]}
+             (GET "/checks/export" {:keys [query-params identity]}
                   (assert-admin identity)
                   (let [query [[:all_checks
                                 {:company-id (query-params "company")} 
                                 [:id :check-number :amount :memo :date
                                  [:invoices [:invoice-id :amount]]
                                  [:bank-account [:number :bank-name :bank-code]]
-                                 [:vendor [:name :id :primary-contact :primary-email :primary-phone :default-expense-account]]
+                                 [:vendor [:name :id :primary-contact :primary-email :primary-phone :default-expense-account [:address [:street1 :city :state :zip]]]]
                                  [:company [:id :name]]
                                  ]]]
                         checks (graphql/query identity (venia/graphql-query {:venia/queries (->graphql query)}))]