D547.id.diff
No OneTemporary
Actions

Subscribers

None

File Metadata

	Index: branches/5.2.x/units/orders/orders_event_handler.php
	===================================================================
	--- branches/5.2.x/units/orders/orders_event_handler.php
	+++ branches/5.2.x/units/orders/orders_event_handler.php
	@@ -2886,7 +2886,7 @@
	""),
	"_",
	PackageNum
	- ) AS Grouping,
	+ ) AS GroupingCalc,
	SUM(Quantity) AS TotalItems,
	SUM('.$table_prefix.'OrderItems.Weight*Quantity) AS TotalWeight,
	SUM(Price * Quantity) AS TotalAmount,
	@@ -2896,7 +2896,7 @@
	LEFT JOIN '.TABLE_PREFIX.'Products
	ON '.TABLE_PREFIX.'Products.ProductId = '.$table_prefix.'OrderItems.ProductId
	WHERE OrderId = '.$ord_id.'
	- GROUP BY BackOrderFlagCalc, Grouping
	+ GROUP BY BackOrderFlagCalc, GroupingCalc
	ORDER BY BackOrderFlagCalc ASC, PackageNum ASC, ProductType ASC';

	$sub_orders = $this->Conn->Query($query);
	@@ -2930,7 +2930,7 @@
	$sub_order->SetDBField('SubNumber', $next_sub_number);
	$sub_order->SetDBField('SubTotal', $sub_order_data['TotalAmount']);

	- $grouping_data = explode('_', $sub_order_data['Grouping']);
	+ $grouping_data = explode('_', $sub_order_data['GroupingCalc']);
	$named_grouping_data['Type'] = $grouping_data[0];

	if (!in_array($named_grouping_data['Type'], $skip_types)) {