injitools / cms-Inji

system/modules/Ecommerce/Ecommerce.php

Indentation +238 added lines, -238 removed lines

@@ -10,172 +10,172 @@ 
  */
 class Ecommerce extends Module {
 
-  public function init() {
+    public function init() {
     App::$primary->view->customAsset('js', '/moduleAsset/Ecommerce/js/cart.js');
-  }
+    }
 
-  public function getPayTypeHandlers($forSelect = false) {
+    public function getPayTypeHandlers($forSelect = false) {
     if (!$forSelect) {
-      return $this->getSnippets('payTypeHandler');
+        return $this->getSnippets('payTypeHandler');
     }
     $handlers = ['' => 'Не выбрано'];
     foreach ($this->getSnippets('payTypeHandler') as $key => $handler) {
-      if (empty($handler)) {
+        if (empty($handler)) {
         continue;
-      }
-      $handlers[$key] = $handler['name'];
+        }
+        $handlers[$key] = $handler['name'];
     }
     return $handlers;
-  }
+    }
 
-  public function cartPayRecive($data) {
+    public function cartPayRecive($data) {
     $cart = Ecommerce\Cart::get($data['pay']->data);
     if ($cart) {
-      $payed = true;
-      foreach ($cart->pays as $pay) {
+        $payed = true;
+        foreach ($cart->pays as $pay) {
         if ($pay->pay_status_id != 2) {
-          $payed = false;
-          break;
+            $payed = false;
+            break;
         }
-      }
-      $cart->payed = $payed;
-      $cart->save();
+        }
+        $cart->payed = $payed;
+        $cart->save();
+    }
     }
-  }
 
-  public function parseFields($data, $cart) {
+    public function parseFields($data, $cart) {
     $fields = \Ecommerce\UserAdds\Field::getList();
     $name = '';
     foreach ($fields as $field) {
-      if ($field->save && !empty($data[$field->id])) {
+        if ($field->save && !empty($data[$field->id])) {
         $name .= htmlspecialchars($data[$field->id]) . ' ';
-      }
+        }
     }
     $name = trim($name);
 
     $userAdds = Ecommerce\UserAdds::get([['user_id', $cart->user->id], ['name', $name]]);
     if (!$userAdds) {
-      $userAdds = new Ecommerce\UserAdds();
-      $userAdds->user_id = $cart->user->id;
-      $userAdds->name = $name;
-      $userAdds->save();
-      foreach ($fields as $field) {
+        $userAdds = new Ecommerce\UserAdds();
+        $userAdds->user_id = $cart->user->id;
+        $userAdds->name = $name;
+        $userAdds->save();
+        foreach ($fields as $field) {
         if (!$field->save) {
-          continue;
+            continue;
         }
         $userAddsValue = new Ecommerce\UserAdds\Value();
         $userAddsValue->value = htmlspecialchars($data[$field->id]);
         $userAddsValue->useradds_field_id = $field->id;
         $userAddsValue->useradds_id = $userAdds->id;
         $userAddsValue->save();
-      }
+        }
     }
     $user = \Users\User::get($cart->user_id);
     foreach ($fields as $field) {
-      $info = new \Ecommerce\Cart\Info();
-      $info->name = $field->name;
-      $info->value = htmlspecialchars($data[$field->id]);
-      $info->useradds_field_id = $field->id;
-      $info->cart_id = $cart->id;
-      $info->save();
-      $relations = [];
-      if ($field->userfield) {
+        $info = new \Ecommerce\Cart\Info();
+        $info->name = $field->name;
+        $info->value = htmlspecialchars($data[$field->id]);
+        $info->useradds_field_id = $field->id;
+        $info->cart_id = $cart->id;
+        $info->save();
+        $relations = [];
+        if ($field->userfield) {
         if (strpos($field->userfield, ':')) {
-          $path = explode(':', $field->userfield);
-          if (!$user->{$path[0]}->{$path[1]}) {
+            $path = explode(':', $field->userfield);
+            if (!$user->{$path[0]}->{$path[1]}) {
             $user->{$path[0]}->{$path[1]} = $info->value;
             $relations[$path[0]] = $path[0];
-          }
+            }
         } else {
-          if (!$user->{$field->userfield}) {
+            if (!$user->{$field->userfield}) {
             $user->{$field->userfield} = $info->value;
-          }
+            }
         }
-      }
-      foreach ($relations as $rel) {
+        }
+        foreach ($relations as $rel) {
         $user->$rel->save();
-      }
-      $user->save();
+        }
+        $user->save();
     }
     return $userAdds;
-  }
+    }
 
-  public function parseDeliveryFields($data, $cart, $fields) {
+    public function parseDeliveryFields($data, $cart, $fields) {
     $name = '';
     foreach ($fields as $field) {
-      if ($field->save && !empty($data[$field->id])) {
+        if ($field->save && !empty($data[$field->id])) {
         $name .= htmlspecialchars($data[$field->id]) . ' ';
-      }
+        }
     }
     $name = trim($name);
 
     $save = Ecommerce\Delivery\Save::get([['user_id', $cart->user->id], ['name', $name]]);
     if (!$save) {
-      $save = new Ecommerce\Delivery\Save();
-      $save->user_id = $cart->user->id;
-      $save->name = $name;
-      $save->save();
-      foreach ($fields as $field) {
+        $save = new Ecommerce\Delivery\Save();
+        $save->user_id = $cart->user->id;
+        $save->name = $name;
+        $save->save();
+        foreach ($fields as $field) {
         if (!$field->save) {
-          continue;
+            continue;
         }
         $saveValue = new Ecommerce\Delivery\Value();
         $saveValue->value = htmlspecialchars($data[$field->id]);
         $saveValue->delivery_field_id = $field->id;
         $saveValue->delivery_save_id = $save->id;
         $saveValue->save();
-      }
+        }
     }
     $user = \Users\User::get($cart->user_id);
     foreach ($fields as $field) {
-      $info = new \Ecommerce\Cart\DeliveryInfo();
-      $info->name = $field->name;
-      $info->value = htmlspecialchars($data[$field->id]);
-      $info->delivery_field_id = $field->id;
-      $info->cart_id = $cart->id;
-      $info->save();
-      $relations = [];
-      if ($field->userfield) {
+        $info = new \Ecommerce\Cart\DeliveryInfo();
+        $info->name = $field->name;
+        $info->value = htmlspecialchars($data[$field->id]);
+        $info->delivery_field_id = $field->id;
+        $info->cart_id = $cart->id;
+        $info->save();
+        $relations = [];
+        if ($field->userfield) {
         if (strpos($field->userfield, ':')) {
-          $path = explode(':', $field->userfield);
-          if (!$user->{$path[0]}->{$path[1]}) {
+            $path = explode(':', $field->userfield);
+            if (!$user->{$path[0]}->{$path[1]}) {
             $user->{$path[0]}->{$path[1]} = $info->value;
             $relations[$path[0]] = $path[0];
-          }
+            }
         } else {
-          if (!$user->{$field->userfield}) {
+            if (!$user->{$field->userfield}) {
             $user->{$field->userfield} = $info->value;
-          }
+            }
         }
-      }
-      foreach ($relations as $rel) {
+        }
+        foreach ($relations as $rel) {
         $user->$rel->save();
-      }
-      $user->save();
+        }
+        $user->save();
     }
     return $save;
-  }
+    }
 
-  public function getCurCart($create = true) {
+    public function getCurCart($create = true) {
     $cart = false;
     if (!empty($_SESSION['cart']['cart_id'])) {
-      $cart = Ecommerce\Cart::get((int) $_SESSION['cart']['cart_id']);
+        $cart = Ecommerce\Cart::get((int) $_SESSION['cart']['cart_id']);
     }
     if (!$cart && $create) {
-      $cart = new Ecommerce\Cart();
-      $cart->cart_status_id = 1;
-      $cart->user_id = Users\User::$cur->id;
-      $userCard = \Ecommerce\Card\Item::get(\Users\User::$cur->id, 'user_id');
-      if ($userCard) {
+        $cart = new Ecommerce\Cart();
+        $cart->cart_status_id = 1;
+        $cart->user_id = Users\User::$cur->id;
+        $userCard = \Ecommerce\Card\Item::get(\Users\User::$cur->id, 'user_id');
+        if ($userCard) {
         $cart->card_item_id = $userCard->id;
-      }
-      $cart->save();
-      $_SESSION['cart']['cart_id'] = $cart->id;
+        }
+        $cart->save();
+        $_SESSION['cart']['cart_id'] = $cart->id;
     }
     return $cart;
-  }
+    }
 
-  public function parseOptions($options = []) {
+    public function parseOptions($options = []) {
     $selectOptions = [
         'where' => !empty($options['where']) ? $options['where'] : [],
         'distinct' => false,
@@ -186,29 +186,29 @@ 
         'limit' => !empty($options['count']) ? (int) $options['count'] : 0,
     ];
     if (!empty($options['sort']) && is_array($options['sort'])) {
-      foreach ($options['sort'] as $col => $direction) {
+        foreach ($options['sort'] as $col => $direction) {
         switch ($col) {
-          case 'price':
+            case 'price':
             $selectOptions['order'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
             break;
-          case 'name':
+            case 'name':
             $selectOptions['order'][] = ['name', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
             break;
-          case 'sales':
+            case 'sales':
             $selectOptions['order'][] = ['sales', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
             break;
-          case 'weight':
+            case 'weight':
             $selectOptions['order'][] = ['weight', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
             break;
-          case 'new':
+            case 'new':
             $selectOptions['order'][] = ['date_create', strtolower($direction) == 'desc' ? 'desc' : 'asc'];
             break;
         }
-      }
+        }
     }
     $selectOptions['where'][] = ['deleted', 0];
     if (empty($this->config['view_empty_image'])) {
-      $selectOptions['where'][] = ['image_file_id', 0, '!='];
+        $selectOptions['where'][] = ['image_file_id', 0, '!='];
     }
 
     $selectOptions['join'][] = [Ecommerce\Item\Offer::table(), Ecommerce\Item::index() . ' = ' . Ecommerce\Item\Offer::colPrefix() . Ecommerce\Item::index(), 'inner'];
@@ -232,111 +232,111 @@ 
 
 
     if (!empty($this->config['view_filter'])) {
-      if (!empty($this->config['view_filter']['options'])) {
+        if (!empty($this->config['view_filter']['options'])) {
         foreach ($this->config['view_filter']['options'] as $optionId => $optionValue) {
-          $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
-              'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
-              'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value = "' . (int) $optionValue . '"',
-              'inner', 'option' . $optionId];
+            $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
+                'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
+                'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value = "' . (int) $optionValue . '"',
+                'inner', 'option' . $optionId];
+        }
         }
-      }
     }
     //filters
     if (!empty($options['filters'])) {
-      foreach ($options['filters'] as $col => $filter) {
+        foreach ($options['filters'] as $col => $filter) {
         switch ($col) {
-          case 'price':
+            case 'price':
             if (!empty($filter['min'])) {
-              $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['min'], '>='];
+                $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['min'], '>='];
             }
             if (!empty($filter['max'])) {
-              $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['max'], '<='];
+                $selectOptions['where'][] = [Ecommerce\Item\Offer\Price::colPrefix() . 'price', (float) $filter['max'], '<='];
             }
             break;
-          case 'options':
+            case 'options':
             foreach ($filter as $optionId => $optionValue) {
-              $optionId = (int) $optionId;
-              if (is_array($optionValue)) {
+                $optionId = (int) $optionId;
+                if (is_array($optionValue)) {
                 $optionValueArr = [];
                 foreach ($optionValue as $val) {
-                  $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
+                    $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
                 }
                 $qstr = 'IN (' . implode(',', $optionValueArr) . ')';
-              } else {
+                } else {
                 $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue);
-              }
-              $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
-                  'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
-                  'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value ' . $qstr . '',
-                  'inner', 'option' . $optionId];
+                }
+                $selectOptions['join'][] = [Ecommerce\Item\Param::table(), Ecommerce\Item::index() . ' = ' . 'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item::index() . ' AND ' .
+                    'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . Ecommerce\Item\Option::index() . ' = "' . (int) $optionId . '" AND ' .
+                    'option' . $optionId . '.' . Ecommerce\Item\Param::colPrefix() . 'value ' . $qstr . '',
+                    'inner', 'option' . $optionId];
             }
             break;
-          case 'offerOptions':
+            case 'offerOptions':
             //$selectOptions['join'][] = [Ecommerce\Item\Offer::table(), Ecommerce\Item::index() . ' = offer.' . Ecommerce\Item\Offer::colPrefix() . Ecommerce\Item::index(), 'left', 'offer'];
             foreach ($filter as $optionId => $optionValue) {
-              $optionId = (int) $optionId;
-              if (is_array($optionValue)) {
+                $optionId = (int) $optionId;
+                if (is_array($optionValue)) {
                 $optionValueArr = [];
                 foreach ($optionValue as $val) {
-                  $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
+                    $optionValueArr[] = \App::$cur->db->connection->pdo->quote($val);
                 }
                 $qstr = 'IN (' . implode(',', $optionValueArr) . ')';
-              } else {
+                } else {
                 $qstr = '= ' . \App::$cur->db->connection->pdo->quote($optionValue);
-              }
-              $selectOptions['join'][] = [Ecommerce\Item\Offer\Param::table(), Ecommerce\Item\Offer::index() . ' = ' . 'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer::index() . ' AND ' .
-                  'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer\Option::index() . ' = "' . (int) $optionId . '" AND ' .
-                  'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . 'value ' . $qstr,
-                  'inner', 'offerOption' . $optionId];
+                }
+                $selectOptions['join'][] = [Ecommerce\Item\Offer\Param::table(), Ecommerce\Item\Offer::index() . ' = ' . 'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer::index() . ' AND ' .
+                    'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . Ecommerce\Item\Offer\Option::index() . ' = "' . (int) $optionId . '" AND ' .
+                    'offerOption' . $optionId . '.' . Ecommerce\Item\Offer\Param::colPrefix() . 'value ' . $qstr,
+                    'inner', 'offerOption' . $optionId];
             }
             break;
         }
-      }
+        }
     }
     //parents
     if (!empty($options['parent']) && strpos($options['parent'], ',') !== false) {
-      $first = true;
-      $where = [];
-      foreach (explode(',', $options['parent']) as $categoryId) {
+        $first = true;
+        $where = [];
+        foreach (explode(',', $options['parent']) as $categoryId) {
         if (!$categoryId) {
-          continue;
+            continue;
         }
         $category = \Ecommerce\Category::get($categoryId);
         $where[] = ['tree_path', $category->tree_path . (int) $categoryId . '/%', 'LIKE', $first ? 'AND' : 'OR'];
         $first = false;
-      }
-      $selectOptions['where'][] = $where;
+        }
+        $selectOptions['where'][] = $where;
     } elseif (!empty($options['parent'])) {
-      $category = \Ecommerce\Category::get($options['parent']);
-      $selectOptions['where'][] = ['tree_path', $category->tree_path . (int) $options['parent'] . '/%', 'LIKE'];
+        $category = \Ecommerce\Category::get($options['parent']);
+        $selectOptions['where'][] = ['tree_path', $category->tree_path . (int) $options['parent'] . '/%', 'LIKE'];
     }
 
     //search
     if (!empty($options['search'])) {
-      $searchStr = preg_replace('![^A-zА-я0-9 ]!iSu', ' ', $options['search']);
-      $searchArr = [];
-      foreach (explode(' ', $searchStr) as $part) {
+        $searchStr = preg_replace('![^A-zА-я0-9 ]!iSu', ' ', $options['search']);
+        $searchArr = [];
+        foreach (explode(' ', $searchStr) as $part) {
         $part = trim($part);
         if ($part && strlen($part) > 2) {
-          $searchArr[] = ['search_index', '%' . $part . '%', 'LIKE'];
+            $searchArr[] = ['search_index', '%' . $part . '%', 'LIKE'];
+        }
         }
-      }
-      if (!empty($searchArr)) {
+        if (!empty($searchArr)) {
         $selectOptions['where'][] = $searchArr;
-      }
+        }
     }
     if (empty($this->config['view_empty_warehouse'])) {
-      $warehouseIds = [];
-      if (App::$cur->geography && \Geography\City::$cur) {
+        $warehouseIds = [];
+        if (App::$cur->geography && \Geography\City::$cur) {
         $warehouses = \Geography\City\Data::get([['code', 'warehouses'], ['city_id', \Geography\City::$cur->id]]);
         if ($warehouses && $warehouses->data) {
-          foreach (explode(',', $warehouses->data) as $id) {
+            foreach (explode(',', $warehouses->data) as $id) {
             $warehouseIds[$id] = $id;
-          }
+            }
+        }
         }
-      }
-      $selectOptions['where'][] = [
-          '(
+        $selectOptions['where'][] = [
+            '(
           (SELECT COALESCE(sum(`' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . 'count`),0) 
             FROM ' . \App::$cur->db->table_prefix . \Ecommerce\Item\Offer\Warehouse::table() . ' iciw 
             WHERE iciw.' . \Ecommerce\Item\Offer\Warehouse::colPrefix() . \Ecommerce\Item\Offer::index() . ' = ' . \Ecommerce\Item\Offer::index() . '
@@ -351,28 +351,28 @@ 
             )
             WHERE iewb.' . \Ecommerce\Warehouse\Block::colPrefix() . \Ecommerce\Item\Offer::index() . ' = ' . \Ecommerce\Item\Offer::index() . ')
           )',
-          0,
-          '>'
-      ];
+            0,
+            '>'
+        ];
     }
 
     $selectOptions['group'] = Ecommerce\Item::index();
 
     return $selectOptions;
