injitools / cms-Inji

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

Indentation +23 added lines, -23 removed lines

@@ -13,40 +13,40 @@ 
 
 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) {
         $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']);
         $image = new \Ecommerce\Item\Image([
             'item_id' => $this->model->pk(),
@@ -54,18 +54,18 @@ 
         ]);
         $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();
-      }
+        }
+    }
     }
-  }
 
 }

Spacing +3 added lines, -3 removed lines

@@ -25,11 +25,11 @@ 
     $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);
+      $md5Cur = md5_file($dir.'/'.$imagePath);
       foreach ($this->model->images as $imageId => $image) {
         $file = $image->file;
         $md5File = '';
@@ -47,7 +47,7 @@ 
         }
       }
       if ($notEq) {
-        $file_id = \App::$primary->files->uploadFromUrl($dir . '/' . $imagePath, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
+        $file_id = \App::$primary->files->uploadFromUrl($dir.'/'.$imagePath, ['accept_group' => 'image', 'upload_code' => 'MigrationUpload']);
         $image = new \Ecommerce\Item\Image([
             'item_id' => $this->model->pk(),
             'file_id' => $file_id

system/modules/Ecommerce/appControllers/CartController.php

Indentation +106 added lines, -106 removed lines

@@ -10,145 +10,145 @@ 
  */
 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) {
-          Tools::redirect('/ecommerce', 'Ваша корзина пуста');
+            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 = [];
@@ -161,12 +161,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' => 'Каталог',
@@ -182,54 +182,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' => 'Каталог',
@@ -245,70 +245,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();
-  }
+    }
 
 }

Spacing +13 added lines, -13 removed lines

@@ -61,7 +61,7 @@ 
             $warecount = $cartitem->price->offer->warehouseCount($cart->id);
             if ($cartitem->count > $warecount) {
               $error = true;
-              Msg::add('Вы заказали <b>' . $cartitem->item->name . '</b> больше чем есть на складе. на складе: <b>' . $warecount . '</b>', 'danger');
+              Msg::add('Вы заказали <b>'.$cartitem->item->name.'</b> больше чем есть на складе. на складе: <b>'.$warecount.'</b>', 'danger');
             }
           }
         }
@@ -73,7 +73,7 @@ 
           foreach ($deliverys[$cart->delivery_id]->fields as $field) {
             if (empty($_POST['deliveryFields'][$field->id]) && $field->required) {
               $error = 1;
-              Msg::add('Вы не указали: ' . $field->name, 'danger');
+              Msg::add('Вы не указали: '.$field->name, 'danger');
             }
           }
         }
@@ -89,7 +89,7 @@ 
         foreach (\Ecommerce\UserAdds\Field::getList() as $field) {
           if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
             $error = 1;
-            Msg::add('Вы не указали: ' . $field->name, 'danger');
+            Msg::add('Вы не указали: '.$field->name, 'danger');
           }
         }
         if (!empty($_POST['discounts']['card_item_id'])) {
@@ -126,13 +126,13 @@ 
           }
           $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);
+            $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) {
             $notification = new Notifications\Notification();
-            $notification->name = 'Новый заказ в интернет магазине на сайте ' . idn_to_utf8(INJI_DOMAIN_NAME);
+            $notification->name = 'Новый заказ в интернет магазине на сайте '.idn_to_utf8(INJI_DOMAIN_NAME);
             $notification->text = 'Перейдите в админ панель чтобы просмотреть новый заказ';
             $notification->chanel_id = $this->notifications->getChanel('Ecommerce-orders')->id;
             $notification->save();
@@ -177,10 +177,10 @@ 
         'href' => '/ecommerce/cart'
     ];
     $bread[] = [
-        'text' => 'Заказ: №' . $cart->id,
-        'href' => '/ecommerce/cart/orderDetail/' . $cart->id
+        'text' => 'Заказ: №'.$cart->id,
+        'href' => '/ecommerce/cart/orderDetail/'.$cart->id
     ];
-    $this->view->setTitle('Заказ №' . $cart->id);
+    $this->view->setTitle('Заказ №'.$cart->id);
     $this->view->page(['data' => compact('cart', 'bread')]);
   }
 
