Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed the sales report so it returns the number of sales and revenue … #777

Merged
merged 2 commits into from
Mar 11, 2022
Merged

fixed the sales report so it returns the number of sales and revenue … #777

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c2111d
fixed the sales report so it returns the number of sales and revenue …
fonsekaean Mar 11, 2022
eca1bc1
default report value is 1
fonsekaean Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 112 additions & 20 deletions src/Reports/ProductReport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
namespace SilverShop\Reports;

use SilverShop\Page\Product;
use SilverShop\SQLQueryList\SQLQueryList;
use SilverStripe\CMS\Model\SiteTree;
use SilverStripe\ORM\DataObject;
use SilverStripe\ORM\Queries\SQLSelect;

class ProductReport extends ShopPeriodReport
{
Expand All @@ -13,7 +16,7 @@ class ProductReport extends ShopPeriodReport

protected $dataClass = Product::class;

protected $periodfield = '"SiteTree"."Created"';
protected $periodfield = '"SilverShop_Order"."Created"';

public function columns()
{
Expand All @@ -23,35 +26,124 @@ public function columns()
'formatting' => '<a href=\"admin/catalog/Product/EditForm/field/Product/item/$ID/edit\" target=\"_new\">$Title</a>',
),
'BasePrice' => 'Price',
'Created' => 'Created',
'Quantity' => 'Quantity',
'Sales' => 'Sales',
);
}


public function sourceRecords($params)
{
$list = SQLQueryList::create($this->query($params));
$self = $this;
$list->setOutputClosure(
function ($row) use ($self) {
$row['BasePrice'] = $self->formatMoney($row['BasePrice']);
$row['Sales'] = $self->formatMoney($row['Sales']);
return new $self->dataClass($row);
}
);
return $list;
}

private function formatMoney($money)
{
return number_format($money, 2);
}

public function query($params)
{
$query = parent::query($params);
$query->selectField($this->periodfield, 'FilterPeriod')
->addSelect(
[
'"SilverShop_Product"."ID"',
'"SiteTree"."ClassName"',
//convert dates to correct format
$fields = $this->parameterFields();
$fields->setValues($params);
$start = $fields->fieldByName('StartPeriod')->dataValue();
$end = $fields->fieldByName('EndPeriod')->dataValue();


$table = DataObject::getSchema()->tableName($this->dataClass);
$query = new SQLSelect();
$query->setFrom('"' . $table . '"');

$whereClue = '1';
$filterperiod = $this->periodfield;
if ($start && $end) {
$whereClue = sprintf(
'DATE("o"."Placed") BETWEEN DATE(\'%s\') AND DATE(\'%s\')',
$start,
$end
);
} elseif ($start) {
$whereClue = sprintf(
'DATE("o"."Placed") > DATE(\'%s\')',
$start
);
} elseif ($end) {
$whereClue = sprintf(
'DATE("o"."Placed") <= DATE(\'%s\')',
$end
);
}

$completedStatus = '\'' . implode('\', \'', [
'Unpaid', 'Paid', 'Processing', 'Sent', 'Complete'
]) . '\'';


$query->setSelect(
[
'"SiteTree"."ID"',
'"SiteTree"."Title"',
'"SilverShop_Product"."BasePrice"',
'"SiteTree"."Created"',
]
)
->selectField('COUNT("SilverShop_OrderItem"."Quantity")', 'Quantity')
->selectField('SUM("SilverShop_OrderAttribute"."CalculatedTotal")', 'Sales');
$query->addInnerJoin('SiteTree', '"SilverShop_Product"."ID" = "SiteTree"."ID"');
$query->addLeftJoin('SilverShop_Product_OrderItem', 'SilverShop_Product.ID = "SilverShop_Product_OrderItem"."ProductID"');
$query->addLeftJoin('SilverShop_OrderItem', '"SilverShop_Product_OrderItem"."ID" = "SilverShop_OrderItem"."ID"');
$query->addLeftJoin('SilverShop_OrderAttribute', '"SilverShop_Product_OrderItem"."ID" = "SilverShop_OrderAttribute"."ID"');
$query->addLeftJoin('SilverShop_Order', '"SilverShop_OrderAttribute"."OrderID" = "SilverShop_Order"."ID"');
$query->addGroupby('"SilverShop_Product"."ID"');
$query->addWhere('"SilverShop_Order"."Paid" IS NOT NULL OR "SilverShop_Product_OrderItem"."ID" IS NULL');
]
)
->selectField(
sprintf(
'(
SELECT
SUM(soi."Quantity")
FROM
"SilverShop_Product_OrderItem" spo,
"SilverShop_OrderItem" soi,
"SilverShop_OrderAttribute" soa,
"SilverShop_Order" o
WHERE
spo.ProductID = "SilverShop_Product"."ID"
AND spo.ID = soi.ID
AND soi.ID = spo.ID
AND spo.ID = soa.ID
AND soa.OrderID = o.ID
AND o.Status IN (%s)
AND %s
)',
$completedStatus,
$whereClue
), 'Quantity')
->selectField(
sprintf(
'(
SELECT
SUM(soa."CalculatedTotal")
FROM
"SilverShop_Product_OrderItem" spo,
"SilverShop_OrderItem" soi,
"SilverShop_OrderAttribute" soa,
"SilverShop_Order" o
WHERE
spo.ProductID = "SilverShop_Product"."ID"
AND spo.ID = soi.ID
AND soi.ID = spo.ID
AND spo.ID = soa.ID
AND soa.OrderID = o.ID
AND o.Status IN (%s)
AND %s
)',
$completedStatus,
$whereClue
), 'Sales')
;

$query->addInnerJoin('SiteTree', '"SilverShop_Product"."ID" = "SiteTree"."ID"');
$query->setOrderBy('Quantity DESC');
return $query;
}
}