-  }
-
-  /**
-   * Getting items params with params
-   * 
-   * @param array $params
-   * @return array
-   */
-  public function getItemsParams($params = []) {
+    }
+
+    /**
+     * Getting items params with params
+     * 
+     * @param array $params
+     * @return array
+     */
+    public function getItemsParams($params = []) {
     $selectOptions = $this->parseOptions($params);
 
     $items = Ecommerce\Item::getList($selectOptions);
     if (!$items) {
-      return [];
+        return [];
     }
     $items = Ecommerce\Item\Param::getList([
                 'where' => ['item_id', array_keys($items), 'IN'],
@@ -380,58 +380,58 @@ 
                 'distinct' => \Ecommerce\Item\Option::index()
     ]);
     return $items;
-  }
-
-  /**
-   * Getting items with params
-   * 
-   * @param array $params
-   * @return array
-   */
-  public function getItems($params = []) {
+    }
+
+    /**
+     * Getting items with params
+     * 
+     * @param array $params
+     * @return array
+     */
+    public function getItems($params = []) {
     $selectOptions = $this->parseOptions($params);
     $items = Ecommerce\Item::getList($selectOptions);
     return $items;
-  }
-
-  /**
-   * Return count of items with params
-   * 
-   * @param array $params
-   * @return int
-   */
-  public function getItemsCount($params = []) {
+    }
+
+    /**
+     * Return count of items with params
+     * 
+     * @param array $params
+     * @return int
+     */
+    public function getItemsCount($params = []) {
     $selectOptions = $this->parseOptions($params);
     $selectOptions['distinct'] = \Ecommerce\Item::index();
     $counts = Ecommerce\Item::getCount($selectOptions);
     if (is_array($counts)) {
-      $sum = 0;
-      foreach ($counts as $count) {
+        $sum = 0;
+        foreach ($counts as $count) {
         $sum +=$count['count'];
-      }
-      return $sum;
+        }
+        return $sum;
     }
     return $counts;
-  }
+    }
 
