From e23b8d99477c83ff88bcdaea5d48cdd294597374 Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@live.com>
Date: Wed, 26 Aug 2020 13:06:16 +0200
Subject: [PATCH] feat: Link sale invoice to payment receive entries.

---
 server/src/models/PaymentReceiveEntry.js      | 10 ++++++++++
 server/src/services/Sales/PaymentsReceives.ts |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/server/src/models/PaymentReceiveEntry.js b/server/src/models/PaymentReceiveEntry.js
index bc997b4be..8e9d311b6 100644
--- a/server/src/models/PaymentReceiveEntry.js
+++ b/server/src/models/PaymentReceiveEntry.js
@@ -30,6 +30,7 @@ export default class PaymentReceiveEntry extends mixin(TenantModel, [CachableMod
    */
   static get relationMappings() {
     const PaymentReceive = require('@/models/PaymentReceive');
+    const SaleInvoice = require('@/models/SaleInvoice');
 
     return {
       entries: {
@@ -40,6 +41,15 @@ export default class PaymentReceiveEntry extends mixin(TenantModel, [CachableMod
           to: 'payment_receives.id',
         },
       },
+
+      invoice: {
+        relation: Model.BelongsToOneRelation,
+        modelClass: this.relationBindKnex(SaleInvoice.default),
+        join: {
+          from: 'payment_receives_entries.invoiceId',
+          to: 'sales_invoices.id',
+        }
+      }
     };
   }
 }
diff --git a/server/src/services/Sales/PaymentsReceives.ts b/server/src/services/Sales/PaymentsReceives.ts
index 5b26bcfae..bfa6b1948 100644
--- a/server/src/services/Sales/PaymentsReceives.ts
+++ b/server/src/services/Sales/PaymentsReceives.ts
@@ -217,7 +217,7 @@ export default class PaymentReceiveService {
     const paymentReceive = await PaymentReceive.tenant()
       .query()
       .where('id', paymentReceiveId)
-      .withGraphFetched('entries')
+      .withGraphFetched('entries.invoice')
       .first();
     return paymentReceive;
   }