Нумерация заказа MS2

_build/data/transport.settings.php

@@ -205,6 +205,16 @@
         'area' => 'ms2_cart',
     ),
 
+    'ms2_order_format_num' => array(
+        'value' => '%y%m',
+        'xtype' => 'textfield',
+        'area' => 'ms2_order_format_num',
+    ),
+    'ms2_order_format_num_separator' => array(
+        'value' => '/',
+        'xtype' => 'textfield',
+        'area' => 'ms2_order_format_num_separator',
+    ),
     'ms2_order_grid_fields' => array(
         'value' => 'id,num,customer,status,cost,weight,delivery,payment,createdon,updatedon,comment',
         'xtype' => 'textarea',
@@ -314,4 +324,4 @@
     $settings[] = $setting;
 }
 
-return $settings;
+return $settings;

core/components/minishop2/lexicon/ru/setting.inc.php

@@ -114,6 +114,10 @@
 $_lang['setting_ms2_payment_paypal_cancel_order'] = 'Отмена заказа PayPal';
 $_lang['setting_ms2_payment_paypal_cancel_order_desc'] = 'Если включено, заказ будет отменён при отказе от оплаты';
 
+$_lang['setting_ms2_order_format_num'] = 'Формат нумерации заказа';
+$_lang['setting_ms2_order_format_num_desc'] = 'Формат нумерации заказа. Доступные значения в формате PHP strftime()';
+$_lang['setting_ms2_order_format_num_separator'] = 'Разделитель для нумерации заказа';
+$_lang['setting_ms2_order_format_num_separator_desc'] = 'Разделитель для нумерации заказа. Доступние значения "/" и ","';
 $_lang['setting_ms2_order_grid_fields'] = 'Поля таблицы заказов';
 $_lang['setting_ms2_order_grid_fields_desc'] = 'Список полей, которые будут показаны в таблице заказов. Доступны: "createdon,updatedon,num,cost,cart_cost,delivery_cost,weight,status,delivery,payment,customer,receiver".';
 $_lang['setting_ms2_order_address_fields'] = 'Поля адреса доставки';

core/components/minishop2/model/minishop2/msorderhandler.class.php

@@ -596,7 +596,15 @@ public function getCost($with_cart = true, $only_cost = false)
      */
     public function getNum()
     {
-        $cur = date('ym');
+        $formatNum = htmlspecialchars($this->modx->getOption('ms2_order_format_num', null, '%y%m'));
+        $formatNumSeparator = trim(preg_replace("/[^,\/\-]/", '', "\/"));
+
+        if ($formatNum){
+            $cur = strftime($formatNum);
+        }else{
+            $cur = date('ym');
+        }
+
         $num = 0;
 
         $c = $this->modx->newQuery('msOrder');
@@ -608,10 +616,10 @@ public function getNum()
             $num = $c->stmt->fetchColumn();
         }
         if (empty($num)) {
-            $num = date('ym') . '/0';
+            $num = "{$cur}{$formatNumSeparator}0";
         }
-        $num = explode('/', $num);
-        $num = $cur . '/' . ($num[1] + 1);
+        $num = explode($formatNumSeparator, $num);
+        $num = "{$cur}{$formatNumSeparator}" . ($num[1] + 1);
 
         return $num;
     }