Merge branch 'master' of https://gitlab.chiefsoft.net/MERMS/MermsProvision
# Conflicts: # app/Controllers/Provision.php Fix fata
This commit is contained in:
@@ -415,7 +415,7 @@ class Provision extends BaseController
|
|||||||
p.provision_port
|
p.provision_port
|
||||||
FROM provision_plans pp
|
FROM provision_plans pp
|
||||||
LEFT JOIN members_products p ON p.id =pp.provision_id
|
LEFT JOIN members_products p ON p.id =pp.provision_id
|
||||||
WHERE p.provision_status = 0
|
WHERE p.provision_status = 1
|
||||||
ORDER BY pp.updated ASC LIMIT ".$PROCESS_LIMIT;
|
ORDER BY pp.updated ASC LIMIT ".$PROCESS_LIMIT;
|
||||||
$query = $this->db->query($mysql);
|
$query = $this->db->query($mysql);
|
||||||
$provision_list = $query->getResult();
|
$provision_list = $query->getResult();
|
||||||
|
|||||||
Reference in New Issue
Block a user