Correct duplicate Xero orders

src/Order.hs

@@ -185,10 +185,14 @@ upsertOrder :: ZGoOrder -> Action IO ()
 upsertOrder o = do
   let order = val $ updateOrderTotals o
   case order of
-    Doc d ->
+    Doc d -> upsert (select ["_id" =: q_id o] "orders") d
-      if isJust (q_id o)
+    _ -> return ()
-        then upsert (select ["_id" =: q_id o] "orders") d
+
-        else insert_ "orders" d
+upsertXeroOrder :: ZGoOrder -> Action IO ()
+upsertXeroOrder o = do
+  let order = val $ updateOrderTotals o
+  case order of
+    Doc d -> upsert (select ["externalInvoice" =: qexternalInvoice o, "shortCode" =: qshortCode o] "orders") d
     _ -> return ()
 
 -- | Function to update order totals from items

src/ZGoBackend.hs

@@ -752,7 +752,7 @@ routes pipe config = do
   post "/api/orderx" $ do
     newOrder <- jsonData
     let q = payload (newOrder :: Payload ZGoOrder)
-    _ <- liftIO $ run (upsertOrder q)
+    _ <- liftIO $ run (upsertXeroOrder q)
     myOrder <-
       liftIO $
       run (findXeroOrder (qaddress q) (qexternalInvoice q) (qshortCode q))