@@ -268,7 +268,7 @@ 
       $result->send();
     }
 
-    $item->sales ++;
+    $item->sales++;
     $item->save();
 
     if (empty($_GET['count']))
@@ -280,7 +280,7 @@ 
     $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->content = 'На складе недостаточно товара! Доступно: '.$price->offer->warehouseCount();
       $result->send();
     }
 
@@ -298,7 +298,7 @@ 
     }
     $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->successMsg = '<a href="/ecommerce/view/'.$item->id.'">'.$item->name().($price->offer->name() ? ' ('.$price->offer->name().')' : '').'</a> добавлен <a href="/ecommerce/cart">в корзину покупок</a>!';
     $result->send();
   }
 

system/modules/Ecommerce/appControllers/EcommerceController.php

Indentation +80 added lines, -80 removed lines

@@ -10,42 +10,42 @@ 
  */
 class ecommerceController extends Controller {
 
-  public function buyCardAction() {
+    public function buyCardAction() {
     $this->view->setTitle('Покупка карты');
     $bread = [];
     $bread[] = ['text' => 'Покупка карты'];
     $user = Users\User::$cur;
     if (!empty($_POST) && !empty($_POST['card_id'])) {
-      $error = false;
-      $card = \Ecommerce\Card::get((int) $_POST['card_id']);
-      if (!$card) {
+        $error = false;
+        $card = \Ecommerce\Card::get((int) $_POST['card_id']);
+        if (!$card) {
         $error = true;
         Msg::add('Такой карты не существует', 'danger');
-      }
+        }
 
-      if (!Users\User::$cur->id) {
+        if (!Users\User::$cur->id) {
         $user_id = $this->Users->registration($_POST, true);
         if (!$user_id) {
-          $error = true;
-          $user = null;
+            $error = true;
+            $user = null;
         } else {
-          $user = Users\User::get($user_id);
+            $user = Users\User::get($user_id);
+        }
         }
-      }
-      $userCard = \Ecommerce\Card\Item::get([['card_id', $card->id], ['user_id', $user->id]]);
-      if ($userCard) {
+        $userCard = \Ecommerce\Card\Item::get([['card_id', $card->id], ['user_id', $user->id]]);
+        if ($userCard) {
         $error = true;
         Msg::add('У вас уже есть такая карта', 'danger');
-      }
+        }
 
-      $fields = \Ecommerce\UserAdds\Field::getList();
-      foreach ($fields as $field) {
+        $fields = \Ecommerce\UserAdds\Field::getList();
+        foreach ($fields as $field) {
         if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
-          $error = 1;
-          Msg::add('Вы не указали: ' . $field->name);
+            $error = 1;
+            Msg::add('Вы не указали: ' . $field->name);
+        }
         }
-      }
-      if (!$error) {
+        if (!$error) {
         $cardItem = new \Ecommerce\Card\Item();
         $cardItem->card_id = $card->id;
         $cardItem->user_id = $user->id;
@@ -58,7 +58,7 @@ 
         $cart->date_status = date('Y-m-d H:i:s');
         $cart->complete_data = date('Y-m-d H:i:s');
         if (!empty($_SESSION['cart']['cart_id'])) {
-          $cart->card_item_id = $cardItem->id;
+            $cart->card_item_id = $cardItem->id;
         }
         $cart->save();
 
@@ -73,69 +73,69 @@ 
         $extra->info = 'card:' . $card->id . '|cardItem:' . $cardItem->id;
         $extra->save();
         Tools::redirect('/ecommerce/cart/success');
-      }
+        }
     }
     $this->view->page(['data' => compact('bread')]);
-  }
+    }
 
-  public function autoCompleteAction() {
+    public function autoCompleteAction() {
     $return = Cache::get('itemsAutocomplete');
     if (!$return) {
-      $items = $this->ecommerce->getItems();
-      $return = [];
-      foreach ($items as $item) {
+        $items = $this->ecommerce->getItems();
+        $return = [];
+        foreach ($items as $item) {
         $return[] = ['name' => $item->name(), 'search' => $item->search_index . ' ' . $item->name];
-      }
-      $return = json_encode($return);
-      Cache::set('itemsAutocomplete', [], $return);
+        }
+        $return = json_encode($return);
+        Cache::set('itemsAutocomplete', [], $return);
     }
     echo $return;
-  }
+    }
 
