Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F1168786
D141.id352.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
Thu, Sep 25, 11:22 AM
Size
2 KB
Mime Type
text/x-diff
Expires
Fri, Sep 26, 11:22 AM (10 h, 15 m)
Engine
blob
Format
Raw Data
Handle
757182
Attached To
D141: MINC-134 - Lock tables to generate unique order numbers
D141.id352.diff
View Options
Index: modules/in-commerce/units/orders/orders_event_handler.php
===================================================================
--- modules/in-commerce/units/orders/orders_event_handler.php
+++ modules/in-commerce/units/orders/orders_event_handler.php
@@ -2271,21 +2271,18 @@
}
/**
- * Set next available order number
+ * Set next available order number.
*
- * @param kEvent $event
+ * @param kEvent $event Event.
+ *
+ * @return void
*/
- function setNextOrderNumber($event)
+ protected function setNextOrderNumber(kEvent $event)
{
+ /** @var OrdersItem $object */
$object = $event->getObject();
- /* @var $object OrdersItem */
-
- $sql = 'SELECT MAX(Number)
- FROM ' . $this->Application->GetLiveName($object->TableName);
- $next_order_number = $this->Conn->GetOne($sql) + 1;
- $next_order_number = max($next_order_number, $this->Application->ConfigValue('Comm_Next_Order_Number'));
- $this->Application->SetConfigValue('Comm_Next_Order_Number', $next_order_number + 1);
+ $next_order_number = $this->getNextOrderNumber();
$object->SetDBField('Number', $next_order_number);
$object->SetDBField('SubNumber', 0);
@@ -2299,6 +2296,50 @@
}
/**
+ * Returns order number to be used next.
+ *
+ * @return integer
+ */
+ protected function getNextOrderNumber()
+ {
+ $lock_clause = array(
+ TABLE_PREFIX . 'IdGenerator WRITE',
+ $this->Application->getUnitOption('conf', 'TableName') . ' WRITE',
+ $this->Application->getUnitOption($this->Prefix, 'TableName') . ' WRITE',
+ );
+ $this->Conn->Query('LOCK TABLES ' . implode(', ', $lock_clause));
+
+ $sql = 'UPDATE ' . $this->Application->getUnitOption('conf', 'TableName') . '
+ SET VariableValue = GREATEST(VariableValue, ' . $this->getLastUsedOrderNumber() . ') + 1
+ WHERE VariableName = "Comm_Next_Order_Number"';
+ $this->Conn->Query($sql);
+
+ $sql = 'SELECT VariableValue
+ FROM ' . $this->Application->getUnitOption('conf', 'TableName') . '
+ WHERE VariableName = "Comm_Next_Order_Number"';
+ $next_order_number = $this->Conn->GetOne($sql);
+
+ $this->Application->SetConfigValue('Comm_Next_Order_Number', $next_order_number);
+
+ $this->Conn->Query('UNLOCK TABLES');
+
+ return $next_order_number - 1;
+ }
+
+ /**
+ * Returns last used order number.
+ *
+ * @return integer
+ */
+ protected function getLastUsedOrderNumber()
+ {
+ $sql = 'SELECT MAX(Number)
+ FROM ' . $this->Application->getUnitOption($this->Prefix, 'TableName');
+
+ return (int)$this->Conn->GetOne($sql);
+ }
+
+ /**
* Set's new order address based on another address from order (e.g. billing from shipping)
*
* @param unknown_type $object
Event Timeline
Log In to Comment