From bc5a8a91939e3b992a20ff0bb61069ba505bebd4 Mon Sep 17 00:00:00 2001
From: Steve Ng <hengnam.ng@yycasia.com>
Date: Tue, 24 Oct 2023 21:21:51 +0800
Subject: [PATCH] fix bug in function import invoices

---
 .../Imports/ImportStatementInvoiceController.php | 10 ++--------
 app/Models/StatementTransactionOwner.php         |  1 +
 app/Models/Transaction.php                       | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
index 7ea3454e..73e58e87 100644
--- a/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
+++ b/app/Http/Controllers/Imports/ImportStatementInvoiceController.php
@@ -137,16 +137,10 @@ class ImportStatementInvoiceController
 
     private function mappingExchange(Array $row) {
         $date = $row['date'];
-        $transactions = Transaction::where('original_amount', $row['net_total'])->whereRaw("DATE(created_at) = '$date'")
-        ->whereHas('receiverCompany', function($q) use($row) {
-            $q->where('debtor',$row['debtor_code']);
-        })->get();
+        $transactions = Transaction::getReceiverWithJoinStatementTransactionAndOwner($row)->select('transactions.*')->where('statement_transactions.amount', $row['net_total'])->whereRaw("DATE(posting_date) = '$date'")->get();
 
         if ($transactions && $transactions->count() == 0) {
-            $transactions = Transaction::where(DB::raw('FLOOR(original_amount)'), floor($row['net_total']))->whereRaw("DATE(created_at) = '$date'")
-            ->whereHas('receiverCompany', function($q) use($row) {
-                $q->where('debtor',$row['debtor_code']);
-            })->get();
+            $transactions = Transaction::getReceiverWithJoinStatementTransactionAndOwner($row)->select('transactions.*')->where(DB::raw('FLOOR(statement_transactions.amount)'), floor($row['net_total']))->whereRaw("DATE(posting_date) = '$date'")->get();
         }
 
         if ($transactions && $transactions->count() == 1) {
diff --git a/app/Models/StatementTransactionOwner.php b/app/Models/StatementTransactionOwner.php
index fb13f4b4..bd96efff 100644
--- a/app/Models/StatementTransactionOwner.php
+++ b/app/Models/StatementTransactionOwner.php
@@ -5,6 +5,7 @@ namespace App\Models;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 class StatementTransactionOwner extends Model
 {
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index 631a5fa5..185fdb36 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -221,6 +221,22 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
         return $query->whereIn('status', [ApprovalStatus::APPROVED]);
     }
 
+    /**
+     * @param Builder $query
+     * @return Builder
+     */
+    public function scopeGetReceiverWithJoinStatementTransactionAndOwner(Builder $query, Array $row) {
+        $query->join('companies',function($q) use ($row) {
+            $q->on('companies.id','=','transactions.receiver');
+            $q->where('debtor',$row['debtor_code']);
+        })
+        ->join('statement_transaction_owners', function ($q) {
+            $q->on('statement_transaction_owners.owner_id','=','transactions.id');
+            $q->where('statement_transaction_owners.owner_type','=',Transaction::class);
+        })
+        ->join('statement_transactions','statement_transactions.id','=','statement_transaction_owners.statement_transaction_id');
+    }
+
     /**
      * @return MorphMany
      */