|
|
|
|
@ -358,6 +358,7 @@ class StatisticsController extends CommonController
|
|
|
|
|
if ($mode == 'order') {
|
|
|
|
|
$orderBalances = Orders::query()
|
|
|
|
|
->withoutGlobalScopes()
|
|
|
|
|
->leftJoin("project", "project.id", "=", "orders.project_id")
|
|
|
|
|
->leftJoin("customers", "customers.id", "=", "orders.customer_id")
|
|
|
|
|
->leftJoin("patient", "patient.id", "=", "orders.patient_id")
|
|
|
|
|
->leftJoin("balance", function ($join) use ($before_datetime_text) {
|
|
|
|
|
@ -372,10 +373,12 @@ class StatisticsController extends CommonController
|
|
|
|
|
->groupBy(
|
|
|
|
|
"orders.id",
|
|
|
|
|
"orders.serial",
|
|
|
|
|
"project.name",
|
|
|
|
|
"orders.from_date",
|
|
|
|
|
"orders.to_date",
|
|
|
|
|
"orders.contact",
|
|
|
|
|
"orders.mobile",
|
|
|
|
|
"orders.status",
|
|
|
|
|
"customers.mobile",
|
|
|
|
|
"patient.name"
|
|
|
|
|
)
|
|
|
|
|
@ -384,10 +387,21 @@ class StatisticsController extends CommonController
|
|
|
|
|
->get([
|
|
|
|
|
"orders.id",
|
|
|
|
|
"orders.serial",
|
|
|
|
|
"project.name as project_name",
|
|
|
|
|
"orders.from_date",
|
|
|
|
|
"orders.to_date",
|
|
|
|
|
"orders.contact",
|
|
|
|
|
"orders.mobile as contact_mobile",
|
|
|
|
|
DB::raw("'" . $before_datetime_text . "' as point_time"),
|
|
|
|
|
DB::raw("
|
|
|
|
|
CASE orders.status
|
|
|
|
|
WHEN " . Orders::STATUS_UNCONFIRMED . " THEN '" . Orders::TEXT_UNCONFIRMED . "'
|
|
|
|
|
WHEN " . Orders::STATUS_UNASSIGNED . " THEN '" . Orders::TEXT_UNASSIGNED . "'
|
|
|
|
|
WHEN " . Orders::STATUS_ONGOING . " THEN '" . Orders::TEXT_ONGOING . "'
|
|
|
|
|
WHEN " . Orders::STATUS_FINISHED . " THEN '" . Orders::TEXT_FINISHED . "'
|
|
|
|
|
ELSE orders.status
|
|
|
|
|
END as status_name
|
|
|
|
|
"),
|
|
|
|
|
"customers.mobile as customer_mobile",
|
|
|
|
|
"patient.name as patient_name",
|
|
|
|
|
DB::raw("COALESCE(SUM(balance.money), 0) as balance"),
|
|
|
|
|
|