diff --git a/app/Controllers/Products.php b/app/Controllers/Products.php index 7d1ebc8..f347af5 100644 --- a/app/Controllers/Products.php +++ b/app/Controllers/Products.php @@ -480,8 +480,8 @@ class Products extends BaseController { $where = 0; - $sql = "SELECT a2.accountname, p.statuspart, ps.productservicetext, p.productid, pc.productname, p.productnumber, p.active, pc.catalognumber, pt.texts as type_name, pc.manufacturer, s.sitename, - z.zonename as city, z2.zonename as prov, p.installationdate, p.locationstartdate, p.locationenddate, p.warrantystartdate, p.warrantyenddate + $sql = "SELECT a2.accountname as owneraccount, p.statuspart, ps.productservicetext, p.productid, pc.productname, p.productnumber, p.active, pc.catalognumber, pt.texts as type_name, pc.manufacturer, s.sitename, + z.zonename as city, z2.zonename as prov, p.installationdate, p.locationstartdate, p.locationenddate, p.warrantystartdate, p.warrantyenddate, p.productowner FROM products p left join productcatalog pc on pc.catalogid=p.catalogid -- left join accoun pc2 on pc2.catalogid=p.accountid_productowner diff --git a/app/Models/ProductsModel.php b/app/Models/ProductsModel.php index 2a3605f..8897e35 100644 --- a/app/Models/ProductsModel.php +++ b/app/Models/ProductsModel.php @@ -5,7 +5,7 @@ use CodeIgniter\Model; class ProductsModel extends Model { protected $table = 'products'; protected $primaryKey = 'productid'; - protected $allowedFields = [ 'siteid', 'productnumber', 'productname', 'catalogid', + protected $allowedFields = [ 'siteid', 'productnumber', 'productname', 'catalogid', 'accountid_productowner', 'installationdate', 'locationstartdate', 'locationenddate', 'warrantystartdate', 'warrantyenddate', 'productowner', 'productserviceid', 'statuspart', 'active', 'remotetool', 'remoteid', 'remotepwd', 'createdate', 'enddate' ]; diff --git a/app/Views/products_export_excel.php b/app/Views/products_export_excel.php index d3ee846..f43f38e 100644 --- a/app/Views/products_export_excel.php +++ b/app/Views/products_export_excel.php @@ -36,6 +36,7 @@