From c37ba573b1cda18f822994eb131b8e549f5e5341 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Thu, 4 Jul 2024 08:12:01 +0000 Subject: [PATCH] FIX_API Shipping address not availble means take billing Address : ps --- app/Controllers/ApiIntegration.php | 58 ++++++++++++++++++------------ app/Controllers/Invoice.php | 3 +- app/Models/SubscriptionModel.php | 4 +++ 3 files changed, 41 insertions(+), 24 deletions(-) diff --git a/app/Controllers/ApiIntegration.php b/app/Controllers/ApiIntegration.php index 5c018757..da8d6b84 100644 --- a/app/Controllers/ApiIntegration.php +++ b/app/Controllers/ApiIntegration.php @@ -775,6 +775,12 @@ class ApiIntegration extends ResourceController $result_shipping_addr = $this->save_invoice_address_in_customer_address($shipping_array,2,(int)$local_customer_id); $shipping_addr_id = $result_shipping_addr['addr_id']; $shipping_addr = $result_shipping_addr['addr']; + }else{ + if(count($billing_array) > 0){ + $result_shipping_addr = $this->save_invoice_address_in_customer_address($billing_array,2,(int)$local_customer_id); + $shipping_addr_id = $result_shipping_addr['addr_id']; + $shipping_addr = $result_shipping_addr['addr']; + } } if (count($records['line_items']) > 0) { @@ -954,30 +960,36 @@ class ApiIntegration extends ResourceController $fromDate = NULL; $toDate = NULL; $duration = 0; - for ($x = 0; $x < count($result_book_category); $x++) { - $duration = isset($result_book_category[$x]['duration']) && $result_book_category[$x]['duration'] != '' && (int)$result_book_category[$x]['duration'] > 0 ? $result_book_category[$x]['duration'] * 12 : 1 * 12; - $this->logger->info("Api SaveSalesDetails : Duration - Given : " .$result_book_category[$x]['duration']." Final : ".$duration); - $fromDateTimestamp = strtotime($records['date_created']); - $toDateTimestamp = strtotime("+$duration months", $fromDateTimestamp); - $fromDate = date("Y-m-d", strtotime($records['date_created'])); - $toDate = date("Y-m-d", $toDateTimestamp); - // $scheme_id = $result_book_category[$x]['category_id']; b4 - $scheme_id = $result_book_category[$x]['book_id']; - $dataToCheck = ['scheme_id'=>$scheme_id,'customer_id' => $local_customer_id,'invoice_id' => $invoice_id ]; - $existing_subscription = $api_model->getData('subscription', $dataToCheck); - - if (count($existing_subscription) > 0) { - $this->logger->info("Api SaveSalesDetails : Subscription ".count($existing_subscription)." data already exists = ".json_encode($dataToCheck)); - } else { - $subscription_data[$x]['scheme_id'] = $result_book_category[$x]['category_id']; - $subscription_data[$x]['customer_id'] = $local_customer_id; - $subscription_data[$x]['invoice_id'] = $invoice_id; - $subscription_data[$x]['from_subscription'] = $fromDate; - $subscription_data[$x]['to_subscription'] = $toDate; - $subscription_data[$x]['mode'] = $result_book_category[$x]['category_name']; - $subscription_data[$x]['business_id']=$this->global_variable_business_id; - $this->logger->info("Api SaveSalesDetails : Subscription Data inx = $x Request data = ".json_encode($subscription_data)); + if($invoice_id){ + $this->logger->info("Api SaveSalesDetails : Subscription Data not Inserted because I don't have => Local invoice ID = ".$invoice_id); + for ($x = 0; $x < count($result_book_category); $x++) { + $duration = isset($result_book_category[$x]['duration']) && $result_book_category[$x]['duration'] != '' && (int)$result_book_category[$x]['duration'] > 0 ? $result_book_category[$x]['duration'] * 12 : 1 * 12; + $this->logger->info("Api SaveSalesDetails : Duration - Given : " .$result_book_category[$x]['duration']." Final : ".$duration); + $fromDateTimestamp = strtotime($records['date_created']); + $toDateTimestamp = strtotime("+$duration months", $fromDateTimestamp); + $fromDate = date("Y-m-d", strtotime($records['date_created'])); + $toDate = date("Y-m-d", $toDateTimestamp); + // $scheme_id = $result_book_category[$x]['category_id']; b4 + $scheme_id = $result_book_category[$x]['book_id']; + $dataToCheck = ['scheme_id'=>$scheme_id,'customer_id' => $local_customer_id,'invoice_id' => $invoice_id ]; + $existing_subscription = $api_model->getData('subscription', $dataToCheck); + + if (count($existing_subscription) > 0) { + $this->logger->info("Api SaveSalesDetails : Subscription ".count($existing_subscription)." data already exists = ".json_encode($dataToCheck)); + } else { + $subscription_data[$x]['scheme_id'] = $scheme_id; + $subscription_data[$x]['customer_id'] = $local_customer_id; + $subscription_data[$x]['invoice_id'] = $invoice_id; + $subscription_data[$x]['from_subscription'] = $fromDate; + $subscription_data[$x]['to_subscription'] = $toDate; + $subscription_data[$x]['mode'] = $result_book_category[$x]['category_name']; + $subscription_data[$x]['business_id']=$this->global_variable_business_id; + $this->logger->info("Api SaveSalesDetails : Subscription Data inx = $x Request data = ".json_encode($subscription_data)); + } } + }else{ + $this->logger->info("Api SaveSalesDetails : Subscription Data not Inserted because I don't have => Local invoice ID = ".$invoice_id); + } // echo $fromDate; // echo $toDate; diff --git a/app/Controllers/Invoice.php b/app/Controllers/Invoice.php index d301457f..06356499 100644 --- a/app/Controllers/Invoice.php +++ b/app/Controllers/Invoice.php @@ -806,7 +806,8 @@ class Invoice extends BaseController $status = $data[0]->status; // Load view with data - $html = view('invoice_print_preview_template', ['data' => $data, 'invoiceItems' => $invoiceItems,'business'=>$business, 'invoice_type' => $invoice_type, 'invoiceTerms' => $data, 'status' => $status]); + // $html = view('invoice_print_preview_template', ['data' => $data, 'invoiceItems' => $invoiceItems,'business'=>$business, 'invoice_type' => $invoice_type, 'invoiceTerms' => $data, 'status' => $status]); + $html = view('invoice_pdf_template', ['data' => $data, 'invoiceItems' => $invoiceItems,'business'=>$business, 'invoice_type' => $invoice_type, 'invoiceTerms' => $data, 'status' => $status]); // Return HTML content echo $html; diff --git a/app/Models/SubscriptionModel.php b/app/Models/SubscriptionModel.php index b86061e6..bc3248af 100644 --- a/app/Models/SubscriptionModel.php +++ b/app/Models/SubscriptionModel.php @@ -88,6 +88,7 @@ public function getCustomerAddressesBySchemeName($schemeName) } public function getAllCustomerDetailsBySchemeName($schemeName) { + // echo "addresses - Customer"; $currentDate = date('Y-m-d'); $builder = $this->db->table('subscription'); $builder->select('customers.customer_id, CONCAT(customers.first_name, " ", customers.last_name) as customer_name,customer_addresses.mobile_no, customer_addresses.address_1,customer_addresses.address_2, customer_addresses.city, customer_addresses.state, customer_addresses.postal_code,business.title as business_name,business.address as business_address,business.city as business_city,business.state as business_state,business.postal_code as business_postal_code,books.title,from_subscription,to_subscription,business.title as business_name,business.mobile_no as business_mobile_no,states.state_name'); @@ -103,6 +104,9 @@ public function getAllCustomerDetailsBySchemeName($schemeName) // Fetch the query result $query = $builder->get(); + // $lastQuery = $this->db->getLastQuery(); + // $finalQueryString = $lastQuery->getQuery(); + // echo $finalQueryString; $customerDetails = [];