-  public function indexAction() {
+    public function indexAction() {
     if (empty($this->module->config['catalogPresentPage'])) {
-      Tools::redirect('/ecommerce/itemList');
+        Tools::redirect('/ecommerce/itemList');
     }
     //$this->view->setTitle('Каталог');
     $this->view->page();
-  }
+    }
 
-  public function itemListAction($category_id = 0) {
+    public function itemListAction($category_id = 0) {
     //search
     if (!empty($_GET['search'])) {
-      if (!empty($_GET['inCatalog'])) {
+        if (!empty($_GET['inCatalog'])) {
         $category_id = (int) $_GET['inCatalog'];
-      }
-      $search = $_GET['search'];
+        }
+        $search = $_GET['search'];
     } else {
-      $search = '';
+        $search = '';
     }
 
     //sort
     if (!empty($_GET['sort'])) {
-      $sort = $_GET['sort'];
+        $sort = $_GET['sort'];
     } elseif (!empty($this->ecommerce->config['defaultSort'])) {
-      $sort = $this->ecommerce->config['defaultSort'];
+        $sort = $this->ecommerce->config['defaultSort'];
     } else {
-      $sort = ['name' => 'asc'];
+        $sort = ['name' => 'asc'];
     }
 
     //category
     $category = null;
     if ($category_id) {
-      if (is_numeric($category_id)) {
+        if (is_numeric($category_id)) {
         $category = \Ecommerce\Category::get($category_id);
-      }
-      if (!$category) {
+        }
+        if (!$category) {
         $category = \Ecommerce\Category::get($category_id, 'alias');
-      }
-      if ($category) {
+        }
+        if ($category) {
         $category_id = $category->id;
-      } else {
+        } else {
         $category_id = 0;
-      }
+        }
     } else {
-      $category_id = 0;
+        $category_id = 0;
     }
     $active = $category_id;
 
@@ -151,17 +151,17 @@ 
     //bread
     $bread = [];
     if (!$category || !$category->name) {
-      $bread[] = array('text' => 'Каталог');
-      $this->view->setTitle('Каталог');
+        $bread[] = array('text' => 'Каталог');
+        $this->view->setTitle('Каталог');
     } else {
-      $bread[] = array('text' => 'Каталог', 'href' => '/ecommerce');
-      $categoryIds = array_values(array_filter(explode('/', $category->tree_path)));
-      foreach ($categoryIds as $id) {
+        $bread[] = array('text' => 'Каталог', 'href' => '/ecommerce');
+        $categoryIds = array_values(array_filter(explode('/', $category->tree_path)));
+        foreach ($categoryIds as $id) {
         $cat = Ecommerce\Category::get($id);
         $bread[] = array('text' => $cat->name, 'href' => '/ecommerce/itemList/' . $cat->id);
-      }
-      $bread[] = array('text' => $category->name);
-      $this->view->setTitle($category->name);
+        }
+        $bread[] = array('text' => $category->name);
+        $this->view->setTitle($category->name);
     }
 
     //items
@@ -176,30 +176,30 @@ 
 
     //params 
     if (empty(App::$cur->ecommerce->config['filtersInLast'])) {
-      $options = \Ecommerce\Item\Option::getList(['where' => ['item_option_searchable', 1]]);
+        $options = \Ecommerce\Item\Option::getList(['where' => ['item_option_searchable', 1]]);
     } else {
-      $params = $this->ecommerce->getItemsParams([
-          'parent' => $category_id,
-          'search' => trim($search),
-          'filters' => !empty($_GET['filters']) ? $_GET['filters'] : []
-      ]);
-      $ids = [];
-      foreach ($params as $param) {
+        $params = $this->ecommerce->getItemsParams([
+            'parent' => $category_id,
+            'search' => trim($search),
+            'filters' => !empty($_GET['filters']) ? $_GET['filters'] : []
+        ]);
+        $ids = [];
+        foreach ($params as $param) {
         $ids[] = $param->item_option_id;
-      }
-      if ($ids) {
+        }
+        if ($ids) {
         $options = \Ecommerce\Item\Option::getList(['where' => ['id', $ids, 'IN']]);
-      } else {
+        } else {
         $options = [];
-      }
+        }
     }
 
 
     //child categorys
     if ($category) {
-      $categorys = $category->catalogs;
+        $categorys = $category->catalogs;
     } else {
-      $categorys = \Ecommerce\Category::getList(['where' => ['parent_id', 0]]);
+        $categorys = \Ecommerce\Category::getList(['where' => ['parent_id', 0]]);
     }
 
     //view content
@@ -207,12 +207,12 @@ 
         'page' => $category ? $category->resolveTemplate() : (!empty(App::$cur->ecommerce->config['defaultCategoryTemplate']) ? App::$cur->ecommerce->config['defaultCategoryTemplate'] : 'current'),
         'content' => $category ? $category->resolveViewer() : (!empty(App::$cur->ecommerce->config['defaultCategoryView']) ? App::$cur->ecommerce->config['defaultCategoryView'] : 'itemList'),
         'data' => compact('active', 'category', 'sort', 'search', 'pages', 'items', 'categorys', 'bread', 'options')]);
