Tracker ID : 0000807 issues fixes : ps
This commit is contained in:
parent
54a0c9717c
commit
f742d02d61
@ -2,9 +2,8 @@
|
||||
|
||||
namespace App\Controllers;
|
||||
|
||||
use App\Models\EventModel;
|
||||
|
||||
use App\Models\CustomerModel;
|
||||
use App\Models\SettingsModel;
|
||||
use App\Models\InvoiceModel;
|
||||
use App\Models\BooksModel;
|
||||
use App\Models\AuditHistoryModel;
|
||||
@ -139,7 +138,7 @@ class Invoice extends BaseController
|
||||
|
||||
$data['causes'] = $bmodel->select('*')->where('business_id', (int)get_business_id())->where('isactive',1)->get()->getResult();
|
||||
$data['campaign'] = $model->getData('campaign', $where);
|
||||
$data['invoice_number_formatting'] = $model->getData('settings', $where);
|
||||
$data['invoice_number_formatting'] = $model->getData('business', $where);
|
||||
$data['receipt_type'] = "option1";
|
||||
if ($id === '0') {
|
||||
$this->logger->info("Receipt: In Add Details");
|
||||
@ -495,13 +494,13 @@ class Invoice extends BaseController
|
||||
{
|
||||
// `id``event_name``business_id``updated_by``updated_on``next_id`
|
||||
$model = new InvoiceModel();
|
||||
$model->setTable('settings');
|
||||
$model->setTable('business');
|
||||
$where = ['isactive' => 1, 'business_id' => (int)$update_events['business_id'], 'start_no' => $update_events['start_no']];
|
||||
$details = $model->where($where)->findAll();
|
||||
if (empty($details)) {
|
||||
$update_where = ['business_id' => (int)$update_events['business_id']];
|
||||
$update_data = ['start_no' => $update_events['start_no'], 'updated_by' => $update_events['updated_by']];
|
||||
$model->updateData('settings', $update_data, $update_where);
|
||||
$model->updateData('business', $update_data, $update_where);
|
||||
}
|
||||
}
|
||||
|
||||
@ -511,10 +510,9 @@ class Invoice extends BaseController
|
||||
try {
|
||||
// Fetch the receipt data based on $receipt_id
|
||||
$model = new InvoiceModel();
|
||||
$setting_model = new SettingsModel();
|
||||
|
||||
$where = ['business_id' => (int)get_business_id()];
|
||||
$currency_data = $setting_model->select('currency')->where($where)->findAll();
|
||||
$currency_data = $model->setTable('business')->select('currency')->where($where)->findAll();
|
||||
$terms_data = $this->BusinessModel->select('terms,signature')->where($where)->findAll();
|
||||
$data = $model->getInvoiceData($id);
|
||||
// Check if data is empty
|
||||
|
||||
Loading…
Reference in New Issue
Block a user