-  public function viewsCategoryList($inherit = true) {
+    public function viewsCategoryList($inherit = true) {
     $return = [];
     if ($inherit) {
-      $return['inherit'] = 'Как у родителя';
+        $return['inherit'] = 'Как у родителя';
     }
     $return['itemList'] = 'Список товаров';
     $conf = App::$primary->view->template->config;
     if (!empty($conf['files']['modules']['Ecommerce'])) {
-      foreach ($conf['files']['modules']['Ecommerce'] as $file) {
+        foreach ($conf['files']['modules']['Ecommerce'] as $file) {
         if ($file['type'] == 'Category') {
-          $return[$file['file']] = $file['name'];
+            $return[$file['file']] = $file['name'];
+        }
         }
-      }
     }
     return $return;
-  }
+    }
 
-  public function templatesCategoryList() {
+    public function templatesCategoryList() {
     $return = [
         'inherit' => 'Как у родителя',
         'current' => 'Текущая тема'
@@ -440,107 +440,107 @@ 
     $conf = App::$primary->view->template->config;
 
     if (!empty($conf['files']['aditionTemplateFiels'])) {
-      foreach ($conf['files']['aditionTemplateFiels'] as $file) {
+        foreach ($conf['files']['aditionTemplateFiels'] as $file) {
         $return[$file['file']] = '- ' . $file['name'];
-      }
+        }
     }
     return $return;
-  }
+    }
 
-  public function cartStatusDetector($event) {
+    public function cartStatusDetector($event) {
     $cart = $event['eventObject'];
     if (!empty($cart->_changedParams['cart_cart_status_id'])) {
-      $cart->date_status = date('Y-m-d H:i:s');
-      $event = new Ecommerce\Cart\Event(['cart_id' => $cart->id, 'user_id' => \Users\User::$cur->id, 'cart_event_type_id' => 5, 'info' => $cart->cart_status_id]);
-      $event->save();
+        $cart->date_status = date('Y-m-d H:i:s');
+        $event = new Ecommerce\Cart\Event(['cart_id' => $cart->id, 'user_id' => \Users\User::$cur->id, 'cart_event_type_id' => 5, 'info' => $cart->cart_status_id]);
+        $event->save();
 
-      $prev_status_id = $cart->_changedParams['cart_cart_status_id'];
-      $now_status_id = $cart->cart_status_id;
+        $prev_status_id = $cart->_changedParams['cart_cart_status_id'];
+        $now_status_id = $cart->cart_status_id;
 
-      $status = Ecommerce\Cart\Status::getList(['where' => ['id', implode(',', [$prev_status_id, $now_status_id]), 'IN']]);
+        $status = Ecommerce\Cart\Status::getList(['where' => ['id', implode(',', [$prev_status_id, $now_status_id]), 'IN']]);
 
-      $prefix = isset(App::$cur->ecommerce->config['orderPrefix']) ? $config = App::$cur->ecommerce->config['orderPrefix'] : '';
-      \App::$cur->users->AddUserActivity($cart->user_id, 3, "Статус вашего заказа номер {$prefix}{$cart->id} изменился с {$status[$prev_status_id]->name} на {$status[$now_status_id]->name}");
+        $prefix = isset(App::$cur->ecommerce->config['orderPrefix']) ? $config = App::$cur->ecommerce->config['orderPrefix'] : '';
+        \App::$cur->users->AddUserActivity($cart->user_id, 3, "Статус вашего заказа номер {$prefix}{$cart->id} изменился с {$status[$prev_status_id]->name} на {$status[$now_status_id]->name}");
 
-      if ($cart->cart_status_id == 5) {
+        if ($cart->cart_status_id == 5) {
         Inji::$inst->event('ecommerceCartClosed', $cart);
-      }
+        }
     }
     return $cart;
-  }
+    }
 
-  public function cardTrigger($event) {
+    public function cardTrigger($event) {
     $cart = $event['eventObject'];
     if ($cart->card) {
-      $sum = 0;
-      foreach ($cart->cartItems as $cartItem) {
+        $sum = 0;
+        foreach ($cart->cartItems as $cartItem) {
         $sum += $cartItem->final_price * $cartItem->count;
-      }
-      $cardItemHistory = new Ecommerce\Card\Item\History();
-      $cardItemHistory->amount = $sum;
-      $cardItemHistory->card_item_id = $cart->card_item_id;
-      $cardItemHistory->save();
-      $cart->card->sum += $sum;
-      $cart->card->save();
+        }
+        $cardItemHistory = new Ecommerce\Card\Item\History();
+        $cardItemHistory->amount = $sum;
+        $cardItemHistory->card_item_id = $cart->card_item_id;
+        $cardItemHistory->save();
+        $cart->card->sum += $sum;
+        $cart->card->save();
     }
     return $cart;
-  }
+    }
 
-  public function bonusTrigger($event) {
+    public function bonusTrigger($event) {
     $cart = $event['eventObject'];
     foreach ($cart->cartItems as $cartItem) {
-      foreach ($cartItem->price->offer->bonuses as $bonus) {
+        foreach ($cartItem->price->offer->bonuses as $bonus) {
         if ($bonus->limited && $bonus->left <= 0) {
-          continue;
+            continue;
         } elseif ($bonus->limited && $bonus->left > 0) {
-          $bonus->left -= 1;
-          $bonus->save();
+            $bonus->left -= 1;
+            $bonus->save();
         }
         switch ($bonus->type) {
-          case'currency':
+            case'currency':
             $currency = \Money\Currency::get($bonus->value);
             $wallets = App::$cur->money->getUserWallets($cart->user->id);
             $wallets[$currency->id]->diff($bonus->count, 'Бонус за покупку');
             break;
         }
-      }
+        }
     }
     return $cart;
-  }
+    }
 
-  function sitemap() {
+    function sitemap() {
     $map = [];
     $zeroItems = \Ecommerce\Item::getList(['where' => ['category_id', 0]]);
     foreach ($zeroItems as $item) {
-      $map[] = [
-          'name' => $item->name,
-          'url' => [
-              'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($item->getHref())
-          ],
-      ];
+        $map[] = [
+            'name' => $item->name,
+            'url' => [
+                'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($item->getHref())
+            ],
+        ];
     }
 
     $categorys = \Ecommerce\Category::getList(['where' => ['parent_id', 0]]);
     $scan = function($category, $scan) {
-      $map = [];
+        $map = [];
 
-      foreach ($category->items as $item) {
+        foreach ($category->items as $item) {
         $map[] = [
             'name' => $item->name,
             'url' => [
                 'loc' => (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . INJI_DOMAIN_NAME . ($item->getHref())
             ],
         ];
-      }
-      foreach ($category->catalogs as $child) {
+        }
+        foreach ($category->catalogs as $child) {
         $map = array_merge($map, $scan($child, $scan));
-      }
-      return $map;
+        }
+        return $map;
     };
     foreach ($categorys as $category) {
-      $map = array_merge($map, $scan($category, $scan));
+        $map = array_merge($map, $scan($category, $scan));
     }
     return $map;
-  }
+    }
 
 }

system/modules/Exchange1c/objects/Parser/Item/Images.php

Indentation +31 added lines, -31 removed lines

@@ -13,65 +13,65 @@
 
 class Images extends \Migrations\Parser {
 
-  public function parse() {
+    public function parse() {
     if (is_null($this->data)) {
-      return;
+        return;
     }
     $value = $this->data;
     if (!is_array($value)) {
-      $value = [$value];
+        $value = [$value];
     }
     $ids = [];
     $dir = pathinfo($this->object->walker->migtarionLog->source, PATHINFO_DIRNAME);
     $this->model->image_file_id = 0;
     foreach ($value as $key => $imagePath) {
-      if (!$imagePath || !file_exists($dir . '/' . $imagePath)) {
+        if (!$imagePath || !file_exists($dir . '/' . $imagePath)) {
         continue;
-      }
-      $notEq = true;
-      $md5Cur = md5_file($dir . '/' . $imagePath);
-      foreach ($this->model->images as $imageId => $image) {
+        }
+        $notEq = true;
+        $md5Cur = md5_file($dir . '/' . $imagePath);
+        foreach ($this->model->images as $imageId => $image) {
         if (!$image->file) {
-          $image->delete();
-          continue;
+            $image->delete();
+            continue;
         }
         $file = $image->file;
         $md5File = '';
         if ($file->md5) {
-          $md5File = $file->md5;
+            $md5File = $file->md5;
         } elseif (file_exists($file->getRealPath())) {
-          $md5File = $file->md5 = md5_file($file->getRealPath());
-          $file->save();
+            $md5File = $file->md5 = md5_file($file->getRealPath());
+            $file->save();
         }
 
         if ($file && file_exists($file->getRealPath()) && $md5Cur == $md5File) {
-          $notEq = false;
-          $ids[] = $imageId;
-          break;
+            $notEq = false;
+            $ids[] = $imageId;
+            break;
+        }
         }
-      }
-      if ($notEq) {
+        if ($notEq) {
         $file_id = \App::$primary->files->uploadFromUrl($dir . '/' . $imagePath, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
         if ($file_id) {
-          $image = new \Ecommerce\Item\Image([
-              'item_id' => $this->model->pk(),
-              'file_id' => $file_id
-          ]);
-          $image->save();
-          $ids[] = $image->id;
+            $image = new \Ecommerce\Item\Image([
+                'item_id' => $this->model->pk(),
+                'file_id' => $file_id
+            ]);
+            $image->save();
+            $ids[] = $image->id;
         }
-      } else {
+        } else {
         $image->weight = $key;
-      }
-      if ($image && !$this->model->image_file_id) {
+        }
+        if ($image && !$this->model->image_file_id) {
         $this->model->image_file_id = $image->file_id;
-      }
+        }
     }
     foreach ($this->model->images as $imageId => $image) {
-      if (!in_array($imageId, $ids)) {
+        if (!in_array($imageId, $ids)) {
         $image->delete();
-      }
+        }
+    }
     }
-  }
 
 }

system/modules/Ecommerce/models/Item/Image.php

Indentation +36 added lines, -36 removed lines

@@ -13,22 +13,22 @@ 
 
 class Image extends \Model {
 
-  static $objectName = 'Фото товара';
-  static $labels = [
-      'file_id' => 'Изображение',
-      'item_id' => 'Товар',
-      'name' => 'Название',
-      'description' => 'Описание',
-  ];
-  static $cols = [
-      'file_id' => ['type' => 'image'],
-      'item_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'item'],
-      'name' => ['type' => 'text'],
-      'description' => ['type' => 'html'],
-      'weight' => ['type' => 'number'],
-  ];
+    static $objectName = 'Фото товара';
+    static $labels = [
+        'file_id' => 'Изображение',
+        'item_id' => 'Товар',
+        'name' => 'Название',
+        'description' => 'Описание',
+    ];
+    static $cols = [
+        'file_id' => ['type' => 'image'],
+        'item_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'item'],
+        'name' => ['type' => 'text'],
+        'description' => ['type' => 'html'],
+        'weight' => ['type' => 'number'],
+    ];
 
-  static function relations() {
+    static function relations() {
     return [
         'item' => [
             'col' => 'item_id',
@@ -39,30 +39,30 @@ 
             'model' => 'Files\File'
         ]
     ];
-  }
+    }
 
-  static $dataManagers = [
-      'manager' => [
-          'name' => 'Фото товара',
-          'cols' => [
-              'file_id', 'name'
-          ]
-      ]
-  ];
-  static $forms = [
-      'manager' => [
-          'map' => [
-              ['name'],
-              ['item_id', 'file_id'],
-              ['description']
-          ]
-      ]
-  ];
+    static $dataManagers = [
+        'manager' => [
+            'name' => 'Фото товара',
+            'cols' => [
+                'file_id', 'name'
+            ]
+        ]
+    ];
+    static $forms = [
+        'manager' => [
+            'map' => [
+                ['name'],
+                ['item_id', 'file_id'],
+                ['description']
+            ]
+        ]
+    ];
 
-  function beforeDelete() {
+    function beforeDelete() {
     if ($this->file) {
-      $this->file->delete();
+        $this->file->delete();
+    }
     }
-  }
 
 }

system/modules/Ecommerce/models/Delivery/Save.php

Indentation +6 added lines, -6 removed lines

@@ -13,12 +13,12 @@ 
 
 class Save extends \Model {
 
-  public static $cols = [
-      'name' => ['type' => 'text'],
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user']
-  ];
+    public static $cols = [
+        'name' => ['type' => 'text'],
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user']
+    ];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'values' => [
             'type' => 'many',
@@ -31,6 +31,6 @@ 
             'col' => 'user_id'
         ]
     ];
-  }
+    }
 
 }