-  }
+    }
 
-  public function viewAction($id = '') {
+    public function viewAction($id = '') {
     $item = \Ecommerce\Item::get((int) $id);
     if (!$item) {
-      Tools::redirect('/ecommerce/', 'Такой товар не найден');
+        Tools::redirect('/ecommerce/', 'Такой товар не найден');
     }
     $active = $item->category_id;
     $catalog = $item->category;
@@ -221,10 +221,10 @@ 
 
     $catalogIds = array_values(array_filter(explode('/', $item->tree_path)));
     foreach ($catalogIds as $id) {
-      $cat = Ecommerce\Category::get($id);
-      if ($cat) {
+        $cat = Ecommerce\Category::get($id);
+        if ($cat) {
         $bread[] = ['text' => $cat->name, 'href' => '/ecommerce/itemList/' . $cat->id];
-      }
+        }
     }
     $bread[] = ['text' => $item->name()];
     $this->view->setTitle($item->name());
@@ -233,17 +233,17 @@ 
         'content' => $item->view ? $item->view : 'view'
     ];
     if (isset($_GET['quickview'])) {
-      $options['page'] = 'blank';
+        $options['page'] = 'blank';
     }
 
     $this->view->addMetaTag(['property' => 'og:title', 'content' => $item->name]);
     $this->view->addMetaTag(['property' => 'og:description', 'content' => $item->description]);
     if ($item->image) {
-      $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . INJI_DOMAIN_NAME . $item->image->path]);
+        $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . INJI_DOMAIN_NAME . $item->image->path]);
     }
     $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://' . INJI_DOMAIN_NAME . '/view/' . $item->id]);
 
     $this->view->page($options);
-  }
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -42,7 +42,7 @@ 
       foreach ($fields as $field) {
         if (empty($_POST['userAdds']['fields'][$field->id]) && $field->required) {
           $error = 1;
-          Msg::add('Вы не указали: ' . $field->name);
+          Msg::add('Вы не указали: '.$field->name);
         }
       }
       if (!$error) {
@@ -70,7 +70,7 @@ 
         $extra->price = $card->price;
         $extra->count = 1;
         $extra->cart_id = $cart->id;
-        $extra->info = 'card:' . $card->id . '|cardItem:' . $cardItem->id;
+        $extra->info = 'card:'.$card->id.'|cardItem:'.$cardItem->id;
         $extra->save();
         Tools::redirect('/ecommerce/cart/success');
       }
@@ -84,7 +84,7 @@ 
       $items = $this->ecommerce->getItems();
       $return = [];
       foreach ($items as $item) {
-        $return[] = ['name' => $item->name(), 'search' => $item->search_index . ' ' . $item->name];
+        $return[] = ['name' => $item->name(), 'search' => $item->search_index.' '.$item->name];
       }
       $return = json_encode($return);
       Cache::set('itemsAutocomplete', [], $return);
