Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F871603
D83.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Wed, May 7, 11:05 PM
Size
1 KB
Mime Type
text/x-diff
Expires
Thu, May 8, 11:05 PM (4 h, 20 m)
Engine
blob
Format
Raw Data
Handle
617626
Attached To
D83: MINC-129 - Reset shipment number during order splitting
D83.diff
View Options
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
@@ -2956,18 +2956,24 @@
switch ($named_grouping_data['Type']) {
case PRODUCT_TYPE_TANGIBLE:
- $query = 'UPDATE '.$table_prefix.'OrderItems SET OrderId = %s WHERE OrderId = %s AND PackageNum = %s';
- $query = sprintf($query, $sub_order->GetId(), $ord_id, $sub_order_data['PackageNum']);
+ $query = ' UPDATE ' . $table_prefix . 'OrderItems
+ SET OrderId = %s, PackageNum = 1
+ WHERE OrderId = %s AND PackageNum = %s';
+ $query = sprintf($query, $sub_order->GetID(), $ord_id, $sub_order_data['PackageNum']);
break;
case PRODUCT_TYPE_DOWNLOADABLE:
- $query = 'UPDATE '.$table_prefix.'OrderItems SET OrderId = %s WHERE OrderId = %s AND ProductId IN (%s)';
- $query = sprintf($query, $sub_order->GetId(), $ord_id, implode(',', $product_ids) );
+ $query = ' UPDATE ' . $table_prefix . 'OrderItems
+ SET OrderId = %s, PackageNum = 1
+ WHERE OrderId = %s AND ProductId IN (%s)';
+ $query = sprintf($query, $sub_order->GetID(), $ord_id, implode(',', $product_ids));
break;
default:
- $query = 'UPDATE '.$table_prefix.'OrderItems SET OrderId = %s WHERE OrderId = %s AND OrderItemId = %s';
- $query = sprintf($query, $sub_order->GetId(), $ord_id, $named_grouping_data['OrderItemId']);
+ $query = ' UPDATE ' . $table_prefix . 'OrderItems
+ SET OrderId = %s, PackageNum = 1
+ WHERE OrderId = %s AND OrderItemId = %s';
+ $query = sprintf($query, $sub_order->GetID(), $ord_id, $named_grouping_data['OrderItemId']);
break;
}
Event Timeline
Log In to Comment