system/modules/Exchange1c/objects/Mode/Init.php

Indentation +20 added lines, -20 removed lines

@@ -13,43 +13,43 @@
 
 class Init extends \Exchange1c\Mode {
 
-  public function process() {
+    public function process() {
     echo "zip=no\n";
     echo 'file_limit=' . \Tools::toBytes(ini_get('post_max_size'));
     $this->end();
 
     //clean files
     if (!empty(\App::$cur->exchange1c->config['maxSaveFilesInterval'])) {
-      $query = \App::$cur->db->newQuery();
-      $query->operation = 'select';
-      $query->table = \Exchange1c\Exchange\File::table();
-      $query->cols = \Exchange1c\Exchange\File::colPrefix() . 'id';
-      $queryArr = $query->buildQuery();
-      $queryArr['query'].=' where `' . \Exchange1c\Exchange\File::colPrefix() . 'deleted` = 0 AND  `' . \Exchange1c\Exchange\File::colPrefix() . 'date_create` < NOW() - INTERVAL ' . \App::$cur->exchange1c->config['maxSaveFilesInterval'];
-      try {
+        $query = \App::$cur->db->newQuery();
+        $query->operation = 'select';
+        $query->table = \Exchange1c\Exchange\File::table();
+        $query->cols = \Exchange1c\Exchange\File::colPrefix() . 'id';
+        $queryArr = $query->buildQuery();
+        $queryArr['query'].=' where `' . \Exchange1c\Exchange\File::colPrefix() . 'deleted` = 0 AND  `' . \Exchange1c\Exchange\File::colPrefix() . 'date_create` < NOW() - INTERVAL ' . \App::$cur->exchange1c->config['maxSaveFilesInterval'];
+        try {
         $ids = array_keys($query->query($queryArr)->getArray(\Exchange1c\Exchange\File::colPrefix().'id'));
-      } catch (\PDOException $exc) {
+        } catch (\PDOException $exc) {
         if ($exc->getCode() == '42S02') {
-          \Exchange1c\Exchange\File::createTable();
+            \Exchange1c\Exchange\File::createTable();
         } elseif ($exc->getCode() == '42S22') {
-          $cols = \Exchange1c\Exchange\File::cols();
-          foreach (\Exchange1c\Exchange\File::$cols as $colName => $params) {
+            $cols = \Exchange1c\Exchange\File::cols();
+            foreach (\Exchange1c\Exchange\File::$cols as $colName => $params) {
             if (!isset($cols[\Exchange1c\Exchange\File::colPrefix() . $colName])) {
-              \Exchange1c\Exchange\File::createCol($colName);
+                \Exchange1c\Exchange\File::createCol($colName);
+            }
             }
-          }
         }
         $ids = array_keys($query->query($queryArr)->getArray(\Exchange1c\Exchange\File::colPrefix().'id'));
-      }
-      foreach (array_chunk($ids, 500) as $idGroup) {
+        }
+        foreach (array_chunk($ids, 500) as $idGroup) {
         $dfiles = \Exchange1c\Exchange\File::getList(['where' => ['id', $idGroup, 'IN']]);
         foreach ($dfiles as $dfile) {
-          $dfile->deleteFile();
-          unset($dfile);
+            $dfile->deleteFile();
+            unset($dfile);
         }
         unset($dfiles);
-      }
+        }
+    }
     }
-  }
 
 }

