diff --git a/src/Controller/CustomerAppAPI/InvoiceController.php b/src/Controller/CustomerAppAPI/InvoiceController.php
index 14f1a87e..2e9779eb 100644
--- a/src/Controller/CustomerAppAPI/InvoiceController.php
+++ b/src/Controller/CustomerAppAPI/InvoiceController.php
@@ -41,7 +41,16 @@ class InvoiceController extends ApiController
         }
 
         // get customer location from customer_metadata using customer id
-        $coordinates = $this->getCustomerMetadata($cust);
+        $lng = $req->request->get('longitude');
+        $lat = $req->request->get('latitude');
+
+        if ((empty($lng)) || (empty($lat)))
+        {
+            // use customer metadata location as basis
+            $coordinates = $this->getCustomerMetadata($cust);
+        }
+        else
+            $coordinates = new Point($lng, $lat);
 
         // make invoice criteria
         $icrit = new InvoiceCriteria();