@@ -158,7 +158,7 @@ 
       $categoryIds = array_values(array_filter(explode('/', $category->tree_path)));
       foreach ($categoryIds as $id) {
         $cat = Ecommerce\Category::get($id);
-        $bread[] = array('text' => $cat->name, 'href' => '/ecommerce/itemList/' . $cat->id);
+        $bread[] = array('text' => $cat->name, 'href' => '/ecommerce/itemList/'.$cat->id);
       }
       $bread[] = array('text' => $category->name);
       $this->view->setTitle($category->name);
@@ -223,7 +223,7 @@ 
     foreach ($catalogIds as $id) {
       $cat = Ecommerce\Category::get($id);
       if ($cat) {
-        $bread[] = ['text' => $cat->name, 'href' => '/ecommerce/itemList/' . $cat->id];
+        $bread[] = ['text' => $cat->name, 'href' => '/ecommerce/itemList/'.$cat->id];
       }
     }
     $bread[] = ['text' => $item->name()];
@@ -239,9 +239,9 @@ 
     $this->view->addMetaTag(['property' => 'og:title', 'content' => $item->name]);
     $this->view->addMetaTag(['property' => 'og:description', 'content' => $item->description]);
     if ($item->image) {
-      $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://' . INJI_DOMAIN_NAME . $item->image->path]);
+      $this->view->addMetaTag(['property' => 'og:image', 'content' => 'http://'.INJI_DOMAIN_NAME.$item->image->path]);
     }
-    $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://' . INJI_DOMAIN_NAME . '/view/' . $item->id]);
+    $this->view->addMetaTag(['property' => 'og:url', 'content' => 'http://'.INJI_DOMAIN_NAME.'/view/'.$item->id]);
 
     $this->view->page($options);
   }

system/modules/Ecommerce/models/Category.php

Indentation +73 added lines, -73 removed lines

@@ -13,50 +13,50 @@ 
 
 class Category extends \Model {
 
-  public static $objectName = 'Категория магазина';
-  public static $treeCategory = 'Ecommerce\Item';
-  public static $cols = [
-      //Основные параметры
-      'parent_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'parent'],
-      'name' => ['type' => 'text'],
-      'alias' => ['type' => 'text'],
-      'viewer' => ['type' => 'select', 'source' => 'method', 'method' => 'viewsCategoryList', 'module' => 'Ecommerce'],
-      'template' => ['type' => 'select', 'source' => 'method', 'method' => 'templatesCategoryList', 'module' => 'Ecommerce'],
-      'description' => ['type' => 'html'],
-      'image_file_id' => ['type' => 'image'],
-      'options_inherit' => ['type' => 'bool'],
-      //Системные
-      'imported' => ['type' => 'bool'],
-      'weight' => ['type' => 'number'],
-      'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
-      'tree_path' => ['type' => 'text'],
-      'date_create' => ['type' => 'dateTime'],
-      //Менеджеры
-      'options' => ['type' => 'dataManager', 'relation' => 'options'],
-  ];
-  public static $labels = [
-      'name' => 'Название',
-      'alias' => 'Алиас',
-      'parent_id' => 'Родительская категория',
-      'image_file_id' => 'Изображение',
-      'description' => 'Описание',
-      'options_inherit' => 'Наследовать набор свойств',
-      'options' => 'Свойства товаров',
-  ];
-  public static $forms = [
-      'manager' => [
-          'map' => [
-              ['name', 'alias'],
-              ['parent_id', 'image_file_id'],
-              ['viewer', 'template'],
-              ['options_inherit'],
-              ['options'],
-              ['description']
-          ]
-      ]
-  ];
+    public static $objectName = 'Категория магазина';
+    public static $treeCategory = 'Ecommerce\Item';
+    public static $cols = [
+        //Основные параметры
+        'parent_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'parent'],
+        'name' => ['type' => 'text'],
+        'alias' => ['type' => 'text'],
+        'viewer' => ['type' => 'select', 'source' => 'method', 'method' => 'viewsCategoryList', 'module' => 'Ecommerce'],
+        'template' => ['type' => 'select', 'source' => 'method', 'method' => 'templatesCategoryList', 'module' => 'Ecommerce'],
+        'description' => ['type' => 'html'],
+        'image_file_id' => ['type' => 'image'],
+        'options_inherit' => ['type' => 'bool'],
+        //Системные
+        'imported' => ['type' => 'bool'],
+        'weight' => ['type' => 'number'],
+        'user_id' => ['type' => 'select', 'source' => 'relation', 'relation' => 'user'],
+        'tree_path' => ['type' => 'text'],
+        'date_create' => ['type' => 'dateTime'],
+        //Менеджеры
+        'options' => ['type' => 'dataManager', 'relation' => 'options'],
+    ];
+    public static $labels = [
+        'name' => 'Название',
+        'alias' => 'Алиас',
+        'parent_id' => 'Родительская категория',
+        'image_file_id' => 'Изображение',
+        'description' => 'Описание',
+        'options_inherit' => 'Наследовать набор свойств',
+        'options' => 'Свойства товаров',
+    ];
+    public static $forms = [
+        'manager' => [
+            'map' => [
+                ['name', 'alias'],
+                ['parent_id', 'image_file_id'],
+                ['viewer', 'template'],
+                ['options_inherit'],
+                ['options'],
+                ['description']
+            ]
+        ]
+    ];
 
-  public static function indexes() {
+    public static function indexes() {
     return [
         'ecommerce_category_category_parent_id' => [
             'type' => 'INDEX',
@@ -71,9 +71,9 @@ 
             ]
         ],
     ];
-  }
+    }
 