system/modules/Exchange1c/objects/Mode/File.php

Indentation +12 added lines, -12 removed lines

@@ -13,7 +13,7 @@ 
 
 class File extends \Exchange1c\Mode {
 
-  public function process() {
+    public function process() {
     $dir = $this->exchange->path;
     \Tools::createDir($dir);
     $file = new \Exchange1c\Exchange\File();
@@ -24,26 +24,26 @@ 
 
     $filename = \Tools::parsePath($_GET['filename']);
     if (strpos($filename, '/') !== false) {
-      $subDir = substr($filename, 0, strrpos($filename, "/") + 1);
-      \Tools::createDir($dir . '/' . $subDir);
+        $subDir = substr($filename, 0, strrpos($filename, "/") + 1);
+        \Tools::createDir($dir . '/' . $subDir);
     }
     $text = '';
     if (false === file_put_contents($dir . '/' . $filename, file_get_contents("php://input"))) {
-      $text = 'Fail on save file: ' . $filename;
-      $file->status = 'failure';
+        $text = 'Fail on save file: ' . $filename;
+        $file->status = 'failure';
     } else {
-      $file->size = ceil(filesize($dir . '/' . $filename));
-      $file->name = $filename;
-      $file->status = 'success';
+        $file->size = ceil(filesize($dir . '/' . $filename));
+        $file->name = $filename;
+        $file->status = 'success';
     }
     $file->save();
     if (strpos($filename, '1cbitrix') !== false) {
-      $data = new \SimpleXMLElement(file_get_contents($dir . '/' . $filename));
-      $orders = new \Exchange1c\Parser\Orders($data);
-      $orders->process();
+        $data = new \SimpleXMLElement(file_get_contents($dir . '/' . $filename));
+        $orders = new \Exchange1c\Parser\Orders($data);
+        $orders->process();
     }
     \App::$cur->exchange1c->response($file->status, $text, false);
     $this->end($file->status);
-  }
+    }
 
 }

