changed stats calculation
This commit is contained in:
@@ -1190,7 +1190,7 @@ class PreorderModel
|
|||||||
public static function countActivePreorder($preorderCampaignId = null) {
|
public static function countActivePreorder($preorderCampaignId = null) {
|
||||||
$db = FronkDB::singleton();
|
$db = FronkDB::singleton();
|
||||||
|
|
||||||
$where = " AND h.rimo_op_state != 'Not2Connect' AND h.rimo_ex_state != 'Gross planning'";
|
$where = " AND !(h.rimo_op_state = 'Not2Connect' AND h.rimo_ex_state = 'Gross planning')";
|
||||||
if ($preorderCampaignId) {
|
if ($preorderCampaignId) {
|
||||||
$where .= " AND p.preordercampaign_id = $preorderCampaignId";
|
$where .= " AND p.preordercampaign_id = $preorderCampaignId";
|
||||||
}
|
}
|
||||||
@@ -1230,7 +1230,7 @@ class PreorderModel
|
|||||||
public static function countTotalUnits($preorderCampaignId = null) {
|
public static function countTotalUnits($preorderCampaignId = null) {
|
||||||
$db = FronkDB::singleton();
|
$db = FronkDB::singleton();
|
||||||
|
|
||||||
$where = " h.rimo_type != 'greenfield' AND h.rimo_op_state != 'Not2Connect' AND h.rimo_ex_state != 'Gross planning'";
|
$where = " h.rimo_type != 'greenfield' AND !(h.rimo_op_state = 'Not2Connect' AND h.rimo_ex_state = 'Gross planning')";
|
||||||
if ($preorderCampaignId) {
|
if ($preorderCampaignId) {
|
||||||
$where .= " AND pc.id = $preorderCampaignId";
|
$where .= " AND pc.id = $preorderCampaignId";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user