-  public static function relations() {
+    public static function relations() {
     return [
         'items' => [
             'type' => 'many',
@@ -103,50 +103,50 @@ 
             'col' => 'parent_id',
         ]
     ];
-  }
+    }
 
-  public static $dataManagers = [
-      'manager' => [
-          'name' => 'Категории товаров',
-          'cols' => [
-              'name',
-              'parent_id',
-          ],
-          'sortMode' => true
-      ]
-  ];
+    public static $dataManagers = [
+        'manager' => [
+            'name' => 'Категории товаров',
+            'cols' => [
+                'name',
+                'parent_id',
+            ],
+            'sortMode' => true
+        ]
+    ];
 
-  public function beforeSave() {
+    public function beforeSave() {
     if ($this->id && $this->id == $this->parent_id) {
-      $this->parent_id = 0;
-      \Msg::add('Категория не может быть сама себе родителем');
+        $this->parent_id = 0;
+        \Msg::add('Категория не может быть сама себе родителем');
+    }
     }
-  }
 
-  public function beforeDelete() {
+    public function beforeDelete() {
     foreach ($this->catalogs as $category) {
-      $category->delete();
+        $category->delete();
+    }
     }
-  }
 
-  public function resolveTemplate() {
+    public function resolveTemplate() {
     if ($this->template !== 'inherit') {
-      return $this->template;
+        return $this->template;
     } elseif ($this->template == 'inherit' && $this->category) {
-      return $this->category->resolveTemplate(true);
+        return $this->category->resolveTemplate(true);
     } else {
-      return (!empty(\App::$cur->ecommerce->config['defaultCategoryTemplate']) ? \App::$cur->ecommerce->config['defaultCategoryTemplate'] : 'current');
+        return (!empty(\App::$cur->ecommerce->config['defaultCategoryTemplate']) ? \App::$cur->ecommerce->config['defaultCategoryTemplate'] : 'current');
+    }
     }
-  }
 
-  public function resolveViewer() {
+    public function resolveViewer() {
     if ($this->viewer !== 'inherit') {
-      return $this->viewer;
+        return $this->viewer;
     } elseif ($this->viewer == 'inherit' && $this->category) {
-      return $this->category->resolveViewer(true);
+        return $this->category->resolveViewer(true);
     } else {
-      return (!empty(\App::$cur->ecommerce->config['defaultCategoryView']) ? \App::$cur->ecommerce->config['defaultCategoryView'] : 'itemList');
+        return (!empty(\App::$cur->ecommerce->config['defaultCategoryView']) ? \App::$cur->ecommerce->config['defaultCategoryView'] : 'itemList');
+    }
     }
-  }
 
 }