system/modules/Exchange1c/models/Exchange/File.php

Indentation +20 added lines, -20 removed lines

@@ -13,37 +13,37 @@
 
 class File extends \Model {
 
-  public static $cols = [
-      'name' => ['type' => 'text'],
-      'exchange_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'exchange'],
-      'size' => ['type' => 'number'],
-      'status' => ['type' => 'text'],
-      'deleted' => ['type' => 'bool'],
-      'date_create' => ['type' => 'dateTime'],
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'cols' => [
-              'name', 'size', 'status', 'deleted', 'date_create'
-          ],
-      ]
-  ];
+    public static $cols = [
+        'name' => ['type' => 'text'],
+        'exchange_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'exchange'],
+        'size' => ['type' => 'number'],
+        'status' => ['type' => 'text'],
+        'deleted' => ['type' => 'bool'],
+        'date_create' => ['type' => 'dateTime'],
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'cols' => [
+                'name', 'size', 'status', 'deleted', 'date_create'
+            ],
+        ]
+    ];
 
-  public function deleteFile() {
+    public function deleteFile() {
     if ($this->exchange && file_exists($this->exchange->path . '/' . $this->name)) {
-      unlink($this->exchange->path . '/' . $this->name);
+        unlink($this->exchange->path . '/' . $this->name);
     }
     $this->deleted = 1;
     $this->save();
-  }
+    }
 
-  public static function relations() {
+    public static function relations() {
     return [
         'exchange' => [
             'model' => 'Exchange1c\Exchange',
             'col' => 'exchange_id'
         ]
     ];
-  }
+    }
 
 }

system/modules/Ecommerce/appControllers/CartController.php

Indentation +107 added lines, -107 removed lines

@@ -10,146 +10,146 @@ 
  */
 class CartController extends Controller {
 
-  public function indexAction() {
+    public function indexAction() {
     $cart = '';
     $deliverys = \Ecommerce\Delivery::getList(['order' => ['weight', 'ASC']]);
     $payTypes = \Ecommerce\PayType::getList(['order' => ['weight', 'ASC']]);
     if (!empty($_SESSION['cart']['cart_id'])) {
-      $cart = Ecommerce\Cart::get($_SESSION['cart']['cart_id']);
-      if (!empty($_POST)) {
+        $cart = Ecommerce\Cart::get($_SESSION['cart']['cart_id']);
+        if (!empty($_POST)) {
         $error = false;
         if (!Users\User::$cur->id) {
-          $user_id = $this->Users->registration($_POST, true);
-          if (!$user_id) {
+            $user_id = $this->Users->registration($_POST, true);
+            if (!$user_id) {
             $error = true;
-          } else {
+            } else {
             $user = Users\User::get($user_id);
-          }
+            }
         } else {
-          $user = Users\User::$cur;
+            $user = Users\User::$cur;
         }
         $ids = [];
         if (!empty($_POST['cartItems'])) {
-          foreach ($_POST['cartItems'] as $cartItemId => $cartItemCont) {
+            foreach ($_POST['cartItems'] as $cartItemId => $cartItemCont) {
             $cartItem = \Ecommerce\Cart\Item::get((int) $cartItemId);
             if (!$cartItem) {
-              continue;
+                continue;
             }
             if ($cartItem->cart_id != $cart->id) {
-              continue;
+                continue;
             }
             $count = (float) $cartItemCont;
             if ($count < 0.001) {
-              $count = 1;
+                $count = 1;
             }
             $cartItem->count = $count;
             $cartItem->save();
             $ids[] = $cartItemId;
-          }
+            }
         }
         foreach ($cart->cartItems as $cartItem) {
-          if (!in_array($cartItem->id, $ids)) {
+            if (!in_array($cartItem->id, $ids)) {
             $cartItem->delete();
-          }
+            }
         }
         $cart = Ecommerce\Cart::get($cart->id);
         if (!$cart->cartItems) {
-          $error = true;
-          //Tools::redirect('/ecommerce', 'Ваша корзина пуста');
+            $error = true;
+            //Tools::redirect('/ecommerce', 'Ваша корзина пуста');
         }
         if (empty($this->module->config['sell_over_warehouse'])) {
-          foreach ($cart->cartItems as $cartitem) {
+            foreach ($cart->cartItems as $cartitem) {
             $warecount = $cartitem->price->offer->warehouseCount($cart->id);
             if ($cartitem->count > $warecount) {
-              $error = true;
-              Msg::add('Вы заказали <b>' . $cartitem->item->name . '</b> больше чем есть на складе. на складе: <b>' . $warecount . '</b>', 'danger');
+                $error = true;
+                Msg::add('Вы заказали <b>' . $cartitem->item->name . '</b> больше чем есть на складе. на складе: <b>' . $warecount . '</b>', 'danger');
+            }
             }
-          }
         }
         if ($deliverys && empty($deliverys[$_POST['delivery']])) {
-          $error = 1;
-          Msg::add('Выберите способ доставки', 'danger');
+            $error = 1;
+            Msg::add('Выберите способ доставки', 'danger');
         } elseif ($deliverys && !empty($deliverys[$_POST['delivery']])) {
-          $cart->delivery_id = $_POST['delivery'];
-          foreach ($deliverys[$cart->delivery_id]->fields as $field) {
+            $cart->delivery_id = $_POST['delivery'];
+            foreach ($deliverys[$cart->delivery_id]->fields as $field) {
             if (empty($_POST['deliveryFields'][$field->id]) && $field->required) {
-              $error = 1;
-              Msg::add('Вы не указали: ' . $field->name, 'danger');
+                $error = 1;
+                Msg::add('Вы не указали: ' . $field->name, 'danger');
+            }
             }
-          }
         }
         if ($payTypes && (empty($_POST['payType']) || empty($payTypes[$_POST['payType']]))) {
-          $error = 1;
-          Msg::add('Выберите способ оплаты', 'danger');
+            $error = 1;
+            Msg::add('Выберите способ оплаты', 'danger');
         } elseif ($payTypes && !empty($payTypes[$_POST['payType']])) {
-          $payType = $payTypes[$_POST['payType']];
-          $cart->paytype_id = $payType->id;
+            $payType = $payTypes[$_POST['payType']];
+            $cart->paytype_id = $payType->id;
         } else {
-          $payType = null;
+            $payType = null;
         }
         foreach (\Ecommerce\UserAdds\Field::getList() as $field) {
-          if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
+            if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
             $error = 1;
             Msg::add('Вы не указали: ' . $field->name, 'danger');
-          }
+            }
         }
         if (!empty($_POST['discounts']['card_item_id'])) {
-          $userCard = \Ecommerce\Card\Item::get((int) $_POST['discounts']['card_item_id']);
-          if (!$userCard) {
+            $userCard = \Ecommerce\Card\Item::get((int) $_POST['discounts']['card_item_id']);
+            if (!$userCard) {
             $error = true;
             Msg::add('Такой карты не существует', 'danger');
-          } elseif ($userCard->user_id != $user->id) {
+            } elseif ($userCard->user_id != $user->id) {
             $error = true;
             Msg::add('Это не ваша карта', 'danger');
-          } else {
+            } else {
             $cart->card_item_id = $userCard->id;
-          }
+            }
         }
         $cart->save();
         if (!$error && !empty($_POST['action']) && $_POST['action'] = 'order') {
-          $cart->user_id = $user->user_id;
-          $this->module->parseFields($_POST['userAdds']['fields'], $cart);
-          if ($payTypes && !empty($payTypes[$cart->paytype_id]) && !empty($_POST['deliveryFields'])) {
+            $cart->user_id = $user->user_id;
+            $this->module->parseFields($_POST['userAdds']['fields'], $cart);
+            if ($payTypes && !empty($payTypes[$cart->paytype_id]) && !empty($_POST['deliveryFields'])) {
             $this->module->parseDeliveryFields($_POST['deliveryFields'], $cart, $deliverys[$cart->delivery_id]->fields);
-          }
-          $cart->cart_status_id = 2;
-          $cart->comment = !empty($_POST['comment']) ? htmlspecialchars($_POST['comment']) : '';
-          $cart->date_status = date('Y-m-d H:i:s');
-          $cart->complete_data = date('Y-m-d H:i:s');
-          $cart->warehouse_block = 1;
-          $cart->save();
+            }
+            $cart->cart_status_id = 2;
+            $cart->comment = !empty($_POST['comment']) ? htmlspecialchars($_POST['comment']) : '';
+            $cart->date_status = date('Y-m-d H:i:s');
+            $cart->complete_data = date('Y-m-d H:i:s');
+            $cart->warehouse_block = 1;
+            $cart->save();
 
-          $cart = \Ecommerce\Cart::get($cart->id);
-          foreach ($cart->cartItems as $cartItem) {
+            $cart = \Ecommerce\Cart::get($cart->id);
+            foreach ($cart->cartItems as $cartItem) {
             $cartItem->discount = $cartItem->discount();
             $cartItem->final_price = $cartItem->price->price - $cartItem->discount;
             $cartItem->save();
-          }
-          $cart = \Ecommerce\Cart::get($cart->id);
-          if (!empty(\App::$cur->ecommerce->config['notify_mail'])) {
+            }
+            $cart = \Ecommerce\Cart::get($cart->id);
+            if (!empty(\App::$cur->ecommerce->config['notify_mail'])) {
             $text = 'Перейдите в админ панель чтобы просмотреть новый заказ <a href = "http://' . idn_to_utf8(INJI_DOMAIN_NAME) . '/admin/ecommerce/Cart">Админ панель</a>';
             $title = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
             \Tools::sendMail('noreply@' . INJI_DOMAIN_NAME, \App::$cur->ecommerce->config['notify_mail'], $title, $text);
-          }
-          if ($this->notifications) {
+            }
+            if ($this->notifications) {
             $notification = new Notifications\Notification();
             $notification->name = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
             $notification->text = 'Перейдите в админ панель чтобы просмотреть новый заказ';
             $notification->chanel_id = $this->notifications->getChanel('Ecommerce-orders')->id;
             $notification->save();
-          }
-          $handlers = $this->ecommerce->getSnippets('payTypeHandler');
-          $redirect = ['/ecommerce/cart/success'];
-          if ($payType && !empty($handlers[$payType->handler]['handler'])) {
+            }
+            $handlers = $this->ecommerce->getSnippets('payTypeHandler');
+            $redirect = ['/ecommerce/cart/success'];
+            if ($payType && !empty($handlers[$payType->handler]['handler'])) {
             $newRedirect = $handlers[$payType->handler]['handler']($cart);
             if (!empty($newRedirect)) {
-              $redirect = $newRedirect;
+                $redirect = $newRedirect;
+            }
             }
-          }
-          unset($_SESSION['cart']['cart_id']);
-          call_user_func_array(['Tools', 'redirect'], $redirect);
+            unset($_SESSION['cart']['cart_id']);
+            call_user_func_array(['Tools', 'redirect'], $redirect);
+        }
         }
-      }
     }
     $this->view->setTitle('Корзина');
     $bread = [];
@@ -162,12 +162,12 @@ 
         'href' => '/ecommerce/cart'
     ];
     $this->view->page(['data' => compact('cart', 'items', 'deliverys', 'payTypes', 'packItem', 'bread')]);
