From 774d3733c30c6404f4f200525cb1f9fb8e683297 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Fri, 23 Aug 2024 11:23:16 +0000 Subject: [PATCH] FIX_Subscription query revert --- app/Models/SubscriptionModel.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/SubscriptionModel.php b/app/Models/SubscriptionModel.php index 41bff6d2..c9da3139 100644 --- a/app/Models/SubscriptionModel.php +++ b/app/Models/SubscriptionModel.php @@ -236,8 +236,8 @@ public function getQueryforSubscriptionDetailsBySchemeName($flag,$condition, $va $builder->join('customers as c', 's.customer_id = c.customer_id', 'left'); $builder->join('invoice as i', 's.invoice_id = i.invoice_id', 'left'); - // $builder->join('customer_addresses as ca', 'ca.customer_id = s.customer_id AND i.shipping_address_id = ca.customer_address_id AND ca.address_type = 2', 'left'); - $builder->join('customer_addresses as ca', 'ca.customer_id = c.customer_id and ca.address_type = 2','left'); + $builder->join('customer_addresses as ca', 'ca.customer_id = c.customer_id AND i.shipping_address_id = ca.customer_address_id AND ca.address_type = 2', 'left');//sir told to map the ID + // $builder->join('customer_addresses as ca', 'ca.customer_id = c.customer_id and ca.address_type = 2','left'); $builder->join('books as bs', 'bs.book_id = s.scheme_id', 'left'); $builder->join('states as st', 'st.state_short_name = ca.state', 'left'); $builder->join('business as b', 'b.business_id = s.business_id', 'left');