Merge branch 'uat' of bitbucket.org:venbainformationtechnology/vb_book into uat

This commit is contained in:
heama 2023-10-10 15:02:10 +05:30
commit e3880e1624

View File

@ -739,10 +739,13 @@ class ApiIntegration extends ResourceController
$subtotal = $lineitems_subtotal + (float)$records['shipping_total'];
$tax = $lineitems_tax + (float)$records['shipping_tax'];
$total = ($lineitems_total)+(float)$records['shipping_total'] + (float)$records['shipping_tax'];
$where = ['wp_api_customer_id' => (int)$records['customer_id'], 'isactive' => 1];
$local_customer = $api_model->getData('customers', $where);
$local_customer_id = !empty($local_customer) ? $local_customer[0]->customer_id : "";
$invoice_data['invoice_id']=$invoice_id;
$invoice_data['invoice_number']=$records['number'];
$invoice_data['customer_id']=$records['customer_id'];
$invoice_data['customer_id']=$local_customer_id;
$invoice_data['wp_api_order_id']=$records['id'];
$invoice_data['invoice_date']=date("Y-m-d", strtotime($records['date_created']));
$invoice_data['due_date']=NULL;
@ -871,13 +874,13 @@ class ApiIntegration extends ResourceController
$fromDate = date("Y-m-d", strtotime($records['date_created']));
$toDate = date("Y-m-d", $toDateTimestamp);
$scheme_id = $result_book_category[$x]['category_id'];
$dataToCheck = ['scheme_id'=>$scheme_id,'customer_id' => $records['customer_id'],'invoice_id' => $invoice_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'] = $records['customer_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;