-  }
+    }
 
-  public function orderDetailAction($id = 0) {
+    public function orderDetailAction($id = 0) {
     $cart = Ecommerce\Cart::get((int) $id);
     if ($cart->user_id != Users\User::$cur->id) {
-      $this->url->redirect('/', 'Это не ваша корзина');
+        $this->url->redirect('/', 'Это не ваша корзина');
     }
     $bread[] = [
         'text' => 'Каталог',
@@ -183,54 +183,54 @@ 
     ];
     $this->view->setTitle('Заказ №' . $cart->id);
     $this->view->page(['data' => compact('cart', 'bread')]);
-  }
+    }
 
-  public function continueAction($id = 0) {
+    public function continueAction($id = 0) {
     $cart = \Ecommerce\Cart::get((int) $id);
     if ($cart->user_id != Users\User::$cur->id) {
-      Tools::redirect('/', 'Это не ваша корзина');
+        Tools::redirect('/', 'Это не ваша корзина');
     }
     if ($cart->cart_status_id > 1) {
-      Tools::redirect('/', 'Корзина уже оформлена');
+        Tools::redirect('/', 'Корзина уже оформлена');
     }
     $_SESSION['cart']['cart_id'] = $cart->id;
     Tools::redirect('/ecommerce/cart');
-  }
+    }
 
-  public function deleteAction($id = 0) {
+    public function deleteAction($id = 0) {
     $cart = \Ecommerce\Cart::get((int) $id);
     if ($cart->user_id != Users\User::$cur->id) {
-      Tools::redirect('/', 'Это не ваша корзина');
+        Tools::redirect('/', 'Это не ваша корзина');
     }
     if ($cart->cart_status_id > 1) {
-      Tools::redirect('/', 'Корзина уже оформлена');
+        Tools::redirect('/', 'Корзина уже оформлена');
     }
     if (!empty($_SESSION['cart']['cart_id']) && $_SESSION['cart']['cart_id'] == $cart->id) {
-      unset($_SESSION['cart']['cart_id']);
+        unset($_SESSION['cart']['cart_id']);
     }
     $cart->delete();
     Tools::redirect('/users/cabinet/ecommerceOrdersHistory', 'Корзина была удалена', 'success');
-  }
+    }
 
-  public function refillAction($id = 0) {
+    public function refillAction($id = 0) {
     $cart = \Ecommerce\Cart::get((int) $id);
     if ($cart->user_id != Users\User::$cur->id) {
-      Tools::redirect('/', 'Это не ваша корзина');
+        Tools::redirect('/', 'Это не ваша корзина');
     }
     if (!empty($_SESSION['cart']['cart_id'])) {
-      unset($_SESSION['cart']['cart_id']);
+        unset($_SESSION['cart']['cart_id']);
     }
     $newCart = $this->ecommerce->getCurCart();
     foreach ($cart->cartItems as $cartitem) {
-      $newCart->addItem($cartitem->item_offer_price_id, $cartitem->count);
+        $newCart->addItem($cartitem->item_offer_price_id, $cartitem->count);
     }
 
     $newCart->save();
 
     Tools::redirect('/ecommerce/cart/');
-  }
+    }
 
-  public function successAction() {
+    public function successAction() {
     $bread = [];
     $bread[] = [
         'text' => 'Каталог',
@@ -246,70 +246,70 @@ 
     ];
     $this->view->setTitle('Заказ принят');
     $this->view->page(['data' => compact('bread')]);
-  }
+    }
 
-  public function addAction() {
+    public function addAction() {
     $result = new Server\Result();
     if (empty($_GET['itemOfferPriceId'])) {
-      $result->success = false;
-      $result->content = 'Произошла непредвиденная ошибка при добавлении товара';
-      $result->send();
+        $result->success = false;
+        $result->content = 'Произошла непредвиденная ошибка при добавлении товара';
+        $result->send();
     }
     $price = \Ecommerce\Item\Offer\Price::get((int) $_GET['itemOfferPriceId']);
     if (!$price) {
-      $result->success = false;
-      $result->content = 'Такой цены не найдено';
-      $result->send();
+        $result->success = false;
+        $result->content = 'Такой цены не найдено';
+        $result->send();
     }
     $item = $price->offer->item;
 
     if (!$item) {
-      $result->success = false;
-      $result->content = 'Такого товара не существует';
-      $result->send();
+        $result->success = false;
+        $result->content = 'Такого товара не существует';
+        $result->send();
     }
 
     $item->sales ++;
     $item->save();
 
     if (empty($_GET['count']))
-      $count = 1;
+        $count = 1;
     else
-      $count = (float) $_GET['count'];
+        $count = (float) $_GET['count'];
 
     $cart = $this->ecommerce->getCurCart();
     $stages = Ecommerce\Cart\Stage::getList();
     if (empty($this->module->config['sell_over_warehouse']) && $price->offer->warehouseCount() < $count) {
-      $result->success = false;
-      $result->content = 'На складе недостаточно товара! Доступно: ' . $price->offer->warehouseCount();
-      $result->send();
+        $result->success = false;
+        $result->content = 'На складе недостаточно товара! Доступно: ' . $price->offer->warehouseCount();
+        $result->send();
     }
 
     $isset = false;
     foreach ($cart->cartItems as $cartItem) {
-      if ($cartItem->item_id == $item->id && $cartItem->item_offer_price_id == $price->id) {
+        if ($cartItem->item_id == $item->id && $cartItem->item_offer_price_id == $price->id) {
         $cartItem->count += $count;
         $cartItem->save();
         $isset = true;
         break;
-      }
+        }
     }
     if (!$isset) {
-      $cart->addItem($price->id, $count);
+        $cart->addItem($price->id, $count);
     }
     $cart->date_last_activ = date('Y-m-d H:i:s');
     $cart->calc();
     $result->successMsg = '<a href="/ecommerce/view/' . $item->id . '">' . $item->name() . ($price->offer->name() ? ' (' . $price->offer->name() . ')' : '') . '</a> добавлен <a href="/ecommerce/cart">в корзину покупок</a>!';
     $result->send();
-  }
+    }
 
-  public function getcartAction() {
+    public function getcartAction() {
     $result = new Server\Result();
     ob_start();
     $this->view->widget('Ecommerce\cart');
     $result->content = ob_get_contents();
     ob_end_clean();
     $result->send();
-  }
+    }
 
 }

system/modules/Ecommerce/models/Delivery.php

Indentation +59 added lines, -59 removed lines

@@ -13,65 +13,65 @@ 
 
 class Delivery extends \Model {
 
-  public static $objectName = 'Доставка';
-  public static $cols = [
-      //Основные параметры
-      'name' => ['type' => 'text'],
-      'price' => ['type' => 'decimal'],
-      'currency_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'currency'],
-      'price_text' => ['type' => 'textarea'],
-      'max_cart_price' => ['type' => 'decimal'],
-      'icon_file_id' => ['type' => 'image'],
-      'info' => ['type' => 'html'],
-      'disabled' => ['type' => 'bool'],
-      //Системные
-      'weight' => ['type' => 'number'],
-      'date_create' => ['type' => 'dateTime'],
-      //Менеджеры
-      'field' => ['type' => 'dataManager', 'relation' => 'fields'],
-      'priceChanger' => ['type' => 'dataManager', 'relation' => 'prices']
-  ];
-  public static $labels = [
-      'name' => 'Название',
-      'price' => 'Стоимость',
-      'price_text' => 'Текстовое описание стоимости (отображается вместо цены)',
-      'max_cart_price' => 'Басплатно при',
-      'icon_file_id' => 'Иконка',
-      'currency_id' => 'Валюта',
-      'info' => 'Дополнительная информация',
-      'priceChanger' => 'Градация стоимости',
-      'field' => 'Поля',
-      'disabled' => 'Отключено',
-  ];
-  public static $dataManagers = [
-      'manager' => [
-          'name' => 'Варианты доставки',
-          'cols' => [
-              'name',
-              'price',
-              'currency_id',
-              'max_cart_price',
-              'disabled',
-              'field',
-              'priceChanger',
-          ],
-          'sortMode' => true
-      ],
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['name', 'disabled'],
-              ['max_cart_price', 'icon_file_id'],
-              ['price', 'currency_id'],
-              ['price_text'],
-              ['info'],
-              ['priceChanger'],
-              ['field']
-          ]
-  ]];
+    public static $objectName = 'Доставка';
+    public static $cols = [
+        //Основные параметры
+        'name' => ['type' => 'text'],
+        'price' => ['type' => 'decimal'],
+        'currency_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'currency'],
+        'price_text' => ['type' => 'textarea'],
+        'max_cart_price' => ['type' => 'decimal'],
+        'icon_file_id' => ['type' => 'image'],
+        'info' => ['type' => 'html'],
+        'disabled' => ['type' => 'bool'],
+        //Системные
+        'weight' => ['type' => 'number'],
+        'date_create' => ['type' => 'dateTime'],
+        //Менеджеры
+        'field' => ['type' => 'dataManager', 'relation' => 'fields'],
+        'priceChanger' => ['type' => 'dataManager', 'relation' => 'prices']
+    ];
+    public static $labels = [
+        'name' => 'Название',
+        'price' => 'Стоимость',
+        'price_text' => 'Текстовое описание стоимости (отображается вместо цены)',
+        'max_cart_price' => 'Басплатно при',
+        'icon_file_id' => 'Иконка',
+        'currency_id' => 'Валюта',
+        'info' => 'Дополнительная информация',
+        'priceChanger' => 'Градация стоимости',
+        'field' => 'Поля',
+        'disabled' => 'Отключено',
+    ];
+    public static $dataManagers = [
+        'manager' => [
+            'name' => 'Варианты доставки',
+            'cols' => [
+                'name',
+                'price',
+                'currency_id',
+                'max_cart_price',
+                'disabled',
+                'field',
+                'priceChanger',
+            ],
+            'sortMode' => true
+        ],
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['name', 'disabled'],
+                ['max_cart_price', 'icon_file_id'],
+                ['price', 'currency_id'],
+                ['price_text'],
+                ['info'],
+                ['priceChanger'],
+                ['field']
+            ]
+    ]];
 
-  public static function relations() {
+    public static function relations() {
     return [
         'icon' => [
             'model' => 'Files\File',
@@ -92,6 +92,6 @@ 
             'col' => 'delivery_id'
         ]
     ];
-  }
+    }
 
 }